From 2ca4318cc1ee57dda907ba2069bd61d162b1baef Mon Sep 17 00:00:00 2001
From: Eric Erfanian <erfanian@google.com>
Date: Thu, 31 Aug 2017 06:57:16 -0700
Subject: Update Dialer source to latest internal Google revision.

Previously, Android's Dialer app was developed in an internal Google
source control system and only exported to public during AOSP drops.

The Dialer team is now switching to a public development model similar
to the telephony team.

This CL represents all internal Google changes that were committed to
Dialer between the public O release and today's tip of tree on internal
master. This CL squashes those changes into a single commit.
In subsequent changes, changes will be exported on a per-commit basis.

Test: make, flash install, run
Merged-In: I45270eaa8ce732d71a1bd84b08c7fa0e99af3160
Change-Id: I529aaeb88535b9533c0ae4ef4e6c1222d4e0f1c8
PiperOrigin-RevId: 167068436
---
 .../com/android/incallui/res/values-uz/strings.xml | 86 +++-------------------
 1 file changed, 10 insertions(+), 76 deletions(-)

(limited to 'java/com/android/incallui/res/values-uz')

diff --git a/java/com/android/incallui/res/values-uz/strings.xml b/java/com/android/incallui/res/values-uz/strings.xml
index 38285015a..893e93152 100644
--- a/java/com/android/incallui/res/values-uz/strings.xml
+++ b/java/com/android/incallui/res/values-uz/strings.xml
@@ -18,25 +18,18 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefon"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Konferensiya qo‘ng‘irog‘i"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Chaqiruv uzilib qoldi"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Ushbu tovushlar jo‘natilsinmi?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Tovushlar jo‘natilmoqda\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Yuborish"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Ha"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Yo‘q"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Belgilarni quyidagilar bilan almashtiring:"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Konferensiya qo‘ng‘irog‘i <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Ovozli pochta raqami"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Raqam terilmoqda"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> chaqiruvi javobsiz qoldi"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Joriy qo‘ng‘iroq"</string>
+    <string name="notification_ongoing_call" msgid="8712641937577776125">"Joriy chaqiruv"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Chiquvchi ishchi qo‘ng‘irog‘i"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Chiquvchi Wi-Fi qo‘ng‘irog‘i"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Chiquvchi Wi-Fi ishchi qo‘ng‘irog‘i"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Joriy <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Kiruvchi <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi qo‘ng‘iroq"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi-Fi qo‘ng‘iroq (ish)"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Kutmoqda"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Kiruvchi qo‘ng‘iroq"</string>
+    <string name="notification_incoming_call" msgid="7520580807513849283">"Kiruvchi chaqiruv"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Suratga ega kiruvchi chaqiruv"</string>
     <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Xabarga ega kiruvchi chaqiruv"</string>
     <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Joylashuv axborotiga ega kiruvchi chaqiruv"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Surat, xabar va joy. ax. ega muhim kiruv. chaqiruv"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Biriktirmalarga ega muhim kiruvchi chaqiruv"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Kiruvchi ishchi qo‘ng‘irog‘i"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Kiruvchi Wi-Fi qo‘ng‘irog‘i"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Kiruvchi Wi-Fi ishchi qo‘ng‘irog‘i"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Shubhali kiruvchi qo‘ng‘iroq"</string>
