diff options
98 files changed, 288 insertions, 161 deletions
diff --git a/Android.mk b/Android.mk index eb6798cb7..b7a4a8ffe 100644 --- a/Android.mk +++ b/Android.mk @@ -79,8 +79,6 @@ 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)) diff --git a/java/com/android/dialer/theme/res/values-af/strings.xml b/java/com/android/dialer/theme/res/values-af/strings.xml index 9681aee94..444061699 100644 --- a/java/com/android/dialer/theme/res/values-af/strings.xml +++ b/java/com/android/dialer/theme/res/values-af/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Onbekend"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Telefoonhokkie"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Foon"</string> <string name="video_call" msgid="8914878391104612532">"Video-oproep"</string> diff --git a/java/com/android/dialer/theme/res/values-am/strings.xml b/java/com/android/dialer/theme/res/values-am/strings.xml index 0bbcc02b7..cb697277b 100644 --- a/java/com/android/dialer/theme/res/values-am/strings.xml +++ b/java/com/android/dialer/theme/res/values-am/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"ያልታወቀ"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"የሕዝብ ስልክ"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"ስልክ"</string> <string name="video_call" msgid="8914878391104612532">"የቪዲዮ ጥሪ"</string> diff --git a/java/com/android/dialer/theme/res/values-ar/strings.xml b/java/com/android/dialer/theme/res/values-ar/strings.xml index c474c6e44..49ecdf692 100644 --- a/java/com/android/dialer/theme/res/values-ar/strings.xml +++ b/java/com/android/dialer/theme/res/values-ar/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"غير معروف"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"هاتف يعمل بالعملة"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"الهاتف"</string> <string name="video_call" msgid="8914878391104612532">"مكالمة فيديو"</string> diff --git a/java/com/android/dialer/theme/res/values-az/strings.xml b/java/com/android/dialer/theme/res/values-az/strings.xml index f3e7a014d..6aa8a03bd 100644 --- a/java/com/android/dialer/theme/res/values-az/strings.xml +++ b/java/com/android/dialer/theme/res/values-az/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Naməlum"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Taksofon"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefon"</string> <string name="video_call" msgid="8914878391104612532">"Video zəng"</string> diff --git a/java/com/android/dialer/theme/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/theme/res/values-b+sr+Latn/strings.xml index e1a26fa90..159f2a144 100644 --- a/java/com/android/dialer/theme/res/values-b+sr+Latn/strings.xml +++ b/java/com/android/dialer/theme/res/values-b+sr+Latn/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Nepoznato"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Telefonska govornica"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefon"</string> <string name="video_call" msgid="8914878391104612532">"Uputi video poziv"</string> diff --git a/java/com/android/dialer/theme/res/values-be/strings.xml b/java/com/android/dialer/theme/res/values-be/strings.xml index 305f608f0..c69fa10dd 100644 --- a/java/com/android/dialer/theme/res/values-be/strings.xml +++ b/java/com/android/dialer/theme/res/values-be/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Невядомы"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Таксафон"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Тэлефон"</string> <string name="video_call" msgid="8914878391104612532">"Відэавыклік"</string> diff --git a/java/com/android/dialer/theme/res/values-bg/strings.xml b/java/com/android/dialer/theme/res/values-bg/strings.xml index 77c80863b..0e829a5bb 100644 --- a/java/com/android/dialer/theme/res/values-bg/strings.xml +++ b/java/com/android/dialer/theme/res/values-bg/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Неизвестен номер"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Обществен телефон"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Телефон"</string> <string name="video_call" msgid="8914878391104612532">"Видеообаждане"</string> diff --git a/java/com/android/dialer/theme/res/values-bn/strings.xml b/java/com/android/dialer/theme/res/values-bn/strings.xml index 1e13496ed..be082640f 100644 --- a/java/com/android/dialer/theme/res/values-bn/strings.xml +++ b/java/com/android/dialer/theme/res/values-bn/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"অজানা"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"পে ফোন"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"ফোন"</string> <string name="video_call" msgid="8914878391104612532">"ভিডিও কল"</string> diff --git a/java/com/android/dialer/theme/res/values-bs/strings.xml b/java/com/android/dialer/theme/res/values-bs/strings.xml index 051e4e947..7d1e17bc8 100644 --- a/java/com/android/dialer/theme/res/values-bs/strings.xml +++ b/java/com/android/dialer/theme/res/values-bs/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Nepoznato"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Telefonska govornica"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefon"</string> <string name="video_call" msgid="8914878391104612532">"Videopoziv"</string> diff --git a/java/com/android/dialer/theme/res/values-ca/strings.xml b/java/com/android/dialer/theme/res/values-ca/strings.xml index ce3bd4316..a15434b8a 100644 --- a/java/com/android/dialer/theme/res/values-ca/strings.xml +++ b/java/com/android/dialer/theme/res/values-ca/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Desconegut"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Telèfon públic"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Telèfon"</string> <string name="video_call" msgid="8914878391104612532">"Videotrucada"</string> diff --git a/java/com/android/dialer/theme/res/values-cs/strings.xml b/java/com/android/dialer/theme/res/values-cs/strings.xml index 235260fb1..7525c3eaf 100644 --- a/java/com/android/dialer/theme/res/values-cs/strings.xml +++ b/java/com/android/dialer/theme/res/values-cs/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Neznámé"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Telefonní automat"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefon"</string> <string name="video_call" msgid="8914878391104612532">"Zahájit videohovor"</string> diff --git a/java/com/android/dialer/theme/res/values-da/strings.xml b/java/com/android/dialer/theme/res/values-da/strings.xml index 552574486..1c2bbb528 100644 --- a/java/com/android/dialer/theme/res/values-da/strings.xml +++ b/java/com/android/dialer/theme/res/values-da/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Ukendt"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Mønttelefon"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Opkald"</string> <string name="video_call" msgid="8914878391104612532">"Videoopkald"</string> diff --git a/java/com/android/dialer/theme/res/values-de/strings.xml b/java/com/android/dialer/theme/res/values-de/strings.xml index b1555773d..102d59cbe 100644 --- a/java/com/android/dialer/theme/res/values-de/strings.xml +++ b/java/com/android/dialer/theme/res/values-de/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Unbekannt"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Münztelefon"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefon"</string> <string name="video_call" msgid="8914878391104612532">"Videoanruf"</string> diff --git a/java/com/android/dialer/theme/res/values-el/strings.xml b/java/com/android/dialer/theme/res/values-el/strings.xml index 156b7cdbe..20cd85612 100644 --- a/java/com/android/dialer/theme/res/values-el/strings.xml +++ b/java/com/android/dialer/theme/res/values-el/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Άγνωστος"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Τηλέφωνο με χρέωση"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Τηλέφωνο"</string> <string name="video_call" msgid="8914878391104612532">"Βιντεοκλήση"</string> diff --git a/java/com/android/dialer/theme/res/values-en-rAU/strings.xml b/java/com/android/dialer/theme/res/values-en-rAU/strings.xml index 36de9e5ae..5ab154e4d 100644 --- a/java/com/android/dialer/theme/res/values-en-rAU/strings.xml +++ b/java/com/android/dialer/theme/res/values-en-rAU/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Unknown"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Payphone"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Phone"</string> <string name="video_call" msgid="8914878391104612532">"Video call"</string> diff --git a/java/com/android/dialer/theme/res/values-en-rGB/strings.xml b/java/com/android/dialer/theme/res/values-en-rGB/strings.xml index 36de9e5ae..5ab154e4d 100644 --- a/java/com/android/dialer/theme/res/values-en-rGB/strings.xml +++ b/java/com/android/dialer/theme/res/values-en-rGB/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Unknown"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Payphone"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Phone"</string> <string name="video_call" msgid="8914878391104612532">"Video call"</string> diff --git a/java/com/android/dialer/theme/res/values-en-rIN/strings.xml b/java/com/android/dialer/theme/res/values-en-rIN/strings.xml index 36de9e5ae..5ab154e4d 100644 --- a/java/com/android/dialer/theme/res/values-en-rIN/strings.xml +++ b/java/com/android/dialer/theme/res/values-en-rIN/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Unknown"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Payphone"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Phone"</string> <string name="video_call" msgid="8914878391104612532">"Video call"</string> diff --git a/java/com/android/dialer/theme/res/values-es-rUS/strings.xml b/java/com/android/dialer/theme/res/values-es-rUS/strings.xml index be2eac8fc..ac31fffcf 100644 --- a/java/com/android/dialer/theme/res/values-es-rUS/strings.xml +++ b/java/com/android/dialer/theme/res/values-es-rUS/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Desconocido"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Teléfono público"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Teléfono"</string> <string name="video_call" msgid="8914878391104612532">"Videollamada"</string> diff --git a/java/com/android/dialer/theme/res/values-es/strings.xml b/java/com/android/dialer/theme/res/values-es/strings.xml index c63374c24..8a12c0285 100644 --- a/java/com/android/dialer/theme/res/values-es/strings.xml +++ b/java/com/android/dialer/theme/res/values-es/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Desconocido"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Teléfono público"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Teléfono"</string> <string name="video_call" msgid="8914878391104612532">"Videollamada"</string> diff --git a/java/com/android/dialer/theme/res/values-et/strings.xml b/java/com/android/dialer/theme/res/values-et/strings.xml index 1f76a4b20..42adb0352 100644 --- a/java/com/android/dialer/theme/res/values-et/strings.xml +++ b/java/com/android/dialer/theme/res/values-et/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Tundmatu"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Telefoniautomaat"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefon"</string> <string name="video_call" msgid="8914878391104612532">"Videokõne"</string> diff --git a/java/com/android/dialer/theme/res/values-eu/strings.xml b/java/com/android/dialer/theme/res/values-eu/strings.xml index 8b284671a..8760dac58 100644 --- a/java/com/android/dialer/theme/res/values-eu/strings.xml +++ b/java/com/android/dialer/theme/res/values-eu/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Ezezaguna"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Telefono publikoa"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefonoa"</string> <string name="video_call" msgid="8914878391104612532">"Bideo-deia"</string> diff --git a/java/com/android/dialer/theme/res/values-fa/strings.xml b/java/com/android/dialer/theme/res/values-fa/strings.xml index 340adb156..0379d7c97 100644 --- a/java/com/android/dialer/theme/res/values-fa/strings.xml +++ b/java/com/android/dialer/theme/res/values-fa/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"ناشناس"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="ID">%d</xliff:g> <xliff:g id="UNKNOWN">%s</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="ID">%1$d</xliff:g> <xliff:g id="UNKNOWN">%2$s</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"تلفن عمومی"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"تلفن"</string> <string name="video_call" msgid="8914878391104612532">"تماس ویدیویی"</string> diff --git a/java/com/android/dialer/theme/res/values-fi/strings.xml b/java/com/android/dialer/theme/res/values-fi/strings.xml index 52cab8a83..82172e6d2 100644 --- a/java/com/android/dialer/theme/res/values-fi/strings.xml +++ b/java/com/android/dialer/theme/res/values-fi/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Tuntematon"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Maksupuhelin"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Puhelin"</string> <string name="video_call" msgid="8914878391104612532">"Videopuhelu"</string> diff --git a/java/com/android/dialer/theme/res/values-fr-rCA/strings.xml b/java/com/android/dialer/theme/res/values-fr-rCA/strings.xml index b1d0ff12d..3fe64f4a3 100644 --- a/java/com/android/dialer/theme/res/values-fr-rCA/strings.xml +++ b/java/com/android/dialer/theme/res/values-fr-rCA/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Inconnu"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Cabine téléphonique"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Téléphone"</string> <string name="video_call" msgid="8914878391104612532">"Appel vidéo"</string> diff --git a/java/com/android/dialer/theme/res/values-fr/strings.xml b/java/com/android/dialer/theme/res/values-fr/strings.xml index b1d0ff12d..3fe64f4a3 100644 --- a/java/com/android/dialer/theme/res/values-fr/strings.xml +++ b/java/com/android/dialer/theme/res/values-fr/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Inconnu"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Cabine téléphonique"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Téléphone"</string> <string name="video_call" msgid="8914878391104612532">"Appel vidéo"</string> diff --git a/java/com/android/dialer/theme/res/values-gl/strings.xml b/java/com/android/dialer/theme/res/values-gl/strings.xml index 1788843f2..c137c523f 100644 --- a/java/com/android/dialer/theme/res/values-gl/strings.xml +++ b/java/com/android/dialer/theme/res/values-gl/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Descoñecido"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Teléfono público"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Teléfono"</string> <string name="video_call" msgid="8914878391104612532">"Videochamada"</string> diff --git a/java/com/android/dialer/theme/res/values-gu/strings.xml b/java/com/android/dialer/theme/res/values-gu/strings.xml index 8de6e2a4a..7af93677c 100644 --- a/java/com/android/dialer/theme/res/values-gu/strings.xml +++ b/java/com/android/dialer/theme/res/values-gu/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"અજાણ્યું"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"પેફોન"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"ફોન"</string> <string name="video_call" msgid="8914878391104612532">"વિડિઓ કૉલ"</string> diff --git a/java/com/android/dialer/theme/res/values-hi/strings.xml b/java/com/android/dialer/theme/res/values-hi/strings.xml index fbc56e9c9..a475383ed 100644 --- a/java/com/android/dialer/theme/res/values-hi/strings.xml +++ b/java/com/android/dialer/theme/res/values-hi/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"अज्ञात"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"पे-फ़ोन"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"फ़ोन"</string> <string name="video_call" msgid="8914878391104612532">"वीडियो कॉल"</string> diff --git a/java/com/android/dialer/theme/res/values-hr/strings.xml b/java/com/android/dialer/theme/res/values-hr/strings.xml index 73c6542f9..668d8ff2f 100644 --- a/java/com/android/dialer/theme/res/values-hr/strings.xml +++ b/java/com/android/dialer/theme/res/values-hr/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Nepoznato"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Javna telefonska govornica"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefon"</string> <string name="video_call" msgid="8914878391104612532">"Videopoziv"</string> diff --git a/java/com/android/dialer/theme/res/values-hu/strings.xml b/java/com/android/dialer/theme/res/values-hu/strings.xml index d70977df4..75c89c67e 100644 --- a/java/com/android/dialer/theme/res/values-hu/strings.xml +++ b/java/com/android/dialer/theme/res/values-hu/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Ismeretlen"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Nyilvános telefon"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefon"</string> <string name="video_call" msgid="8914878391104612532">"Videohívás"</string> diff --git a/java/com/android/dialer/theme/res/values-hy/strings.xml b/java/com/android/dialer/theme/res/values-hy/strings.xml index 5f53c9fea..cefdf459e 100644 --- a/java/com/android/dialer/theme/res/values-hy/strings.xml +++ b/java/com/android/dialer/theme/res/values-hy/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Անհայտ"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Բջջային տերմինալ"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Հեռախոս"</string> <string name="video_call" msgid="8914878391104612532">"Տեսազանգ"</string> diff --git a/java/com/android/dialer/theme/res/values-in/strings.xml b/java/com/android/dialer/theme/res/values-in/strings.xml index 193c6e949..ef441369e 100644 --- a/java/com/android/dialer/theme/res/values-in/strings.xml +++ b/java/com/android/dialer/theme/res/values-in/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Tidak diketahui"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Telepon Umum"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Telepon"</string> <string name="video_call" msgid="8914878391104612532">"Video call"</string> diff --git a/java/com/android/dialer/theme/res/values-is/strings.xml b/java/com/android/dialer/theme/res/values-is/strings.xml index 6a67ad942..88763f5f5 100644 --- a/java/com/android/dialer/theme/res/values-is/strings.xml +++ b/java/com/android/dialer/theme/res/values-is/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Óþekkt"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Símasjálfsali"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Sími"</string> <string name="video_call" msgid="8914878391104612532">"Hringja myndsímtal"</string> diff --git a/java/com/android/dialer/theme/res/values-it/strings.xml b/java/com/android/dialer/theme/res/values-it/strings.xml index 46c6d56b8..ec0caa916 100644 --- a/java/com/android/dialer/theme/res/values-it/strings.xml +++ b/java/com/android/dialer/theme/res/values-it/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Sconosciuto"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Cabina telefonica"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefono"</string> <string name="video_call" msgid="8914878391104612532">"Videochiamata"</string> diff --git a/java/com/android/dialer/theme/res/values-iw/strings.xml b/java/com/android/dialer/theme/res/values-iw/strings.xml index 1bc8cbbaa..e6652dc6e 100644 --- a/java/com/android/dialer/theme/res/values-iw/strings.xml +++ b/java/com/android/dialer/theme/res/values-iw/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"לא ידוע"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"טלפון ציבורי"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"טלפון"</string> <string name="video_call" msgid="8914878391104612532">"שיחת וידאו"</string> diff --git a/java/com/android/dialer/theme/res/values-ja/strings.xml b/java/com/android/dialer/theme/res/values-ja/strings.xml index 839495d5b..a3517171f 100644 --- a/java/com/android/dialer/theme/res/values-ja/strings.xml +++ b/java/com/android/dialer/theme/res/values-ja/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"不明"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g>（<xliff:g id="ID">%d</xliff:g>）"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g>（<xliff:g id="ID">%2$d</xliff:g>）"</string> <string name="payphone" msgid="7106361320283710387">"公衆電話"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"電話"</string> <string name="video_call" msgid="8914878391104612532">"ビデオハングアウト"</string> diff --git a/java/com/android/dialer/theme/res/values-ka/strings.xml b/java/com/android/dialer/theme/res/values-ka/strings.xml index 37fdabdb1..03e368bfd 100644 --- a/java/com/android/dialer/theme/res/values-ka/strings.xml +++ b/java/com/android/dialer/theme/res/values-ka/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"უცნობი"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"გადახდის ტელეფონი"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"ტელეფონი"</string> <string name="video_call" msgid="8914878391104612532">"ვიდეოზარი"</string> diff --git a/java/com/android/dialer/theme/res/values-kk/strings.xml b/java/com/android/dialer/theme/res/values-kk/strings.xml index 1b6a516e6..a26da8c98 100644 --- a/java/com/android/dialer/theme/res/values-kk/strings.xml +++ b/java/com/android/dialer/theme/res/values-kk/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Белгісіз"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Автомат-телефон"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Телефон"</string> <string name="video_call" msgid="8914878391104612532">"Бейне қоңырау"</string> diff --git a/java/com/android/dialer/theme/res/values-km/strings.xml b/java/com/android/dialer/theme/res/values-km/strings.xml index cfc20104d..9128d45a8 100644 --- a/java/com/android/dialer/theme/res/values-km/strings.xml +++ b/java/com/android/dialer/theme/res/values-km/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"មិនស្គាល់"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"ទូរស័ព្ទសាធារណៈ"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"ទូរស័ព្ទ"</string> <string name="video_call" msgid="8914878391104612532">"ការហៅវីដេអូ"</string> diff --git a/java/com/android/dialer/theme/res/values-kn/strings.xml b/java/com/android/dialer/theme/res/values-kn/strings.xml index dffa10e08..63f2e5ba5 100644 --- a/java/com/android/dialer/theme/res/values-kn/strings.xml +++ b/java/com/android/dialer/theme/res/values-kn/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"ಅಪರಿಚಿತ"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"ಪೇಫೋನ್"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"ಫೋನ್"</string> <string name="video_call" msgid="8914878391104612532">"ವೀಡಿಯೊ ಕರೆ"</string> diff --git a/java/com/android/dialer/theme/res/values-ko/strings.xml b/java/com/android/dialer/theme/res/values-ko/strings.xml index ff6710c95..03c0ab180 100644 --- a/java/com/android/dialer/theme/res/values-ko/strings.xml +++ b/java/com/android/dialer/theme/res/values-ko/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"알 수 없음"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"공중전화"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"휴대전화"</string> <string name="video_call" msgid="8914878391104612532">"화상 통화"</string> diff --git a/java/com/android/dialer/theme/res/values-ky/strings.xml b/java/com/android/dialer/theme/res/values-ky/strings.xml index 036c27096..ccbcecb2e 100644 --- a/java/com/android/dialer/theme/res/values-ky/strings.xml +++ b/java/com/android/dialer/theme/res/values-ky/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Белгисиз"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Таксофон"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Телефон"</string> <string name="video_call" msgid="8914878391104612532">"Видео чалуу"</string> diff --git a/java/com/android/dialer/theme/res/values-lo/strings.xml b/java/com/android/dialer/theme/res/values-lo/strings.xml index 9204a022d..8148bce64 100644 --- a/java/com/android/dialer/theme/res/values-lo/strings.xml +++ b/java/com/android/dialer/theme/res/values-lo/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"ບໍ່ຮູ້ຈັກ"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"ຕູ້ໂທລະສັບສາທາລະນະ"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"ໂທລະສັບ"</string> <string name="video_call" msgid="8914878391104612532">"ໂທວິດີໂອ"</string> diff --git a/java/com/android/dialer/theme/res/values-lt/strings.xml b/java/com/android/dialer/theme/res/values-lt/strings.xml index be145363c..db133d927 100644 --- a/java/com/android/dialer/theme/res/values-lt/strings.xml +++ b/java/com/android/dialer/theme/res/values-lt/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Nežinomas"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="ID">%d</xliff:g> <xliff:g id="UNKNOWN">%s</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="ID">%1$d</xliff:g> <xliff:g id="UNKNOWN">%2$s</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Taksofonas"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefonas"</string> <string name="video_call" msgid="8914878391104612532">"Vaizdo skambutis"</string> diff --git a/java/com/android/dialer/theme/res/values-lv/strings.xml b/java/com/android/dialer/theme/res/values-lv/strings.xml index 35b742f84..435d33460 100644 --- a/java/com/android/dialer/theme/res/values-lv/strings.xml +++ b/java/com/android/dialer/theme/res/values-lv/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Nezināms"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Maksas tālrunis"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Tālrunis"</string> <string name="video_call" msgid="8914878391104612532">"Videozvans"</string> diff --git a/java/com/android/dialer/theme/res/values-mk/strings.xml b/java/com/android/dialer/theme/res/values-mk/strings.xml index 3975ae5ff..f8e8fbbc6 100644 --- a/java/com/android/dialer/theme/res/values-mk/strings.xml +++ b/java/com/android/dialer/theme/res/values-mk/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Непознато"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Говорница"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Телефон"</string> <string name="video_call" msgid="8914878391104612532">"Воспоставете видеоповик"</string> diff --git a/java/com/android/dialer/theme/res/values-ml/strings.xml b/java/com/android/dialer/theme/res/values-ml/strings.xml index 146bfdf60..beae000b1 100644 --- a/java/com/android/dialer/theme/res/values-ml/strings.xml +++ b/java/com/android/dialer/theme/res/values-ml/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"അജ്ഞാതം"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"പണം നൽകി ഉപയോഗിക്കുന്ന ഫോൺ"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"ഫോണ്"</string> <string name="video_call" msgid="8914878391104612532">"വീഡിയോ കോള്"</string> diff --git a/java/com/android/dialer/theme/res/values-mn/strings.xml b/java/com/android/dialer/theme/res/values-mn/strings.xml index 0e27e8db0..3a37dd101 100644 --- a/java/com/android/dialer/theme/res/values-mn/strings.xml +++ b/java/com/android/dialer/theme/res/values-mn/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Тодорхойгүй"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Payphone"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Утас"</string> <string name="video_call" msgid="8914878391104612532">"Видео дуудлага"</string> diff --git a/java/com/android/dialer/theme/res/values-mr/strings.xml b/java/com/android/dialer/theme/res/values-mr/strings.xml index 7fa6f26d9..c60c7b747 100644 --- a/java/com/android/dialer/theme/res/values-mr/strings.xml +++ b/java/com/android/dialer/theme/res/values-mr/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"अज्ञात"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"सार्वजनिक फोन"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"फोन"</string> <string name="video_call" msgid="8914878391104612532">"व्हिडिओ कॉल"</string> diff --git a/java/com/android/dialer/theme/res/values-ms/strings.xml b/java/com/android/dialer/theme/res/values-ms/strings.xml index 18df9122d..f3d1a7b89 100644 --- a/java/com/android/dialer/theme/res/values-ms/strings.xml +++ b/java/com/android/dialer/theme/res/values-ms/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Tidak diketahui"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Telefon Awam"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefon"</string> <string name="video_call" msgid="8914878391104612532">"Panggilan video"</string> diff --git a/java/com/android/dialer/theme/res/values-my/strings.xml b/java/com/android/dialer/theme/res/values-my/strings.xml index 67b9b28c7..0e61898da 100644 --- a/java/com/android/dialer/theme/res/values-my/strings.xml +++ b/java/com/android/dialer/theme/res/values-my/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"အကြောင်းအရာ မသိရှိ"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"ငွေပေးရသည့်ဖုန်း"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"ဖုန်း"</string> <string name="video_call" msgid="8914878391104612532">"ဗီဒီယိုခေါ်ဆိုမှု"</string> diff --git a/java/com/android/dialer/theme/res/values-nb/strings.xml b/java/com/android/dialer/theme/res/values-nb/strings.xml index 1a6e593e5..97ddbec63 100644 --- a/java/com/android/dialer/theme/res/values-nb/strings.xml +++ b/java/com/android/dialer/theme/res/values-nb/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Ukjent"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Telefonkiosk"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefon"</string> <string name="video_call" msgid="8914878391104612532">"Videosamtale"</string> diff --git a/java/com/android/dialer/theme/res/values-ne/strings.xml b/java/com/android/dialer/theme/res/values-ne/strings.xml index eb73de90c..c4e699201 100644 --- a/java/com/android/dialer/theme/res/values-ne/strings.xml +++ b/java/com/android/dialer/theme/res/values-ne/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"अज्ञात"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"पेफोन"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"फोन"</string> <string name="video_call" msgid="8914878391104612532">"भिडियो कल"</string> diff --git a/java/com/android/dialer/theme/res/values-nl/strings.xml b/java/com/android/dialer/theme/res/values-nl/strings.xml index 36e904cc2..19346eb47 100644 --- a/java/com/android/dialer/theme/res/values-nl/strings.xml +++ b/java/com/android/dialer/theme/res/values-nl/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Onbekend"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Telefooncel"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefoon"</string> <string name="video_call" msgid="8914878391104612532">"Videogesprek"</string> diff --git a/java/com/android/dialer/theme/res/values-no/strings.xml b/java/com/android/dialer/theme/res/values-no/strings.xml index 1a6e593e5..97ddbec63 100644 --- a/java/com/android/dialer/theme/res/values-no/strings.xml +++ b/java/com/android/dialer/theme/res/values-no/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Ukjent"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Telefonkiosk"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefon"</string> <string name="video_call" msgid="8914878391104612532">"Videosamtale"</string> diff --git a/java/com/android/dialer/theme/res/values-pa/strings.xml b/java/com/android/dialer/theme/res/values-pa/strings.xml index af263c82c..e74c7aad8 100644 --- a/java/com/android/dialer/theme/res/values-pa/strings.xml +++ b/java/com/android/dialer/theme/res/values-pa/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"ਅਗਿਆਤ"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"ਪੇਫੋਨ"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"ਫੋਨ"</string> <string name="video_call" msgid="8914878391104612532">"ਵੀਡੀਓ ਕਾਲ"</string> diff --git a/java/com/android/dialer/theme/res/values-pl/strings.xml b/java/com/android/dialer/theme/res/values-pl/strings.xml index a25df0a2a..ea1136727 100644 --- a/java/com/android/dialer/theme/res/values-pl/strings.xml +++ b/java/com/android/dialer/theme/res/values-pl/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Nieznane"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Automat telefoniczny"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefon"</string> <string name="video_call" msgid="8914878391104612532">"Rozmowa wideo"</string> diff --git a/java/com/android/dialer/theme/res/values-pt-rBR/strings.xml b/java/com/android/dialer/theme/res/values-pt-rBR/strings.xml index 9f44269aa..552839577 100644 --- a/java/com/android/dialer/theme/res/values-pt-rBR/strings.xml +++ b/java/com/android/dialer/theme/res/values-pt-rBR/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Desconhecido"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Telefone público"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefone"</string> <string name="video_call" msgid="8914878391104612532">"Videochamada"</string> diff --git a/java/com/android/dialer/theme/res/values-pt-rPT/strings.xml b/java/com/android/dialer/theme/res/values-pt-rPT/strings.xml index 1b77257e8..52c22ba3d 100644 --- a/java/com/android/dialer/theme/res/values-pt-rPT/strings.xml +++ b/java/com/android/dialer/theme/res/values-pt-rPT/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Desconhecido"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Telefone público"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefone"</string> <string name="video_call" msgid="8914878391104612532">"Videochamada"</string> diff --git a/java/com/android/dialer/theme/res/values-pt/strings.xml b/java/com/android/dialer/theme/res/values-pt/strings.xml index 9f44269aa..552839577 100644 --- a/java/com/android/dialer/theme/res/values-pt/strings.xml +++ b/java/com/android/dialer/theme/res/values-pt/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Desconhecido"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Telefone público"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefone"</string> <string name="video_call" msgid="8914878391104612532">"Videochamada"</string> diff --git a/java/com/android/dialer/theme/res/values-ro/strings.xml b/java/com/android/dialer/theme/res/values-ro/strings.xml index 1cf8c8ca0..d572b7124 100644 --- a/java/com/android/dialer/theme/res/values-ro/strings.xml +++ b/java/com/android/dialer/theme/res/values-ro/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Necunoscut"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Telefon public"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefon"</string> <string name="video_call" msgid="8914878391104612532">"Apel video"</string> diff --git a/java/com/android/dialer/theme/res/values-ru/strings.xml b/java/com/android/dialer/theme/res/values-ru/strings.xml index 8aa6e8fa0..2cb464882 100644 --- a/java/com/android/dialer/theme/res/values-ru/strings.xml +++ b/java/com/android/dialer/theme/res/values-ru/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Неизвестно"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Телефон-автомат"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Телефон"</string> <string name="video_call" msgid="8914878391104612532">"Видеовызов"</string> diff --git a/java/com/android/dialer/theme/res/values-si/strings.xml b/java/com/android/dialer/theme/res/values-si/strings.xml index 04d04687d..08a421e83 100644 --- a/java/com/android/dialer/theme/res/values-si/strings.xml +++ b/java/com/android/dialer/theme/res/values-si/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"නොදනී"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"පේෆෝනය"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"දුරකථනය"</string> <string name="video_call" msgid="8914878391104612532">"වීඩියෝ ඇමතුම"</string> diff --git a/java/com/android/dialer/theme/res/values-sk/strings.xml b/java/com/android/dialer/theme/res/values-sk/strings.xml index 9e56e12ab..e8e201975 100644 --- a/java/com/android/dialer/theme/res/values-sk/strings.xml +++ b/java/com/android/dialer/theme/res/values-sk/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Neznáme"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Telefónny automat"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefón"</string> <string name="video_call" msgid="8914878391104612532">"Videohovor"</string> diff --git a/java/com/android/dialer/theme/res/values-sl/strings.xml b/java/com/android/dialer/theme/res/values-sl/strings.xml index 623653563..ee80c787e 100644 --- a/java/com/android/dialer/theme/res/values-sl/strings.xml +++ b/java/com/android/dialer/theme/res/values-sl/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Neznano"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Telefonska govorilnica"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefon"</string> <string name="video_call" msgid="8914878391104612532">"Videoklic"</string> diff --git a/java/com/android/dialer/theme/res/values-sq/strings.xml b/java/com/android/dialer/theme/res/values-sq/strings.xml index 6fecf147a..c0a61b0a6 100644 --- a/java/com/android/dialer/theme/res/values-sq/strings.xml +++ b/java/com/android/dialer/theme/res/values-sq/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"I panjohur"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Telefon me pagesë"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefoni"</string> <string name="video_call" msgid="8914878391104612532">"Telefonatë me video"</string> diff --git a/java/com/android/dialer/theme/res/values-sr/strings.xml b/java/com/android/dialer/theme/res/values-sr/strings.xml index 8f910540b..934997701 100644 --- a/java/com/android/dialer/theme/res/values-sr/strings.xml +++ b/java/com/android/dialer/theme/res/values-sr/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Непознато"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Телефонска говорница"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Телефон"</string> <string name="video_call" msgid="8914878391104612532">"Упути видео позив"</string> diff --git a/java/com/android/dialer/theme/res/values-sv/strings.xml b/java/com/android/dialer/theme/res/values-sv/strings.xml index f31a3788c..b2811a1ca 100644 --- a/java/com/android/dialer/theme/res/values-sv/strings.xml +++ b/java/com/android/dialer/theme/res/values-sv/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Okänd"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Telefonautomat"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefon"</string> <string name="video_call" msgid="8914878391104612532">"Videosamtal"</string> diff --git a/java/com/android/dialer/theme/res/values-sw/strings.xml b/java/com/android/dialer/theme/res/values-sw/strings.xml index c35d56017..c5e50b8f7 100644 --- a/java/com/android/dialer/theme/res/values-sw/strings.xml +++ b/java/com/android/dialer/theme/res/values-sw/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Haijulikani"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Simu ya kulipia"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Simu"</string> <string name="video_call" msgid="8914878391104612532">"Simu ya video"</string> diff --git a/java/com/android/dialer/theme/res/values-ta/strings.xml b/java/com/android/dialer/theme/res/values-ta/strings.xml index 737e43edf..0be66175d 100644 --- a/java/com/android/dialer/theme/res/values-ta/strings.xml +++ b/java/com/android/dialer/theme/res/values-ta/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"தெரியாதவர்"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"கட்டணத் தொலைபேசி"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"மொபைல்"</string> <string name="video_call" msgid="8914878391104612532">"வீடியோ அழைப்பு"</string> diff --git a/java/com/android/dialer/theme/res/values-te/strings.xml b/java/com/android/dialer/theme/res/values-te/strings.xml index c1a02123c..d8406a8f3 100644 --- a/java/com/android/dialer/theme/res/values-te/strings.xml +++ b/java/com/android/dialer/theme/res/values-te/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"తెలియదు"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"పే ఫోన్"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"ఫోన్"</string> <string name="video_call" msgid="8914878391104612532">"వీడియో కాల్"</string> diff --git a/java/com/android/dialer/theme/res/values-th/strings.xml b/java/com/android/dialer/theme/res/values-th/strings.xml index 0df98d9c4..be1dc1d45 100644 --- a/java/com/android/dialer/theme/res/values-th/strings.xml +++ b/java/com/android/dialer/theme/res/values-th/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"ไม่ทราบ"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"โทรศัพท์สาธารณะ"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"โทรศัพท์"</string> <string name="video_call" msgid="8914878391104612532">"แฮงเอาท์วิดีโอ"</string> diff --git a/java/com/android/dialer/theme/res/values-tl/strings.xml b/java/com/android/dialer/theme/res/values-tl/strings.xml index 573b6b889..2f03ae63b 100644 --- a/java/com/android/dialer/theme/res/values-tl/strings.xml +++ b/java/com/android/dialer/theme/res/values-tl/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Di-kilala"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Payphone"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Telepono"</string> <string name="video_call" msgid="8914878391104612532">"Mag-video call"</string> diff --git a/java/com/android/dialer/theme/res/values-tr/strings.xml b/java/com/android/dialer/theme/res/values-tr/strings.xml index 21e288964..bcbd5255e 100644 --- a/java/com/android/dialer/theme/res/values-tr/strings.xml +++ b/java/com/android/dialer/theme/res/values-tr/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Bilinmiyor"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Ankesörlü telefon"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefon"</string> <string name="video_call" msgid="8914878391104612532">"Görüntülü görüşme"</string> diff --git a/java/com/android/dialer/theme/res/values-uk/strings.xml b/java/com/android/dialer/theme/res/values-uk/strings.xml index dab89df98..73aa2f993 100644 --- a/java/com/android/dialer/theme/res/values-uk/strings.xml +++ b/java/com/android/dialer/theme/res/values-uk/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Невідомий"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Таксофон"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Телефон"</string> <string name="video_call" msgid="8914878391104612532">"Відеодзвінок"</string> diff --git a/java/com/android/dialer/theme/res/values-ur/strings.xml b/java/com/android/dialer/theme/res/values-ur/strings.xml index 187eb22d2..b61ace1e7 100644 --- a/java/com/android/dialer/theme/res/values-ur/strings.xml +++ b/java/com/android/dialer/theme/res/values-ur/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"نامعلوم"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"پے فون"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"فون"</string> <string name="video_call" msgid="8914878391104612532">"ویڈیو کال"</string> diff --git a/java/com/android/dialer/theme/res/values-uz/strings.xml b/java/com/android/dialer/theme/res/values-uz/strings.xml index b57e07247..72d4663cf 100644 --- a/java/com/android/dialer/theme/res/values-uz/strings.xml +++ b/java/com/android/dialer/theme/res/values-uz/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Noma’lum"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Taksofon"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Telefon"</string> <string name="video_call" msgid="8914878391104612532">"Video suhbat"</string> diff --git a/java/com/android/dialer/theme/res/values-vi/strings.xml b/java/com/android/dialer/theme/res/values-vi/strings.xml index 38bd8ec4f..23ee89a0d 100644 --- a/java/com/android/dialer/theme/res/values-vi/strings.xml +++ b/java/com/android/dialer/theme/res/values-vi/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Không xác định"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Điện thoại công cộng"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Điện thoại"</string> <string name="video_call" msgid="8914878391104612532">"Gọi điện video"</string> diff --git a/java/com/android/dialer/theme/res/values-zh-rCN/strings.xml b/java/com/android/dialer/theme/res/values-zh-rCN/strings.xml index c80f19748..77676bd7f 100644 --- a/java/com/android/dialer/theme/res/values-zh-rCN/strings.xml +++ b/java/com/android/dialer/theme/res/values-zh-rCN/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"未知"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"公用电话"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"电话"</string> <string name="video_call" msgid="8914878391104612532">"视频通话"</string> diff --git a/java/com/android/dialer/theme/res/values-zh-rHK/strings.xml b/java/com/android/dialer/theme/res/values-zh-rHK/strings.xml index 605089bbb..f455dc4cb 100644 --- a/java/com/android/dialer/theme/res/values-zh-rHK/strings.xml +++ b/java/com/android/dialer/theme/res/values-zh-rHK/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"未知"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"公共電話"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"電話"</string> <string name="video_call" msgid="8914878391104612532">"視像通話"</string> diff --git a/java/com/android/dialer/theme/res/values-zh-rTW/strings.xml b/java/com/android/dialer/theme/res/values-zh-rTW/strings.xml index 7a5604c0a..2db624c24 100644 --- a/java/com/android/dialer/theme/res/values-zh-rTW/strings.xml +++ b/java/com/android/dialer/theme/res/values-zh-rTW/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"不明"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"公用電話"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"電話"</string> <string name="video_call" msgid="8914878391104612532">"視訊通話"</string> diff --git a/java/com/android/dialer/theme/res/values-zu/strings.xml b/java/com/android/dialer/theme/res/values-zu/strings.xml index ae07c45cc..e985338d1 100644 --- a/java/com/android/dialer/theme/res/values-zu/strings.xml +++ b/java/com/android/dialer/theme/res/values-zu/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown" msgid="7932659017139013277">"Akwaziwa"</string> - <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%s</xliff:g> <xliff:g id="ID">%d</xliff:g>"</string> + <string name="unknown_counter" msgid="7452889151953704159">"<xliff:g id="UNKNOWN">%1$s</xliff:g> <xliff:g id="ID">%2$d</xliff:g>"</string> <string name="payphone" msgid="7106361320283710387">"Ucingo olufakwa imali"</string> <string name="launcherActivityLabel" msgid="9034868428899993166">"Ifoni"</string> <string name="video_call" msgid="8914878391104612532">"Ikholi yevidiyo"</string> diff --git a/java/com/android/incallui/CallButtonPresenter.java b/java/com/android/incallui/CallButtonPresenter.java index 7d12d5281..2a9600a2b 100644 --- a/java/com/android/incallui/CallButtonPresenter.java +++ b/java/com/android/incallui/CallButtonPresenter.java @@ -42,6 +42,7 @@ import com.android.incallui.audiomode.AudioModeProvider.AudioModeListener; import com.android.incallui.call.CallList; import com.android.incallui.call.DialerCall; import com.android.incallui.call.DialerCall.CameraDirection; +import com.android.incallui.call.DialerCallListener; import com.android.incallui.call.TelecomAdapter; import com.android.incallui.call.state.DialerCallState; import com.android.incallui.incall.protocol.InCallButtonIds; @@ -58,17 +59,12 @@ public class CallButtonPresenter InCallDetailsListener, CanAddCallListener, Listener, - InCallButtonUiDelegate { - - 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"; + InCallButtonUiDelegate, + DialerCallListener { private final Context context; private InCallButtonUi inCallButtonUi; private DialerCall call; - private boolean automaticallyMutedByAddCall = false; - private boolean previousMuteState = false; private boolean isInCallButtonUiReady; private PhoneAccountHandle otherAccount; @@ -106,11 +102,18 @@ public class CallButtonPresenter InCallPresenter.getInstance().getInCallCameraManager().removeCameraSelectionListener(this); InCallPresenter.getInstance().removeCanAddCallListener(this); isInCallButtonUiReady = false; + + if (call != null) { + call.removeListener(this); + } } @Override public void onStateChange(InCallState oldState, InCallState newState, CallList callList) { Trace.beginSection("CallButtonPresenter.onStateChange"); + if (call != null) { + call.removeListener(this); + } if (newState == InCallState.OUTGOING) { call = callList.getOutgoingCall(); } else if (newState == InCallState.INCALL) { @@ -133,6 +136,10 @@ public class CallButtonPresenter } else { call = null; } + + if (call != null) { + call.addListener(this); + } updateUi(newState, call); Trace.endSection(); } @@ -275,18 +282,7 @@ public class CallButtonPresenter 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 - automaticallyMutedByAddCall = true; - previousMuteState = AudioModeProvider.getInstance().getAudioState().isMuted(); - // Simulate a click on the mute button - muteClicked(true /* checked */, false /* clickedByUser */); - TelecomAdapter.getInstance().addCall(); + InCallPresenter.getInstance().addCallClicked(); } @Override @@ -393,7 +389,6 @@ public class CallButtonPresenter call.getTimeAddedMs()); if (pause) { - call.getVideoTech().setCamera(null); call.getVideoTech().stopTransmission(); } else { updateCamera( @@ -542,31 +537,10 @@ public class CallButtonPresenter } @Override - public void refreshMuteState() { - // Restore the previous mute state - if (automaticallyMutedByAddCall - && AudioModeProvider.getInstance().getAudioState().isMuted() != previousMuteState) { - if (inCallButtonUi == null) { - return; - } - muteClicked(previousMuteState, false /* clickedByUser */); - } - automaticallyMutedByAddCall = false; - } - - @Override - public void onSaveInstanceState(Bundle outState) { - outState.putBoolean(KEY_AUTOMATICALLY_MUTED_BY_ADD_CALL, automaticallyMutedByAddCall); - outState.putBoolean(KEY_PREVIOUS_MUTE_STATE, previousMuteState); - } + public void onSaveInstanceState(Bundle outState) {} @Override - public void onRestoreInstanceState(Bundle savedInstanceState) { - automaticallyMutedByAddCall = - savedInstanceState.getBoolean( - KEY_AUTOMATICALLY_MUTED_BY_ADD_CALL, automaticallyMutedByAddCall); - previousMuteState = savedInstanceState.getBoolean(KEY_PREVIOUS_MUTE_STATE, previousMuteState); - } + public void onRestoreInstanceState(Bundle savedInstanceState) {} @Override public void onCameraPermissionGranted() { @@ -584,6 +558,41 @@ public class CallButtonPresenter } @Override + public void onDialerCallSessionModificationStateChange() { + if (inCallButtonUi != null && call != null) { + inCallButtonUi.enableButton(InCallButtonIds.BUTTON_PAUSE_VIDEO, true); + updateButtonsState(call); + } + } + + @Override + public void onDialerCallDisconnect() {} + + @Override + public void onDialerCallUpdate() {} + + @Override + public void onDialerCallChildNumberChange() {} + + @Override + public void onDialerCallLastForwardedNumberChange() {} + + @Override + public void onDialerCallUpgradeToVideo() {} + + @Override + public void onWiFiToLteHandover() {} + + @Override + public void onHandoverToWifiFailure() {} + + @Override + public void onInternationalCallOnWifi() {} + + @Override + public void onEnrichedCallSessionUpdate() {} + + @Override public Context getContext() { return context; } diff --git a/java/com/android/incallui/InCallPresenter.java b/java/com/android/incallui/InCallPresenter.java index 150499f73..17af75691 100644 --- a/java/com/android/incallui/InCallPresenter.java +++ b/java/com/android/incallui/InCallPresenter.java @@ -273,6 +273,9 @@ public class InCallPresenter implements CallList.Listener, AudioModeProvider.Aud private SpeakEasyCallManager speakEasyCallManager; + private boolean addCallClicked = false; + private boolean automaticallyMutedByAddCall = false; + /** Inaccessible constructor. Must use getRunningInstance() to get this singleton. */ @VisibleForTesting InCallPresenter() {} @@ -1226,7 +1229,9 @@ public class InCallPresenter implements CallList.Listener, AudioModeProvider.Aud proximitySensor.onInCallShowing(showing); } - if (!showing) { + if (showing) { + refreshMuteState(); + } else { updateIsChangingConfigurations(); } @@ -2033,5 +2038,38 @@ public class InCallPresenter implements CallList.Listener, AudioModeProvider.Aud return true; } + public void addCallClicked() { + if (addCallClicked) { + // 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. + return; + } + addCallClicked = true; + if (!AudioModeProvider.getInstance().getAudioState().isMuted()) { + // Automatically mute the current call + TelecomAdapter.getInstance().mute(true); + automaticallyMutedByAddCall = true; + } + TelecomAdapter.getInstance().addCall(); + } + + /** Refresh mute state after call UI resuming from add call screen. */ + public void refreshMuteState() { + LogUtil.i( + "InCallPresenter.refreshMuteState", + "refreshMuteStateAfterAddCall: %b addCallClicked: %b", + automaticallyMutedByAddCall, + addCallClicked); + if (!addCallClicked) { + return; + } + if (automaticallyMutedByAddCall) { + // Restore the previous mute state + TelecomAdapter.getInstance().mute(false); + automaticallyMutedByAddCall = false; + } + addCallClicked = false; + } + private final Set<InCallUiLock> inCallUiLocks = new ArraySet<>(); } diff --git a/java/com/android/incallui/VideoCallPresenter.java b/java/com/android/incallui/VideoCallPresenter.java index 5bdcd7a73..0d1d1a5e0 100644 --- a/java/com/android/incallui/VideoCallPresenter.java +++ b/java/com/android/incallui/VideoCallPresenter.java @@ -323,6 +323,17 @@ public class VideoCallPresenter InCallPresenter.InCallState inCallState = InCallPresenter.getInstance().getInCallState(); onStateChange(inCallState, inCallState, CallList.getInstance()); isVideoCallScreenUiReady = true; + + Point sourceVideoDimensions = getRemoteVideoSurfaceTexture().getSourceVideoDimensions(); + if (sourceVideoDimensions != null && primaryCall != null) { + int width = primaryCall.getPeerDimensionWidth(); + int height = primaryCall.getPeerDimensionHeight(); + boolean updated = DialerCall.UNKNOWN_PEER_DIMENSIONS != width + && DialerCall.UNKNOWN_PEER_DIMENSIONS != height; + if (updated && (sourceVideoDimensions.x != width || sourceVideoDimensions.y != height)) { + onUpdatePeerDimensions(primaryCall, width, height); + } + } } /** Called when the user interface is no longer ready to be used. */ @@ -420,6 +431,11 @@ public class VideoCallPresenter InCallPresenter.getInstance().getInCallCameraManager().onCameraPermissionGranted(); } + @Override + public boolean isFullscreen() { + return InCallPresenter.getInstance().isFullscreen(); + } + /** * Called when the user interacts with the UI. If a fullscreen timer is pending then we start the * timer from scratch to avoid having the UI disappear while the user is interacting with it. diff --git a/java/com/android/incallui/call/DialerCall.java b/java/com/android/incallui/call/DialerCall.java index 1f4e49ad8..f9afd2d54 100644 --- a/java/com/android/incallui/call/DialerCall.java +++ b/java/com/android/incallui/call/DialerCall.java @@ -126,6 +126,8 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa private static int idCounter = 0; + public static final int UNKNOWN_PEER_DIMENSIONS = -1; + /** * A counter used to append to restricted/private/hidden calls so that users can identify them in * a conversation. This value is reset in {@link CallList#onCallRemoved(Context, Call)} when there @@ -386,6 +388,8 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa }; private long timeAddedMs; + private int peerDimensionWidth = UNKNOWN_PEER_DIMENSIONS; + private int peerDimensionHeight = UNKNOWN_PEER_DIMENSIONS; public DialerCall( Context context, @@ -1558,6 +1562,8 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa @Override public void onPeerDimensionsChanged(int width, int height) { + peerDimensionWidth = width; + peerDimensionHeight = height; InCallVideoCallCallbackNotifier.getInstance().peerDimensionsChanged(this, width, height); } @@ -1974,4 +1980,14 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa public interface CannedTextResponsesLoadedListener { void onCannedTextResponsesLoaded(DialerCall call); } + + /** Gets peer dimension width. */ + public int getPeerDimensionWidth() { + return peerDimensionWidth; + } + + /** Gets peer dimension height. */ + public int getPeerDimensionHeight() { + return peerDimensionHeight; + } } diff --git a/java/com/android/incallui/callpending/CallPendingActivity.java b/java/com/android/incallui/callpending/CallPendingActivity.java index a686308c2..4086e1419 100644 --- a/java/com/android/incallui/callpending/CallPendingActivity.java +++ b/java/com/android/incallui/callpending/CallPendingActivity.java @@ -232,9 +232,6 @@ public class CallPendingActivity extends FragmentActivity public void onRestoreInstanceState(Bundle savedInstanceState) {} @Override - public void refreshMuteState() {} - - @Override public void addCallClicked() {} @Override diff --git a/java/com/android/incallui/contactgrid/TopRow.java b/java/com/android/incallui/contactgrid/TopRow.java index d242c3a14..213a3c6af 100644 --- a/java/com/android/incallui/contactgrid/TopRow.java +++ b/java/com/android/incallui/contactgrid/TopRow.java @@ -92,6 +92,8 @@ public class TopRow { } else if (VideoUtils.hasSentVideoUpgradeRequest(state.sessionModificationState()) || VideoUtils.hasReceivedVideoUpgradeRequest(state.sessionModificationState())) { label = getLabelForVideoRequest(context, state); + } else if (state.sessionModificationState() == SessionModificationState.REQUEST_FAILED) { + label = context.getString(R.string.incall_video_call_operation_failed); } else if (state.state() == DialerCallState.PULLING) { label = context.getString(R.string.incall_transferring); } else if (state.state() == DialerCallState.DIALING diff --git a/java/com/android/incallui/contactgrid/res/values/strings.xml b/java/com/android/incallui/contactgrid/res/values/strings.xml index 9ee10c327..e8592b234 100644 --- a/java/com/android/incallui/contactgrid/res/values/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values/strings.xml @@ -65,6 +65,9 @@ requests and we timed out. --> <string name="incall_video_call_request_timed_out">Call timed out</string> + <!-- Displayed above the contact name when the user's operation for video calling is failed due to an unknown reason. --> + <string name="incall_video_call_operation_failed">Unable to operate</string> + <!-- In-call screen: status label for a call that's in the process of hanging up [CHAR LIMIT=25] --> <string name="incall_hanging_up">Hanging up</string> diff --git a/java/com/android/incallui/incall/impl/InCallFragment.java b/java/com/android/incallui/incall/impl/InCallFragment.java index 7f20b407f..30620699a 100644 --- a/java/com/android/incallui/incall/impl/InCallFragment.java +++ b/java/com/android/incallui/incall/impl/InCallFragment.java @@ -206,7 +206,6 @@ public class InCallFragment extends Fragment @Override public void onResume() { super.onResume(); - inCallButtonUiDelegate.refreshMuteState(); inCallScreenDelegate.onInCallScreenResumed(); } diff --git a/java/com/android/incallui/incall/protocol/InCallButtonUiDelegate.java b/java/com/android/incallui/incall/protocol/InCallButtonUiDelegate.java index b0e23efcd..4cf40ef6a 100644 --- a/java/com/android/incallui/incall/protocol/InCallButtonUiDelegate.java +++ b/java/com/android/incallui/incall/protocol/InCallButtonUiDelegate.java @@ -31,8 +31,6 @@ public interface InCallButtonUiDelegate { void onRestoreInstanceState(Bundle savedInstanceState); - void refreshMuteState(); - void addCallClicked(); void muteClicked(boolean checked, boolean clickedByUser); diff --git a/java/com/android/incallui/rtt/impl/RttChatFragment.java b/java/com/android/incallui/rtt/impl/RttChatFragment.java index 988f20c2c..649e80840 100644 --- a/java/com/android/incallui/rtt/impl/RttChatFragment.java +++ b/java/com/android/incallui/rtt/impl/RttChatFragment.java @@ -361,7 +361,6 @@ public class RttChatFragment extends Fragment @Override public void onRttScreenStart() { - inCallButtonUiDelegate.refreshMuteState(); rttCallScreenDelegate.onRttCallScreenUiReady(); Activity activity = getActivity(); Window window = getActivity().getWindow(); diff --git a/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java b/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java index f270edab9..89db07903 100644 --- a/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java +++ b/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java @@ -308,7 +308,6 @@ public class SurfaceViewVideoCallFragment extends Fragment @Override public void onVideoScreenStart() { - inCallButtonUiDelegate.refreshMuteState(); videoCallScreenDelegate.onVideoCallScreenUiReady(); getView().postDelayed(cameraPermissionDialogRunnable, CAMERA_PERMISSION_DIALOG_DELAY_IN_MILLIS); } diff --git a/java/com/android/incallui/video/impl/VideoCallFragment.java b/java/com/android/incallui/video/impl/VideoCallFragment.java index 11b80ceb9..edfc17c46 100644 --- a/java/com/android/incallui/video/impl/VideoCallFragment.java +++ b/java/com/android/incallui/video/impl/VideoCallFragment.java @@ -306,6 +306,30 @@ public class VideoCallFragment extends Fragment updatePreviewOffView(); } }); + + controls.addOnLayoutChangeListener( + new OnLayoutChangeListener() { + @Override + public void onLayoutChange( + View v, + int left, + int top, + int right, + int bottom, + int oldLeft, + int oldTop, + int oldRight, + int oldBottom) { + LogUtil.i("VideoCallFragment.onLayoutChange", "controls layout changed"); + if (getActivity() != null && getView() != null) { + controls.removeOnLayoutChangeListener(this); + if (isInFullscreenMode) { + enterFullscreenMode(); + } + } + } + }); + return view; } @@ -334,6 +358,12 @@ public class VideoCallFragment extends Fragment inCallButtonUiDelegate.onInCallButtonUiReady(this); view.setOnSystemUiVisibilityChangeListener(this); + + if (videoCallScreenDelegate.isFullscreen()) { + controls.setVisibility(View.INVISIBLE); + contactGridManager.getContainerView().setVisibility(View.INVISIBLE); + endCallButton.setVisibility(View.INVISIBLE); + } } @Override @@ -367,7 +397,6 @@ public class VideoCallFragment extends Fragment @Override public void onVideoScreenStart() { - inCallButtonUiDelegate.refreshMuteState(); videoCallScreenDelegate.onVideoCallScreenUiReady(); getView().postDelayed(cameraPermissionDialogRunnable, CAMERA_PERMISSION_DIALOG_DELAY_IN_MILLIS); getView() @@ -421,6 +450,13 @@ public class VideoCallFragment extends Fragment .translationY(0) .setInterpolator(linearOutSlowInInterpolator) .alpha(1) + .withStartAction( + new Runnable() { + @Override + public void run() { + controls.setVisibility(View.VISIBLE); + } + }) .start(); // Animate onHold to the shown state. @@ -541,13 +577,13 @@ public class VideoCallFragment extends Fragment return new Point(); } if (isLandscape()) { - int stableInsetEnd = + int systemWindowInsetEnd = getView().getLayoutDirection() == View.LAYOUT_DIRECTION_RTL - ? getView().getRootWindowInsets().getStableInsetLeft() - : -getView().getRootWindowInsets().getStableInsetRight(); - return new Point(stableInsetEnd, 0); + ? getView().getRootWindowInsets().getSystemWindowInsetLeft() + : -getView().getRootWindowInsets().getSystemWindowInsetRight(); + return new Point(systemWindowInsetEnd, 0); } else { - return new Point(0, -getView().getRootWindowInsets().getStableInsetBottom()); + return new Point(0, -getView().getRootWindowInsets().getSystemWindowInsetBottom()); } } @@ -696,9 +732,17 @@ public class VideoCallFragment extends Fragment videoCallScreenDelegate.getLocalVideoSurfaceTexture().attachToTextureView(previewTextureView); videoCallScreenDelegate.getRemoteVideoSurfaceTexture().attachToTextureView(remoteTextureView); - this.isRemotelyHeld = isRemotelyHeld; + boolean updateRemoteOffView = false; if (this.shouldShowRemote != shouldShowRemote) { this.shouldShowRemote = shouldShowRemote; + updateRemoteOffView = true; + } + if (this.isRemotelyHeld != isRemotelyHeld) { + this.isRemotelyHeld = isRemotelyHeld; + updateRemoteOffView = true; + } + + if (updateRemoteOffView) { updateRemoteOffView(); } if (this.shouldShowPreview != shouldShowPreview) { diff --git a/java/com/android/incallui/video/protocol/VideoCallScreenDelegate.java b/java/com/android/incallui/video/protocol/VideoCallScreenDelegate.java index 55ea23f5e..9dd545080 100644 --- a/java/com/android/incallui/video/protocol/VideoCallScreenDelegate.java +++ b/java/com/android/incallui/video/protocol/VideoCallScreenDelegate.java @@ -48,4 +48,6 @@ public interface VideoCallScreenDelegate { void setSurfaceViews(SurfaceView preview, SurfaceView remote); int getDeviceOrientation(); + + boolean isFullscreen(); } diff --git a/java/com/android/incallui/videotech/ims/ImsVideoCallCallback.java b/java/com/android/incallui/videotech/ims/ImsVideoCallCallback.java index d254d6df6..3e6f4417b 100644 --- a/java/com/android/incallui/videotech/ims/ImsVideoCallCallback.java +++ b/java/com/android/incallui/videotech/ims/ImsVideoCallCallback.java @@ -103,8 +103,6 @@ public class ImsVideoCallCallback extends VideoCall.Callback { if (videoTech.getSessionModificationState() == SessionModificationState.WAITING_FOR_UPGRADE_TO_VIDEO_RESPONSE) { - handler.removeCallbacksAndMessages(null); // Clear everything - final int newSessionModificationState = getSessionModificationStateFromTelecomStatus(status); if (status == VideoProvider.SESSION_MODIFY_REQUEST_SUCCESS) { // Telecom manages audio route for us @@ -114,31 +112,21 @@ public class ImsVideoCallCallback extends VideoCall.Callback { videoTech.setSessionModificationState(newSessionModificationState); } - // Wait for 4 seconds and then clean the session modification state. This allows the video UI - // to stay up so that the user can read the error message. - // // If the other person accepted the upgrade request then this will keep the video UI up until // the call's video state change. Without this we would switch to the voice call and then // switch back to video UI. - handler.postDelayed( - () -> { - if (videoTech.getSessionModificationState() == newSessionModificationState) { - LogUtil.i("ImsVideoCallCallback.onSessionModifyResponseReceived", "clearing state"); - videoTech.setSessionModificationState(SessionModificationState.NO_REQUEST); - } else { - LogUtil.i( - "ImsVideoCallCallback.onSessionModifyResponseReceived", - "session modification state has changed, not clearing state"); - } - }, - CLEAR_FAILED_REQUEST_TIMEOUT_MILLIS); + clearFailedResponseState(newSessionModificationState); } else if (videoTech.getSessionModificationState() == SessionModificationState.RECEIVED_UPGRADE_TO_VIDEO_REQUEST) { requestedVideoState = VideoProfile.STATE_AUDIO_ONLY; videoTech.setSessionModificationState(SessionModificationState.NO_REQUEST); } else if (videoTech.getSessionModificationState() == SessionModificationState.WAITING_FOR_RESPONSE) { - videoTech.setSessionModificationState(getSessionModificationStateFromTelecomStatus(status)); + final int newSessionModificationState = getSessionModificationStateFromTelecomStatus(status); + videoTech.setSessionModificationState(newSessionModificationState); + if (status != VideoProvider.SESSION_MODIFY_REQUEST_SUCCESS) { + clearFailedResponseState(newSessionModificationState); + } } else { LogUtil.i( "ImsVideoCallCallback.onSessionModifyResponseReceived", @@ -146,6 +134,24 @@ public class ImsVideoCallCallback extends VideoCall.Callback { } } + private void clearFailedResponseState(final int newSessionModificationState) { + handler.removeCallbacksAndMessages(null); // Clear everything + // Wait for 4 seconds and then clean the session modification state. This allows the video UI + // to stay up so that the user can read the error message. + handler.postDelayed( + () -> { + if (videoTech.getSessionModificationState() == newSessionModificationState) { + LogUtil.i("ImsVideoCallCallback.onSessionModifyResponseReceived", "clearing state"); + videoTech.setSessionModificationState(SessionModificationState.NO_REQUEST); + } else { + LogUtil.i( + "ImsVideoCallCallback.onSessionModifyResponseReceived", + "session modification state has changed, not clearing state"); + } + }, + CLEAR_FAILED_REQUEST_TIMEOUT_MILLIS); + } + @SessionModificationState private int getSessionModificationStateFromTelecomStatus(int telecomStatus) { switch (telecomStatus) { diff --git a/java/com/android/incallui/videotech/ims/ImsVideoTech.java b/java/com/android/incallui/videotech/ims/ImsVideoTech.java index 5b733d612..1d4fe769a 100644 --- a/java/com/android/incallui/videotech/ims/ImsVideoTech.java +++ b/java/com/android/incallui/videotech/ims/ImsVideoTech.java @@ -227,6 +227,7 @@ public class ImsVideoTech implements VideoTech { call.getVideoCall() .sendSessionModifyRequest( new VideoProfile(unpausedVideoState & ~VideoProfile.STATE_TX_ENABLED)); + setSessionModificationState(SessionModificationState.WAITING_FOR_RESPONSE); } @Override |