Merge "Updated contact picture" into honeycomb
diff --git a/res/drawable-hdpi/aizy_knob.png b/res/drawable-hdpi/aizy_knob.png
deleted file mode 100644
index 6940a94..0000000
--- a/res/drawable-hdpi/aizy_knob.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/aizy_label.9.png b/res/drawable-hdpi/aizy_label.9.png
deleted file mode 100644
index 1599037..0000000
--- a/res/drawable-hdpi/aizy_label.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/filter_selector_corner.png b/res/drawable-hdpi/filter_selector_corner.png
deleted file mode 100644
index 964dd75..0000000
--- a/res/drawable-hdpi/filter_selector_corner.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_contact_list_picture.png b/res/drawable-hdpi/ic_contact_list_picture.png
deleted file mode 100644
index b96fbf4..0000000
--- a/res/drawable-hdpi/ic_contact_list_picture.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_join.png b/res/drawable-hdpi/ic_join.png
deleted file mode 100644
index 8f140d4..0000000
--- a/res/drawable-hdpi/ic_join.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_cancel_holo_light.png b/res/drawable-hdpi/ic_menu_cancel_holo_light.png
deleted file mode 100644
index 259b90c..0000000
--- a/res/drawable-hdpi/ic_menu_cancel_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/list_item_activated_bg.9.png b/res/drawable-hdpi/list_item_activated_bg.9.png
deleted file mode 100644
index dd82c22..0000000
--- a/res/drawable-hdpi/list_item_activated_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/statusbox_widget_holo_light.9.png b/res/drawable-hdpi/statusbox_widget_holo_light.9.png
deleted file mode 100644
index 383aab8..0000000
--- a/res/drawable-hdpi/statusbox_widget_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/aizy_knob.png b/res/drawable-mdpi/aizy_knob.png
deleted file mode 100644
index daa8242..0000000
--- a/res/drawable-mdpi/aizy_knob.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/aizy_label.9.png b/res/drawable-mdpi/aizy_label.9.png
deleted file mode 100644
index 695b000..0000000
--- a/res/drawable-mdpi/aizy_label.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/filter_selector_corner.png b/res/drawable-mdpi/filter_selector_corner.png
deleted file mode 100644
index 964dd75..0000000
--- a/res/drawable-mdpi/filter_selector_corner.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_contact_list_picture.png b/res/drawable-mdpi/ic_contact_list_picture.png
deleted file mode 100644
index f8aa4ba..0000000
--- a/res/drawable-mdpi/ic_contact_list_picture.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_join.png b/res/drawable-mdpi/ic_join.png
deleted file mode 100644
index 177a582..0000000
--- a/res/drawable-mdpi/ic_join.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_cancel_holo_light.png b/res/drawable-mdpi/ic_menu_cancel_holo_light.png
deleted file mode 100644
index d3bdc37..0000000
--- a/res/drawable-mdpi/ic_menu_cancel_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/list_item_activated_bg.9.png b/res/drawable-mdpi/list_item_activated_bg.9.png
deleted file mode 100644
index dd82c22..0000000
--- a/res/drawable-mdpi/list_item_activated_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/statusbox_widget_holo_light.9.png b/res/drawable-mdpi/statusbox_widget_holo_light.9.png
deleted file mode 100644
index 00c6ba5..0000000
--- a/res/drawable-mdpi/statusbox_widget_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/layout-xlarge/item_group_membership.xml b/res/layout-xlarge/item_group_membership.xml
index 62d20b4..41d77b7 100644
--- a/res/layout-xlarge/item_group_membership.xml
+++ b/res/layout-xlarge/item_group_membership.xml
@@ -32,10 +32,8 @@
android:textColor="@color/editor_label_text_color"
android:ellipsize="marquee" />
- <!-- TODO: Change to android.R.attr.spinnerTextStyle when available
- style="?android:attr/editTextStyle"
- -->
<Button
+ style="?android:attr/spinnerStyle"
android:id="@+id/group_list"
android:layout_width="0dip"
android:layout_height="wrap_content"
diff --git a/res/layout/group_membership_list_item.xml b/res/layout/group_membership_list_item.xml
new file mode 100644
index 0000000..1e4f049
--- /dev/null
+++ b/res/layout/group_membership_list_item.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@android:id/text1"
+ android:layout_width="match_parent"
+ android:layout_height="48dip"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:gravity="center_vertical"
+ android:checkMark="?android:attr/listChoiceIndicatorMultiple"
+ android:paddingLeft="6dip"
+ android:paddingRight="6dip"
+/>
diff --git a/res/layout/search_header.xml b/res/layout/search_header.xml
index 1eaa4e0..ab8ec53 100644
--- a/res/layout/search_header.xml
+++ b/res/layout/search_header.xml
@@ -34,6 +34,7 @@
android:id="@+id/progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_toRightOf="@id/totalContactsText"
style="?android:attr/progressBarStyleSmall"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 21f5bcd..a8dbd0b 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -228,10 +228,8 @@
<string name="fail_reason_io_error" msgid="5922864781066136340">"خطأ I/O"</string>
<string name="fail_reason_low_memory_during_import" msgid="7514918659342886381">"الذاكرة لا تكفي (ربما يكون الملف كبير جدًا)"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"أخفق تحليل vCard بسبب غير متوقع"</string>
- <!-- no translation found for fail_reason_not_supported (294499264620201243) -->
- <skip />
- <!-- no translation found for vcard_import_failed (7718330063493653085) -->
- <skip />
+ <string name="fail_reason_not_supported" msgid="294499264620201243">"التنسيق غير معتمد."</string>
+ <string name="vcard_import_failed" msgid="7718330063493653085">"أخفق استيراد vCard"</string>
<string name="import_failure_no_vcard_file" product="nosdcard" msgid="8809370398968655782">"لم يتم العثور على ملف vCard على وحدة تخزين USB"</string>
<string name="import_failure_no_vcard_file" product="default" msgid="1730986357514922756">"لم يتم العثور على ملف vCard على بطاقة SD"</string>
<string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="4154492282316067754">"أخفق جمع معلومات وصفية عن ملفات vCard المحددة"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 00e369a..0baa3a9 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -228,10 +228,8 @@
<string name="fail_reason_io_error" msgid="5922864781066136340">"I/O грешка"</string>
<string name="fail_reason_low_memory_during_import" msgid="7514918659342886381">"Няма достатъчно памет (файлът може да е твърде голям)"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"Неуспешен анализ на vCard по неизвестна причина"</string>
- <!-- no translation found for fail_reason_not_supported (294499264620201243) -->
- <skip />
- <!-- no translation found for vcard_import_failed (7718330063493653085) -->
- <skip />
+ <string name="fail_reason_not_supported" msgid="294499264620201243">"Форматът не се поддържа."</string>
+ <string name="vcard_import_failed" msgid="7718330063493653085">"Импортирането на vCard не бе успешно"</string>
<string name="import_failure_no_vcard_file" product="nosdcard" msgid="8809370398968655782">"В USB устройството за съхранение не бе намерен vCard файл"</string>
<string name="import_failure_no_vcard_file" product="default" msgid="1730986357514922756">"На SD картата не бе намерен vCard файл"</string>
<string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="4154492282316067754">"Събирането на метаинформация от дадените vCard файлове не бе успешно."</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 04af712..607685f 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -228,10 +228,8 @@
<string name="fail_reason_io_error" msgid="5922864781066136340">"Error d\'E/S"</string>
<string name="fail_reason_low_memory_during_import" msgid="7514918659342886381">"La memòria és insuficient (és possible que el fitxer sigui massa gran)"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"No s\'ha pogut analitzar la vCard per un motiu inesperat"</string>
- <!-- no translation found for fail_reason_not_supported (294499264620201243) -->
- <skip />
- <!-- no translation found for vcard_import_failed (7718330063493653085) -->
- <skip />
+ <string name="fail_reason_not_supported" msgid="294499264620201243">"No s\'admet aquest format."</string>
+ <string name="vcard_import_failed" msgid="7718330063493653085">"No s\'ha pogut importar la vCard"</string>
<string name="import_failure_no_vcard_file" product="nosdcard" msgid="8809370398968655782">"No s\'ha trobat cap fitxer vCard a l\'emmagatzematge USB"</string>
<string name="import_failure_no_vcard_file" product="default" msgid="1730986357514922756">"No s\'ha trobat cap fitxer vCard a la targeta SD"</string>
<string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="4154492282316067754">"S\'ha produït un error en aplegar metainformació dels fitxers vCard especificats."</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 262b612..dfb6d83 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -228,10 +228,8 @@
<string name="fail_reason_io_error" msgid="5922864781066136340">"Chyba V/V"</string>
<string name="fail_reason_low_memory_during_import" msgid="7514918659342886381">"Není k dispozici dostatek paměti (soubor může být příliš velký)"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"Analýza karty vCard se z neznámého důvodu nezdařila."</string>
- <!-- no translation found for fail_reason_not_supported (294499264620201243) -->
- <skip />
- <!-- no translation found for vcard_import_failed (7718330063493653085) -->
- <skip />
+ <string name="fail_reason_not_supported" msgid="294499264620201243">"Formát není podporován."</string>
+ <string name="vcard_import_failed" msgid="7718330063493653085">"Import karty vCard se nezdařil"</string>
<string name="import_failure_no_vcard_file" product="nosdcard" msgid="8809370398968655782">"V úložišti USB nebyl nalezen žádný soubor vCard"</string>
<string name="import_failure_no_vcard_file" product="default" msgid="1730986357514922756">"Na kartě SD nebyl nalezen žádný soubor vCard"</string>
<string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="4154492282316067754">"Shromáždění metainformací zadaných souborů vCard se nezdařilo."</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 0ec3b19..fbcfbea 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -228,10 +228,8 @@
<string name="fail_reason_io_error" msgid="5922864781066136340">"I/O-fejl"</string>
<string name="fail_reason_low_memory_during_import" msgid="7514918659342886381">"Der er ikke nok hukommelse (filen er muligvis for stor)"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"vCard kunne ikke parses pga. en uventet årsag"</string>
- <!-- no translation found for fail_reason_not_supported (294499264620201243) -->
- <skip />
- <!-- no translation found for vcard_import_failed (7718330063493653085) -->
- <skip />
+ <string name="fail_reason_not_supported" msgid="294499264620201243">"Formatet understøttes ikke."</string>
+ <string name="vcard_import_failed" msgid="7718330063493653085">"vCard kunne ikke importeres"</string>
<string name="import_failure_no_vcard_file" product="nosdcard" msgid="8809370398968655782">"Der blev ikke fundet nogen vCard-fil i USB-lageret"</string>
<string name="import_failure_no_vcard_file" product="default" msgid="1730986357514922756">"Der blev ikke fundet nogen vCard-fil på SD-kortet"</string>
<string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="4154492282316067754">"Metaoplysninger om angivne vCard-filer kunne ikke hentes."</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 261f8a6..f5c8a48 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -228,10 +228,8 @@
<string name="fail_reason_io_error" msgid="5922864781066136340">"Σφάλμα I/O"</string>
<string name="fail_reason_low_memory_during_import" msgid="7514918659342886381">"Η μνήμη είναι ανεπαρκής (το αρχείο μπορεί να είναι πολύ μεγάλο)"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"Η ανάλυση της κάρτας vCard απέτυχε εξαιτίας μη αναμενόμενου συμβάντος"</string>
- <!-- no translation found for fail_reason_not_supported (294499264620201243) -->
- <skip />
- <!-- no translation found for vcard_import_failed (7718330063493653085) -->
- <skip />
+ <string name="fail_reason_not_supported" msgid="294499264620201243">"Η μορφή δεν υποστηρίζεται."</string>
+ <string name="vcard_import_failed" msgid="7718330063493653085">"Αποτυχία εισαγωγής vCard"</string>
<string name="import_failure_no_vcard_file" product="nosdcard" msgid="8809370398968655782">"Δεν βρέθηκαν αρχεία vCard στον αποθηκευτικό σας χώρο USB"</string>
<string name="import_failure_no_vcard_file" product="default" msgid="1730986357514922756">"Δεν βρέθηκε αρχείο VCard στην κάρτα SD"</string>
<string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="4154492282316067754">"Η συλλογή μετα-πληροφοριών του δεδομένου αρχείου(ων) vCard απέτυχε."</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index f17f71e..840d97d 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -228,10 +228,8 @@
<string name="fail_reason_io_error" msgid="5922864781066136340">"I/O Error"</string>
<string name="fail_reason_low_memory_during_import" msgid="7514918659342886381">"Memory is insufficient (the file may be too large)"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"Failed to parse vCard for unexpected reason"</string>
- <!-- no translation found for fail_reason_not_supported (294499264620201243) -->
- <skip />
- <!-- no translation found for vcard_import_failed (7718330063493653085) -->
- <skip />
+ <string name="fail_reason_not_supported" msgid="294499264620201243">"The format is not supported."</string>
+ <string name="vcard_import_failed" msgid="7718330063493653085">"Failed to import vCard"</string>
<string name="import_failure_no_vcard_file" product="nosdcard" msgid="8809370398968655782">"No vCard file found in the USB storage"</string>
<string name="import_failure_no_vcard_file" product="default" msgid="1730986357514922756">"No vCard file found on the SD card"</string>
<string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="4154492282316067754">"Failed to collect meta information of given vCard file(s)."</string>
diff --git a/res/values-es-rUS-xlarge/strings.xml b/res/values-es-rUS-xlarge/strings.xml
index 7586572..8e14d57 100644
--- a/res/values-es-rUS-xlarge/strings.xml
+++ b/res/values-es-rUS-xlarge/strings.xml
@@ -48,6 +48,10 @@
<!-- XL -->
<string name="description_image_button_star" msgid="7658091418708665690">"estrella"</string>
<!-- XL -->
+ <string name="fail_reason_not_supported" msgid="2869697177825996431">"El formato no está admitido."</string>
+ <!-- XL -->
+ <string name="vcard_import_failed" msgid="5030663873475156120">"Falló la importación de la vCard"</string>
+ <!-- XL -->
<string name="vcard_import_will_start_message_with_default_name" msgid="1059778205923280983">"El archivo se importará en unos instantes."</string>
<!-- XL -->
<string name="composer_has_no_exportable_contact" product="tablet" msgid="1102663976836995021">"No hay ningún contacto exportable. Si en realidad tienes contactos en tu tableta, es posible que algún proveedor de datos prohíba la exportación de todos los contactos."</string>
@@ -89,8 +93,4 @@
<string name="non_phone_caption" msgid="8339220263670193331">"Número de teléfono"</string>
<!-- XL -->
<string name="delete_group_dialog_message" msgid="6739622355328278915">"¿Estás seguro de que deseas eliminar el grupo \"<xliff:g id="GROUP_LABEL">%1$s</xliff:g>\"? (Los contactos no se eliminarán)."</string>
- <!-- XL -->
- <string name="fail_reason_not_supported" msgid="2869697177825996431">"El formato no está admitido."</string>
- <!-- XL -->
- <string name="vcard_import_failed" msgid="5030663873475156120">"Falló la importación de la vCard"</string>
</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 2a59a1c..05ef8c5 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -228,10 +228,8 @@
<string name="fail_reason_io_error" msgid="5922864781066136340">"Error de E/S"</string>
<string name="fail_reason_low_memory_during_import" msgid="7514918659342886381">"Memoria insuficiente (es probable que el archivo sea muy grande)"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"No se ha podido analizar vCard debido a un motivo inesperado"</string>
- <!-- no translation found for fail_reason_not_supported (294499264620201243) -->
- <skip />
- <!-- no translation found for vcard_import_failed (7718330063493653085) -->
- <skip />
+ <string name="fail_reason_not_supported" msgid="294499264620201243">"El formato no es compatible."</string>
+ <string name="vcard_import_failed" msgid="7718330063493653085">"No se pudo importar vCard"</string>
<string name="import_failure_no_vcard_file" product="nosdcard" msgid="8809370398968655782">"No se encontró ningún archivo vCard en el almacenamiento USB."</string>
<string name="import_failure_no_vcard_file" product="default" msgid="1730986357514922756">"No se ha encontrado un archivo de vCard en la Tarjeta SD."</string>
<string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="4154492282316067754">"Error al recopilar metadatos de un archivo específico de la vCard."</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index f47222f..b79f839 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -228,10 +228,8 @@
<string name="fail_reason_io_error" msgid="5922864781066136340">"Error de E/S"</string>
<string name="fail_reason_low_memory_during_import" msgid="7514918659342886381">"Memoria insuficiente (el archivo puede ser demasiado grande)"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"No se ha podido analizar el archivo de vCard debido a un error inesperado."</string>
- <!-- no translation found for fail_reason_not_supported (294499264620201243) -->
- <skip />
- <!-- no translation found for vcard_import_failed (7718330063493653085) -->
- <skip />
+ <string name="fail_reason_not_supported" msgid="294499264620201243">"No se admite este formato."</string>
+ <string name="vcard_import_failed" msgid="7718330063493653085">"Se ha producido un error al importar vCard."</string>
<string name="import_failure_no_vcard_file" product="nosdcard" msgid="8809370398968655782">"No se ha encontrado el archivo de vCard en el almacenamiento USB."</string>
<string name="import_failure_no_vcard_file" product="default" msgid="1730986357514922756">"No se ha encontrado ningún archivo de vCard en la tarjeta SD."</string>
<string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="4154492282316067754">"Error al recopilar metainformación de los archivos vCard"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index d46706a..7dc1d4d 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -228,10 +228,8 @@
<string name="fail_reason_io_error" msgid="5922864781066136340">"خطای ورودی/خروجی"</string>
<string name="fail_reason_low_memory_during_import" msgid="7514918659342886381">"حافظه کافی نیست (ممکن است فایل بسیار بزرگ باشد)"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"تجزیه کارت ویزیت به دلیل پیش بینی نشده انجام نشد"</string>
- <!-- no translation found for fail_reason_not_supported (294499264620201243) -->
- <skip />
- <!-- no translation found for vcard_import_failed (7718330063493653085) -->
- <skip />
+ <string name="fail_reason_not_supported" msgid="294499264620201243">"قالب پشتیبانی نمی شود."</string>
+ <string name="vcard_import_failed" msgid="7718330063493653085">"vCard وارد نشد"</string>
<string name="import_failure_no_vcard_file" product="nosdcard" msgid="8809370398968655782">"فایل کارت ویزیتی در دستگاه ذخیره USB یافت نشد"</string>
<string name="import_failure_no_vcard_file" product="default" msgid="1730986357514922756">"فایل کارت ویزیتی در کارت SD یافت نشد"</string>
<string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="4154492282316067754">"جمع آوری فوق اطلاعات فایل(های) کارت ویزیت موجود ناموفق بود."</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 82f0ef8..185b719 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -228,10 +228,8 @@
<string name="fail_reason_io_error" msgid="5922864781066136340">"I/O-virhe"</string>
<string name="fail_reason_low_memory_during_import" msgid="7514918659342886381">"Muisti ei riitä (tiedosto voi olla liian suuri)"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"vCardin jäsennys epäonnistui tuntemattomasta syystä"</string>
- <!-- no translation found for fail_reason_not_supported (294499264620201243) -->
- <skip />
- <!-- no translation found for vcard_import_failed (7718330063493653085) -->
- <skip />
+ <string name="fail_reason_not_supported" msgid="294499264620201243">"Muotoa ei tueta."</string>
+ <string name="vcard_import_failed" msgid="7718330063493653085">"vCard-tietojen tuonti epäonnistui"</string>
<string name="import_failure_no_vcard_file" product="nosdcard" msgid="8809370398968655782">"USB-tallennustilasta ei löydy vCard-tiedostoa"</string>
<string name="import_failure_no_vcard_file" product="default" msgid="1730986357514922756">"SD-kortilta ei löydy vCard-tiedostoa"</string>
<string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="4154492282316067754">"Annettujen vCard-tiedostojen sisällönkuvaustietojen noutaminen epäonnistui."</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f66492d..379fc10 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -158,12 +158,12 @@
<string name="simContacts_title" msgid="27341688347689769">"Contacts de carte SIM"</string>
<string name="noContactsHelpTextWithSyncForCreateShortcut" msgid="801504710275614594">"Vous n\'avez aucun contact à afficher. Si vous venez d\'ajouter un compte, la synchronisation des contacts peut prendre quelques minutes."</string>
<string name="noContactsHelpTextForCreateShortcut" msgid="3081286388667108335">"Vous n\'avez aucun contact à afficher."</string>
- <!-- syntax error in translation for noContactsHelpText (6450346791169710787) org.xmlpull.v1.XmlPullParserException: expected: /b read: font (position:END_TAG </font>@1:560 in java.io.StringReader@137bd6a1) -->
- <!-- syntax error in translation for noContactsHelpText (7633826236417884130) org.xmlpull.v1.XmlPullParserException: expected: /b read: font (position:END_TAG </font>@1:567 in java.io.StringReader@2747ee05) -->
+ <!-- syntax error in translation for noContactsHelpText (6450346791169710787) org.xmlpull.v1.XmlPullParserException: expected: /b read: font (position:END_TAG </font>@1:560 in java.io.StringReader@6345e044) -->
+ <!-- syntax error in translation for noContactsHelpText (7633826236417884130) org.xmlpull.v1.XmlPullParserException: expected: /b read: font (position:END_TAG </font>@1:567 in java.io.StringReader@86c347) -->
<string name="noContactsHelpTextWithSync" product="tablet" msgid="2364665535969139880">"Vous n\'avez aucun contact à afficher (si vous venez d\'ajouter un compte, la synchronisation des contacts peut prendre quelques minutes)."\n\n"Pour ajouter des contacts, appuyez sur "<font fgcolor="#ffffffff"><b>"Menu"</b></font>", puis sur :"\n" "\n<li><font fgcolor="#ffffffff"><b>"Comptes"</b></font>" pour ajouter ou configurer un compte dont vous pourrez synchroniser les contacts vers la tablette ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Options d\'affichage"</b></font>" pour modifier les paramètres de visibilité des contacts ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Nouveau contact"</b></font>" pour créer un contact ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importer/Exporter"</b></font>" pour importer des contacts depuis votre carte SIM ou SD."\n</li></string>
<string name="noContactsHelpTextWithSync" product="default" msgid="3017521127042216243">"Vous n\'avez aucun contact à afficher (si vous venez d\'ajouter un compte, la synchronisation des contacts peut prendre quelques minutes)."\n\n"Pour ajouter des contacts, appuyez sur "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" et sélectionnez :"\n" "\n<li><font fgcolor="#ffffffff"><b>"Comptes"</b></font>" pour ajouter ou configurer un compte dont vous pourrez synchroniser les contacts sur le téléphone ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Options d\'affichage"</b></font>" pour modifier le paramètre de visibilité des contacts ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Nouveau contact"</b></font>" pour créer un contact ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importer/Exporter"</b></font>" pour importer des contacts depuis votre carte SIM ou SD."\n</li></string>
- <!-- syntax error in translation for noContactsNoSimHelpText (6031363021287849874) org.xmlpull.v1.XmlPullParserException: expected: /b read: font (position:END_TAG </font>@1:565 in java.io.StringReader@635b9e68) -->
- <!-- syntax error in translation for noContactsNoSimHelpText (467658807711582876) org.xmlpull.v1.XmlPullParserException: expected: /b read: font (position:END_TAG </font>@1:571 in java.io.StringReader@13fcf0ce) -->
+ <!-- syntax error in translation for noContactsNoSimHelpText (6031363021287849874) org.xmlpull.v1.XmlPullParserException: expected: /b read: font (position:END_TAG </font>@1:565 in java.io.StringReader@35960f05) -->
+ <!-- syntax error in translation for noContactsNoSimHelpText (467658807711582876) org.xmlpull.v1.XmlPullParserException: expected: /b read: font (position:END_TAG </font>@1:571 in java.io.StringReader@eb42cbf) -->
<string name="noContactsNoSimHelpTextWithSync" product="tablet" msgid="6222739731808897565">"Vous n\'avez aucun contact à afficher (si vous venez d\'ajouter un compte, la synchronisation des contacts peut prendre quelques minutes)."\n\n"Pour ajouter des contacts, appuyez sur "<font fgcolor="#ffffffff"><b>"Menu"</b></font>", puis sur :"\n" "\n<li><font fgcolor="#ffffffff"><b>"Comptes"</b></font>" pour ajouter ou configurer un compte dont vous pourrez synchroniser les contacts vers la tablette ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Options d\'affichage"</b></font>" pour modifier les paramètres de visibilité des contacts ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Nouveau contact"</b></font>" pour créer un contact ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importer/Exporter"</b></font>" pour importer des contacts depuis votre carte SD."\n</li></string>
<string name="noContactsNoSimHelpTextWithSync" product="default" msgid="9040060730467973050">"Vous n\'avez aucun contact à afficher (si vous venez d\'ajouter un compte, la synchronisation des contacts peut prendre quelques minutes)."\n\n"Pour ajouter des contacts, appuyez sur "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" et sélectionnez :"\n" "\n<li><font fgcolor="#ffffffff"><b>"Comptes"</b></font>" pour ajouter ou configurer un compte dont vous pourrez synchroniser les contacts sur le téléphone ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Options d\'affichage"</b></font>" pour modifier le paramètre de visibilité des contacts ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Nouveau contact"</b></font>" pour créer un contact ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importer/Exporter"</b></font>" pour importer des contacts depuis votre carte SD."\n</li></string>
<string name="noFavoritesHelpText" msgid="3744655776704833277">"Vous ne disposez d\'aucun favoris."\n\n"Pour ajouter un contact à la liste de favoris :"\n\n" "<li>"Appuyez sur l\'onglet "<b>"Contacts"</b>"."\n</li>" "\n<li>"Appuyez sur le contact à ajouter à vos favoris."\n</li>" "\n<li>"Appuyez sur l\'étoile en regard du nom du contact."\n</li></string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 5014772..8e2c19f 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -228,10 +228,8 @@
<string name="fail_reason_io_error" msgid="5922864781066136340">"I/O hiba"</string>
<string name="fail_reason_low_memory_during_import" msgid="7514918659342886381">"Nincs elég memória (lehet, hogy túl nagy a fájl)"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"Váratlan ok miatt nem sikerült a vCard szintaktikai elemzése"</string>
- <!-- no translation found for fail_reason_not_supported (294499264620201243) -->
- <skip />
- <!-- no translation found for vcard_import_failed (7718330063493653085) -->
- <skip />
+ <string name="fail_reason_not_supported" msgid="294499264620201243">"A formátum nem támogatott."</string>
+ <string name="vcard_import_failed" msgid="7718330063493653085">"Nem sikerült a vCard importálása"</string>
<string name="import_failure_no_vcard_file" product="nosdcard" msgid="8809370398968655782">"Nem található vCard fájl az USB-táron"</string>
<string name="import_failure_no_vcard_file" product="default" msgid="1730986357514922756">"Nem található vCard fájl az SD-kártyán"</string>
<string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="4154492282316067754">"Nem sikerült begyűjteni a vCard fájl(ok) metaadatait."</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 8f3f878..4d0bb66 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -228,10 +228,8 @@
<string name="fail_reason_io_error" msgid="5922864781066136340">"Galat I/O"</string>
<string name="fail_reason_low_memory_during_import" msgid="7514918659342886381">"Memori tidak memadai (berkas mungkin terlalu besar)"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"Gagal melakukan parse pada vCard karena alasan yang tidak diharapkan"</string>
- <!-- no translation found for fail_reason_not_supported (294499264620201243) -->
- <skip />
- <!-- no translation found for vcard_import_failed (7718330063493653085) -->
- <skip />
+ <string name="fail_reason_not_supported" msgid="294499264620201243">"Format tidak didukung."</string>
+ <string name="vcard_import_failed" msgid="7718330063493653085">"Gagal mengimpor vCard"</string>
<string name="import_failure_no_vcard_file" product="nosdcard" msgid="8809370398968655782">"Tidak ada berkas vCard yang ditemukan pada penyimpanan USB"</string>
<string name="import_failure_no_vcard_file" product="default" msgid="1730986357514922756">"Tidak ada berkas vCard yang ditemukan pada kartu SD"</string>
<string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="4154492282316067754">"Gagal mengumpulkan informasi meta dari berkas vCard yang diberikan."</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 2a8d27e..f2eb2b3 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -228,10 +228,8 @@
<string name="fail_reason_io_error" msgid="5922864781066136340">"Errore I/O"</string>
<string name="fail_reason_low_memory_during_import" msgid="7514918659342886381">"Memoria insufficiente (il file potrebbe essere di dimensioni eccessive)"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"Impossibile analizzare la vCard per motivi imprevisti"</string>
- <!-- no translation found for fail_reason_not_supported (294499264620201243) -->
- <skip />
- <!-- no translation found for vcard_import_failed (7718330063493653085) -->
- <skip />
+ <string name="fail_reason_not_supported" msgid="294499264620201243">"Il formato non è supportato."</string>
+ <string name="vcard_import_failed" msgid="7718330063493653085">"Importazione vCard non riuscita"</string>
<string name="import_failure_no_vcard_file" product="nosdcard" msgid="8809370398968655782">"Nessun file vCard trovato nell\'archivio USB"</string>
<string name="import_failure_no_vcard_file" product="default" msgid="1730986357514922756">"Nessun file vCard trovato sulla scheda SD"</string>
<string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="4154492282316067754">"Raccolta dei metadati dei file vCard forniti non riuscita."</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index fe8afd7..8a0fa22 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -228,10 +228,8 @@
<string name="fail_reason_io_error" msgid="5922864781066136340">"שגיאת קלט/פלט"</string>
<string name="fail_reason_low_memory_during_import" msgid="7514918659342886381">"אין מספיק זיכרון (ייתכן שהקובץ גדול מדי)"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"נכשל ניתוח vCard עקב סיבה לא צפויה"</string>
- <!-- no translation found for fail_reason_not_supported (294499264620201243) -->
- <skip />
- <!-- no translation found for vcard_import_failed (7718330063493653085) -->
- <skip />
+ <string name="fail_reason_not_supported" msgid="294499264620201243">"הפורמט אינו נתמך."</string>
+ <string name="vcard_import_failed" msgid="7718330063493653085">"נכשל ייבוא vCard"</string>
<string name="import_failure_no_vcard_file" product="nosdcard" msgid="8809370398968655782">"לא נמצא קובץ vCard באמצעי אחסון מסוג USB"</string>
<string name="import_failure_no_vcard_file" product="default" msgid="1730986357514922756">"לא נמצא קובץ vCard בכרטיס ה-SD"</string>
<string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="4154492282316067754">"נכשל איסוף מידע-על מקובצי vCard נתונים."</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 13d4b0f..ffc3b0f 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -228,10 +228,8 @@
<string name="fail_reason_io_error" msgid="5922864781066136340">"I/O 오류"</string>
<string name="fail_reason_low_memory_during_import" msgid="7514918659342886381">"메모리가 부족합니다. 파일이 너무 크기 때문일 수 있습니다."</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"예기치 못한 이유로 인해 vCard를 구문분석하지 못했습니다."</string>
- <!-- no translation found for fail_reason_not_supported (294499264620201243) -->
- <skip />
- <!-- no translation found for vcard_import_failed (7718330063493653085) -->
- <skip />
+ <string name="fail_reason_not_supported" msgid="294499264620201243">"지원되지 않는 형식입니다."</string>
+ <string name="vcard_import_failed" msgid="7718330063493653085">"vCard를 가져오지 못했습니다."</string>
<string name="import_failure_no_vcard_file" product="nosdcard" msgid="8809370398968655782">"vCard 파일이 USB 저장소에 없습니다."</string>
<string name="import_failure_no_vcard_file" product="default" msgid="1730986357514922756">"SD 카드에 VCard 파일이 없습니다."</string>
<string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="4154492282316067754">"지정한 vCard 파일에 대한 메타 정보를 수집하지 못했습니다."</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index fbe974d..0c2bb1a 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -228,10 +228,8 @@
<string name="fail_reason_io_error" msgid="5922864781066136340">"Įvesties / išvesties klaida"</string>
<string name="fail_reason_low_memory_during_import" msgid="7514918659342886381">"Nepakanka atminties (failas gali būti per didelis)"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"Dėl netikėtos priežasties nepavyko išanalizuoti „vCard“"</string>
- <!-- no translation found for fail_reason_not_supported (294499264620201243) -->
- <skip />
- <!-- no translation found for vcard_import_failed (7718330063493653085) -->
- <skip />
+ <string name="fail_reason_not_supported" msgid="294499264620201243">"Formatas nepalaikomas."</string>
+ <string name="vcard_import_failed" msgid="7718330063493653085">"Nepavyko import. el. vizitinės kortelės"</string>
<string name="import_failure_no_vcard_file" product="nosdcard" msgid="8809370398968655782">"USB atmintinėje nerasta jokių el. vizitinių kortelių failų"</string>
<string name="import_failure_no_vcard_file" product="default" msgid="1730986357514922756">"SD kortelėje nerasta jokių el. vizitinių kortelių failų"</string>
<string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="4154492282316067754">"Nepavyko surinkti nurodyto (-ų) el. vizitinės kortelės failo (-ų) metainformacijos."</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 37c1049..7a68169 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -228,10 +228,8 @@
<string name="fail_reason_io_error" msgid="5922864781066136340">"Ievades/izvades kļūda"</string>
<string name="fail_reason_low_memory_during_import" msgid="7514918659342886381">"Atmiņā nepietiek vietas (iespējams, fails ir pārāk liels)"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"Neparedzēta iemesla dēļ neizdevās parsēt vCard failu."</string>
- <!-- no translation found for fail_reason_not_supported (294499264620201243) -->
- <skip />
- <!-- no translation found for vcard_import_failed (7718330063493653085) -->
- <skip />
+ <string name="fail_reason_not_supported" msgid="294499264620201243">"Šis formāts nav atbalstīts."</string>
+ <string name="vcard_import_failed" msgid="7718330063493653085">"vCard importēšana neizdevās."</string>
<string name="import_failure_no_vcard_file" product="nosdcard" msgid="8809370398968655782">"USB atmiņā nav atrasts neviens vCard fails."</string>
<string name="import_failure_no_vcard_file" product="default" msgid="1730986357514922756">"SD kartē nav atrasts neviens vCard fails."</string>
<string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="4154492282316067754">"Neizdevās iegūt meta informāciju par konkrēto(-ajiem) vCard failu(-iem)."</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 70e4d0b..eb13b03 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -158,12 +158,12 @@
<string name="simContacts_title" msgid="27341688347689769">"Kontakter på SIM-kort"</string>
<string name="noContactsHelpTextWithSyncForCreateShortcut" msgid="801504710275614594">"Du har ingen kontakter å vise. (Hvis du nettopp har lagt til en konto, kan det ta noen minutter å synkronisere kontaktene.)"</string>
<string name="noContactsHelpTextForCreateShortcut" msgid="3081286388667108335">"Du har ingen kontakter å vise."</string>
- <!-- syntax error in translation for noContactsHelpText (6450346791169710787) org.xmlpull.v1.XmlPullParserException: expected: /li read: font (position:END_TAG </font>@1:292 in java.io.StringReader@13fcf0ce) -->
- <!-- syntax error in translation for noContactsHelpText (7633826236417884130) org.xmlpull.v1.XmlPullParserException: expected: /li read: font (position:END_TAG </font>@1:293 in java.io.StringReader@43256ea2) -->
+ <!-- syntax error in translation for noContactsHelpText (6450346791169710787) org.xmlpull.v1.XmlPullParserException: expected: /li read: font (position:END_TAG </font>@1:292 in java.io.StringReader@593d93f4) -->
+ <!-- syntax error in translation for noContactsHelpText (7633826236417884130) org.xmlpull.v1.XmlPullParserException: expected: /li read: font (position:END_TAG </font>@1:293 in java.io.StringReader@59bca5f1) -->
<string name="noContactsHelpTextWithSync" product="tablet" msgid="2364665535969139880">"Du har ingen kontakter å vise. (Hvis du nylig la til en konto, kan det ta noen minutter å synkronisere kontaktene.)"\n\n"Slik legger du til kontakter: Trykk på "<font fgcolor="#ffffffff"><b>"Meny"</b></font>", og trykk deretter på:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Kontoer"</b></font>" for å legge til eller konfigurere en konto med kontakter som kan synkroniseres til nettbrettet"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Visningsalternativer"</b></font>" for å endre hvilke kontakter som vises"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Ny kontakt"</b></font>" for å opprette en ny kontakt fra grunnen av"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importer/Eksporter"</b></font>" for å importere kontakter fra SIM- eller SD-kort"\n</li></string>
<string name="noContactsHelpTextWithSync" product="default" msgid="3017521127042216243">"Du har ingen kontakter å vise. (Hvis du nylig la til en konto, kan det ta noen minutter å synkronisere kontaktene.)"\n\n"Slik legger du til kontakter: Trykk på "<font fgcolor="#ffffffff"><b>"Meny"</b></font>" og trykk deretter på: "\n" "\n<li><font fgcolor="#ffffffff"><b>"Kontoer "</b></font>" for å legge til eller konfigurere en konto med kontakter som kan synkroniseres til telefonen"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Visningsalternativer"</b></font>" for å endre hvilke kontakter som vises"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Ny kontakt"</b></font>" for å opprette en ny kontakt"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importér/Eksportér"</b></font>" for å importere kontakter fra SIM- eller SD-kort"\n</li></string>
- <!-- syntax error in translation for noContactsNoSimHelpText (6031363021287849874) org.xmlpull.v1.XmlPullParserException: expected: /li read: font (position:END_TAG </font>@1:297 in java.io.StringReader@4e82701e) -->
- <!-- syntax error in translation for noContactsNoSimHelpText (467658807711582876) org.xmlpull.v1.XmlPullParserException: expected: /li read: font (position:END_TAG </font>@1:297 in java.io.StringReader@558ee9d6) -->
+ <!-- syntax error in translation for noContactsNoSimHelpText (6031363021287849874) org.xmlpull.v1.XmlPullParserException: expected: /li read: font (position:END_TAG </font>@1:297 in java.io.StringReader@70329f3d) -->
+ <!-- syntax error in translation for noContactsNoSimHelpText (467658807711582876) org.xmlpull.v1.XmlPullParserException: expected: /li read: font (position:END_TAG </font>@1:297 in java.io.StringReader@b749757) -->
<string name="noContactsNoSimHelpTextWithSync" product="tablet" msgid="6222739731808897565">"Du har ingen kontakter å vise. (Hvis du nylig la til en konto, kan det ta noen minutter å synkronisere kontaktene.)"\n\n"Slik legger du til kontakter: Trykk på "<font fgcolor="#ffffffff"><b>"Meny"</b></font>", og trykk deretter på: "\n" "\n<li><font fgcolor="#ffffffff"><b>"Kontoer"</b></font>" for å legge til eller konfigurere en konto med kontakter som kan synkroniseres til nettbrettet"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Visningsalternativer"</b></font>" for å endre hvilke kontakter som vises"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Ny kontakt"</b></font>" for å opprette en ny kontakt fra grunnen av"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importer/eksporter"</b></font>" for å importere kontakter fra SD-kortet"\n</li></string>
<string name="noContactsNoSimHelpTextWithSync" product="default" msgid="9040060730467973050">"Du har ingen kontakter å vise. (Hvis du nylig la til en konto, kan det ta noen minutter å synkronisere kontaktene.)"\n\n"Slik legger du til kontakter: Trykk på "<font fgcolor="#ffffffff"><b>"Meny"</b></font>" og trykk deretter på: "\n" "\n<li><font fgcolor="#ffffffff"><b>"Kontoer "</b></font>" for å legge til eller konfigurere en konto med kontakter som kan synkroniseres til telefonen"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Visningsalternativer"</b></font>" for å endre hvilke kontakter som vises"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Ny kontakt"</b></font>" for å opprette en ny kontakt"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importér/eksportér"</b></font>" for å importere kontakter fra SD-kortet"\n</li></string>
<string name="noFavoritesHelpText" msgid="3744655776704833277">"Du har ingen favoritter."\n\n"Slik legger du til en kontakt i favorittlisten:"\n\n" "<li>"Trykk på fanen "<b>"Kontakter"</b>" "\n</li>" "\n<li>"Trykk på kontakten du vil legge til i favoritter"\n</li>" "\n<li>"Trykk på stjernen ved siden av kontaktnavnet"\n</li></string>
@@ -228,10 +228,8 @@
<string name="fail_reason_io_error" msgid="5922864781066136340">"Inn/ut-feil (årsak: «FAIL_REASON»)"</string>
<string name="fail_reason_low_memory_during_import" msgid="7514918659342886381">"Ikke tilstrekkelig minne (filen kan være for stor)"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"Kan ikke analysere VCard av uventet årsak"</string>
- <!-- no translation found for fail_reason_not_supported (294499264620201243) -->
- <skip />
- <!-- no translation found for vcard_import_failed (7718330063493653085) -->
- <skip />
+ <string name="fail_reason_not_supported" msgid="294499264620201243">"Formatet støttes ikke."</string>
+ <string name="vcard_import_failed" msgid="7718330063493653085">"Kunne ikke importere vCard"</string>
<string name="import_failure_no_vcard_file" product="nosdcard" msgid="8809370398968655782">"Finner ingen vCard-fil i USB-lagring"</string>
<string name="import_failure_no_vcard_file" product="default" msgid="1730986357514922756">"Fant ingen vCard-fil på SD-kortet"</string>
<string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="4154492282316067754">"Kan ikke hente inn metainformasjon for de(n) aktuelle vCard-filen(e)."</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index a7a03af..2ba10e5 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -228,10 +228,8 @@
<string name="fail_reason_io_error" msgid="5922864781066136340">"I/O-fout"</string>
<string name="fail_reason_low_memory_during_import" msgid="7514918659342886381">"Onvoldoende geheugen (het bestand is mogelijk te groot)"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"Parseren van vCard is mislukt om onbekende reden"</string>
- <!-- no translation found for fail_reason_not_supported (294499264620201243) -->
- <skip />
- <!-- no translation found for vcard_import_failed (7718330063493653085) -->
- <skip />
+ <string name="fail_reason_not_supported" msgid="294499264620201243">"De indeling wordt niet ondersteund."</string>
+ <string name="vcard_import_failed" msgid="7718330063493653085">"Kan vCard niet importeren"</string>
<string name="import_failure_no_vcard_file" product="nosdcard" msgid="8809370398968655782">"Geen vCard-bestand gevonden in USB-opslag"</string>
<string name="import_failure_no_vcard_file" product="default" msgid="1730986357514922756">"Geen vCard-bestand gevonden op SD-kaart"</string>
<string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="4154492282316067754">"Verzamelen van metagegevens van betreffende vCard-bestanden is mislukt."</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 96e2833..2b528b5 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -228,10 +228,8 @@
<string name="fail_reason_io_error" msgid="5922864781066136340">"Błąd wejścia/wyjścia"</string>
<string name="fail_reason_low_memory_during_import" msgid="7514918659342886381">"Niewystarczająca ilość pamięci (plik może być zbyt duży)"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"Nie można zanalizować pliku vCard z nieoczekiwanego powodu"</string>
- <!-- no translation found for fail_reason_not_supported (294499264620201243) -->
- <skip />
- <!-- no translation found for vcard_import_failed (7718330063493653085) -->
- <skip />
+ <string name="fail_reason_not_supported" msgid="294499264620201243">"Ten format nie jest obsługiwany."</string>
+ <string name="vcard_import_failed" msgid="7718330063493653085">"Nie można zaimportować karty vCard"</string>
<string name="import_failure_no_vcard_file" product="nosdcard" msgid="8809370398968655782">"Na nośniku USB nie znaleziono żadnego pliku vCard"</string>
<string name="import_failure_no_vcard_file" product="default" msgid="1730986357514922756">"Na karcie SD nie znaleziono żadnego pliku vCard"</string>
<string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="4154492282316067754">"Nie można zebrać metainformacji z podanych plików vCard."</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 7e39e08..5eb00a9 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -228,10 +228,8 @@
<string name="fail_reason_io_error" msgid="5922864781066136340">"Erro de E/S"</string>
<string name="fail_reason_low_memory_during_import" msgid="7514918659342886381">"A memória não é suficiente (o ficheiro pode ser demasiado grande)"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"Falha na análise do vCard por motivo inesperado"</string>
- <!-- no translation found for fail_reason_not_supported (294499264620201243) -->
- <skip />
- <!-- no translation found for vcard_import_failed (7718330063493653085) -->
- <skip />
+ <string name="fail_reason_not_supported" msgid="294499264620201243">"O formato não é suportado."</string>
+ <string name="vcard_import_failed" msgid="7718330063493653085">"Falha ao importar vCard"</string>
<string name="import_failure_no_vcard_file" product="nosdcard" msgid="8809370398968655782">"Não foi encontrado nenhum ficheiro vCard no armazenamento USB"</string>
<string name="import_failure_no_vcard_file" product="default" msgid="1730986357514922756">"Não foi encontrado nenhum ficheiro vCard no cartão SD"</string>
<string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="4154492282316067754">"A recolha de meta informações de ficheiro(s) vCard específicado(s) falhou."</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index ebafb3f..8deb671 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -228,10 +228,8 @@
<string name="fail_reason_io_error" msgid="5922864781066136340">"Eroare I/E"</string>
<string name="fail_reason_low_memory_during_import" msgid="7514918659342886381">"Memoria este insuficientă (probabil fişierul este prea mare)"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"Analiza vCard a eşuat dintr-un motiv necunoscut"</string>
- <!-- no translation found for fail_reason_not_supported (294499264620201243) -->
- <skip />
- <!-- no translation found for vcard_import_failed (7718330063493653085) -->
- <skip />
+ <string name="fail_reason_not_supported" msgid="294499264620201243">"Formatul nu este acceptat."</string>
+ <string name="vcard_import_failed" msgid="7718330063493653085">"Nu a reuşit să importe vCard"</string>
<string name="import_failure_no_vcard_file" product="nosdcard" msgid="8809370398968655782">"Niciun fişier vCard găsit în stocarea USB"</string>
<string name="import_failure_no_vcard_file" product="default" msgid="1730986357514922756">"Niciun fişier vCard găsit pe cardul SD"</string>
<string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="4154492282316067754">"Colectarea metainformaţiilor pentru fişierele vCard indicate a eşuat."</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index c00aacf..53fe638 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -48,7 +48,7 @@
<string name="menu_splitAggregate" msgid="8368636463748691868">"Отделить"</string>
<string name="menu_renameGroup" msgid="2798886925154156075">"Переименовать группу"</string>
<string name="menu_deleteGroup" msgid="644571524292675446">"Удалить группу"</string>
- <string name="menu_new_contact_action_bar" msgid="8887818026717394343">"Создать"</string>
+ <string name="menu_new_contact_action_bar" msgid="8887818026717394343">"Добавить"</string>
<string name="splitConfirmation_title" msgid="6716467920283502570">"Разделить контакты"</string>
<string name="splitConfirmation" msgid="1150797297503944823">"Вы действительно хотите разделить этот контакт на несколько контактов: по одному для каждого набора контактной информации, содержащейся в этом контакте?"</string>
<string name="menu_joinAggregate" msgid="5027981918265667970">"Присоединить"</string>
@@ -228,10 +228,8 @@
<string name="fail_reason_io_error" msgid="5922864781066136340">"Ошибка ввода-вывода"</string>
<string name="fail_reason_low_memory_during_import" msgid="7514918659342886381">"Недостаточно памяти (возможно, файл слишком велик)"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"Не удалось обработать vCard по неизвестной причине."</string>
- <!-- no translation found for fail_reason_not_supported (294499264620201243) -->
- <skip />
- <!-- no translation found for vcard_import_failed (7718330063493653085) -->
- <skip />
+ <string name="fail_reason_not_supported" msgid="294499264620201243">"Формат не поддерживается."</string>
+ <string name="vcard_import_failed" msgid="7718330063493653085">"Не удалось импортировать vCard"</string>
<string name="import_failure_no_vcard_file" product="nosdcard" msgid="8809370398968655782">"На USB-накопителе отсутствуют файлы vCard"</string>
<string name="import_failure_no_vcard_file" product="default" msgid="1730986357514922756">"На SD-карте не найдены файлы VCard"</string>
<string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="4154492282316067754">"Не удалось собрать метаинформацию файлов VCard."</string>
@@ -413,7 +411,7 @@
<string name="take_new_photo" msgid="7341354729436576304">"Создать новое фото"</string>
<string name="pick_photo" msgid="448886509158039462">"Выбрать фото из галереи"</string>
<string name="pick_new_photo" msgid="7962368009197147617">"Выбрать новое фото из Галереи"</string>
- <string name="locale_change_in_progress" msgid="7583992153091537467">"Выполняется обновление списка контактов, чтобы изменение языка вступило в силу."</string>
+ <string name="locale_change_in_progress" msgid="7583992153091537467">"Список контактов обновляется после смены языка интерфейса."</string>
<string name="upgrade_in_progress" msgid="474511436863451061">"Список контактов обновляется..."</string>
<string name="upgrade_out_of_memory" msgid="6153384328042175667">"Список контактов обновляется. "\n\n"Для обновления требуется около <xliff:g id="SIZE_IN_MEGABYTES">%s</xliff:g> МБ встроенной памяти."\n\n"Выберите один из следующих вариантов:"</string>
<string name="upgrade_out_of_memory_uninstall" msgid="1721798828992091432">"Удалить некоторые приложения"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 41421ec..8e7070a 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -228,10 +228,8 @@
<string name="fail_reason_io_error" msgid="5922864781066136340">"Chyba I/O"</string>
<string name="fail_reason_low_memory_during_import" msgid="7514918659342886381">"Nie je k dispozícii dostatok pamäte (súbor môže byť príliš veľký)"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"Analýza karty vCard z neznámeho dôvodu zlyhala."</string>
- <!-- no translation found for fail_reason_not_supported (294499264620201243) -->
- <skip />
- <!-- no translation found for vcard_import_failed (7718330063493653085) -->
- <skip />
+ <string name="fail_reason_not_supported" msgid="294499264620201243">"Formát nie je podporovaný."</string>
+ <string name="vcard_import_failed" msgid="7718330063493653085">"Importovanie vizitky vCard zlyhalo"</string>
<string name="import_failure_no_vcard_file" product="nosdcard" msgid="8809370398968655782">"V ukladacom priestore USB nebola nájdená žiadna karta vCard"</string>
<string name="import_failure_no_vcard_file" product="default" msgid="1730986357514922756">"Na karte SD nebol nájdený žiadny súbor vCard"</string>
<string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="4154492282316067754">"Zhromaždenie metainformácií zadaných súborov vCard zlyhalo."</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index ef684c3..b8fbc81 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -228,10 +228,8 @@
<string name="fail_reason_io_error" msgid="5922864781066136340">"Vhodno/izhodna napaka"</string>
<string name="fail_reason_low_memory_during_import" msgid="7514918659342886381">"Ni dovolj pomnilnika (morda je datoteka prevelika)"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"Iz neznanega razloga razčlenjevanje vizitke vCard ni bilo uspešno"</string>
- <!-- no translation found for fail_reason_not_supported (294499264620201243) -->
- <skip />
- <!-- no translation found for vcard_import_failed (7718330063493653085) -->
- <skip />
+ <string name="fail_reason_not_supported" msgid="294499264620201243">"Oblika zapisa ni podprta."</string>
+ <string name="vcard_import_failed" msgid="7718330063493653085">"Uvoz kartice vCard ni uspel"</string>
<string name="import_failure_no_vcard_file" product="nosdcard" msgid="8809370398968655782">"Na disku USB ni datotek vCard"</string>
<string name="import_failure_no_vcard_file" product="default" msgid="1730986357514922756">"Na kartici SD ni datotek vCard"</string>
<string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="4154492282316067754">"Metapodatkov datotek(e) vCard ni bilo mogoče zbrati."</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 977a39f..2b416f8 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -228,10 +228,8 @@
<string name="fail_reason_io_error" msgid="5922864781066136340">"I/O грешка"</string>
<string name="fail_reason_low_memory_during_import" msgid="7514918659342886381">"Нема довољно меморије (датотека је можда превелика)"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"Рашчлањивање дигиталне визиткарте није успело из неочекиваног разлога"</string>
- <!-- no translation found for fail_reason_not_supported (294499264620201243) -->
- <skip />
- <!-- no translation found for vcard_import_failed (7718330063493653085) -->
- <skip />
+ <string name="fail_reason_not_supported" msgid="294499264620201243">"Формат није подржан."</string>
+ <string name="vcard_import_failed" msgid="7718330063493653085">"Увоз vCard датотеке није успео"</string>
<string name="import_failure_no_vcard_file" product="nosdcard" msgid="8809370398968655782">"У USB меморији није пронађена ниједна vCard датотека"</string>
<string name="import_failure_no_vcard_file" product="default" msgid="1730986357514922756">"На SD картици није пронађена ниједна vCard датотека"</string>
<string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="4154492282316067754">"Неуспешно прикупљање мета података за дате датотеке дигиталне визиткарте."</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 8f06281..7c6fd5e 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -228,10 +228,8 @@
<string name="fail_reason_io_error" msgid="5922864781066136340">"I/O-fel"</string>
<string name="fail_reason_low_memory_during_import" msgid="7514918659342886381">"Det finns för lite minne (filen kan vara för stor)"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"Det gick inte att analysera vCard av okänd anledning"</string>
- <!-- no translation found for fail_reason_not_supported (294499264620201243) -->
- <skip />
- <!-- no translation found for vcard_import_failed (7718330063493653085) -->
- <skip />
+ <string name="fail_reason_not_supported" msgid="294499264620201243">"Formatet stöds inte."</string>
+ <string name="vcard_import_failed" msgid="7718330063493653085">"Det gick inte att importera vCard"</string>
<string name="import_failure_no_vcard_file" product="nosdcard" msgid="8809370398968655782">"Det finns ingen vCard-fil på USB-lagringsenheten"</string>
<string name="import_failure_no_vcard_file" product="default" msgid="1730986357514922756">"Det finns ingen vCard-fil på SD-kortet"</string>
<string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="4154492282316067754">"Det går inte att samla in metainformation för den eller de givna vCard-filerna."</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index c3bed17..b476eba 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -228,10 +228,8 @@
<string name="fail_reason_io_error" msgid="5922864781066136340">"ข้อผิดพลาด I/O"</string>
<string name="fail_reason_low_memory_during_import" msgid="7514918659342886381">"หน่วยความจำไม่เพียงพอ (ไฟล์อาจใหญ่เกินไป)"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"แยกวิเคราะห์ vCard ไม่สำเร็จด้วยเหตุผลที่ไม่คาดคิด"</string>
- <!-- no translation found for fail_reason_not_supported (294499264620201243) -->
- <skip />
- <!-- no translation found for vcard_import_failed (7718330063493653085) -->
- <skip />
+ <string name="fail_reason_not_supported" msgid="294499264620201243">"รูปแบบไม่ได้รับการสนับสนุน"</string>
+ <string name="vcard_import_failed" msgid="7718330063493653085">"ไม่สามารถนำเข้า vCard"</string>
<string name="import_failure_no_vcard_file" product="nosdcard" msgid="8809370398968655782">"ไม่พบไฟล์ vCard ในที่เก็บข้อมูล USB"</string>
<string name="import_failure_no_vcard_file" product="default" msgid="1730986357514922756">"ไม่พบไฟล์ vCard บนการ์ด SD"</string>
<string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="4154492282316067754">"รวบรวมข้อมูลเมตาของไฟล์ vCard ที่ระบุไม่สำเร็จ"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 64f84c8..0589405 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -228,10 +228,8 @@
<string name="fail_reason_io_error" msgid="5922864781066136340">"Error na I/O"</string>
<string name="fail_reason_low_memory_during_import" msgid="7514918659342886381">"Hindi sapat ang memorya (maaaring masyadong malaki ang file)"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"Nabigong i-parse ang vCard para sa di-inaasahang dahilan"</string>
- <!-- no translation found for fail_reason_not_supported (294499264620201243) -->
- <skip />
- <!-- no translation found for vcard_import_failed (7718330063493653085) -->
- <skip />
+ <string name="fail_reason_not_supported" msgid="294499264620201243">"Hindi suportado ang format."</string>
+ <string name="vcard_import_failed" msgid="7718330063493653085">"Nabigong i-import ang vCard"</string>
<string name="import_failure_no_vcard_file" product="nosdcard" msgid="8809370398968655782">"Walang nakitang vCard file sa imabakan ng USB"</string>
<string name="import_failure_no_vcard_file" product="default" msgid="1730986357514922756">"Walang nakitang vCard file sa SD card"</string>
<string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="4154492282316067754">"Nabigong kumolekta ng impormasyon na meta ng ibinigay na (mga) vCard."</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 8da6964..5bb30db 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -228,10 +228,8 @@
<string name="fail_reason_io_error" msgid="5922864781066136340">"G/Ç Hatası"</string>
<string name="fail_reason_low_memory_during_import" msgid="7514918659342886381">"Bellek yetersiz (dosya çok büyük olabilir)"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"Beklenmedik bir nedenden dolayı vCard ayrıştırılamadı"</string>
- <!-- no translation found for fail_reason_not_supported (294499264620201243) -->
- <skip />
- <!-- no translation found for vcard_import_failed (7718330063493653085) -->
- <skip />
+ <string name="fail_reason_not_supported" msgid="294499264620201243">"Biçim desteklenmiyor."</string>
+ <string name="vcard_import_failed" msgid="7718330063493653085">"vCard içe aktarılamadı"</string>
<string name="import_failure_no_vcard_file" product="nosdcard" msgid="8809370398968655782">"USB depolama biriminde herhangi bir vCard dosyası bulunamadı"</string>
<string name="import_failure_no_vcard_file" product="default" msgid="1730986357514922756">"SD kartta hiçbir vCard dosyası bulunamadı"</string>
<string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="4154492282316067754">"Belirtilen vCard dosyalarının meta bilgileri toplanamıyor."</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 4b80cc6..17dc859 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -228,10 +228,8 @@
<string name="fail_reason_io_error" msgid="5922864781066136340">"Помилка I/O"</string>
<string name="fail_reason_low_memory_during_import" msgid="7514918659342886381">"Недостатньо пам\'яті (можливо, файл завеликий)"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"Не вдал. проаналіз. vCard через неочік. прич."</string>
- <!-- no translation found for fail_reason_not_supported (294499264620201243) -->
- <skip />
- <!-- no translation found for vcard_import_failed (7718330063493653085) -->
- <skip />
+ <string name="fail_reason_not_supported" msgid="294499264620201243">"Формат не підтримується."</string>
+ <string name="vcard_import_failed" msgid="7718330063493653085">"Помилка імпорту vCard"</string>
<string name="import_failure_no_vcard_file" product="nosdcard" msgid="8809370398968655782">"На носії USB не знайдено файлів vCard"</string>
<string name="import_failure_no_vcard_file" product="default" msgid="1730986357514922756">"На карті SD не знайдено файлів vCard"</string>
<string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="4154492282316067754">"Помилка отримання мета-інформації файлів даної vCard."</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 838d94a..fc7b6ea 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -228,10 +228,8 @@
<string name="fail_reason_io_error" msgid="5922864781066136340">"Lỗi I/O"</string>
<string name="fail_reason_low_memory_during_import" msgid="7514918659342886381">"Bộ nhớ không đủ (tệp có thể quá lớn)"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"Không thể phân tích cú pháp vCard vì lý do không mong muốn"</string>
- <!-- no translation found for fail_reason_not_supported (294499264620201243) -->
- <skip />
- <!-- no translation found for vcard_import_failed (7718330063493653085) -->
- <skip />
+ <string name="fail_reason_not_supported" msgid="294499264620201243">"Định dạng không được hỗ trợ."</string>
+ <string name="vcard_import_failed" msgid="7718330063493653085">"Không thể nhập vCard"</string>
<string name="import_failure_no_vcard_file" product="nosdcard" msgid="8809370398968655782">"Không tìm thấy tệp vCard trong bộ lưu trữ USB"</string>
<string name="import_failure_no_vcard_file" product="default" msgid="1730986357514922756">"Không tìm thấy tệp vCard trên thẻ SD"</string>
<string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="4154492282316067754">"Không thể thu thập siêu thông tin của (các) tệp vCard cho trước."</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 6b5c6e1..7b51748 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -228,10 +228,8 @@
<string name="fail_reason_io_error" msgid="5922864781066136340">"I/O 錯誤"</string>
<string name="fail_reason_low_memory_during_import" msgid="7514918659342886381">"記憶體不足 (檔案可能過大)"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"因未預期原因，無法剖析 VCard"</string>
- <!-- no translation found for fail_reason_not_supported (294499264620201243) -->
- <skip />
- <!-- no translation found for vcard_import_failed (7718330063493653085) -->
- <skip />
+ <string name="fail_reason_not_supported" msgid="294499264620201243">"不支援這種格式。"</string>
+ <string name="vcard_import_failed" msgid="7718330063493653085">"無法匯入 vCard"</string>
<string name="import_failure_no_vcard_file" product="nosdcard" msgid="8809370398968655782">"在 USB 儲存裝置中找不到 vCard 檔案"</string>
<string name="import_failure_no_vcard_file" product="default" msgid="1730986357514922756">"在 SD 卡上找不到 vCard 檔案"</string>
<string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="4154492282316067754">"無法從指定的 vCard 檔案收集中繼資料。"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b0dffca..d09904a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -307,8 +307,8 @@
<item quantity="other"><xliff:g id="count">%d</xliff:g> contacts with phone numbers</item>
</plurals>
- <!-- Displayed at the top of the contacts showing the zero as total number of contacts visible when "Only contacts with phones" is selected -->
- <string name="listTotalPhoneContactsZero">No visible contacts with phone numbers</string>
+ <!-- Displayed at the top of the contacts showing the zero as total number of contacts visible when "Only contacts with phones" is selected [CHAR LIMIT=64]-->
+ <string name="listTotalPhoneContactsZero">No contacts with phone numbers</string>
<!-- Displayed at the top of the contacts showing the total number of contacts visible when "Only contacts with phones" not selected -->
<plurals name="listTotalAllContacts">
@@ -316,8 +316,17 @@
<item quantity="other"><xliff:g id="count">%d</xliff:g> contacts</item>
</plurals>
- <!-- Displayed at the top of the contacts showing the zero total number of contacts visible when "Only contacts with phones" not selected -->
- <string name="listTotalAllContactsZero">No visible contacts</string>
+ <!-- Displayed at the top of the contacts showing the zero total number of contacts visible when "All contacts" is selected [CHAR LIMIT=64]-->
+ <string name="listTotalAllContactsZero">No contacts</string>
+
+ <!-- Displayed at the top of the contacts showing the zero total number of contacts visible when "Custom" is selected [CHAR LIMIT=64]-->
+ <string name="listTotalAllContactsZeroCustom">No visible contacts</string>
+
+ <!-- Displayed at the top of the contacts showing the zero total number of contacts visible when starred contact list is selected [CHAR LIMIT=64]-->
+ <string name="listTotalAllContactsZeroStarred">No starred contacts</string>
+
+ <!-- Displayed at the top of the contacts showing the zero total number of contacts visible when a group or account is selected [CHAR LIMIT=64]-->
+ <string name="listTotalAllContactsZeroGroup">No contacts in <xliff:g id="name" example="Friends">%s</xliff:g></string>
<!-- Displayed at the top of the contacts showing the total number of contacts found when "Only contacts with phones" not selected -->
<plurals name="listFoundAllContacts">
diff --git a/src/com/android/contacts/ContactsApplication.java b/src/com/android/contacts/ContactsApplication.java
index f0e2736..8346c04 100644
--- a/src/com/android/contacts/ContactsApplication.java
+++ b/src/com/android/contacts/ContactsApplication.java
@@ -20,6 +20,7 @@
import com.android.contacts.test.InjectedServices;
import android.app.Application;
+import android.app.LoaderManager;
import android.content.ContentResolver;
import android.content.Context;
import android.content.SharedPreferences;
@@ -92,6 +93,7 @@
Context context = getApplicationContext();
PreferenceManager.getDefaultSharedPreferences(context);
AccountTypeManager.getInstance(context);
+ LoaderManager.enableDebugLogging(true);
StrictMode.setThreadPolicy(
new StrictMode.ThreadPolicy.Builder().detectAll().penaltyLog().build());
diff --git a/src/com/android/contacts/activities/ContactSelectionActivity.java b/src/com/android/contacts/activities/ContactSelectionActivity.java
index 907edd3..4efc43f 100644
--- a/src/com/android/contacts/activities/ContactSelectionActivity.java
+++ b/src/com/android/contacts/activities/ContactSelectionActivity.java
@@ -54,6 +54,9 @@
private static final String KEY_ACTION_CODE = "actionCode";
private static final int DEFAULT_DIRECTORY_RESULT_LIMIT = 20;
+ // Delay to allow the UI to settle before making search view visible
+ private static final int FOCUS_DELAY = 200;
+
private ContactsIntentResolver mIntentResolver;
protected ContactEntryListFragment<?> mListFragment;
@@ -116,13 +119,13 @@
// at this point. If search view were visible, it would always grabs focus
// because it is the first focusable widget in the window.
mSearchView.setVisibility(View.INVISIBLE);
- mSearchView.post(new Runnable() {
+ mSearchView.postDelayed(new Runnable() {
@Override
public void run() {
mSearchView.setVisibility(View.VISIBLE);
}
- });
+ }, FOCUS_DELAY);
}
Button cancel = (Button) findViewById(R.id.cancel);
diff --git a/src/com/android/contacts/datepicker/DatePickerDialog.java b/src/com/android/contacts/datepicker/DatePickerDialog.java
index dbf1e25..112b96e 100644
--- a/src/com/android/contacts/datepicker/DatePickerDialog.java
+++ b/src/com/android/contacts/datepicker/DatePickerDialog.java
@@ -160,7 +160,6 @@
this);
setButton(BUTTON_NEGATIVE, context.getText(android.R.string.cancel),
(OnClickListener) null);
- setIcon(com.android.internal.R.drawable.ic_dialog_time);
LayoutInflater inflater =
(LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
diff --git a/src/com/android/contacts/editor/EventFieldEditorView.java b/src/com/android/contacts/editor/EventFieldEditorView.java
index fb196fe..7345dbb 100644
--- a/src/com/android/contacts/editor/EventFieldEditorView.java
+++ b/src/com/android/contacts/editor/EventFieldEditorView.java
@@ -36,7 +36,6 @@
import android.view.View;
import android.widget.Button;
import android.widget.LinearLayout;
-import android.widget.TextView;
import java.text.ParsePosition;
import java.util.Calendar;
@@ -126,15 +125,7 @@
if (mDateView == null) {
- // TODO: Change to android.R.attr.spinnerTextStyle when available
- // mDateView = new Button(getContext(), null, android.R.attr.editTextStyle);
- mDateView = new Button(getContext());
- // TODO: Remove hard-coded padding and gravity when android.R.attr.spinnerTextStyle
- // becomes available
- mDateView.setPadding(18, mDateView.getPaddingTop(),
- mDateView.getPaddingRight(), mDateView.getPaddingBottom());
- mDateView.setGravity(Gravity.LEFT | Gravity.CENTER_VERTICAL);
-
+ mDateView = new Button(getContext(), null, android.R.attr.spinnerStyle);
mDateView.setLayoutParams(new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT,
LayoutParams.WRAP_CONTENT));
mDateView.setEnabled(isEnabled() && !readOnly);
diff --git a/src/com/android/contacts/editor/GroupMembershipView.java b/src/com/android/contacts/editor/GroupMembershipView.java
index c0b3644..8845aa3 100644
--- a/src/com/android/contacts/editor/GroupMembershipView.java
+++ b/src/com/android/contacts/editor/GroupMembershipView.java
@@ -203,7 +203,7 @@
}
mAdapter = new ArrayAdapter<GroupSelectionItem>(
- getContext(), android.R.layout.simple_list_item_multiple_choice);
+ getContext(), R.layout.group_membership_list_item);
mGroupMetaData.moveToPosition(-1);
while (mGroupMetaData.moveToNext()) {
diff --git a/src/com/android/contacts/list/ContactEntryListFragment.java b/src/com/android/contacts/list/ContactEntryListFragment.java
index e61232a..6bdfd97 100644
--- a/src/com/android/contacts/list/ContactEntryListFragment.java
+++ b/src/com/android/contacts/list/ContactEntryListFragment.java
@@ -401,9 +401,6 @@
@Override
public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
if (!mEnabled) {
- if (data != null) {
- data.close();
- }
return;
}
@@ -760,7 +757,7 @@
protected void configurePhotoLoader() {
if (isPhotoLoaderEnabled() && mContext != null) {
if (mPhotoLoader == null) {
- mPhotoLoader = new ContactPhotoLoader(mContext, R.drawable.ic_contact_list_picture);
+ mPhotoLoader = new ContactPhotoLoader(mContext, R.drawable.ic_contact_picture);
}
if (mListView != null) {
mListView.setOnScrollListener(this);
@@ -892,17 +889,6 @@
}
}
- // TODO: fix PluralRules to handle zero correctly and use Resources.getQuantityText directly
- public String getQuantityText(int count, int zeroResourceId, int pluralResourceId) {
- if (count == 0) {
- return mContext.getString(zeroResourceId);
- } else {
- String format = mContext.getResources()
- .getQuantityText(pluralResourceId, count).toString();
- return String.format(format, count);
- }
- }
-
protected void setEmptyText(int resourceId) {
TextView empty = (TextView) getEmptyView().findViewById(R.id.emptyText);
empty.setText(mContext.getText(resourceId));
diff --git a/src/com/android/contacts/list/ContactListAdapter.java b/src/com/android/contacts/list/ContactListAdapter.java
index 2183622..a6db641 100644
--- a/src/com/android/contacts/list/ContactListAdapter.java
+++ b/src/com/android/contacts/list/ContactListAdapter.java
@@ -234,9 +234,14 @@
}
protected void bindSectionHeaderAndDivider(ContactListItemView view, int position) {
- Placement placement = getItemPlacementInSection(position);
- view.setSectionHeader(placement.firstInSection ? placement.sectionHeader : null);
- view.setDividerVisible(!placement.lastInSection);
+ if (isSectionHeaderDisplayEnabled()) {
+ Placement placement = getItemPlacementInSection(position);
+ view.setSectionHeader(placement.firstInSection ? placement.sectionHeader : null);
+ view.setDividerVisible(!placement.lastInSection);
+ } else {
+ view.setSectionHeader(null);
+ view.setDividerVisible(true);
+ }
}
protected void bindPhoto(final ContactListItemView view, int partitionIndex, Cursor cursor) {
diff --git a/src/com/android/contacts/list/ContactListFilter.java b/src/com/android/contacts/list/ContactListFilter.java
index 5cb96b4..c53859b 100644
--- a/src/com/android/contacts/list/ContactListFilter.java
+++ b/src/com/android/contacts/list/ContactListFilter.java
@@ -43,6 +43,7 @@
private static final String KEY_GROUP_ID = "filter.groupId";
private static final String KEY_GROUP_SOURCE_ID = "filter.groupSourceId";
private static final String KEY_GROUP_READ_ONLY = "filter.groupReadOnly";
+ private static final String KEY_GROUP_TITLE = "filter.groupTitle";
public int filterType;
public String accountType;
@@ -177,6 +178,7 @@
.putLong(KEY_GROUP_ID, filter == null ? -1 : filter.groupId)
.putString(KEY_GROUP_SOURCE_ID, filter == null ? null : filter.groupSourceId)
.putBoolean(KEY_GROUP_READ_ONLY, filter == null ? false : filter.groupReadOnly)
+ .putString(KEY_GROUP_TITLE, filter == null ? null : filter.title)
.apply();
}
@@ -192,6 +194,7 @@
filter.groupId = prefs.getLong(KEY_GROUP_ID, -1);
filter.groupSourceId = prefs.getString(KEY_GROUP_SOURCE_ID, null);
filter.groupReadOnly = prefs.getBoolean(KEY_GROUP_READ_ONLY, false);
+ filter.title = prefs.getString(KEY_GROUP_TITLE, "group");
return filter;
}
diff --git a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
index 7b04562..f95c4af 100644
--- a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
+++ b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
@@ -95,15 +95,38 @@
protected void showCount(int partitionIndex, Cursor data) {
if (!isSearchMode() && data != null) {
int count = data.getCount();
- // TODO
- // if (contactsListActivity.mDisplayOnlyPhones) {
- // text = contactsListActivity.getQuantityText(count,
- // R.string.listTotalPhoneContactsZero,
- // R.plurals.listTotalPhoneContacts);
- TextView textView = (TextView)mCounterHeaderView.findViewById(R.id.totalContactsText);
- String text = getQuantityText(count, R.string.listTotalAllContactsZero,
- R.plurals.listTotalAllContacts);
- textView.setText(text);
+ TextView textView = (TextView) mCounterHeaderView.findViewById(R.id.totalContactsText);
+ if (count != 0) {
+ String format = getResources().getQuantityText(
+ R.plurals.listTotalAllContacts, count).toString();
+ textView.setText(String.format(format, count));
+ } else {
+ ContactListFilter filter = getFilter();
+ int filterType = filter != null ? filter.filterType
+ : ContactListFilter.FILTER_TYPE_ALL_ACCOUNTS;
+ switch (filterType) {
+ case ContactListFilter.FILTER_TYPE_ACCOUNT:
+ textView.setText(getString(
+ R.string.listTotalAllContactsZeroGroup, filter.accountName));
+ break;
+ case ContactListFilter.FILTER_TYPE_GROUP:
+ textView.setText(
+ getString(R.string.listTotalAllContactsZeroGroup, filter.title));
+ break;
+ case ContactListFilter.FILTER_TYPE_WITH_PHONE_NUMBERS_ONLY:
+ textView.setText(R.string.listTotalPhoneContactsZero);
+ break;
+ case ContactListFilter.FILTER_TYPE_STARRED:
+ textView.setText(R.string.listTotalAllContactsZeroStarred);
+ break;
+ case ContactListFilter.FILTER_TYPE_CUSTOM:
+ textView.setText(R.string.listTotalAllContactsZeroCustom);
+ break;
+ default:
+ textView.setText(R.string.listTotalAllContactsZero);
+ break;
+ }
+ }
} else {
ContactListAdapter adapter = getAdapter();
if (adapter == null) {
diff --git a/src/com/android/contacts/list/PhoneNumberListAdapter.java b/src/com/android/contacts/list/PhoneNumberListAdapter.java
index ffd5ab9..48a6042 100644
--- a/src/com/android/contacts/list/PhoneNumberListAdapter.java
+++ b/src/com/android/contacts/list/PhoneNumberListAdapter.java
@@ -174,19 +174,12 @@
}
protected void bindSectionHeaderAndDivider(final ContactListItemView view, int position) {
- final int section = getSectionForPosition(position);
- if (getPositionForSection(section) == position) {
- String title = (String)getSections()[section];
- view.setSectionHeader(title);
+ if (isSectionHeaderDisplayEnabled()) {
+ Placement placement = getItemPlacementInSection(position);
+ view.setSectionHeader(placement.firstInSection ? placement.sectionHeader : null);
+ view.setDividerVisible(!placement.lastInSection);
} else {
- view.setDividerVisible(false);
view.setSectionHeader(null);
- }
-
- // move the divider for the last item in a section
- if (getPositionForSection(section + 1) - 1 == position) {
- view.setDividerVisible(false);
- } else {
view.setDividerVisible(true);
}
}
@@ -205,10 +198,4 @@
getPhotoLoader().loadPhoto(view.getPhotoView(), photoId);
}
-//
-// protected void bindSearchSnippet(final ContactListItemView view, Cursor cursor) {
-// view.showSnippet(cursor, SUMMARY_SNIPPET_MIMETYPE_COLUMN_INDEX,
-// SUMMARY_SNIPPET_DATA1_COLUMN_INDEX, SUMMARY_SNIPPET_DATA4_COLUMN_INDEX);
-// }
-
}
diff --git a/src/com/android/contacts/list/PhoneNumberPickerFragment.java b/src/com/android/contacts/list/PhoneNumberPickerFragment.java
index a84f4ff..071a370 100644
--- a/src/com/android/contacts/list/PhoneNumberPickerFragment.java
+++ b/src/com/android/contacts/list/PhoneNumberPickerFragment.java
@@ -36,6 +36,8 @@
public PhoneNumberPickerFragment() {
setQuickContactEnabled(false);
setPhotoLoaderEnabled(true);
+ setVisibleScrollbarEnabled(true);
+ setSectionHeaderDisplayEnabled(true);
setDirectorySearchMode(DirectoryListLoader.SEARCH_MODE_DATA_SHORTCUT);
}
@@ -76,13 +78,6 @@
}
@Override
- protected void configureAdapter() {
- setSectionHeaderDisplayEnabled(!isSearchMode());
- setVisibleScrollbarEnabled(!isSearchMode());
- super.configureAdapter();
- }
-
- @Override
protected View inflateView(LayoutInflater inflater, ViewGroup container) {
return inflater.inflate(R.layout.contacts_list_content, null);
}
