Merge "Update to support long version codes."
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 4da5452..b6d496e 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -136,13 +136,13 @@
<string name="quickcontact_add_phone_number" msgid="731665835910658965">"Dodajte broj telefona"</string>
<string name="quickcontact_add_email" msgid="739298028384348482">"Dodajte adresu e-pošte"</string>
<string name="missing_app" msgid="1466111003546611387">"Nije pronađena aplikacija za obavljanje ove radnje."</string>
- <string name="menu_share" msgid="943789700636542260">"Podijeli"</string>
+ <string name="menu_share" msgid="943789700636542260">"Dijeli"</string>
<string name="menu_add_contact" msgid="3198704337220892684">"Dodaj u kontakte"</string>
<string name="menu_add_contacts" msgid="4465646512002163011">"Dodaj"</string>
<plurals name="title_share_via" formatted="false" msgid="5886112726191455415">
- <item quantity="one">Podijeli kontakte putem</item>
- <item quantity="few">Podijeli kontakte putem</item>
- <item quantity="other">Podijeli kontakte putem</item>
+ <item quantity="one">Dijeli kontakte putem</item>
+ <item quantity="few">Dijeli kontakte putem</item>
+ <item quantity="other">Dijeli kontakte putem</item>
</plurals>
<string name="dialog_new_group_account" msgid="3451312333591556651">"Odaberi račun"</string>
<string name="group_name_dialog_insert_title" msgid="2668452090427027941">"Izrada oznake"</string>
@@ -419,7 +419,7 @@
<string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Nije moguće otvoriti \"<xliff:g id="FILE_NAME">%1$s</xliff:g>\": <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Nije moguće pokrenuti program za izvoz: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Nema sadržaja za izvoz."</string>
- <string name="missing_required_permission" msgid="5865884842972833120">"Onemogućili ste potrebnu dozvolu."</string>
+ <string name="missing_required_permission" msgid="5865884842972833120">"Onemogućili ste potrebno odobrenje."</string>
<string name="fail_reason_error_occurred_during_export" msgid="3018855323913649063">"Došlo je do greške prilikom izvoza: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_io_error" msgid="6748358842976073255">"I/O greška"</string>
<string name="fail_reason_low_memory_during_import" msgid="875222757734882898">"Nema dovoljno memorije. Možda je fajl prevelik."</string>
@@ -497,7 +497,7 @@
<string name="about_open_source_licenses" msgid="6479990452352919641">"Licence otvorenog koda"</string>
<string name="about_open_source_licenses_summary" msgid="57418386931763994">"Detalji o licenci za softver otvorenog koda"</string>
<string name="about_privacy_policy" msgid="3705518622499152626">"Pravila privatnosti"</string>
- <string name="about_terms_of_service" msgid="4642400812150296723">"Uslovi pružanja usluge"</string>
+ <string name="about_terms_of_service" msgid="4642400812150296723">"Uslovi korištenja usluge"</string>
<string name="activity_title_licenses" msgid="5467767062737708066">"Licence otvorenog koda"</string>
<string name="url_open_error_toast" msgid="452592089815420457">"Otvaranje URL-a nije uspjelo."</string>
<string name="account_filter_view_checked" msgid="6696859503887762213">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> je označen"</string>
@@ -536,4 +536,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Nije moguće uvesti kontakte sa SIM kartice"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Uvoz sa SIM kartice"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Obavještenja"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Da"</string>
+ <string name="no_button" msgid="5742815694687835125">"Ne"</string>
</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index f60f241..9ff358b 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -66,16 +66,16 @@
<string name="contacts_deleted_two_named_toast" msgid="3642082931473111791">"Contactos <xliff:g id="NAME_0">%1$s</xliff:g> e <xliff:g id="NAME_1">%2$s</xliff:g> eliminados"</string>
<string name="contacts_deleted_many_named_toast" msgid="7731565342428031249">"<xliff:g id="NAME_0">%1$s</xliff:g>, <xliff:g id="NAME_1">%2$s</xliff:g>, <xliff:g id="NAME_2">%3$s</xliff:g>… foram eliminados"</string>
<plurals name="contacts_deleted_toast" formatted="false" msgid="1477708624197262295">
- <item quantity="one">Contacto eliminado</item>
<item quantity="other">Contactos eliminados</item>
+ <item quantity="one">Contacto eliminado</item>
</plurals>
<plurals name="contacts_count" formatted="false" msgid="8696793457340503668">
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> contacto</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> contactos</item>
+ <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> contacto</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> contacto · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
<item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> contactos · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> contacto · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Da Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"Da conta <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -137,8 +137,8 @@
<string name="menu_add_contact" msgid="3198704337220892684">"Adicionar aos contactos"</string>
<string name="menu_add_contacts" msgid="4465646512002163011">"Adicionar"</string>
<plurals name="title_share_via" formatted="false" msgid="5886112726191455415">
- <item quantity="one">Partilhar contacto através de</item>
<item quantity="other">Partilhar contactos através de</item>
+ <item quantity="one">Partilhar contacto através de</item>
</plurals>
<string name="dialog_new_group_account" msgid="3451312333591556651">"Selecionar conta"</string>
<string name="group_name_dialog_insert_title" msgid="2668452090427027941">"Criar etiqueta"</string>
@@ -396,12 +396,12 @@
<string name="import_from_sim" msgid="6912071635295799131">"Cartão SIM"</string>
<string name="import_from_sim_summary_fmt" msgid="5169032449686348118">"SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
<plurals name="import_from_sim_secondary_contact_count_fmt" formatted="false" msgid="5821095773211149295">
- <item quantity="one">1 contacto</item>
<item quantity="other">%1$d contactos</item>
+ <item quantity="one">1 contacto</item>
</plurals>
<plurals name="import_from_sim_secondary_template" formatted="false" msgid="2484832025802907060">
- <item quantity="one"><xliff:g id="COUNT_0">^1</xliff:g> contacto • <xliff:g id="PHONE_NUMBER_1">^2</xliff:g></item>
<item quantity="other"><xliff:g id="COUNT_2">^1</xliff:g> contactos • <xliff:g id="PHONE_NUMBER_3">^2</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">^1</xliff:g> contacto • <xliff:g id="PHONE_NUMBER_1">^2</xliff:g></item>
</plurals>
<string name="import_from_vcf_file" msgid="8662528435646418203">"Ficheiro .vcf"</string>
<string name="nothing_to_import_message" msgid="1651921906873335656">"Nada para importar"</string>
@@ -509,8 +509,8 @@
<string name="sim_import_empty_message" msgid="7743815244380189651">"Sem contactos no cartão SIM"</string>
<string name="sim_import_contact_exists_toast" msgid="1503743663717316732">"O contacto já existe na sua lista"</string>
<plurals name="sim_import_success_toast_fmt" formatted="false" msgid="8572156521110906443">
- <item quantity="one">1 contacto do cartão SIM importado</item>
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> contactos do cartão SIM importados</item>
+ <item quantity="one">1 contacto do cartão SIM importado</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Ocorreu uma falha ao importar os contactos do cartão SIM"</string>
<string name="sim_import_title" msgid="2511154832820812822">"Importar do cartão SIM"</string>
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Não foi possível importar contactos do cartão SIM"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"A importar SIM…"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notificações"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Sim"</string>
+ <string name="no_button" msgid="5742815694687835125">"Não"</string>
</resources>
diff --git a/src/com/android/contacts/ContactsUtils.java b/src/com/android/contacts/ContactsUtils.java
index 69890b4..4fd9cc1 100644
--- a/src/com/android/contacts/ContactsUtils.java
+++ b/src/com/android/contacts/ContactsUtils.java
@@ -104,7 +104,8 @@
* dialer is running inside Work Profile.
*/
@Retention(RetentionPolicy.SOURCE)
- @IntDef({USER_TYPE_CURRENT, USER_TYPE_WORK})
+ // TODO: Switch to @LongDef once @LongDef is available in the support library
+ @IntDef({(int)USER_TYPE_CURRENT, (int)USER_TYPE_WORK})
public @interface UserType {}
/**