+    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Kiruvchi chaqiruv: shubhali spam"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Kiruvchi video so\'rovi"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Xizmat mavjud emas"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Tanlangan tarmoq (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) mavjud emas"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Javob"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Suhbatni tugatish"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Ovoz"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Roziman"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Rad etish"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Boshqa qurilmada hozir qo‘ng‘iroq amalga oshirilmoqda."</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Boshqa qurilmada hozir video qo‘ng‘iroq amalga oshirilmoqda."</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Qo‘ng‘iroqni qabul qilish"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Video qo‘ng‘iroq. qabul qilish"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Qo‘ng‘iroq qilish uchun, avval \"Parvoz rejimi\" o‘chirilishi kerak."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Tarmoqda ro‘yxatdan o‘tmagan."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mobil tarmoq mavjud emas."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Qo‘ng‘iroq qilish uchun raqamni to‘g‘ri kiriting."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Qo‘ng‘iroq qilib bo‘lmadi."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"MMI tartibi ishga tushmoqda..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Xizmat qo‘llab-quvvatlanmaydi."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Qo‘ng‘iroqlarni almashtirib bo‘lmadi."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Qo‘ng‘iroqni ajratib bo‘lmadi."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"O‘tkazib bo‘lmadi."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Konferens-aloqa o‘rnatib bo‘lmadi."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Qo‘ng‘iroqni rad qilib bo‘lmadi."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Qo‘ng‘iroq(lar)ni chiqarib bo‘lmadi."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Favqulodda qo‘ng‘iroq"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Radio yoqilmoqda…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Aloqa yo‘q. Qayta urinilmoqda…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Qo‘ng‘iroq qilib bo‘lmadi. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> favqulodda raqam emas."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Qo‘ng‘iroq qilib bo‘lmadi. Favqulodda raqamga tering."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Terish uchun tugmatagdan foydalaning"</string>
-    <string name="player_started" msgid="9177182657338033086">"Pleyer ishga tushirildi"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Pleyer to‘xtatildi"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Kamera tayyor emas"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Kamera tayyor"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Noma’lum qo‘ng‘iroq sessiyasi hodisasi"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Boshqa qo‘ng‘iroq sozlamalari"</string>
     <string name="goPrivate" msgid="5269514638004595378">"alohidaga o‘tish"</string>
-    <string name="selectContact" msgid="1703433172800564849">"kontaktni tanlash"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Rington va tebranish"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Konferens-aloqani sozlash"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Favqulodda qo‘ng‘iroq raqamlari"</string>
     <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> orqali"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"So‘nggi xabarlar"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Korporativ ma’lumotlar"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> mil uzoqda"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> km uzoqda"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> – <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Ertaga <xliff:g id="OPEN_TIME">%s</xliff:g> da ochiladi"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Bugun <xliff:g id="OPEN_TIME">%s</xliff:g> da ochiladi"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"<xliff:g id="CLOSE_TIME">%s</xliff:g> da yopiladi"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Bugun <xliff:g id="CLOSE_TIME">%s</xliff:g> da yopiladi"</string>
-    <string name="open_now" msgid="5897306702060039512">"Ochiq"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Yopiq"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"<xliff:g id="NUMBER">%1$s</xliff:g> sizga tanish raqammi?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"<xliff:g id="NUMBER">%1$s</xliff:g> shubhali raqammi?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> raqami bloklandi va shubhali deb belgilandi."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"<xliff:g id="NUMBER">%1$s</xliff:g> raqamidan qo‘ng‘iroq spam emas deb belgilandi."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Kontaktlarga qo‘shish yoki shubhali raqam deb bloklash uchun bosing."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Bu raqamdan sizga birinchi marta qo‘ng‘iroq qilindi. Agar bu spam-qo‘ng‘iroq bo‘lsa, uni spam deb belgilang va raqamni bloklang."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"SPAM EMAS deb belgilash yoki raqamni bloklash uchun bosing."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Bu spam-qo‘ng‘iroqqa o‘xshayapti. Agar u spam bo‘lmasa, bu haqda bizga xabar berish uchun SPAM EMAS deb belgilang."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Bloklash/xabar ber."</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Kontakt saqlash"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Spam emas"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Raqamni bloklash"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Kontaktlarga saqlash"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Bloklash va spam haqida xabar berish"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Spam emas"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"SIM karta yo‘q yoki SIM kartada xato"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Qo‘ng‘iroqni tugatish"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Konferens-aloqa"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Qo‘ng‘iroq davom etmoqda"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Qo‘ng‘iroq mobil internet orqali davom ettirilmoqda…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Wi-Fi tarmog‘iga o‘tib bo‘lmadi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Video qo‘ng‘iroq uyali tarmoqda davom etilaveradi. Internet uchun operator tarifi bo‘yicha haq olinishi mumkin."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Qo‘ng‘iroq mobil internetga o‘tkazilmoqda…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi-Fi tarmog‘iga o‘tib bo‘lmadi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Video qo‘ng‘iroq mobil internet orqali davom ettiriladi. Internet uchun operator tarifi bo‘yicha haq olinishi mumkin."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Bu xabar boshqa ko‘rsatilmasin"</string>
 </resources>
-- 
cgit v1.2.3