From 9050823ccf6f512e06ad65c8a741cb17cbc4a833 Mon Sep 17 00:00:00 2001
From: Eric Erfanian <erfanian@google.com>
Date: Fri, 24 Mar 2017 09:31:16 -0700
Subject: Update AOSP Dialer source from internal google3 repository at
 cl/151128062

Test: make, treehugger

This CL updates the AOSP Dialer source with all the changes that have
gone into the private google3 repository. This includes all the
changes from cl/150756069 (3/21/2017) to cl/151128062 (3/24/2017).

Notable this release:
- Explicitly enumerate host and target dependencies.
- Update proguard flag references.

This goal of these drops is to keep the AOSP source in sync with the
internal google3 repository. Currently these sync are done by hand
with very minor modifications to the internal source code.
See the Android.mk file for list of modifications.
Our current goal is to do frequent drops (daily if possible) and
eventually switched to an automated process.

Bug: 33210202 36511925

Addresses
33210202 - Proguard support
36511925 - Compiler warnings when building against platform sdk

Change-Id: I448ec3b3f2358886859cf7a4ef76a8fcef3244ae
---
 .../voicemail/impl/res/values-ru/strings.xml       | 87 ++++++++--------------
 1 file changed, 29 insertions(+), 58 deletions(-)

(limited to 'java/com/android/voicemail/impl/res/values-ru/strings.xml')

