Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/apps/Dialer into cm-13.0staging/cm-13.0+r22

Android 6.0.1 release 22

Change-Id: Ie42d0f447825104d3aebcd87a83d4b51ad138274

1 files changed, 25 insertions, 46 deletions

diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 525cc9b02..a3a8fac92 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -17,20 +17,18 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="7762561155467201526">"Telefon"</string>
+    <string name="applicationLabel" msgid="8490255569343340580">"Oppringer"</string>
     <string name="launcherActivityLabel" msgid="1129729740601172692">"Telefon"</string>
     <string name="dialerIconLabel" msgid="6500826552823403796">"Telefon"</string>
     <string name="recentCallsIconLabel" msgid="2639489159797075507">"Anropslogg"</string>
     <string name="recentCalls_callNumber" msgid="1756372533999226126">"Ring <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="call_detail_menu_report" msgid="587960283417977382">"Rapportér feil nummer"</string>
     <string name="recentCalls_editNumberBeforeCall" msgid="7756171675833267857">"Rediger nummer før anrop"</string>
-    <string name="recentCalls_addToContact" msgid="4570467333422734645">"Legg til for en kontakt"</string>
+    <string name="recentCalls_addToContact" msgid="1429899535546487008">"Legg til kontakter"</string>
     <string name="recentCalls_removeFromRecentList" msgid="5551148439199439404">"Slett fra anropsloggen"</string>
     <string name="recentCalls_deleteAll" msgid="5157887960461979812">"Slett anropsloggen"</string>
     <string name="recentCalls_trashVoicemail" msgid="7604696960787435655">"Slett talepost"</string>
     <string name="recentCalls_shareVoicemail" msgid="1416112847592942840">"Del talepost"</string>
-    <string name="recentCalls_empty" msgid="5934808652605981210">"Samtaleloggen din er tom"</string>
-    <string name="recentCalls_empty_action" msgid="6033275870727664335">"Ring"</string>
+    <string name="recentCalls_empty" msgid="8555115547405030734">"Ingen anrop"</string>
     <string name="clearCallLogConfirmation_title" msgid="801753155679372984">"Vil du slette anropsloggen?"</string>
     <string name="clearCallLogConfirmation" msgid="7899552396101432827">"Dette sletter alle anrop fra loggen"</string>
     <string name="clearCallLogProgress_title" msgid="3372471156216306132">"Sletter anropsloggen …"</string>
@@ -49,15 +47,17 @@
     <string name="call_log_incoming_header" msgid="2787722299753674684">"Bare innkommende anrop"</string>
     <string name="call_log_outgoing_header" msgid="761009180766735769">"Bare utgående anrop"</string>
     <string name="call_log_missed_header" msgid="8017148056610855956">"Bare ubesvarte anrop"</string>
-    <string name="visual_voicemail_title" msgid="4574199312906348905">"Visuell talemelding"</string>
-    <string name="visual_voicemail_text" msgid="164967285234132509">"Se og lytt til talemeldingene dine, uten å måtte ringe et nummer. Dette kan føre til datakostnader."</string>
-    <string name="visual_voicemail_settings" msgid="8090338793118794741">"Innstillinger"</string>
     <string name="voicemail_status_voicemail_not_available" msgid="5222480147701456390">"Talepostoppdateringer er ikke tilgjengelige"</string>
-    <string name="voicemail_status_messages_waiting" msgid="6329544650250068650">"Ny talemelding venter. Kan ikke laste inn akkurat nå."</string>
+    <string name="voicemail_status_messages_waiting" msgid="6329544650250068650">"Ny talepost venter. Kan ikke laste inn akkurat nå."</string>
     <string name="voicemail_status_configure_voicemail" msgid="8300808991932816153">"Konfigurer taleposten din"</string>
     <string name="voicemail_status_audio_not_available" msgid="2449801102560158082">"Lyd er ikke tilgjengelig"</string>
     <string name="voicemail_status_action_configure" msgid="8671796489912239589">"Konfigurer"</string>
     <string name="voicemail_status_action_call_server" msgid="1824816252288551794">"Ring talepostkasse"</string>
