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-bs/strings.xml | 80 ++--------------------
 1 file changed, 7 insertions(+), 73 deletions(-)

(limited to 'java/com/android/incallui/res/values-bs/strings.xml')

diff --git a/java/com/android/incallui/res/values-bs/strings.xml b/java/com/android/incallui/res/values-bs/strings.xml
index c6950802f..100186905 100644
--- a/java/com/android/incallui/res/values-bs/strings.xml
+++ b/java/com/android/incallui/res/values-bs/strings.xml
@@ -18,23 +18,16 @@
 <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">"Konferencijski poziv"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Poziv je prekinut"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Poslati sljedeće tonove?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Slanje tonova\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Pošalji"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Da"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Ne"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Zamijeni zamjenski znak sa"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Konferencijski poziv <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Broj govorne pošte"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Poziva se"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Propušteni poziv od kontakta <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Poziv u toku"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Poslovni poziv u toku"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Wi-Fi poziv u toku"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Wi-Fi poslovni poziv u toku"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> poziv u toku"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Dolazni <xliff:g id="BRAND_NAME">%1$s</xliff:g> poziv"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi poziv"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi-Fi poslovni poziv"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Na čekanju"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Dolazni poziv"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Dolazni poziv s fotografijom"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Važan poziv s fotografijom, porukom i lokacijom"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Važan dolazni poziv s prilozima"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Dolazni poslovni poziv"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Dolazni Wi-Fi poziv"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Dolazni Wi-Fi poslovni poziv"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Mogući neželjeni dolazni poziv"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Zahtjev za dolazni videopoziv"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Nema mreže"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Odabrana mreža (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) je nedostupna"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Odgovori"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Prekini vezu"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Videopoziv"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Glasovni"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Prihvati"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Odbij"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Poziv u toku na drugom uređaju"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Videopoziv je u toku na drugom uređaju"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Primi poziv"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Primi videopoziv"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Da uputite poziv, isključite Način rada u avionu."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Nije registrirano na mreži."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mobilna mreža nije dostupna."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Da uputite poziv, upišite važeći broj."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Nije moguće pozvati."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Pokretanje MMI sekvence u toku…"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Usluga nije podržana."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Nije moguće prebacivanje poziva."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Nije moguće odvojiti poziv."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Prijenos nije moguć."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Konferencijski poziv nije uspio."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Nije moguće odbiti poziv."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Nije moguće uputiti poziv(e)."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Hitni poziv"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Uključivanje radija u toku…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Nema mreže. Novi pokušaj u toku…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Nije moguće pozvati. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nije broj za htine slučajeve."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Nije moguće pozvati. Birajte broj za hitne slučajeve."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Koristi tastaturu za biranje"</string>
-    <string name="player_started" msgid="9177182657338033086">"Plejer je pokrenut"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Plejer je zaustavljen"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Kamera nije spremna"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Kamera je spremna"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Nepoznati događaj sesije poziva"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Ostale postavke poziva"</string>
     <string name="goPrivate" msgid="5269514638004595378">"idi na privatno"</string>
-    <string name="selectContact" msgid="1703433172800564849">"odaberi kontakt"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Melodija zvona i vibracija"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Upravljaj konf. pozivom"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Broj za hitne slučajeve"</string>
     <string name="child_number" msgid="3398257437107259682">"putem <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Nedavne poruke"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Informacije o preduzeću"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"Udaljenost u miljama: <xliff:g id="DISTANCE">%.1f</xliff:g>"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"Udaljenost u km: <xliff:g id="DISTANCE">%.1f</xliff:g>"</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">"Otvara se sutra u <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Otvara se danas u <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Zatvara se u <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Zatvoreno danas u <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Otvoreno sad"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Zatvoreno sada"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Poznajete <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"Je li <xliff:g id="NUMBER">%1$s</xliff:g> neželjeni poziv?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> je blokiran i poziv je prijavljen kao neželjen."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Poziv s broja <xliff:g id="NUMBER">%1$s</xliff:g> je prijavljen kao neželjen."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Dodirnite da biste dodali u kontakte ili blokirani neželjeni broj."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Ovo je prvi poziv koji ste primili s ovog broja. Ako je poziv neželjen, možete blokirati ovaj broj i prijaviti ga."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Dodirnite kako biste prijavili da poziv NIJE NEŽELJEN ili ga blokirajte."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Sumnjamo da se radi o neželjenom pozivu. Ako nije neželjeni poziv, dodirnite NIJE NEŽELJEN da biste prijavili našu grešku."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Blokiraj i prijavi"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Dodaj kontakt"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Ovo nije neželjeni sadržaj"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Blokiraj broj"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Dodaj u kontakte"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Blokiraj i prijavi neželjeni poziv"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Ovo nije neželjeni sadržaj"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Nema SIM kartice ili postoji greška sa SIM karticom"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Prekini poziv"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Konferencijski poziv"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Poziv u toku"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Poziv se nastavlja pomoću mobilnih podataka…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Prebacivanje na Wi-Fi mrežu nije moguće"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Videopoziv će ostati na mobilnoj mreži. Mogu nastati standardni troškovi prijenosa podataka."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Nastavak poziva prijenosom mobilnih podataka…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Prebacivanje na Wi-Fi mrežu nije moguće"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Videopoziv će ostati na mobilnoj mreži. Mogu nastati standardni troškovi prijenosa podataka."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Ne prikazuj ponovo"</string>
 </resources>
-- 
cgit v1.2.3