diff --git a/java/com/android/voicemail/impl/res/values-ru/strings.xml b/java/com/android/voicemail/impl/res/values-ru/strings.xml
index 7a9692ead..2d1874a71 100644
--- a/java/com/android/voicemail/impl/res/values-ru/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ru/strings.xml
@@ -16,66 +16,37 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for voicemail_settings_with_label (563926539137546586) -->
-    <skip />
-    <!-- no translation found for voicemail_settings_title (6685263321755930738) -->
-    <skip />
+    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Голосовая почта (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="voicemail_settings_title" msgid="6685263321755930738">"Голосовая почта"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="1017489970564669402">"Вибросигнал"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="913495075516305202">"Вибросигнал"</string>
     <string name="voicemail_notification_ringtone_title" msgid="7516921280035140960">"Звук"</string>
     <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Расширенные настройки"</string>
-    <!-- no translation found for voicemail_visual_voicemail_switch_title (3158454817165714998) -->
-    <skip />
-    <!-- no translation found for voicemail_visual_voicemail_auto_archive_switch_title (7120443850486401455) -->
-    <skip />
-    <!-- no translation found for voicemail_visual_voicemail_auto_archive_temporary_disclaimer (401509437213449235) -->
-    <skip />
-    <!-- no translation found for voicemail_set_pin_dialog_title (8853126653745637812) -->
-    <skip />
-    <!-- no translation found for voicemail_change_pin_dialog_title (6929300804279262966) -->
-    <skip />
-    <!-- no translation found for vm_change_pin_old_pin (3732582036597386047) -->
-    <skip />
-    <!-- no translation found for vm_change_pin_new_pin (5167496290646066333) -->
-    <skip />
-    <!-- no translation found for vm_change_pin_progress_message (4143209637626661679) -->
-    <skip />
-    <!-- no translation found for vm_change_pin_error_too_short (2825020644385639921) -->
-    <skip />
-    <!-- no translation found for vm_change_pin_error_too_long (683260438529171998) -->
-    <skip />
-    <!-- no translation found for vm_change_pin_error_too_weak (5865254034338293113) -->
-    <skip />
-    <!-- no translation found for vm_change_pin_error_mismatch (3682667971009913553) -->
-    <skip />
-    <!-- no translation found for vm_change_pin_error_invalid (4317397281749196545) -->
-    <skip />
-    <!-- no translation found for vm_change_pin_error_system_error (5972056058776852411) -->
-    <skip />
-    <!-- no translation found for vvm_unsupported_message_format (2746490691815392491) -->
-    <skip />
-    <!-- no translation found for change_pin_title (1363830310845461697) -->
-    <skip />
-    <!-- no translation found for change_pin_continue_label (9184635195162827832) -->
-    <skip />
-    <!-- no translation found for change_pin_cancel_label (7258783861113501519) -->
-    <skip />
-    <!-- no translation found for change_pin_ok_label (4527043915415428629) -->
-    <skip />
-    <!-- no translation found for change_pin_enter_old_pin_header (1375728090965833028) -->
-    <skip />
-    <!-- no translation found for change_pin_enter_old_pin_hint (1654231195871094175) -->
-    <skip />
-    <!-- no translation found for change_pin_enter_new_pin_header (7142620840890909719) -->
-    <skip />
-    <!-- no translation found for change_pin_enter_new_pin_hint (1289662932759932217) -->
-    <skip />
-    <!-- no translation found for change_pin_confirm_pin_header (7282604363655862136) -->
-    <skip />
-    <!-- no translation found for change_pin_confirm_pins_dont_match (8626742552205369433) -->
-    <skip />
-    <!-- no translation found for change_pin_succeeded (6869403202124894671) -->
-    <skip />
-    <!-- no translation found for change_pin_system_error (5762853042379833829) -->
-    <skip />
+    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Визуальная голосовая почта"</string>
+    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Дополнительное место для хранения и резервного копирования"</string>
+    <string name="voicemail_visual_voicemail_auto_archive_temporary_disclaimer" msgid="401509437213449235">" "<b><i>"Это экспериментальная функция"</i></b>", которая сейчас проходит тестирование. Возможно, ваши голосовые сообщения будут удалены с вашего сервера. Поддержка этой функции в дальнейшем не гарантируется. Мы бы хотели узнать ваше мнение о ней."</string>
+    <string name="voicemail_set_pin_dialog_title" msgid="8853126653745637812">"Установка PIN-кода"</string>
+    <string name="voicemail_change_pin_dialog_title" msgid="6929300804279262966">"Изменение PIN-кода"</string>
+    <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Прежний PIN-код"</string>
+    <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Новый PIN-код"</string>
+    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Подождите…"</string>
+    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Новый PIN-код слишком короткий."</string>
+    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Новый PIN-код слишком длинный."</string>
+    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Новый PIN-код слишком простой. Чтобы пароль был надежным, он не должен содержать непрерывную последовательность чисел или повторяющиеся цифры."</string>
+    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"Старый PIN-код указан неверно."</string>
+    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Новый PIN-код содержит недопустимые символы."</string>
+    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Не удалось сменить PIN-код"</string>
+    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Неподдерживаемый тип сообщения. Чтобы его прослушать, позвоните по телефону <xliff:g id="NUMBER">%s</xliff:g>."</string>
+    <string name="change_pin_title" msgid="1363830310845461697">"Сменить PIN-код голосовой почты"</string>
+    <string name="change_pin_continue_label" msgid="9184635195162827832">"Продолжить"</string>
+    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Отмена"</string>
+    <string name="change_pin_ok_label" msgid="4527043915415428629">"ОК"</string>
+    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Подтвердите предыдущий PIN-код"</string>
+    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Чтобы продолжить, введите PIN-код голосовой почты."</string>
+    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Задайте новый PIN-код"</string>
+    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN-код должен содержать <xliff:g id="MIN">%1$d</xliff:g>–<xliff:g id="MAX">%2$d</xliff:g> зн."</string>
+    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Подтвердите PIN-код"</string>
+    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PIN-коды не совпадают."</string>
+    <string name="change_pin_succeeded" msgid="6869403202124894671">"PIN-код голосовой почты обновлен"</string>
+    <string name="change_pin_system_error" msgid="5762853042379833829">"Не удалось установить PIN-код"</string>
 </resources>
-- 
cgit v1.2.3