+    <string name="voicemail_speed_slowest" msgid="1733460666177707312">"Laveste hastighet"</string>
+    <string name="voicemail_speed_slower" msgid="1508601287347216244">"Lav hastighet"</string>
+    <string name="voicemail_speed_normal" msgid="9033988544627228892">"Normal hastighet"</string>
+    <string name="voicemail_speed_faster" msgid="2019965121475935488">"Høy hastighet"</string>
+    <string name="voicemail_speed_fastest" msgid="5758712343491183292">"Høyeste hastighet"</string>
     <string name="call_log_item_count_and_date" msgid="7641933305703520787">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
     <string name="sms_disambig_title" msgid="5846266399240630846">"Velg nummer"</string>
     <string name="call_disambig_title" msgid="4392886850104795739">"Velg nummer"</string>
@@ -87,7 +87,7 @@
     <string name="callDetailTitle" msgid="5340227785196217938">"Samtaleinformasjon"</string>
     <string name="toast_call_detail_error" msgid="6947041258280380832">"Informasjon er ikke tilgjengelig"</string>
     <string name="dialer_useDtmfDialpad" msgid="1707548397435075040">"Bruk tonetastatur"</string>
-    <string name="dialer_returnToInCallScreen" msgid="3719386377550913067">"Gå tilbake til aktiv samtale"</string>
+    <string name="dialer_returnToInCallScreen" msgid="3719386377550913067">"Gå tilbake til pågående samtale"</string>
     <string name="dialer_addAnotherCall" msgid="4205688819890074468">"Legg til en samtale"</string>
     <string name="type_incoming" msgid="6502076603836088532">"Innkommende samtale"</string>
     <string name="type_outgoing" msgid="343108709599392641">"Utgående samtale"</string>
@@ -112,7 +112,6 @@
     <string name="voicemail" msgid="3851469869202611441">"Telefonsvarer"</string>
     <string name="private_num" msgid="6374339738119166953">"Skjult nummer"</string>
     <string name="payphone" msgid="7726415831153618726">"Telefonkiosk"</string>
-    <string name="callDetailsShortDurationFormat" msgid="3988146235579303592">"<xliff:g id="SECONDS">%s</xliff:g> sek"</string>
     <string name="callDetailsDurationFormat" msgid="6061406028764382234">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> sek"</string>
     <string name="dialog_phone_call_prohibited_message" msgid="5730565540182492608">"Kan ikke ringe dette nummeret"</string>
     <string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Du konfigurerer talepost ved å gå til Meny &amp;gt Innstillinger"</string>
@@ -127,55 +126,44 @@
     <string name="call_not_available" msgid="8941576511946492225">"Kan ikke ringe fordi Telefon-appen er deaktivert."</string>
     <string name="activity_not_available" msgid="2287665636817987623">"Det finnes ingen apper for det på denne enheten"</string>
     <string name="dialer_hint_find_contact" msgid="1012544667033887519">"Angi navn eller telefonnummer"</string>
-    <string name="recentMissed_empty" msgid="6213733029875741604">"Du har ingen tapte anrop."</string>
-    <string name="recentVoicemails_empty" msgid="7345542764648856330">"Talepostkassen din er tom."</string>
+    <string name="recentMissed_empty" msgid="4901789420356796156">"Ingen anrop"</string>
+    <string name="recentVoicemails_empty" msgid="8582424947259156664">"Ingen nye talepostmeldinger"</string>
     <string name="show_favorites_only" msgid="5520072531022614595">"Vis bare favoritter"</string>
     <string name="call_log_activity_title" msgid="4612824396355272023">"Logg"</string>
     <string name="call_log_all_title" msgid="3566738938889333307">"Alle"</string>
