From 8369df095a73a77b3715f8ae7ba06089cebca4ce Mon Sep 17 00:00:00 2001 From: Eric Erfanian Date: Wed, 3 May 2017 10:27:13 -0700 Subject: This change reflects the Dialer V10 RC00 branch. RC00 is based on: branch: dialer-android_release_branch/153304843.1 synced to: 153304843 following the instructions at go/dialer-aosp-release. In this release: * Removes final apache sources. * Uses native lite compilation. More drops will follow with subsequent release candidates until we reach our final v10 release, in cadence with our prebuilt drops. Test: TreeHugger, on device Change-Id: Ic9684057230f9b579c777820c746cd21bf45ec0f --- .../dialer/calllogutils/CallEntryFormatter.java | 19 ++++++---- .../dialer/calllogutils/CallTypeIconsView.java | 28 ++++++++++----- .../dialer/calllogutils/PhoneCallDetails.java | 4 +-- .../dialer/calllogutils/res/values-af/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-am/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-ar/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-az/strings.xml | 6 ++-- .../calllogutils/res/values-b+sr+Latn/strings.xml | 42 ++++++++++++++++++++++ .../dialer/calllogutils/res/values-be/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-bg/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-bn/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-bs/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-ca/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-cs/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-da/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-de/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-el/strings.xml | 6 ++-- .../calllogutils/res/values-en-rAU/strings.xml | 6 ++-- .../calllogutils/res/values-en-rGB/strings.xml | 6 ++-- .../calllogutils/res/values-en-rIN/strings.xml | 6 ++-- .../calllogutils/res/values-es-rUS/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-es/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-et/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-eu/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-fa/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-fi/strings.xml | 6 ++-- .../calllogutils/res/values-fr-rCA/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-fr/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-gl/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-gu/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-hi/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-hr/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-hu/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-hy/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-in/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-is/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-it/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-iw/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-ja/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-ka/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-kk/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-km/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-kn/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-ko/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-ky/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-lo/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-lt/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-lv/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-mk/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-ml/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-mn/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-mr/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-ms/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-my/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-nb/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-ne/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-nl/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-no/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-pa/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-pl/strings.xml | 6 ++-- .../calllogutils/res/values-pt-rBR/strings.xml | 6 ++-- .../calllogutils/res/values-pt-rPT/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-pt/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-ro/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-ru/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-si/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-sk/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-sl/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-sq/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-sr/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-sv/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-sw/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-ta/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-te/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-th/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-tl/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-tr/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-uk/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-ur/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-uz/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-vi/strings.xml | 6 ++-- .../calllogutils/res/values-zh-rCN/strings.xml | 6 ++-- .../calllogutils/res/values-zh-rHK/strings.xml | 6 ++-- .../calllogutils/res/values-zh-rTW/strings.xml | 6 ++-- .../dialer/calllogutils/res/values-zu/strings.xml | 6 ++-- .../dialer/calllogutils/res/values/strings.xml | 10 ++++-- 86 files changed, 409 insertions(+), 180 deletions(-) create mode 100644 java/com/android/dialer/calllogutils/res/values-b+sr+Latn/strings.xml (limited to 'java/com/android/dialer/calllogutils') diff --git a/java/com/android/dialer/calllogutils/CallEntryFormatter.java b/java/com/android/dialer/calllogutils/CallEntryFormatter.java index bd6d53f48..bd184bb89 100644 --- a/java/com/android/dialer/calllogutils/CallEntryFormatter.java +++ b/java/com/android/dialer/calllogutils/CallEntryFormatter.java @@ -76,7 +76,7 @@ public class CallEntryFormatter { UCharacter.TITLECASE_NO_LOWERCASE); } - private static CharSequence formatDuration(Context context, long elapsedSeconds) { + private static CharSequence formatDuration(Context context, long elapsedSeconds, boolean a11y) { long minutes = 0; long seconds = 0; @@ -84,10 +84,16 @@ public class CallEntryFormatter { minutes = elapsedSeconds / 60; elapsedSeconds -= minutes * 60; seconds = elapsedSeconds; - return context.getString(R.string.call_details_duration_format, minutes, seconds); + int stringId = + a11y ? R.string.call_details_duration_format_a11y : R.string.call_details_duration_format; + return context.getString(stringId, minutes, seconds); } else { seconds = elapsedSeconds; - return context.getString(R.string.call_details_short_duration_format, seconds); + int stringId = + a11y + ? R.string.call_details_short_duration_format_a11y + : R.string.call_details_short_duration_format; + return context.getString(stringId, seconds); } } @@ -96,13 +102,14 @@ public class CallEntryFormatter { * * @param elapsedSeconds Total elapsed seconds. * @param dataUsage Data usage in bytes, or null if not specified. + * @param a11y {@code true} if string should be talk back friendly. * @return String containing call duration and data usage. */ public static CharSequence formatDurationAndDataUsage( - Context context, long elapsedSeconds, Long dataUsage) { - CharSequence duration = formatDuration(context, elapsedSeconds); + Context context, long elapsedSeconds, long dataUsage, boolean a11y) { + CharSequence duration = formatDuration(context, elapsedSeconds, a11y); List durationItems = new ArrayList<>(); - if (dataUsage != null) { + if (dataUsage > 0) { durationItems.add(duration); durationItems.add(Formatter.formatShortFileSize(context, dataUsage)); return DialerUtils.join(durationItems); diff --git a/java/com/android/dialer/calllogutils/CallTypeIconsView.java b/java/com/android/dialer/calllogutils/CallTypeIconsView.java index 55672ca07..58e4acfba 100644 --- a/java/com/android/dialer/calllogutils/CallTypeIconsView.java +++ b/java/com/android/dialer/calllogutils/CallTypeIconsView.java @@ -232,44 +232,56 @@ public class CallTypeIconsView extends View { * Configures the call icon drawables. A single white call arrow which points down and left is * used as a basis for all of the call arrow icons, applying rotation and colors as needed. * + *

For each drawable we call mutate so that a new instance of the drawable is created. This + * is done so that when we apply a color filter to the drawables, they are recolored across + * dialer. + * * @param context The current context. */ public Resources(Context context, boolean largeIcons) { final android.content.res.Resources r = context.getResources(); int iconId = R.drawable.quantum_ic_call_received_white_24; - incoming = largeIcons ? r.getDrawable(iconId) : getScaledBitmap(context, iconId); + Drawable drawable = largeIcons ? r.getDrawable(iconId) : getScaledBitmap(context, iconId); + incoming = drawable.mutate(); incoming.setColorFilter(r.getColor(R.color.answered_call), PorterDuff.Mode.MULTIPLY); // Create a rotated instance of the call arrow for outgoing calls. iconId = R.drawable.quantum_ic_call_made_white_24; - outgoing = largeIcons ? r.getDrawable(iconId) : getScaledBitmap(context, iconId); + drawable = largeIcons ? r.getDrawable(iconId) : getScaledBitmap(context, iconId); + outgoing = drawable.mutate(); outgoing.setColorFilter(r.getColor(R.color.answered_call), PorterDuff.Mode.MULTIPLY); // Need to make a copy of the arrow drawable, otherwise the same instance colored // above will be recolored here. iconId = R.drawable.quantum_ic_call_missed_white_24; - missed = largeIcons ? r.getDrawable(iconId) : getScaledBitmap(context, iconId); + drawable = largeIcons ? r.getDrawable(iconId) : getScaledBitmap(context, iconId); + missed = drawable.mutate(); missed.setColorFilter(r.getColor(R.color.missed_call), PorterDuff.Mode.MULTIPLY); iconId = R.drawable.quantum_ic_voicemail_white_24; - voicemail = largeIcons ? r.getDrawable(iconId) : getScaledBitmap(context, iconId); + drawable = largeIcons ? r.getDrawable(iconId) : getScaledBitmap(context, iconId); + voicemail = drawable.mutate(); voicemail.setColorFilter(r.getColor(R.color.call_type_icon_color), PorterDuff.Mode.MULTIPLY); iconId = R.drawable.quantum_ic_block_white_24; - blocked = largeIcons ? r.getDrawable(iconId) : getScaledBitmap(context, iconId); + drawable = largeIcons ? r.getDrawable(iconId) : getScaledBitmap(context, iconId); + blocked = drawable.mutate(); blocked.setColorFilter(r.getColor(R.color.blocked_call), PorterDuff.Mode.MULTIPLY); iconId = R.drawable.quantum_ic_videocam_white_24; - videoCall = largeIcons ? r.getDrawable(iconId) : getScaledBitmap(context, iconId); + drawable = largeIcons ? r.getDrawable(iconId) : getScaledBitmap(context, iconId); + videoCall = drawable.mutate(); videoCall.setColorFilter(r.getColor(R.color.call_type_icon_color), PorterDuff.Mode.MULTIPLY); iconId = R.drawable.quantum_ic_hd_white_24; - hdCall = largeIcons ? r.getDrawable(iconId) : getScaledBitmap(context, iconId); + drawable = largeIcons ? r.getDrawable(iconId) : getScaledBitmap(context, iconId); + hdCall = drawable.mutate(); hdCall.setColorFilter(r.getColor(R.color.call_type_icon_color), PorterDuff.Mode.MULTIPLY); iconId = R.drawable.quantum_ic_signal_wifi_4_bar_white_24; - wifiCall = largeIcons ? r.getDrawable(iconId) : getScaledBitmap(context, iconId); + drawable = largeIcons ? r.getDrawable(iconId) : getScaledBitmap(context, iconId); + wifiCall = drawable.mutate(); wifiCall.setColorFilter(r.getColor(R.color.call_type_icon_color), PorterDuff.Mode.MULTIPLY); iconMargin = largeIcons ? 0 : r.getDimensionPixelSize(R.dimen.call_log_icon_margin); diff --git a/java/com/android/dialer/calllogutils/PhoneCallDetails.java b/java/com/android/dialer/calllogutils/PhoneCallDetails.java index 6fa507325..13c528ad2 100644 --- a/java/com/android/dialer/calllogutils/PhoneCallDetails.java +++ b/java/com/android/dialer/calllogutils/PhoneCallDetails.java @@ -27,7 +27,7 @@ import android.text.TextUtils; import com.android.contacts.common.ContactsUtils.UserType; import com.android.contacts.common.preference.ContactsPreferences; import com.android.contacts.common.util.ContactDisplayUtils; -import com.android.dialer.phonenumbercache.CachedNumberLookupService.CachedContactInfo.ContactSourceType; +import com.android.dialer.logging.ContactSource; import com.android.dialer.phonenumbercache.ContactInfo; /** The details of a phone call to be shown in the UI. */ @@ -82,7 +82,7 @@ public class PhoneCallDetails { public Uri photoUri; // The source type of the contact associated with this call. - public @ContactSourceType int sourceType; + public ContactSource.Type sourceType; // The object id type of the contact associated with this call. public String objectId; diff --git a/java/com/android/dialer/calllogutils/res/values-af/strings.xml b/java/com/android/dialer/calllogutils/res/values-af/strings.xml index d4d615e79..1858a7210 100644 --- a/java/com/android/dialer/calllogutils/res/values-af/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-af/strings.xml @@ -35,6 +35,8 @@ "via %1$s" "op %1$s, via %2$s" "Stemboodskap" - "%s m. %s s." - "%s s." + "%d m. %d s." + "%d s." + "%d minute %d sekondes" + "%d sekondes" diff --git a/java/com/android/dialer/calllogutils/res/values-am/strings.xml b/java/com/android/dialer/calllogutils/res/values-am/strings.xml index 80a71c93f..2d4f10ddd 100644 --- a/java/com/android/dialer/calllogutils/res/values-am/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-am/strings.xml @@ -35,6 +35,8 @@ "በ %1$s በኩል" "በ %1$s ላይ፣ በ %2$s በኩል" "የድምፅ መልእክት" - "%sደ %sሰ" - "%s ሰከንዶች" + "%dደ %dሰ" + "%d ሰከንዶች" + "%d ደቂቃዎች %d ሰከንዶች" + "%d ሰከንዶች" diff --git a/java/com/android/dialer/calllogutils/res/values-ar/strings.xml b/java/com/android/dialer/calllogutils/res/values-ar/strings.xml index 04cc6d9ac..49a96ffbf 100644 --- a/java/com/android/dialer/calllogutils/res/values-ar/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ar/strings.xml @@ -35,6 +35,8 @@ "من خلال %1$s" "على %1$s من خلال %2$s" "البريد الصوتي" - "%s د %s ث" - "%s ثانية" + "%d د %d ث" + "%d ثانية" + "%d دقيقة %d ثانية" + "%d ثانية" diff --git a/java/com/android/dialer/calllogutils/res/values-az/strings.xml b/java/com/android/dialer/calllogutils/res/values-az/strings.xml index 76726120c..8bf5c03d1 100644 --- a/java/com/android/dialer/calllogutils/res/values-az/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-az/strings.xml @@ -35,6 +35,8 @@ "%1$s vasitəsilə" "%2$s vasitəsilə %1$s hesabında" "Səsli e-məktub" - "%s dəq %s san" - "%ssan" + "%d dəq %d san" + "%dsan" + "%d dəqiqə %d saniyə" + "%d saniyə" diff --git a/java/com/android/dialer/calllogutils/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/calllogutils/res/values-b+sr+Latn/strings.xml new file mode 100644 index 000000000..0d658c455 --- /dev/null +++ b/java/com/android/dialer/calllogutils/res/values-b+sr+Latn/strings.xml @@ -0,0 +1,42 @@ + + + + + "Dolazni poziv" + "Dolazni poziv je prenet na drugi uređaj" + "Odlazni poziv" + "Odlazni poziv je prenet na drugi uređaj" + "Propušten poziv" + "Dolazni video poziv" + "Dolazni video poziv je prenet na drugi uređaj" + "Odlazni video poziv" + "Odlazni video poziv je prenet na drugi uređaj" + "Propušten video poziv" + "Govorna pošta" + "Odbijen poziv" + "Blokiran poziv" + "Poziv je prihvaćen na drugom uređaju" + "na ^1" + "preko %1$s" + "na %1$s, preko %2$s" + "Govorna pošta" + "%d m %d s" + "%d s" + "%d min %d sek" + "%d sek" + diff --git a/java/com/android/dialer/calllogutils/res/values-be/strings.xml b/java/com/android/dialer/calllogutils/res/values-be/strings.xml index fbb7bf24b..e04d815d5 100644 --- a/java/com/android/dialer/calllogutils/res/values-be/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-be/strings.xml @@ -35,6 +35,8 @@ "праз %1$s" "на %1$s, праз %2$s" "Галасавая пошта" - "%s хв %s с" - "%s с" + "%d хв %d с" + "%d с" + "Хвілін: %d; секунд: %d" + "%d с" diff --git a/java/com/android/dialer/calllogutils/res/values-bg/strings.xml b/java/com/android/dialer/calllogutils/res/values-bg/strings.xml index 4f21eb3f3..716cecb3a 100644 --- a/java/com/android/dialer/calllogutils/res/values-bg/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-bg/strings.xml @@ -35,6 +35,8 @@ "през %1$s" "в/ъв %1$s, през %2$s" "Гласова поща" - "%s мин %s сек" - "%s сек" + "%d мин %d сек" + "%d сек" + "%d минути и %d секунди" + "%d секунди" diff --git a/java/com/android/dialer/calllogutils/res/values-bn/strings.xml b/java/com/android/dialer/calllogutils/res/values-bn/strings.xml index 28b40b448..ab2862e64 100644 --- a/java/com/android/dialer/calllogutils/res/values-bn/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-bn/strings.xml @@ -35,6 +35,8 @@ "%1$s এর মাধ্যমে" "%1$s এ, %2$s এর মাধ্যমে" "ভয়েসমেল" - "%sমিনিট %sসেকেন্ড" - "%sসেকেন্ড" + "%dমিনিট %dসেকেন্ড" + "%dসেকেন্ড" + "%d মিনিট %d সেকেন্ড" + "%d সেকেন্ড" diff --git a/java/com/android/dialer/calllogutils/res/values-bs/strings.xml b/java/com/android/dialer/calllogutils/res/values-bs/strings.xml index c6693d364..27bf8a46a 100644 --- a/java/com/android/dialer/calllogutils/res/values-bs/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-bs/strings.xml @@ -35,6 +35,8 @@ "preko %1$s" "na %1$s, preko %2$s" "Govorna pošta" - "%s min %s s" - "%s s" + "%d min %d s" + "%d s" + "%d min. %d sek." + "%d sek." diff --git a/java/com/android/dialer/calllogutils/res/values-ca/strings.xml b/java/com/android/dialer/calllogutils/res/values-ca/strings.xml index 45b581423..eb26926a1 100644 --- a/java/com/android/dialer/calllogutils/res/values-ca/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ca/strings.xml @@ -35,6 +35,8 @@ "al número %1$s" "a %1$s, al número %2$s" "Bústia de veu" - "%s min %s s" - "%s s" + "%d min %d s" + "%d s" + "%d minuts %d segons" + "%d segons" diff --git a/java/com/android/dialer/calllogutils/res/values-cs/strings.xml b/java/com/android/dialer/calllogutils/res/values-cs/strings.xml index f2de1f887..66b58810d 100644 --- a/java/com/android/dialer/calllogutils/res/values-cs/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-cs/strings.xml @@ -35,6 +35,8 @@ "z čísla %1$s" "na účet %1$s, z čísla %2$s" "Hlasová schránka" - "%s min %s s" - "%s s" + "%d min %d s" + "%d s" + "%d min %d s" + "%d s" diff --git a/java/com/android/dialer/calllogutils/res/values-da/strings.xml b/java/com/android/dialer/calllogutils/res/values-da/strings.xml index 09f5b3d77..aa6ba8a2f 100644 --- a/java/com/android/dialer/calllogutils/res/values-da/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-da/strings.xml @@ -35,6 +35,8 @@ "via %1$s" "til %1$s, via %2$s" "Telefonsvarer" - "%s min. %s sek." - "%s sek." + "%d min. %d sek." + "%d sek." + "%d minutter %d sekunder" + "%d sekunder" diff --git a/java/com/android/dialer/calllogutils/res/values-de/strings.xml b/java/com/android/dialer/calllogutils/res/values-de/strings.xml index b71487432..7fd087fb7 100644 --- a/java/com/android/dialer/calllogutils/res/values-de/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-de/strings.xml @@ -35,6 +35,8 @@ "über %1$s" "mit %1$s, über %2$s" "Mailbox" - "%s min %s s" - "%s s" + "%d min %d s" + "%d s" + "%d Minuten %d Sekunden" + "%d Sekunden" diff --git a/java/com/android/dialer/calllogutils/res/values-el/strings.xml b/java/com/android/dialer/calllogutils/res/values-el/strings.xml index ab9b5e3ee..7a3db9ab8 100644 --- a/java/com/android/dialer/calllogutils/res/values-el/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-el/strings.xml @@ -35,6 +35,8 @@ "μέσω %1$s" "στον λογαριασμό %1$s, μέσω %2$s" "Αυτόματος τηλεφωνητής" - "%sλ %sδ" - "%sδ" + "%dλ %dδ" + "%dδ" + "%d λεπτά, %d δευτερόλεπτα" + "%d δευτερόλεπτα" diff --git a/java/com/android/dialer/calllogutils/res/values-en-rAU/strings.xml b/java/com/android/dialer/calllogutils/res/values-en-rAU/strings.xml index c1105afcc..97ed6cfcc 100644 --- a/java/com/android/dialer/calllogutils/res/values-en-rAU/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-en-rAU/strings.xml @@ -35,6 +35,8 @@ "via %1$s" "on %1$s, via %2$s" "Voicemail" - "%sm %ss" - "%ss" + "%dm %ds" + "%ds" + "%d minutes %d seconds" + "%d seconds" diff --git a/java/com/android/dialer/calllogutils/res/values-en-rGB/strings.xml b/java/com/android/dialer/calllogutils/res/values-en-rGB/strings.xml index c1105afcc..97ed6cfcc 100644 --- a/java/com/android/dialer/calllogutils/res/values-en-rGB/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-en-rGB/strings.xml @@ -35,6 +35,8 @@ "via %1$s" "on %1$s, via %2$s" "Voicemail" - "%sm %ss" - "%ss" + "%dm %ds" + "%ds" + "%d minutes %d seconds" + "%d seconds" diff --git a/java/com/android/dialer/calllogutils/res/values-en-rIN/strings.xml b/java/com/android/dialer/calllogutils/res/values-en-rIN/strings.xml index c1105afcc..97ed6cfcc 100644 --- a/java/com/android/dialer/calllogutils/res/values-en-rIN/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-en-rIN/strings.xml @@ -35,6 +35,8 @@ "via %1$s" "on %1$s, via %2$s" "Voicemail" - "%sm %ss" - "%ss" + "%dm %ds" + "%ds" + "%d minutes %d seconds" + "%d seconds" diff --git a/java/com/android/dialer/calllogutils/res/values-es-rUS/strings.xml b/java/com/android/dialer/calllogutils/res/values-es-rUS/strings.xml index 74906bd48..8d25bde11 100644 --- a/java/com/android/dialer/calllogutils/res/values-es-rUS/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-es-rUS/strings.xml @@ -35,6 +35,8 @@ "por medio de %1$s" "en %1$s por medio de %2$s" "Buzón de voz" - "%s min %s s" - "%s s" + "%d min %d s" + "%d s" + "%d minutos, %d segundos" + "%d segundos" diff --git a/java/com/android/dialer/calllogutils/res/values-es/strings.xml b/java/com/android/dialer/calllogutils/res/values-es/strings.xml index 9ed0b6472..5ad0f5eab 100644 --- a/java/com/android/dialer/calllogutils/res/values-es/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-es/strings.xml @@ -35,6 +35,8 @@ "a través del %1$s" "en %1$s, a través del %2$s" "Buzón de voz" - "%s min %s s" - "%s s" + "%d min %d s" + "%d s" + "%d minutos %d segundos" + "%d segundos" diff --git a/java/com/android/dialer/calllogutils/res/values-et/strings.xml b/java/com/android/dialer/calllogutils/res/values-et/strings.xml index a6a8b9115..9e2cd14fa 100644 --- a/java/com/android/dialer/calllogutils/res/values-et/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-et/strings.xml @@ -35,6 +35,8 @@ "numbri %1$s kaudu" "kontol %1$s, numbri %2$s kaudu" "Kõnepost" - "%s min %s s" - "%s s" + "%d min %d s" + "%d s" + "%d minutit %d sekundit" + "%d sekundit" diff --git a/java/com/android/dialer/calllogutils/res/values-eu/strings.xml b/java/com/android/dialer/calllogutils/res/values-eu/strings.xml index 8c960bae6..e1a6b3f15 100644 --- a/java/com/android/dialer/calllogutils/res/values-eu/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-eu/strings.xml @@ -35,6 +35,8 @@ "%1$s bidez" "%1$s kontuan, %2$s bidez" "Erantzungailua" - "%s min eta %s s" - "%s s" + "%d min eta %d s" + "%d s" + "%d minutu eta %d segundo" + "%d segundo" diff --git a/java/com/android/dialer/calllogutils/res/values-fa/strings.xml b/java/com/android/dialer/calllogutils/res/values-fa/strings.xml index adb3d9d21..13c92b8f7 100644 --- a/java/com/android/dialer/calllogutils/res/values-fa/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-fa/strings.xml @@ -35,6 +35,8 @@ "ازطریق %1$s" "در %1$s، ازطریق %2$s" "پست صوتی" - "%s دقیقه %s ثانیه" - "%s ثانیه" + "%d دقیقه %d ثانیه" + "%d ثانیه" + "%d دقیقه و %d ثانیه" + "%d ثانیه" diff --git a/java/com/android/dialer/calllogutils/res/values-fi/strings.xml b/java/com/android/dialer/calllogutils/res/values-fi/strings.xml index 2838e0d0e..1b08ea974 100644 --- a/java/com/android/dialer/calllogutils/res/values-fi/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-fi/strings.xml @@ -35,6 +35,8 @@ "numerosta %1$s" "tililtä %1$s numerosta %2$s" "Vastaaja" - "%s min %s s" - "%s s" + "%d min %d s" + "%d s" + "%d minuuttia %d sekuntia" + "%d sekuntia" diff --git a/java/com/android/dialer/calllogutils/res/values-fr-rCA/strings.xml b/java/com/android/dialer/calllogutils/res/values-fr-rCA/strings.xml index bf4ba171c..1288ae318 100644 --- a/java/com/android/dialer/calllogutils/res/values-fr-rCA/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-fr-rCA/strings.xml @@ -35,6 +35,8 @@ "au %1$s" "sur %1$s, au %2$s" "Messagerie vocale" - "%s min et %s s" - "%s s" + "%d min et %d s" + "%d s" + "%d minutes et %d secondes" + "%d secondes" diff --git a/java/com/android/dialer/calllogutils/res/values-fr/strings.xml b/java/com/android/dialer/calllogutils/res/values-fr/strings.xml index 584c53ad4..a0cee2a9f 100644 --- a/java/com/android/dialer/calllogutils/res/values-fr/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-fr/strings.xml @@ -35,6 +35,8 @@ "au %1$s" "sur %1$s, au %2$s" "Messagerie vocale" - "%s min et %s s" - "%s s" + "%d min et %d s" + "%d s" + "%d minutes %d secondes" + "%d secondes" diff --git a/java/com/android/dialer/calllogutils/res/values-gl/strings.xml b/java/com/android/dialer/calllogutils/res/values-gl/strings.xml index ace85e49b..a2a33f791 100644 --- a/java/com/android/dialer/calllogutils/res/values-gl/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-gl/strings.xml @@ -35,6 +35,8 @@ "a través do %1$s" "en %1$s, a través do %2$s" "Correo de voz" - "%s min %s s" - "%s s" + "%d min %d s" + "%d s" + "%d minutos e %d segundos" + "%d segundos" diff --git a/java/com/android/dialer/calllogutils/res/values-gu/strings.xml b/java/com/android/dialer/calllogutils/res/values-gu/strings.xml index 0e8e0212c..598048883 100644 --- a/java/com/android/dialer/calllogutils/res/values-gu/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-gu/strings.xml @@ -35,6 +35,8 @@ "%1$s મારફતે" "%1$s પર, %2$s મારફતે" "વૉઇસમેઇલ" - "%sમિ %sસે" - "%sસે" + "%dમિ %dસે" + "%dસે" + "%d મિનિટ %d સેકંડ" + "%d સેકંડ" diff --git a/java/com/android/dialer/calllogutils/res/values-hi/strings.xml b/java/com/android/dialer/calllogutils/res/values-hi/strings.xml index 59a6aff7b..e8994bd9f 100644 --- a/java/com/android/dialer/calllogutils/res/values-hi/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-hi/strings.xml @@ -35,6 +35,8 @@ "%1$s से" "%1$s पर, %2$s से" "वॉइसमेल" - "%s मि %s से" - "%s से" + "%d मि %d से" + "%d से" + "%d मिनट %d सेकंड" + "%d सेकंड" diff --git a/java/com/android/dialer/calllogutils/res/values-hr/strings.xml b/java/com/android/dialer/calllogutils/res/values-hr/strings.xml index 38843f15b..ef60cd275 100644 --- a/java/com/android/dialer/calllogutils/res/values-hr/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-hr/strings.xml @@ -35,6 +35,8 @@ "putem broja %1$s" "na računu %1$s, putem broja %2$s" "Govorna pošta" - "%s min %s s" - "%s s" + "%d min %d s" + "%d s" + "%d min %d s" + "%d s" diff --git a/java/com/android/dialer/calllogutils/res/values-hu/strings.xml b/java/com/android/dialer/calllogutils/res/values-hu/strings.xml index e2849b1de..566bf272d 100644 --- a/java/com/android/dialer/calllogutils/res/values-hu/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-hu/strings.xml @@ -35,6 +35,8 @@ "szám: %1$s" "fiók: %1$s, szám: %2$s" "Hangposta" - "%s p %s mp" - "%s mp" + "%d p %d mp" + "%d mp" + "%d perc, %d másodperc" + "%d másodperc" diff --git a/java/com/android/dialer/calllogutils/res/values-hy/strings.xml b/java/com/android/dialer/calllogutils/res/values-hy/strings.xml index 58d51a6be..1b939eca0 100644 --- a/java/com/android/dialer/calllogutils/res/values-hy/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-hy/strings.xml @@ -35,6 +35,8 @@ "%1$s համարից" "%1$s-ին %2$s համարից" "Ձայնային փոստ" - "%s ր %s վ" - "%s վ" + "%d ր %d վ" + "%d վ" + "%d րոպե %d վայրկյան" + "%d վայրկյան" diff --git a/java/com/android/dialer/calllogutils/res/values-in/strings.xml b/java/com/android/dialer/calllogutils/res/values-in/strings.xml index faf93627c..f734419d5 100644 --- a/java/com/android/dialer/calllogutils/res/values-in/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-in/strings.xml @@ -35,6 +35,8 @@ "melalui %1$s" "di %1$s, melalui %2$s" "Pesan suara" - "%sm %sd" - "%sd" + "%dm %dd" + "%dd" + "%d menit %d detik" + "%d detik" diff --git a/java/com/android/dialer/calllogutils/res/values-is/strings.xml b/java/com/android/dialer/calllogutils/res/values-is/strings.xml index e7bbbe10e..5643aee28 100644 --- a/java/com/android/dialer/calllogutils/res/values-is/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-is/strings.xml @@ -35,6 +35,8 @@ "í gegnum %1$s" "á %1$s, í gegnum %2$s" "Talhólf" - "%s mín. og %s sek." - "%s sek." + "%d mín. og %d sek." + "%d sek." + "%d mínútur %d sekúndur" + "%d sekúndur" diff --git a/java/com/android/dialer/calllogutils/res/values-it/strings.xml b/java/com/android/dialer/calllogutils/res/values-it/strings.xml index 04a0e1b39..808d4e444 100644 --- a/java/com/android/dialer/calllogutils/res/values-it/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-it/strings.xml @@ -35,6 +35,8 @@ "tramite %1$s" "su %1$s, tramite %2$s" "Messaggi vocali" - "%s m %s s" - "%s s" + "%d m %d s" + "%d s" + "%d minuti %d secondi" + "%d secondi" diff --git a/java/com/android/dialer/calllogutils/res/values-iw/strings.xml b/java/com/android/dialer/calllogutils/res/values-iw/strings.xml index 1df6961c5..069a8b89d 100644 --- a/java/com/android/dialer/calllogutils/res/values-iw/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-iw/strings.xml @@ -35,6 +35,8 @@ "דרך %1$s" "בחשבון %1$s, דרך %2$s" "דואר קולי" - "%s דקות ו-%s שניות" - "%s שניות" + "%d דקות ו-%d שניות" + "%d שניות" + "%d דקות ו-%d שניות" + "%d שניות" diff --git a/java/com/android/dialer/calllogutils/res/values-ja/strings.xml b/java/com/android/dialer/calllogutils/res/values-ja/strings.xml index 4baeecc5a..81e8ee510 100644 --- a/java/com/android/dialer/calllogutils/res/values-ja/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ja/strings.xml @@ -35,6 +35,8 @@ "%1$s で受信" "%1$s（%2$s）で受信" "ボイスメール" - "%s 分 %s 秒" - "%s 秒" + "%d 分 %d 秒" + "%d 秒" + "%d 分 %d 秒" + "%d 秒" diff --git a/java/com/android/dialer/calllogutils/res/values-ka/strings.xml b/java/com/android/dialer/calllogutils/res/values-ka/strings.xml index b1a4a4177..6bfe5d3ae 100644 --- a/java/com/android/dialer/calllogutils/res/values-ka/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ka/strings.xml @@ -35,6 +35,8 @@ "%1$s-ის მეშვეობით" "%1$s-ზე, %2$s-ის მეშვეობით" "ხმოვანი ფოსტა" - "%sწთ %sწმ" - "%sწმ" + "%dწთ %dწმ" + "%dწმ" + "%d წუთი, %d წამი" + "%d წამი" diff --git a/java/com/android/dialer/calllogutils/res/values-kk/strings.xml b/java/com/android/dialer/calllogutils/res/values-kk/strings.xml index efaef2323..8302bb397 100644 --- a/java/com/android/dialer/calllogutils/res/values-kk/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-kk/strings.xml @@ -35,6 +35,8 @@ "%1$s арқылы" "%1$s, %2$s арқылы" "Дауыстық хабар" - "%sм %sс" - "%s с" + "%dм %dс" + "%d с" + "%d минут %d секунд" + "%d секунд" diff --git a/java/com/android/dialer/calllogutils/res/values-km/strings.xml b/java/com/android/dialer/calllogutils/res/values-km/strings.xml index b5e6c5d8e..91b6d9acd 100644 --- a/java/com/android/dialer/calllogutils/res/values-km/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-km/strings.xml @@ -35,6 +35,8 @@ "តាមរយៈ %1$s" "នៅ​លើ %1$s តាមរយៈ %2$s" "សារ​ជា​សំឡេង" - "%sm %ss" - "%ss" + "%dm %ds" + "%ds" + "%d នាទី %d វិនាទី" + "%d វិនាទី" diff --git a/java/com/android/dialer/calllogutils/res/values-kn/strings.xml b/java/com/android/dialer/calllogutils/res/values-kn/strings.xml index 44feee9e3..6d6f8864a 100644 --- a/java/com/android/dialer/calllogutils/res/values-kn/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-kn/strings.xml @@ -35,6 +35,8 @@ "%1$s ಮೂಲಕ" "%1$s ರಲ್ಲಿ, %2$s ಮೂಲಕ" "ಧ್ವನಿಮೇಲ್" - "%sನಿ %sಸೆ" - "%sಸೆ" + "%dನಿ %dಸೆ" + "%dಸೆ" + "%d ನಿಮಿಷಗಳು %d ಸೆಕೆಂಡುಗಳು" + "%d ಸೆಕೆಂಡುಗಳು" diff --git a/java/com/android/dialer/calllogutils/res/values-ko/strings.xml b/java/com/android/dialer/calllogutils/res/values-ko/strings.xml index 76ba89b8a..ff49d5b83 100644 --- a/java/com/android/dialer/calllogutils/res/values-ko/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ko/strings.xml @@ -35,6 +35,8 @@ "%1$s번으로 수신" "%1$s에서 %2$s번으로 수신" "음성사서함" - "%s분 %s초" - "%s초" + "%d분 %d초" + "%d초" + "%d분 %d초" + "%d초" diff --git a/java/com/android/dialer/calllogutils/res/values-ky/strings.xml b/java/com/android/dialer/calllogutils/res/values-ky/strings.xml index a91f0bd45..9ec8ca253 100644 --- a/java/com/android/dialer/calllogutils/res/values-ky/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ky/strings.xml @@ -35,6 +35,8 @@ "%1$s аркылуу" "%1$s боюнча %2$s аркылуу" "Үн почтасы" - "%sмүн. %sсек." - "%sсек." + "%dмүн. %dсек." + "%dсек." + "%d мүнөт %d секунд" + "%d секунд" diff --git a/java/com/android/dialer/calllogutils/res/values-lo/strings.xml b/java/com/android/dialer/calllogutils/res/values-lo/strings.xml index 343fc60dd..72efbd872 100644 --- a/java/com/android/dialer/calllogutils/res/values-lo/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-lo/strings.xml @@ -35,6 +35,8 @@ "ຜ່ານ %1$s" "ຢູ່ %1$s, ຜ່ານ %2$s" "ຂໍ້ຄວາມສຽງ" - "%sນທ %sວິ" - "%sວິ" + "%dນທ %dວິ" + "%dວິ" + "%d ນາທີ %d ວິນາທີ" + "%d ວິນາທີ" diff --git a/java/com/android/dialer/calllogutils/res/values-lt/strings.xml b/java/com/android/dialer/calllogutils/res/values-lt/strings.xml index 779e95267..7eaa42b8f 100644 --- a/java/com/android/dialer/calllogutils/res/values-lt/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-lt/strings.xml @@ -35,6 +35,8 @@ "numeriu %1$s" "%1$s, numeriu %2$s" "Balso paštas" - "%s min. %s sek." - "%s sek." + "%d min. %d sek." + "%d sek." + "%d min. %d sek." + "%d sek." diff --git a/java/com/android/dialer/calllogutils/res/values-lv/strings.xml b/java/com/android/dialer/calllogutils/res/values-lv/strings.xml index d02d7ec3a..cf6b32efe 100644 --- a/java/com/android/dialer/calllogutils/res/values-lv/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-lv/strings.xml @@ -35,6 +35,8 @@ "izmantojot numuru %1$s" "kontā %1$s, izmantojot numuru %2$s" "Balss pasts" - "%s min %s s" - "%s s" + "%d min %d s" + "%d s" + "%d minūtes %d sekundes" + "%d sekundes" diff --git a/java/com/android/dialer/calllogutils/res/values-mk/strings.xml b/java/com/android/dialer/calllogutils/res/values-mk/strings.xml index 21872a817..5747c258d 100644 --- a/java/com/android/dialer/calllogutils/res/values-mk/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-mk/strings.xml @@ -35,6 +35,8 @@ "на %1$s" "на %1$s, на %2$s" "Говорна пошта" - "%s мин. %s сек." - "%s сек." + "%d мин. %d сек." + "%d сек." + "%d минути %d секунди" + "%d секунди" diff --git a/java/com/android/dialer/calllogutils/res/values-ml/strings.xml b/java/com/android/dialer/calllogutils/res/values-ml/strings.xml index f6507ae16..fcd59958c 100644 --- a/java/com/android/dialer/calllogutils/res/values-ml/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ml/strings.xml @@ -35,6 +35,8 @@ "%1$s നമ്പർ വഴി" "%2$s നമ്പർ വഴി, %1$s അക്കൗണ്ടിൽ" "വോയ്‌സ്‌മെയിൽ" - "%sമിനിറ്റ് %sസെക്കന്‍ഡ്" - "%sസെക്കൻഡ്" + "%dമിനിറ്റ് %dസെക്കന്‍ഡ്" + "%dസെക്കൻഡ്" + "%d മിനിറ്റ് %d സെക്കൻഡ്" + "%d സെക്കൻഡ്" diff --git a/java/com/android/dialer/calllogutils/res/values-mn/strings.xml b/java/com/android/dialer/calllogutils/res/values-mn/strings.xml index 3f5bbd3ea..cc2043989 100644 --- a/java/com/android/dialer/calllogutils/res/values-mn/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-mn/strings.xml @@ -35,6 +35,8 @@ "%1$s-р" "%1$s дээр, %2$s-р" "Дуут шуудан" - "%sм %sс" - "%sс" + "%dм %dс" + "%dс" + "%d минут %d секунд" + "%d секунд" diff --git a/java/com/android/dialer/calllogutils/res/values-mr/strings.xml b/java/com/android/dialer/calllogutils/res/values-mr/strings.xml index 893851f69..eb1080289 100644 --- a/java/com/android/dialer/calllogutils/res/values-mr/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-mr/strings.xml @@ -35,6 +35,8 @@ "%1$s द्वारे" "%1$s वर, %2$s द्वारे" "व्हॉइसमेल" - "%sमि %sसे" - "%sसे" + "%dमि %dसे" + "%dसे" + "%d मिनिटे %d सेकंद" + "%d सेकंद" diff --git a/java/com/android/dialer/calllogutils/res/values-ms/strings.xml b/java/com/android/dialer/calllogutils/res/values-ms/strings.xml index 1f7a22127..03e75161d 100644 --- a/java/com/android/dialer/calllogutils/res/values-ms/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ms/strings.xml @@ -35,6 +35,8 @@ "melalui %1$s" "pada %1$s, melalui %2$s" "Mel suara" - "%sm %ss" - "%ss" + "%dm %ds" + "%ds" + "%d minit %d saat" + "%d saat" diff --git a/java/com/android/dialer/calllogutils/res/values-my/strings.xml b/java/com/android/dialer/calllogutils/res/values-my/strings.xml index 8b1337e01..07f0f8915 100644 --- a/java/com/android/dialer/calllogutils/res/values-my/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-my/strings.xml @@ -35,6 +35,8 @@ "%1$s မှတစ်ဆင့်" "%1$s တွင်၊ %2$s မှတစ်ဆင့်" "အသံမေးလ်" - "%sမိနစ် %sစက္ကန့်" - "%sစက္ကန့်" + "%dမိနစ် %dစက္ကန့်" + "%dစက္ကန့်" + "%d မိနစ် %d စက္ကန့်" + "%d စက္ကန့်" diff --git a/java/com/android/dialer/calllogutils/res/values-nb/strings.xml b/java/com/android/dialer/calllogutils/res/values-nb/strings.xml index 7d4622004..0596aa1bd 100644 --- a/java/com/android/dialer/calllogutils/res/values-nb/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-nb/strings.xml @@ -35,6 +35,8 @@ "via %1$s" "på %1$s via %2$s" "Talepost" - "%s m og %s s" - "%s s" + "%d m og %d s" + "%d s" + "%d minutter, %d sekunder" + "%d sekunder" diff --git a/java/com/android/dialer/calllogutils/res/values-ne/strings.xml b/java/com/android/dialer/calllogutils/res/values-ne/strings.xml index d498395f0..31e1e3279 100644 --- a/java/com/android/dialer/calllogutils/res/values-ne/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ne/strings.xml @@ -35,6 +35,8 @@ "%1$s मार्फत" "%1$s मा, %2$s मार्फत" "भ्वाइस मेल" - "%sमिनेट %sसेकेन्ड" - "%sसेकेन्ड" + "%dमिनेट %dसेकेन्ड" + "%dसेकेन्ड" + "%d मिनेट %d सेकेन्ड" + "%d सेकेन्ड" diff --git a/java/com/android/dialer/calllogutils/res/values-nl/strings.xml b/java/com/android/dialer/calllogutils/res/values-nl/strings.xml index 0fcc6ca7f..6801082b3 100644 --- a/java/com/android/dialer/calllogutils/res/values-nl/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-nl/strings.xml @@ -35,6 +35,8 @@ "via %1$s" "op %1$s, via %2$s" "Voicemail" - "%s m %s s" - "%s s" + "%d m %d s" + "%d s" + "%d minuten, %d seconden" + "%d seconden" diff --git a/java/com/android/dialer/calllogutils/res/values-no/strings.xml b/java/com/android/dialer/calllogutils/res/values-no/strings.xml index 7d4622004..0596aa1bd 100644 --- a/java/com/android/dialer/calllogutils/res/values-no/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-no/strings.xml @@ -35,6 +35,8 @@ "via %1$s" "på %1$s via %2$s" "Talepost" - "%s m og %s s" - "%s s" + "%d m og %d s" + "%d s" + "%d minutter, %d sekunder" + "%d sekunder" diff --git a/java/com/android/dialer/calllogutils/res/values-pa/strings.xml b/java/com/android/dialer/calllogutils/res/values-pa/strings.xml index f4cde52ff..e7c6119e2 100644 --- a/java/com/android/dialer/calllogutils/res/values-pa/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-pa/strings.xml @@ -35,6 +35,8 @@ "%1$s ਰਾਹੀਂ" "%1$s \'ਤੇ, %2$s ਰਾਹੀਂ" "ਵੌਇਸਮੇਲ" - "%sਮਿੰ %sਸਕਿੰ" - "%sਸਕਿੰ" + "%dਮਿੰ %dਸਕਿੰ" + "%dਸਕਿੰ" + "%d ਮਿੰਟ %d ਸਕਿੰਟ" + "%d ਸਕਿੰਟ" diff --git a/java/com/android/dialer/calllogutils/res/values-pl/strings.xml b/java/com/android/dialer/calllogutils/res/values-pl/strings.xml index f1396cd88..d863c1d9d 100644 --- a/java/com/android/dialer/calllogutils/res/values-pl/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-pl/strings.xml @@ -35,6 +35,8 @@ "przez %1$s" "na koncie %1$s, przez %2$s" "Poczta głosowa" - "%s min %s s" - "%s s" + "%d min %d s" + "%d s" + "%d min %d s" + "%d s" diff --git a/java/com/android/dialer/calllogutils/res/values-pt-rBR/strings.xml b/java/com/android/dialer/calllogutils/res/values-pt-rBR/strings.xml index 1e8b733b9..5182576e1 100644 --- a/java/com/android/dialer/calllogutils/res/values-pt-rBR/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-pt-rBR/strings.xml @@ -35,6 +35,8 @@ "pelo número %1$s" "em %1$s, pelo número %2$s" "Correio de voz" - "%s min %s s" - "%s s" + "%d min %d s" + "%d s" + "%d minutos %d segundos" + "%d segundos" diff --git a/java/com/android/dialer/calllogutils/res/values-pt-rPT/strings.xml b/java/com/android/dialer/calllogutils/res/values-pt-rPT/strings.xml index f24b83af2..b9c4d2459 100644 --- a/java/com/android/dialer/calllogutils/res/values-pt-rPT/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-pt-rPT/strings.xml @@ -35,6 +35,8 @@ "através do número %1$s" "em %1$s, através do número %2$s" "Correio de voz" - "%s min %s s" - "%s s" + "%d min %d s" + "%d s" + "%d minutos %d segundos" + "%d segundos" diff --git a/java/com/android/dialer/calllogutils/res/values-pt/strings.xml b/java/com/android/dialer/calllogutils/res/values-pt/strings.xml index 1e8b733b9..5182576e1 100644 --- a/java/com/android/dialer/calllogutils/res/values-pt/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-pt/strings.xml @@ -35,6 +35,8 @@ "pelo número %1$s" "em %1$s, pelo número %2$s" "Correio de voz" - "%s min %s s" - "%s s" + "%d min %d s" + "%d s" + "%d minutos %d segundos" + "%d segundos" diff --git a/java/com/android/dialer/calllogutils/res/values-ro/strings.xml b/java/com/android/dialer/calllogutils/res/values-ro/strings.xml index 84497540b..fb4ad6ba1 100644 --- a/java/com/android/dialer/calllogutils/res/values-ro/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ro/strings.xml @@ -35,6 +35,8 @@ "prin %1$s" "pe %1$s, prin %2$s" "Mesagerie vocală" - "%s min. %s sec." - "%s sec." + "%d min. %d sec." + "%d sec." + "%d minute, %d secunde" + "%d secunde" diff --git a/java/com/android/dialer/calllogutils/res/values-ru/strings.xml b/java/com/android/dialer/calllogutils/res/values-ru/strings.xml index 8e6120ab1..7fc772bbb 100644 --- a/java/com/android/dialer/calllogutils/res/values-ru/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ru/strings.xml @@ -35,6 +35,8 @@ "Номер %1$s" "%1$s, номер %2$s" "Голосовая почта" - "%s мин. %s сек." - "%s сек." + "%d мин. %d сек." + "%d сек." + "%d мин. %d сек." + "%d сек." diff --git a/java/com/android/dialer/calllogutils/res/values-si/strings.xml b/java/com/android/dialer/calllogutils/res/values-si/strings.xml index fa24c1c07..5a6e9e650 100644 --- a/java/com/android/dialer/calllogutils/res/values-si/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-si/strings.xml @@ -35,6 +35,8 @@ "%1$s හරහා" "%1$s මත, %2$s හරහා" "හඬ තැපෑල" - "මි%s ත%s" - "තත්%s" + "මි%d ත%d" + "තත්%d" + "මිනිත්තු %d තත්පර %d" + "තත්පර %d" diff --git a/java/com/android/dialer/calllogutils/res/values-sk/strings.xml b/java/com/android/dialer/calllogutils/res/values-sk/strings.xml index ee32a0875..edd431a55 100644 --- a/java/com/android/dialer/calllogutils/res/values-sk/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-sk/strings.xml @@ -35,6 +35,8 @@ "prostredníctvom čísla %1$s" "v účte %1$s, prostredníctvom čísla %2$s" "Hlasová schránka" - "%s min %s s" - "%s s" + "%d min %d s" + "%d s" + "%d min, %d s" + "%d s" diff --git a/java/com/android/dialer/calllogutils/res/values-sl/strings.xml b/java/com/android/dialer/calllogutils/res/values-sl/strings.xml index 0cf0ab2ca..ee2a64180 100644 --- a/java/com/android/dialer/calllogutils/res/values-sl/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-sl/strings.xml @@ -35,6 +35,8 @@ "prek številke %1$s" "v računu %1$s, prek številke %2$s" "Odzivnik" - "%s min %s s" - "%s s" + "%d min %d s" + "%d s" + "%d min in %d s" + "%d s" diff --git a/java/com/android/dialer/calllogutils/res/values-sq/strings.xml b/java/com/android/dialer/calllogutils/res/values-sq/strings.xml index b2a28357c..764a35d98 100644 --- a/java/com/android/dialer/calllogutils/res/values-sq/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-sq/strings.xml @@ -35,6 +35,8 @@ "nëpërmjet %1$s" "në %1$s, nëpërmjet %2$s" "Posta zanore" - "%s minuta e %s sekonda" - "%s sekonda" + "%d minuta e %d sekonda" + "%d sekonda" + "%d minuta %d sekonda" + "%d sekonda" diff --git a/java/com/android/dialer/calllogutils/res/values-sr/strings.xml b/java/com/android/dialer/calllogutils/res/values-sr/strings.xml index 49f7473d4..bef1b1683 100644 --- a/java/com/android/dialer/calllogutils/res/values-sr/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-sr/strings.xml @@ -35,6 +35,8 @@ "преко %1$s" "на %1$s, преко %2$s" "Говорна пошта" - "%s м %s с" - "%s с" + "%d м %d с" + "%d с" + "%d мин %d сек" + "%d сек" diff --git a/java/com/android/dialer/calllogutils/res/values-sv/strings.xml b/java/com/android/dialer/calllogutils/res/values-sv/strings.xml index eff7210ef..630af12de 100644 --- a/java/com/android/dialer/calllogutils/res/values-sv/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-sv/strings.xml @@ -35,6 +35,8 @@ "med %1$s" "på %1$s, med %2$s" "Röstbrevlåda" - "%s m %s s" - "%s s" + "%d m %d s" + "%d s" + "%d minuter, %d sekunder" + "%d sekunder" diff --git a/java/com/android/dialer/calllogutils/res/values-sw/strings.xml b/java/com/android/dialer/calllogutils/res/values-sw/strings.xml index 7810fb14b..fae34e4f1 100644 --- a/java/com/android/dialer/calllogutils/res/values-sw/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-sw/strings.xml @@ -35,6 +35,8 @@ "kupitia %1$s" "kwenye %1$s, kupitia %2$s" "Ujumbe wa sauti" - "Dakika %s sekunde %s" - "Sekunde %s" + "Dakika %d sekunde %d" + "Sekunde %d" + "Dakika %d sekunde %d" + "Sekunde %d" diff --git a/java/com/android/dialer/calllogutils/res/values-ta/strings.xml b/java/com/android/dialer/calllogutils/res/values-ta/strings.xml index b3e60bbc8..4adbe0ec2 100644 --- a/java/com/android/dialer/calllogutils/res/values-ta/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ta/strings.xml @@ -35,6 +35,8 @@ "%1$s மூலம்" "%1$s இல் %2$s மூலம்" "குரலஞ்சல்" - "%sநி %sவி" - "%sவி" + "%dநி %dவி" + "%dவி" + "%d நிமிடங்கள் %d விநாடிகள்" + "%d விநாடிகள்" diff --git a/java/com/android/dialer/calllogutils/res/values-te/strings.xml b/java/com/android/dialer/calllogutils/res/values-te/strings.xml index 4d6553765..91471538d 100644 --- a/java/com/android/dialer/calllogutils/res/values-te/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-te/strings.xml @@ -35,6 +35,8 @@ "%1$s ద్వారా" "%1$sలో, %2$s ద్వారా" "వాయిస్ మెయిల్" - "%sని %sసె" - "%sసె" + "%dని %dసె" + "%dసె" + "%d నిమిషాల %d సెకన్లు" + "%d సెకన్లు" diff --git a/java/com/android/dialer/calllogutils/res/values-th/strings.xml b/java/com/android/dialer/calllogutils/res/values-th/strings.xml index 46d9ec028..33bf725e4 100644 --- a/java/com/android/dialer/calllogutils/res/values-th/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-th/strings.xml @@ -35,6 +35,8 @@ "ผ่าน %1$s" "ใน %1$s ผ่าน %2$s" "ข้อความเสียง" - "%s นาที %s วินาที" - "%s วินาที" + "%d นาที %d วินาที" + "%d วินาที" + "%d นาที %d วินาที" + "%d วินาที" diff --git a/java/com/android/dialer/calllogutils/res/values-tl/strings.xml b/java/com/android/dialer/calllogutils/res/values-tl/strings.xml index b4f4045e3..b4d3e4972 100644 --- a/java/com/android/dialer/calllogutils/res/values-tl/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-tl/strings.xml @@ -35,6 +35,8 @@ "sa pamamagitan ng %1$s" "sa %1$s, sa pamamagitan ng %2$s" "Voicemail" - "%s (na) min. %s (na) segundo" - "%s (na) segundo" + "%d (na) min. %d (na) segundo" + "%d (na) segundo" + "%d (na) minuto %d (na) segundo" + "%d (na) segundo" diff --git a/java/com/android/dialer/calllogutils/res/values-tr/strings.xml b/java/com/android/dialer/calllogutils/res/values-tr/strings.xml index 1a2e762f1..b8dc84cee 100644 --- a/java/com/android/dialer/calllogutils/res/values-tr/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-tr/strings.xml @@ -35,6 +35,8 @@ "%1$s kullanılarak" "%2$s kullanılarak %1$s hesabında" "Sesli mesaj" - "%s dk. %s sn." - "%s sn." + "%d dk. %d sn." + "%d sn." + "%d dakika %d saniye" + "%d saniye" diff --git a/java/com/android/dialer/calllogutils/res/values-uk/strings.xml b/java/com/android/dialer/calllogutils/res/values-uk/strings.xml index 5f3e0aecf..c62f2b0ad 100644 --- a/java/com/android/dialer/calllogutils/res/values-uk/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-uk/strings.xml @@ -35,6 +35,8 @@ "на номер %1$s" "на %1$s на номер %2$s" "Голосова пошта" - "%s хв %s с" - "%s с" + "%d хв %d с" + "%d с" + "%d хв %d с" + "%d с" diff --git a/java/com/android/dialer/calllogutils/res/values-ur/strings.xml b/java/com/android/dialer/calllogutils/res/values-ur/strings.xml index 9872d4368..e9a115452 100644 --- a/java/com/android/dialer/calllogutils/res/values-ur/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ur/strings.xml @@ -35,6 +35,8 @@ "بذریعہ %1$s" "%1$s پر، بذریعہ %2$s" "صوتی میل" - "%sمنٹ %sسیکنڈ" - "%sسیکنڈ" + "%dمنٹ %dسیکنڈ" + "%dسیکنڈ" + "%d منٹ %d سیکنڈ" + "%d سیکنڈ" diff --git a/java/com/android/dialer/calllogutils/res/values-uz/strings.xml b/java/com/android/dialer/calllogutils/res/values-uz/strings.xml index 7917f4790..b1fe269c2 100644 --- a/java/com/android/dialer/calllogutils/res/values-uz/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-uz/strings.xml @@ -35,6 +35,8 @@ "%1$s raqami orqali" "%1$s, %2$s raqami orqali" "Ovozli pochta" - "%s daq. %s son." - "%s son." + "%d daq. %d son." + "%d son." + "%d daqiqa %d soniya" + "%d soniya" diff --git a/java/com/android/dialer/calllogutils/res/values-vi/strings.xml b/java/com/android/dialer/calllogutils/res/values-vi/strings.xml index b722dc234..790997567 100644 --- a/java/com/android/dialer/calllogutils/res/values-vi/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-vi/strings.xml @@ -35,6 +35,8 @@ "qua %1$s" "trên %1$s, qua %2$s" "Thư thoại" - "%s phút %s giây" - "%s giây" + "%d phút %d giây" + "%d giây" + "%d phút %d giây" + "%d giây" diff --git a/java/com/android/dialer/calllogutils/res/values-zh-rCN/strings.xml b/java/com/android/dialer/calllogutils/res/values-zh-rCN/strings.xml index 6f20642e3..0fd41e89b 100644 --- a/java/com/android/dialer/calllogutils/res/values-zh-rCN/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-zh-rCN/strings.xml @@ -35,6 +35,8 @@ "通过 %1$s" "帐号：%1$s，通过 %2$s" "语音邮件" - "%s 分 %s 秒" - "%s 秒" + "%d 分 %d 秒" + "%d 秒" + "%d 分 %d 秒" + "%d 秒" diff --git a/java/com/android/dialer/calllogutils/res/values-zh-rHK/strings.xml b/java/com/android/dialer/calllogutils/res/values-zh-rHK/strings.xml index 83b68acfb..57c669349 100644 --- a/java/com/android/dialer/calllogutils/res/values-zh-rHK/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-zh-rHK/strings.xml @@ -35,6 +35,8 @@ "透過 %1$s" "在 %1$s 上透過 %2$s" "留言" - "%s 分 %s 秒" - "%s 秒" + "%d 分 %d 秒" + "%d 秒" + "%d 分鐘 %d 秒" + "%d 秒" diff --git a/java/com/android/dialer/calllogutils/res/values-zh-rTW/strings.xml b/java/com/android/dialer/calllogutils/res/values-zh-rTW/strings.xml index 1566f05d4..e9816481e 100644 --- a/java/com/android/dialer/calllogutils/res/values-zh-rTW/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-zh-rTW/strings.xml @@ -35,6 +35,8 @@ "透過 %1$s" "%1$s，透過 %2$s" "語音留言" - "%s 分鐘 %s 秒" - "%s 秒" + "%d 分鐘 %d 秒" + "%d 秒" + "%d 分 %d 秒" + "%d 秒" diff --git a/java/com/android/dialer/calllogutils/res/values-zu/strings.xml b/java/com/android/dialer/calllogutils/res/values-zu/strings.xml index 289ff34fe..226d07d6d 100644 --- a/java/com/android/dialer/calllogutils/res/values-zu/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-zu/strings.xml @@ -35,6 +35,8 @@ "nge-%1$s" "ku-%1$s, nge-%2$s" "Ivoyisimeyili" - "%sm %ss" - "%ss" + "%dm %ds" + "%ds" + "%d amaminithi %d amasekhondi" + "%d amasekhondi" diff --git a/java/com/android/dialer/calllogutils/res/values/strings.xml b/java/com/android/dialer/calllogutils/res/values/strings.xml index 01a5a9b87..22bfb7b93 100644 --- a/java/com/android/dialer/calllogutils/res/values/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values/strings.xml @@ -83,8 +83,14 @@ Voicemail - %sm %ss + %dm %ds - %ss + %ds + + + %d minutes %d seconds + + + %d seconds \ No newline at end of file -- cgit v1.2.3