-    <string name="call_log_missed_title" msgid="4541142293870638971">"Ubesvart"</string>
+    <string name="call_log_missed_title" msgid="4541142293870638971">"Ikke besvart"</string>
     <string name="call_log_voicemail_title" msgid="940422274047025948">"Talemeldinger"</string>
     <string name="tab_speed_dial" msgid="7552166276545648893">"Hurtigvalg"</string>
     <string name="tab_recents" msgid="929949073851377206">"Sist brukte"</string>
     <string name="tab_all_contacts" msgid="1410922767166533690">"Kontakter"</string>
-    <string name="tab_voicemail" msgid="155024725947496746">"Talepostkasse"</string>
     <string name="favorite_hidden" msgid="5011234945140912047">"Fjernet fra favoritter"</string>
     <string name="favorite_hidden_undo" msgid="2508998611039406474">"Angre"</string>
     <string name="search_shortcut_call_number" msgid="7277194656832895870">"Ring <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <string name="search_shortcut_create_new_contact" msgid="1679917465521554093">"Opprett ny kontakt"</string>
-    <string name="search_shortcut_add_to_contact" msgid="4327842393369915751">"Legg til for en kontakt"</string>
+    <string name="search_shortcut_add_to_existing_contact" msgid="4403132207405813444">"Legg til i eksisterende kontakt"</string>
     <string name="search_shortcut_send_sms_message" msgid="2569304043345025525">"Send SMS"</string>
     <string name="search_shortcut_make_video_call" msgid="1265971685034465166">"Start en videosamtale"</string>
-    <string name="show_call_history" msgid="1141502332266697170">"Se hele anropsloggen"</string>
+    <string name="recents_footer_text" msgid="7315554578957453359">"Se hele anropsloggen"</string>
     <string name="num_missed_calls" msgid="8081736535604293886">"<xliff:g id="NUMBER">%s</xliff:g> nye tapte anrop"</string>
-    <string name="speed_dial_empty" msgid="8838921693673366129">"Du har ingen på hurtigoppringning ennå"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="7944893641496695770">"Legg til en favoritt"</string>
-    <string name="all_contacts_empty" msgid="471370638298229686">"Du har ingen kontakter ennå"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="1515782853819374618">"Legg til en kontakt"</string>
+    <string name="speed_dial_empty" msgid="1931474498966072849">"Hurtigoppringing ringer til favorittene dine og numrene du ringer ofte, med bare ett trykk"</string>
+    <string name="all_contacts_empty" msgid="2299508125100209367">"Ingen kontakter"</string>
     <string name="contact_tooltip" msgid="2019777545923635266">"Trykk på bildet for å se alle numre, eller trykk på og hold nede for å omorganisere"</string>
     <string name="remove_contact" msgid="1080555335283662961">"Fjern"</string>
+    <string name="favorites_menu_all_contacts" msgid="992506284449891186">"ALLE KONTAKTER"</string>
     <string name="call_log_action_video_call" msgid="7724301709041128296">"Videoanrop"</string>
-    <string name="call_log_action_send_message" msgid="2826466379787846163">"Send meldingen"</string>
-    <string name="call_log_action_details" msgid="701345508704970622">"Samtaleinformasjon"</string>
-    <string name="call_log_action_call" msgid="463690849042459842">"Ring <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
+    <string name="call_log_action_voicemail" msgid="4978620572562925654">"LYTT"</string>
+    <string name="call_log_action_details" msgid="7957138590190911171">"Vis detaljer"</string>
     <string name="description_incoming_missed_call" msgid="2381085098795943627">"Ubesvart anrop fra <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="description_incoming_answered_call" msgid="7117665748428816544">"Besvart anrop fra <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="description_outgoing_call" msgid="6386364390619734734">"Ring til <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
     <string name="description_phone_account" msgid="1767072759541443861">"på <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
     <string name="description_call_log_call_action" msgid="3682561657090693134">"Ring"</string>
     <string name="description_call_action" msgid="4000549004089776147">"Ring <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="7386922428155062213">"Start videoanrop med <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
+    <string name="description_video_call_action" msgid="4303952636480252389">"Videosamtale startet med <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
     <string name="description_voicemail_action" msgid="8054891873788903063">"Lytt til talepostkasse fra <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_play" msgid="2689369874037785439">"Spill av talemelding fra <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_pause" msgid="3905259748756919693">"Sett talemelding fra <xliff:g id="NAMEORNUMBER">^1</xliff:g> på pause"</string>
-    <string name="description_voicemail_delete" msgid="2025472770630153436">"Slett talemelding fra <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <plurals name="description_voicemail_unread" formatted="false" msgid="8708346053055570332">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> nye taleposter</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ny talepost</item>
-    </plurals>
-    <string name="description_create_new_contact_action" msgid="818755978791008167">"Opprett kontakt for <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="6081200053494414351">"Legg <xliff:g id="NAMEORNUMBER">^1</xliff:g> til en eksisterende kontakt"</string>
     <string name="description_details_action" msgid="2433827152749491785">"Samtaledetaljer for <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
     <string name="toast_entry_removed" msgid="8010830299576311534">"Slettet fra anropsloggen"</string>
+    <string name="call_log_action_report" msgid="4327809827087468864">"Rapportér"</string>
     <string name="call_log_header_today" msgid="3225248682434212981">"I dag"</string>
     <string name="call_log_header_yesterday" msgid="9139172458834033092">"I går"</string>
     <string name="call_log_header_other" msgid="5769921959940709084">"Eldre"</string>
@@ -189,9 +177,9 @@
     <string name="display_options_title" msgid="7812852361055667468">"Visningsalternativer"</string>
     <string name="sounds_and_vibration_title" msgid="1692290115642160845">"Lyder og vibrasjon"</string>
     <string name="accessibility_settings_title" msgid="6068141142874046249">"Tilgjengelighet"</string>
-    <string name="ringtone_title" msgid="760362035635084653">"Telefonringelyd"</string>
+    <string name="ringtone_title" msgid="760362035635084653">"Telefonringetone"</string>
     <string name="vibrate_on_ring_title" msgid="3362916460327555241">"Vibrer også når det ringer"</string>
-    <string name="dtmf_tone_enable_title" msgid="6571449695997521615">"Tastetoner"</string>
+    <string name="dtmf_tone_enable_title" msgid="6571449695997521615">"Tastetoner for tastaturet"</string>
     <string name="dtmf_tone_length_title" msgid="8581125689808919460">"Tonelengde for tastaturet"</string>
   <string-array name="dtmf_tone_length_entries">
     <item msgid="1036113889050195575">"Normal"</item>
@@ -199,14 +187,5 @@
   </string-array>
     <string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Hurtigsvar"</string>
     <string name="call_settings_label" msgid="313434211353070209">"Anrop"</string>
-    <string name="phone_account_settings_label" msgid="5864322009841175294">"Ringekontoer"</string>
-    <string name="permission_single_turn_on" msgid="1543391076065465464">"Slå på"</string>
-    <string name="permission_multiple_turn_on" msgid="2426278457455950554">"Angi tillatelser"</string>
-    <string name="permission_no_speeddial" msgid="7449042208802130085">"For å aktivere hurtigoppringning,\n slå på tillatelsen for Kontakter."</string>
-    <string name="permission_no_calllog" msgid="8969825954337678018">"For å se anropsloggen,\n slå på tillatelsen for telefon."</string>
-    <string name="permission_no_contacts" msgid="4427828429876890950">"For å se kontaktene dine,\n slå på tillatelsen for Kontakter."</string>
-    <string name="permission_no_voicemail" msgid="7785949850839671813">"For å få tilgang til talepostkassen,\n slå på tillatelsen for telefon."</string>
-    <string name="permission_no_search" msgid="84152933267902056">"For å søke i kontaktene dine, slå på tillatelser for Kontakter."</string>
-    <string name="permission_place_call" msgid="7588803619716288478">"For å ringe,\n slå på tillatelsen for telefon."</string>
-    <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Telefonappen har ikke tillatelse til å skrive til systeminnstillinger."</string>
+    <string name="phone_account_settings_label" msgid="5864322009841175294">"Ringe kontoer"</string>
 </resources>