am 0c4a0fab: Merge "Fix crash when separating multiple empty raw contacts"
Merge commit '0c4a0fab6dc91f93aacc8787efb6ac0c0587c3eb' into gingerbread-plus-aosp
* commit '0c4a0fab6dc91f93aacc8787efb6ac0c0587c3eb':
Fix crash when separating multiple empty raw contacts
diff --git a/Android.mk b/Android.mk
index d574b3f..5a820bd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -10,7 +10,7 @@
LOCAL_PACKAGE_NAME := Contacts
LOCAL_CERTIFICATE := shared
-LOCAL_PROGUARD_FLAGS := -include $(LOCAL_PATH)/proguard.flags
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags
include $(BUILD_PACKAGE)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1fae984..e543e61 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -17,6 +17,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.contacts"
android:sharedUserId="android.uid.shared"
+ android:sharedUserLabel="@string/sharedUserLabel"
>
<original-package android:name="com.android.contacts" />
@@ -221,23 +222,23 @@
<intent-filter>
<action android:name="android.intent.action.PICK" />
<category android:name="android.intent.category.DEFAULT" />
- <data android:mimeType="vnd.android.cursor.dir/contact" android:host="com.android.contacts" />
- <data android:mimeType="vnd.android.cursor.dir/person" android:host="contacts" />
- <data android:mimeType="vnd.android.cursor.dir/phone_v2" android:host="com.android.contacts" />
- <data android:mimeType="vnd.android.cursor.dir/phone" android:host="contacts" />
- <data android:mimeType="vnd.android.cursor.dir/postal-address_v2" android:host="com.android.contacts" />
- <data android:mimeType="vnd.android.cursor.dir/postal-address" android:host="contacts" />
+ <data android:mimeType="vnd.android.cursor.dir/contact" />
+ <data android:mimeType="vnd.android.cursor.dir/person" />
+ <data android:mimeType="vnd.android.cursor.dir/phone_v2" />
+ <data android:mimeType="vnd.android.cursor.dir/phone" />
+ <data android:mimeType="vnd.android.cursor.dir/postal-address_v2" />
+ <data android:mimeType="vnd.android.cursor.dir/postal-address" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.GET_CONTENT" />
<category android:name="android.intent.category.DEFAULT" />
- <data android:mimeType="vnd.android.cursor.item/contact" android:host="com.android.contacts" />
- <data android:mimeType="vnd.android.cursor.item/person" android:host="contacts" />
- <data android:mimeType="vnd.android.cursor.item/phone_v2" android:host="com.android.contacts" />
- <data android:mimeType="vnd.android.cursor.item/phone" android:host="contacts" />
- <data android:mimeType="vnd.android.cursor.item/postal-address_v2" android:host="com.android.contacts" />
- <data android:mimeType="vnd.android.cursor.item/postal-address" android:host="contacts" />
+ <data android:mimeType="vnd.android.cursor.item/contact" />
+ <data android:mimeType="vnd.android.cursor.item/person" />
+ <data android:mimeType="vnd.android.cursor.item/phone_v2" />
+ <data android:mimeType="vnd.android.cursor.item/phone" />
+ <data android:mimeType="vnd.android.cursor.item/postal-address_v2" />
+ <data android:mimeType="vnd.android.cursor.item/postal-address" />
</intent-filter>
</activity>
diff --git a/res/drawable-hdpi-finger/btn_circle_disable.png b/res/drawable-hdpi-finger/btn_circle_disable.png
index ae063b5..f04da38 100755
--- a/res/drawable-hdpi-finger/btn_circle_disable.png
+++ b/res/drawable-hdpi-finger/btn_circle_disable.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/btn_circle_disable_focused.png b/res/drawable-hdpi-finger/btn_circle_disable_focused.png
index 7a5d4fe..1c918a5 100755
--- a/res/drawable-hdpi-finger/btn_circle_disable_focused.png
+++ b/res/drawable-hdpi-finger/btn_circle_disable_focused.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/btn_circle_normal.png b/res/drawable-hdpi-finger/btn_circle_normal.png
index 5eda668..f5aedb4 100755
--- a/res/drawable-hdpi-finger/btn_circle_normal.png
+++ b/res/drawable-hdpi-finger/btn_circle_normal.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/btn_circle_pressed.png b/res/drawable-hdpi-finger/btn_circle_pressed.png
index 88848ba..bada362 100755
--- a/res/drawable-hdpi-finger/btn_circle_pressed.png
+++ b/res/drawable-hdpi-finger/btn_circle_pressed.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/btn_circle_selected.png b/res/drawable-hdpi-finger/btn_circle_selected.png
index 7469070..1c918a5 100755
--- a/res/drawable-hdpi-finger/btn_circle_selected.png
+++ b/res/drawable-hdpi-finger/btn_circle_selected.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/btn_dial_action_left_disable.9.png b/res/drawable-hdpi-finger/btn_dial_action_left_disable.9.png
index 7ba8672..8a2625b 100644
--- a/res/drawable-hdpi-finger/btn_dial_action_left_disable.9.png
+++ b/res/drawable-hdpi-finger/btn_dial_action_left_disable.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/btn_dial_action_left_disable_focused.9.png b/res/drawable-hdpi-finger/btn_dial_action_left_disable_focused.9.png
index b4300b6..32c9772 100644
--- a/res/drawable-hdpi-finger/btn_dial_action_left_disable_focused.9.png
+++ b/res/drawable-hdpi-finger/btn_dial_action_left_disable_focused.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/btn_dial_action_left_normal.9.png b/res/drawable-hdpi-finger/btn_dial_action_left_normal.9.png
index 7ba8672..255ae18 100644
--- a/res/drawable-hdpi-finger/btn_dial_action_left_normal.9.png
+++ b/res/drawable-hdpi-finger/btn_dial_action_left_normal.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/btn_dial_action_left_pressed.9.png b/res/drawable-hdpi-finger/btn_dial_action_left_pressed.9.png
index 1dc40b7..f63fee6 100644
--- a/res/drawable-hdpi-finger/btn_dial_action_left_pressed.9.png
+++ b/res/drawable-hdpi-finger/btn_dial_action_left_pressed.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/btn_dial_action_left_selected.9.png b/res/drawable-hdpi-finger/btn_dial_action_left_selected.9.png
index 4f6c7cf..77ddcb0 100644
--- a/res/drawable-hdpi-finger/btn_dial_action_left_selected.9.png
+++ b/res/drawable-hdpi-finger/btn_dial_action_left_selected.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/btn_dial_action_middle_disable.9.png b/res/drawable-hdpi-finger/btn_dial_action_middle_disable.9.png
index 0a6cd66..8556118 100644
--- a/res/drawable-hdpi-finger/btn_dial_action_middle_disable.9.png
+++ b/res/drawable-hdpi-finger/btn_dial_action_middle_disable.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/btn_dial_action_middle_disable_focused.9.png b/res/drawable-hdpi-finger/btn_dial_action_middle_disable_focused.9.png
index b28176f..965fe7d 100644
--- a/res/drawable-hdpi-finger/btn_dial_action_middle_disable_focused.9.png
+++ b/res/drawable-hdpi-finger/btn_dial_action_middle_disable_focused.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/btn_dial_action_middle_normal.9.png b/res/drawable-hdpi-finger/btn_dial_action_middle_normal.9.png
index 0a6cd66..cef64b3 100644
--- a/res/drawable-hdpi-finger/btn_dial_action_middle_normal.9.png
+++ b/res/drawable-hdpi-finger/btn_dial_action_middle_normal.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/btn_dial_action_middle_pressed.9.png b/res/drawable-hdpi-finger/btn_dial_action_middle_pressed.9.png
index 58f187d..971ea2d 100644
--- a/res/drawable-hdpi-finger/btn_dial_action_middle_pressed.9.png
+++ b/res/drawable-hdpi-finger/btn_dial_action_middle_pressed.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/btn_dial_action_middle_selected.9.png b/res/drawable-hdpi-finger/btn_dial_action_middle_selected.9.png
index f201dee..3fa740c 100644
--- a/res/drawable-hdpi-finger/btn_dial_action_middle_selected.9.png
+++ b/res/drawable-hdpi-finger/btn_dial_action_middle_selected.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/btn_dial_action_right_disable.9.png b/res/drawable-hdpi-finger/btn_dial_action_right_disable.9.png
index 6e6fa30..c9bb623 100644
--- a/res/drawable-hdpi-finger/btn_dial_action_right_disable.9.png
+++ b/res/drawable-hdpi-finger/btn_dial_action_right_disable.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/btn_dial_action_right_disable_focused.9.png b/res/drawable-hdpi-finger/btn_dial_action_right_disable_focused.9.png
index 46a042f..1b909d4 100644
--- a/res/drawable-hdpi-finger/btn_dial_action_right_disable_focused.9.png
+++ b/res/drawable-hdpi-finger/btn_dial_action_right_disable_focused.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/btn_dial_action_right_normal.9.png b/res/drawable-hdpi-finger/btn_dial_action_right_normal.9.png
index 6e6fa30..d994935 100644
--- a/res/drawable-hdpi-finger/btn_dial_action_right_normal.9.png
+++ b/res/drawable-hdpi-finger/btn_dial_action_right_normal.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/btn_dial_action_right_pressed.9.png b/res/drawable-hdpi-finger/btn_dial_action_right_pressed.9.png
index d66a509..416a925 100644
--- a/res/drawable-hdpi-finger/btn_dial_action_right_pressed.9.png
+++ b/res/drawable-hdpi-finger/btn_dial_action_right_pressed.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/btn_dial_action_right_selected.9.png b/res/drawable-hdpi-finger/btn_dial_action_right_selected.9.png
index d2ee98b..9e1d474 100644
--- a/res/drawable-hdpi-finger/btn_dial_action_right_selected.9.png
+++ b/res/drawable-hdpi-finger/btn_dial_action_right_selected.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/btn_dial_normal.9.png b/res/drawable-hdpi-finger/btn_dial_normal.9.png
index 5702e47..8126679 100644
--- a/res/drawable-hdpi-finger/btn_dial_normal.9.png
+++ b/res/drawable-hdpi-finger/btn_dial_normal.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/btn_dial_pressed.9.png b/res/drawable-hdpi-finger/btn_dial_pressed.9.png
index a5b51d5..e38ae1e 100644
--- a/res/drawable-hdpi-finger/btn_dial_pressed.9.png
+++ b/res/drawable-hdpi-finger/btn_dial_pressed.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/btn_dial_selected.9.png b/res/drawable-hdpi-finger/btn_dial_selected.9.png
index b578146..f38b767 100644
--- a/res/drawable-hdpi-finger/btn_dial_selected.9.png
+++ b/res/drawable-hdpi-finger/btn_dial_selected.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/btn_dial_textfield_activated.9.png b/res/drawable-hdpi-finger/btn_dial_textfield_activated.9.png
index c937c5e..58d0b6a 100644
--- a/res/drawable-hdpi-finger/btn_dial_textfield_activated.9.png
+++ b/res/drawable-hdpi-finger/btn_dial_textfield_activated.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/btn_dial_textfield_normal.9.png b/res/drawable-hdpi-finger/btn_dial_textfield_normal.9.png
index 0c38b39..6234b7b 100644
--- a/res/drawable-hdpi-finger/btn_dial_textfield_normal.9.png
+++ b/res/drawable-hdpi-finger/btn_dial_textfield_normal.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/btn_dial_textfield_pressed.9.png b/res/drawable-hdpi-finger/btn_dial_textfield_pressed.9.png
index 22d8235..dbceaf2 100644
--- a/res/drawable-hdpi-finger/btn_dial_textfield_pressed.9.png
+++ b/res/drawable-hdpi-finger/btn_dial_textfield_pressed.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/btn_dial_textfield_selected.9.png b/res/drawable-hdpi-finger/btn_dial_textfield_selected.9.png
index 1fe4dfc..710c88c 100644
--- a/res/drawable-hdpi-finger/btn_dial_textfield_selected.9.png
+++ b/res/drawable-hdpi-finger/btn_dial_textfield_selected.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_0_blk.png b/res/drawable-hdpi-finger/dial_num_0_blk.png
index 960d968..9470fd8 100644
--- a/res/drawable-hdpi-finger/dial_num_0_blk.png
+++ b/res/drawable-hdpi-finger/dial_num_0_blk.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_0_wht.png b/res/drawable-hdpi-finger/dial_num_0_wht.png
index c257817..d9a139c 100644
--- a/res/drawable-hdpi-finger/dial_num_0_wht.png
+++ b/res/drawable-hdpi-finger/dial_num_0_wht.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_1_no_vm_blk.png b/res/drawable-hdpi-finger/dial_num_1_no_vm_blk.png
index d150354..34ab6a8 100644
--- a/res/drawable-hdpi-finger/dial_num_1_no_vm_blk.png
+++ b/res/drawable-hdpi-finger/dial_num_1_no_vm_blk.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_1_no_vm_wht.png b/res/drawable-hdpi-finger/dial_num_1_no_vm_wht.png
index 9a1152b..30329ae 100644
--- a/res/drawable-hdpi-finger/dial_num_1_no_vm_wht.png
+++ b/res/drawable-hdpi-finger/dial_num_1_no_vm_wht.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_2_blk.png b/res/drawable-hdpi-finger/dial_num_2_blk.png
index 7b0cee7..a451476 100644
--- a/res/drawable-hdpi-finger/dial_num_2_blk.png
+++ b/res/drawable-hdpi-finger/dial_num_2_blk.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_2_wht.png b/res/drawable-hdpi-finger/dial_num_2_wht.png
index cad5485..3ac9d36 100644
--- a/res/drawable-hdpi-finger/dial_num_2_wht.png
+++ b/res/drawable-hdpi-finger/dial_num_2_wht.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_3_blk.png b/res/drawable-hdpi-finger/dial_num_3_blk.png
index d2efe88..2654002 100644
--- a/res/drawable-hdpi-finger/dial_num_3_blk.png
+++ b/res/drawable-hdpi-finger/dial_num_3_blk.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_3_wht.png b/res/drawable-hdpi-finger/dial_num_3_wht.png
index ddb890c..c3896cd 100644
--- a/res/drawable-hdpi-finger/dial_num_3_wht.png
+++ b/res/drawable-hdpi-finger/dial_num_3_wht.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_4_blk.png b/res/drawable-hdpi-finger/dial_num_4_blk.png
index fc3ed43..df5dd09 100644
--- a/res/drawable-hdpi-finger/dial_num_4_blk.png
+++ b/res/drawable-hdpi-finger/dial_num_4_blk.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_4_wht.png b/res/drawable-hdpi-finger/dial_num_4_wht.png
index bb8064c..2366755 100644
--- a/res/drawable-hdpi-finger/dial_num_4_wht.png
+++ b/res/drawable-hdpi-finger/dial_num_4_wht.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_5_blk.png b/res/drawable-hdpi-finger/dial_num_5_blk.png
index 5c78c75..431f662 100644
--- a/res/drawable-hdpi-finger/dial_num_5_blk.png
+++ b/res/drawable-hdpi-finger/dial_num_5_blk.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_5_wht.png b/res/drawable-hdpi-finger/dial_num_5_wht.png
index 1368d36..437ce93 100644
--- a/res/drawable-hdpi-finger/dial_num_5_wht.png
+++ b/res/drawable-hdpi-finger/dial_num_5_wht.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_6_blk.png b/res/drawable-hdpi-finger/dial_num_6_blk.png
index 583fb2a..1592381 100644
--- a/res/drawable-hdpi-finger/dial_num_6_blk.png
+++ b/res/drawable-hdpi-finger/dial_num_6_blk.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_6_wht.png b/res/drawable-hdpi-finger/dial_num_6_wht.png
index 7f1bf4a..ca6a87b 100644
--- a/res/drawable-hdpi-finger/dial_num_6_wht.png
+++ b/res/drawable-hdpi-finger/dial_num_6_wht.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_7_blk.png b/res/drawable-hdpi-finger/dial_num_7_blk.png
index 793660b..aedc9cb 100644
--- a/res/drawable-hdpi-finger/dial_num_7_blk.png
+++ b/res/drawable-hdpi-finger/dial_num_7_blk.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_7_wht.png b/res/drawable-hdpi-finger/dial_num_7_wht.png
index d8038c7..1e6a2ed 100644
--- a/res/drawable-hdpi-finger/dial_num_7_wht.png
+++ b/res/drawable-hdpi-finger/dial_num_7_wht.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_8_blk.png b/res/drawable-hdpi-finger/dial_num_8_blk.png
index 0ee87fe..1320a9a 100644
--- a/res/drawable-hdpi-finger/dial_num_8_blk.png
+++ b/res/drawable-hdpi-finger/dial_num_8_blk.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_8_wht.png b/res/drawable-hdpi-finger/dial_num_8_wht.png
index 9d0d0eb..113a58a 100644
--- a/res/drawable-hdpi-finger/dial_num_8_wht.png
+++ b/res/drawable-hdpi-finger/dial_num_8_wht.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_9_blk.png b/res/drawable-hdpi-finger/dial_num_9_blk.png
index 920235a..db9bd40 100644
--- a/res/drawable-hdpi-finger/dial_num_9_blk.png
+++ b/res/drawable-hdpi-finger/dial_num_9_blk.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_9_wht.png b/res/drawable-hdpi-finger/dial_num_9_wht.png
index ac3727d..ed52823 100644
--- a/res/drawable-hdpi-finger/dial_num_9_wht.png
+++ b/res/drawable-hdpi-finger/dial_num_9_wht.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_pound_blk.png b/res/drawable-hdpi-finger/dial_num_pound_blk.png
index fcfc58c..ee772f1 100644
--- a/res/drawable-hdpi-finger/dial_num_pound_blk.png
+++ b/res/drawable-hdpi-finger/dial_num_pound_blk.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_pound_wht.png b/res/drawable-hdpi-finger/dial_num_pound_wht.png
index df67810..0bad3f9 100644
--- a/res/drawable-hdpi-finger/dial_num_pound_wht.png
+++ b/res/drawable-hdpi-finger/dial_num_pound_wht.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_star_blk.png b/res/drawable-hdpi-finger/dial_num_star_blk.png
index ddda118..28a4504 100644
--- a/res/drawable-hdpi-finger/dial_num_star_blk.png
+++ b/res/drawable-hdpi-finger/dial_num_star_blk.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/dial_num_star_wht.png b/res/drawable-hdpi-finger/dial_num_star_wht.png
index ded1900..fa8b047 100644
--- a/res/drawable-hdpi-finger/dial_num_star_wht.png
+++ b/res/drawable-hdpi-finger/dial_num_star_wht.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/ic_btn_round_minus.png b/res/drawable-hdpi-finger/ic_btn_round_minus.png
index 27af3fa..2cd610c 100755
--- a/res/drawable-hdpi-finger/ic_btn_round_minus.png
+++ b/res/drawable-hdpi-finger/ic_btn_round_minus.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/ic_btn_round_plus.png b/res/drawable-hdpi-finger/ic_btn_round_plus.png
index b24168c..a541efb 100755
--- a/res/drawable-hdpi-finger/ic_btn_round_plus.png
+++ b/res/drawable-hdpi-finger/ic_btn_round_plus.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/ic_contact_list_picture.png b/res/drawable-hdpi-finger/ic_contact_list_picture.png
old mode 100755
new mode 100644
index 296ab9f..b96fbf4
--- a/res/drawable-hdpi-finger/ic_contact_list_picture.png
+++ b/res/drawable-hdpi-finger/ic_contact_list_picture.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_mark.png b/res/drawable-hdpi/ic_menu_mark.png
index 724d787..1c09175 100755
--- a/res/drawable-hdpi/ic_menu_mark.png
+++ b/res/drawable-hdpi/ic_menu_mark.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/btn_dial_action_left_disable.9.png b/res/drawable-mdpi-finger/btn_dial_action_left_disable.9.png
index 6ab27d8..af596d1 100644
--- a/res/drawable-mdpi-finger/btn_dial_action_left_disable.9.png
+++ b/res/drawable-mdpi-finger/btn_dial_action_left_disable.9.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/btn_dial_action_left_disable_focused.9.png b/res/drawable-mdpi-finger/btn_dial_action_left_disable_focused.9.png
index 5bba3c4..b0188dc 100644
--- a/res/drawable-mdpi-finger/btn_dial_action_left_disable_focused.9.png
+++ b/res/drawable-mdpi-finger/btn_dial_action_left_disable_focused.9.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/btn_dial_action_left_normal.9.png b/res/drawable-mdpi-finger/btn_dial_action_left_normal.9.png
index 6ab27d8..6f7d991 100644
--- a/res/drawable-mdpi-finger/btn_dial_action_left_normal.9.png
+++ b/res/drawable-mdpi-finger/btn_dial_action_left_normal.9.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/btn_dial_action_left_pressed.9.png b/res/drawable-mdpi-finger/btn_dial_action_left_pressed.9.png
index 542abe7..31f9e70 100644
--- a/res/drawable-mdpi-finger/btn_dial_action_left_pressed.9.png
+++ b/res/drawable-mdpi-finger/btn_dial_action_left_pressed.9.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/btn_dial_action_left_selected.9.png b/res/drawable-mdpi-finger/btn_dial_action_left_selected.9.png
index 34caba1..96e3aec 100644
--- a/res/drawable-mdpi-finger/btn_dial_action_left_selected.9.png
+++ b/res/drawable-mdpi-finger/btn_dial_action_left_selected.9.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/btn_dial_action_right_disable.9.png b/res/drawable-mdpi-finger/btn_dial_action_right_disable.9.png
index 85dfff0..9bde573 100644
--- a/res/drawable-mdpi-finger/btn_dial_action_right_disable.9.png
+++ b/res/drawable-mdpi-finger/btn_dial_action_right_disable.9.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/btn_dial_action_right_disable_focused.9.png b/res/drawable-mdpi-finger/btn_dial_action_right_disable_focused.9.png
index 1f76f0c..c2aa050 100644
--- a/res/drawable-mdpi-finger/btn_dial_action_right_disable_focused.9.png
+++ b/res/drawable-mdpi-finger/btn_dial_action_right_disable_focused.9.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/btn_dial_action_right_normal.9.png b/res/drawable-mdpi-finger/btn_dial_action_right_normal.9.png
index 85dfff0..7d408e6 100644
--- a/res/drawable-mdpi-finger/btn_dial_action_right_normal.9.png
+++ b/res/drawable-mdpi-finger/btn_dial_action_right_normal.9.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/btn_dial_action_right_pressed.9.png b/res/drawable-mdpi-finger/btn_dial_action_right_pressed.9.png
index 226633f..229e6ba 100644
--- a/res/drawable-mdpi-finger/btn_dial_action_right_pressed.9.png
+++ b/res/drawable-mdpi-finger/btn_dial_action_right_pressed.9.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/btn_dial_action_right_selected.9.png b/res/drawable-mdpi-finger/btn_dial_action_right_selected.9.png
index 9cca52c..e11a660 100644
--- a/res/drawable-mdpi-finger/btn_dial_action_right_selected.9.png
+++ b/res/drawable-mdpi-finger/btn_dial_action_right_selected.9.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_mark.png b/res/drawable-mdpi/ic_menu_mark.png
index 5e95da7..41ccddf 100644
--- a/res/drawable-mdpi/ic_menu_mark.png
+++ b/res/drawable-mdpi/ic_menu_mark.png
Binary files differ
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 9a1220c..05bbaab 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -16,6 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sharedUserLabel" msgid="7965035505237135241">"Android Core Apps"</string>
<string name="contactsList" msgid="8661624236494819731">"Kontakty"</string>
<string name="launcherDialer" msgid="8636288196618486553">"Telefon"</string>
<string name="shortcutContact" msgid="749243779392912958">"Kontakt"</string>
@@ -70,6 +71,7 @@
<string name="editContact_title_insert" msgid="9125600232291405757">"Nový kontakt"</string>
<string name="label_phonetic_name" msgid="2288082649573927286">"Foneticky"</string>
<string name="label_notes" msgid="8337354953278341042">"Poznámky"</string>
+ <string name="label_sip_address" msgid="124073911714324974">"Internetový hovor"</string>
<string name="label_ringtone" msgid="8833166825330686244">"Vyzváněcí tón"</string>
<string name="ghostData_name" msgid="6490954238641157585">"Jméno a příjmení"</string>
<string name="ghostData_phonetic_name" msgid="7852749081984070902">"Jméno (foneticky)"</string>
@@ -202,23 +204,31 @@
<string name="description_contact_photo" msgid="3387458082667894062">"fotografie kontaktu"</string>
<string name="description_minus_button" msgid="387136707700230172">"mínus"</string>
<string name="description_plus_button" msgid="515164827856229880">"plus"</string>
- <string name="no_sdcard_title" msgid="5911758680339949273">"Žádná karta SD"</string>
- <string name="no_sdcard_message" msgid="6019391476490445358">"Nebyla zjištěna žádná karta SD"</string>
+ <!-- outdated translation 5911758680339949273 --> <string name="no_sdcard_title" product="nosdcard" msgid="1432254751491952259">"Žádná karta SD"</string>
+ <string name="no_sdcard_title" product="default" msgid="5911758680339949273">"Žádná karta SD"</string>
+ <!-- outdated translation 6019391476490445358 --> <string name="no_sdcard_message" product="nosdcard" msgid="545247788569631436">"Nebyla zjištěna žádná karta SD"</string>
+ <string name="no_sdcard_message" product="default" msgid="6019391476490445358">"Nebyla zjištěna žádná karta SD"</string>
<string name="searching_vcard_title" msgid="4970508055399376813">"Vyhledávání karty vCard"</string>
<string name="import_from_sim" msgid="3859272228033941659">"Importovat z karty SIM"</string>
- <string name="import_from_sdcard" msgid="8550360976693202816">"Importovat z karty SD"</string>
- <string name="export_to_sdcard" msgid="2597105442616166277">"Exportovat na kartu SD"</string>
+ <!-- outdated translation 8550360976693202816 --> <string name="import_from_sdcard" product="nosdcard" msgid="7450489361553523938">"Importovat z karty SD"</string>
+ <string name="import_from_sdcard" product="default" msgid="8550360976693202816">"Importovat z karty SD"</string>
+ <!-- outdated translation 2597105442616166277 --> <string name="export_to_sdcard" product="nosdcard" msgid="2322839933356280686">"Exportovat na kartu SD"</string>
+ <string name="export_to_sdcard" product="default" msgid="2597105442616166277">"Exportovat na kartu SD"</string>
<string name="share_visible_contacts" msgid="890150378880783797">"Sdílet viditelné kontakty"</string>
<string name="import_one_vcard_string" msgid="9059163467020328433">"Importovat jeden soubor vCard"</string>
<string name="import_multiple_vcard_string" msgid="3810226492811062392">"Importovat několik souborů vCard"</string>
<string name="import_all_vcard_string" msgid="5518136113853448474">"Importovat všechny soubory vCard"</string>
- <string name="searching_vcard_message" msgid="6917522333561434546">"Vyhledávání dat karty vCard na kartě SD"</string>
- <string name="scanning_sdcard_failed_title" msgid="3506782007953167180">"Vyhledávání na kartě SD se nezdařilo"</string>
- <string name="scanning_sdcard_failed_message" msgid="3761992500690182922">"Vyhledávání na kartě SD se nezdařilo. (Důvod: <xliff:g id="FAIL_REASON">%s</xliff:g>)"</string>
+ <!-- outdated translation 6917522333561434546 --> <string name="searching_vcard_message" product="nosdcard" msgid="8987993391730721760">"Vyhledávání dat karty vCard na kartě SD"</string>
+ <string name="searching_vcard_message" product="default" msgid="6917522333561434546">"Vyhledávání dat karty vCard na kartě SD"</string>
+ <!-- outdated translation 3506782007953167180 --> <string name="scanning_sdcard_failed_title" product="nosdcard" msgid="5451697520220712906">"Vyhledávání na kartě SD se nezdařilo"</string>
+ <string name="scanning_sdcard_failed_title" product="default" msgid="3506782007953167180">"Vyhledávání na kartě SD se nezdařilo"</string>
+ <!-- outdated translation 3761992500690182922 --> <string name="scanning_sdcard_failed_message" product="nosdcard" msgid="264566842682850873">"Vyhledávání na kartě SD se nezdařilo. (Důvod: <xliff:g id="FAIL_REASON">%s</xliff:g>)"</string>
+ <string name="scanning_sdcard_failed_message" product="default" msgid="3761992500690182922">"Vyhledávání na kartě SD se nezdařilo. (Důvod: <xliff:g id="FAIL_REASON">%s</xliff:g>)"</string>
<string name="fail_reason_io_error" msgid="5922864781066136340">"Chyba V/V"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"Analýza karty vCard se z neznámého důvodu nezdařila."</string>
<string name="fail_reason_vcard_not_supported_error" msgid="655208100451286027">"Analýza karty vCard se nezdařila. Přestože se zřejmě jedná o správný formát, aktuální implementace jej nepodporuje."</string>
- <string name="fail_reason_no_vcard_file" msgid="6376516175882881595">"Na kartě SD nebyl nalezen žádný soubor vCard"</string>
+ <!-- outdated translation 6376516175882881595 --> <string name="fail_reason_no_vcard_file" product="nosdcard" msgid="6099852462800299180">"Na kartě SD nebyl nalezen žádný soubor vCard"</string>
+ <string name="fail_reason_no_vcard_file" product="default" msgid="6376516175882881595">"Na kartě SD nebyl nalezen žádný soubor vCard"</string>
<string name="fail_reason_failed_to_read_files" msgid="3659521123567134029">"Import jednoho nebo více souborů se nezdařil (%s)."</string>
<string name="fail_reason_unknown" msgid="999034019513096768">"Neznámá chyba"</string>
<string name="select_vcard_title" msgid="3968948173786172468">"Výběr souboru vCard"</string>
@@ -233,7 +243,8 @@
<string name="exporting_contact_failed_title" msgid="585823094820602526">"Export dat kontaktů se nezdařil"</string>
<string name="exporting_contact_failed_message" msgid="4151348002470298092">"Export dat kontaktů se nezdařil."\n"Příčina chyby: <xliff:g id="FAIL_REASON">%s</xliff:g>"</string>
<string name="fail_reason_no_exportable_contact" msgid="4919714086648344495">"Žádný kontakt nelze exportovat"</string>
- <string name="fail_reason_too_many_vcard" msgid="7084146295639672658">"Na kartě SD je příliš mnoho souborů vCard"</string>
+ <!-- outdated translation 7084146295639672658 --> <string name="fail_reason_too_many_vcard" product="nosdcard" msgid="6603952032405558414">"Na kartě SD je příliš mnoho souborů vCard"</string>
+ <string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"Na kartě SD je příliš mnoho souborů vCard"</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"Požadovaný název souboru (<xliff:g id="FILENAME">%s</xliff:g>) je příliš dlouhý"</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"Export dat kontaktů"</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"Probíhá export dat kontaktů do souboru <xliff:g id="FILE_NAME">%s</xliff:g>"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index fda1382..c0e5370 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -16,6 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sharedUserLabel" msgid="7965035505237135241">"Android-kerneprogrammer"</string>
<string name="contactsList" msgid="8661624236494819731">"Kontakter"</string>
<string name="launcherDialer" msgid="8636288196618486553">"Telefon"</string>
<string name="shortcutContact" msgid="749243779392912958">"Kontakt"</string>
@@ -70,6 +71,7 @@
<string name="editContact_title_insert" msgid="9125600232291405757">"Ny kontakt"</string>
<string name="label_phonetic_name" msgid="2288082649573927286">"Fonetisk"</string>
<string name="label_notes" msgid="8337354953278341042">"Noter"</string>
+ <string name="label_sip_address" msgid="124073911714324974">"Internetopkald"</string>
<string name="label_ringtone" msgid="8833166825330686244">"Ringetone"</string>
<string name="ghostData_name" msgid="6490954238641157585">"Fornavn og efternavn"</string>
<string name="ghostData_phonetic_name" msgid="7852749081984070902">"Fonetisk navn"</string>
@@ -202,23 +204,31 @@
<string name="description_contact_photo" msgid="3387458082667894062">"kontaktpersonfoto"</string>
<string name="description_minus_button" msgid="387136707700230172">"minus"</string>
<string name="description_plus_button" msgid="515164827856229880">"plus"</string>
- <string name="no_sdcard_title" msgid="5911758680339949273">"Der er intet SD-kort"</string>
- <string name="no_sdcard_message" msgid="6019391476490445358">"Der blev ikke fundet noget SD-kort"</string>
+ <!-- outdated translation 5911758680339949273 --> <string name="no_sdcard_title" product="nosdcard" msgid="1432254751491952259">"Der er intet SD-kort"</string>
+ <string name="no_sdcard_title" product="default" msgid="5911758680339949273">"Der er intet SD-kort"</string>
+ <!-- outdated translation 6019391476490445358 --> <string name="no_sdcard_message" product="nosdcard" msgid="545247788569631436">"Der blev ikke fundet noget SD-kort"</string>
+ <string name="no_sdcard_message" product="default" msgid="6019391476490445358">"Der blev ikke fundet noget SD-kort"</string>
<string name="searching_vcard_title" msgid="4970508055399376813">"Søger efter vCard"</string>
<string name="import_from_sim" msgid="3859272228033941659">"Importer fra SIM-kort"</string>
- <string name="import_from_sdcard" msgid="8550360976693202816">"Importer fra SD-kort"</string>
- <string name="export_to_sdcard" msgid="2597105442616166277">"Eksporter til SD-kort"</string>
+ <!-- outdated translation 8550360976693202816 --> <string name="import_from_sdcard" product="nosdcard" msgid="7450489361553523938">"Importer fra SD-kort"</string>
+ <string name="import_from_sdcard" product="default" msgid="8550360976693202816">"Importer fra SD-kort"</string>
+ <!-- outdated translation 2597105442616166277 --> <string name="export_to_sdcard" product="nosdcard" msgid="2322839933356280686">"Eksporter til SD-kort"</string>
+ <string name="export_to_sdcard" product="default" msgid="2597105442616166277">"Eksporter til SD-kort"</string>
<string name="share_visible_contacts" msgid="890150378880783797">"Del synlige kontaktpersoner"</string>
<string name="import_one_vcard_string" msgid="9059163467020328433">"Importer en VCard-fil"</string>
<string name="import_multiple_vcard_string" msgid="3810226492811062392">"Importer flere VCard-filer"</string>
<string name="import_all_vcard_string" msgid="5518136113853448474">"Importer alle VCard-filer"</string>
- <string name="searching_vcard_message" msgid="6917522333561434546">"Søger efter vCard-kort på SD-kortet"</string>
- <string name="scanning_sdcard_failed_title" msgid="3506782007953167180">"Scanningen af SD-kortet mislykkedes"</string>
- <string name="scanning_sdcard_failed_message" msgid="3761992500690182922">"Scanningen af SD-kortet mislykkedes: (Årsag: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string>
+ <!-- outdated translation 6917522333561434546 --> <string name="searching_vcard_message" product="nosdcard" msgid="8987993391730721760">"Søger efter vCard-kort på SD-kortet"</string>
+ <string name="searching_vcard_message" product="default" msgid="6917522333561434546">"Søger efter vCard-kort på SD-kortet"</string>
+ <!-- outdated translation 3506782007953167180 --> <string name="scanning_sdcard_failed_title" product="nosdcard" msgid="5451697520220712906">"Scanningen af SD-kortet mislykkedes"</string>
+ <string name="scanning_sdcard_failed_title" product="default" msgid="3506782007953167180">"Scanningen af SD-kortet mislykkedes"</string>
+ <!-- outdated translation 3761992500690182922 --> <string name="scanning_sdcard_failed_message" product="nosdcard" msgid="264566842682850873">"Scanningen af SD-kortet mislykkedes: (Årsag: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string>
+ <string name="scanning_sdcard_failed_message" product="default" msgid="3761992500690182922">"Scanningen af SD-kortet mislykkedes: (Årsag: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string>
<string name="fail_reason_io_error" msgid="5922864781066136340">"I/O-fejl"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"vCard kunne ikke parses pga. en uventet årsag"</string>
<string name="fail_reason_vcard_not_supported_error" msgid="655208100451286027">"vCard kunne ikke parses, selv om det ser ud til at være et gyldigt format, da den nuværende implementering ikke understøtter det"</string>
- <string name="fail_reason_no_vcard_file" msgid="6376516175882881595">"Der blev ikke fundet nogen VCard-fil på SD-kortet"</string>
+ <!-- outdated translation 6376516175882881595 --> <string name="fail_reason_no_vcard_file" product="nosdcard" msgid="6099852462800299180">"Der blev ikke fundet nogen VCard-fil på SD-kortet"</string>
+ <string name="fail_reason_no_vcard_file" product="default" msgid="6376516175882881595">"Der blev ikke fundet nogen VCard-fil på SD-kortet"</string>
<string name="fail_reason_failed_to_read_files" msgid="3659521123567134029">"En eller flere filer blev ikke importeret (%s)."</string>
<string name="fail_reason_unknown" msgid="999034019513096768">"Ukendt fejl"</string>
<string name="select_vcard_title" msgid="3968948173786172468">"Vælg vCard-fil"</string>
@@ -233,7 +243,8 @@
<string name="exporting_contact_failed_title" msgid="585823094820602526">"Eksport af kontaktdata mislykkedes"</string>
<string name="exporting_contact_failed_message" msgid="4151348002470298092">"Eksport af kontaktpersondata mislykkedes."\n"Årsag til fejl: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
<string name="fail_reason_no_exportable_contact" msgid="4919714086648344495">"Der er ingen kontakter, der kan eksporteres"</string>
- <string name="fail_reason_too_many_vcard" msgid="7084146295639672658">"Der er for mange vCard-data på SD-kortet"</string>
+ <!-- outdated translation 7084146295639672658 --> <string name="fail_reason_too_many_vcard" product="nosdcard" msgid="6603952032405558414">"Der er for mange vCard-data på SD-kortet"</string>
+ <string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"Der er for mange vCard-data på SD-kortet"</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"Det krævede filnavn er for langt (\"<xliff:g id="FILENAME">%s</xliff:g>\")"</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"Eksporterer kontaktdata"</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"Kontaktdata eksporteres til \"<xliff:g id="FILE_NAME">%s</xliff:g>\""</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index e32ad20..bbdb4d2 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -16,6 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sharedUserLabel" msgid="7965035505237135241">"Android Core Apps"</string>
<string name="contactsList" msgid="8661624236494819731">"Kontakte"</string>
<string name="launcherDialer" msgid="8636288196618486553">"Telefon"</string>
<string name="shortcutContact" msgid="749243779392912958">"Kontakt"</string>
@@ -70,6 +71,7 @@
<string name="editContact_title_insert" msgid="9125600232291405757">"Neuer Kontakt"</string>
<string name="label_phonetic_name" msgid="2288082649573927286">"Phonetisch"</string>
<string name="label_notes" msgid="8337354953278341042">"Notizen"</string>
+ <string name="label_sip_address" msgid="124073911714324974">"Internetanruf"</string>
<string name="label_ringtone" msgid="8833166825330686244">"Klingelton"</string>
<string name="ghostData_name" msgid="6490954238641157585">"Vor- und Nachname"</string>
<string name="ghostData_phonetic_name" msgid="7852749081984070902">"Phonetischer Name"</string>
@@ -139,7 +141,7 @@
<string name="liveFolderPhone" msgid="3739376066610926780">"Kontakte mit Telefonnummern"</string>
<string name="menu_sendTextMessage" msgid="6937343460284499306">"Textnachricht senden"</string>
<string name="recentCalls_callNumber" msgid="1756372533999226126">"<xliff:g id="NAME">%s</xliff:g> anrufen"</string>
- <string name="recentCalls_editNumberBeforeCall" msgid="7756171675833267857">"Nummer vor Anruf bearbeiten"</string>
+ <string name="recentCalls_editNumberBeforeCall" msgid="7756171675833267857">"Nr. vor Anruf bearbeiten"</string>
<string name="recentCalls_addToContact" msgid="1429899535546487008">"Zu Kontakten hinzufügen"</string>
<string name="recentCalls_removeFromRecentList" msgid="401662244636511330">"Aus Anrufliste entfernen"</string>
<string name="recentCalls_deleteAll" msgid="6352364392762163704">"Anrufliste löschen"</string>
@@ -173,7 +175,7 @@
<string name="toast_call_detail_error" msgid="7200975244804730096">"Details für den angeforderten Anruf konnten nicht gelesen werden."</string>
<string name="type_incoming" msgid="6502076603836088532">"Eingehender Anruf"</string>
<string name="type_outgoing" msgid="343108709599392641">"Ausgehender Anruf"</string>
- <string name="type_missed" msgid="2720502601640509542">"Verpasster Anruf"</string>
+ <string name="type_missed" msgid="2720502601640509542">"Entgangener Anruf"</string>
<string name="actionIncomingCall" msgid="6028930669817038600">"Eingehende Anrufe"</string>
<string name="callBack" msgid="5498224409038809224">"Rückruf"</string>
<string name="callAgain" msgid="3197312117049874778">"Erneut anrufen"</string>
@@ -202,23 +204,31 @@
<string name="description_contact_photo" msgid="3387458082667894062">"Kontaktbild"</string>
<string name="description_minus_button" msgid="387136707700230172">"minus"</string>
<string name="description_plus_button" msgid="515164827856229880">"plus"</string>
- <string name="no_sdcard_title" msgid="5911758680339949273">"Keine SD-Karte"</string>
- <string name="no_sdcard_message" msgid="6019391476490445358">"Keine SD-Karte gefunden"</string>
+ <!-- outdated translation 5911758680339949273 --> <string name="no_sdcard_title" product="nosdcard" msgid="1432254751491952259">"Keine SD-Karte"</string>
+ <string name="no_sdcard_title" product="default" msgid="5911758680339949273">"Keine SD-Karte"</string>
+ <!-- outdated translation 6019391476490445358 --> <string name="no_sdcard_message" product="nosdcard" msgid="545247788569631436">"Keine SD-Karte gefunden"</string>
+ <string name="no_sdcard_message" product="default" msgid="6019391476490445358">"Keine SD-Karte gefunden"</string>
<string name="searching_vcard_title" msgid="4970508055399376813">"vCard wird gesucht."</string>
<string name="import_from_sim" msgid="3859272228033941659">"Von SIM-Karte importieren"</string>
- <string name="import_from_sdcard" msgid="8550360976693202816">"Von SD-Karte importieren"</string>
- <string name="export_to_sdcard" msgid="2597105442616166277">"An SD-Karte exportieren"</string>
+ <!-- outdated translation 8550360976693202816 --> <string name="import_from_sdcard" product="nosdcard" msgid="7450489361553523938">"Von SD-Karte importieren"</string>
+ <string name="import_from_sdcard" product="default" msgid="8550360976693202816">"Von SD-Karte importieren"</string>
+ <!-- outdated translation 2597105442616166277 --> <string name="export_to_sdcard" product="nosdcard" msgid="2322839933356280686">"An SD-Karte exportieren"</string>
+ <string name="export_to_sdcard" product="default" msgid="2597105442616166277">"An SD-Karte exportieren"</string>
<string name="share_visible_contacts" msgid="890150378880783797">"Sichtbare Kontakte weiterleiten"</string>
<string name="import_one_vcard_string" msgid="9059163467020328433">"Eine VCard-Datei importieren"</string>
<string name="import_multiple_vcard_string" msgid="3810226492811062392">"Mehrere VCard-Dateien importieren"</string>
<string name="import_all_vcard_string" msgid="5518136113853448474">"Alle VCard-Dateien importieren"</string>
- <string name="searching_vcard_message" msgid="6917522333561434546">"Suche nach einer vCard-Information auf der SD-Karte"</string>
- <string name="scanning_sdcard_failed_title" msgid="3506782007953167180">"Fehler beim Lesen der SD-Karte"</string>
- <string name="scanning_sdcard_failed_message" msgid="3761992500690182922">"Fehler beim Lesen der SD-Karte. Grund: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
+ <!-- outdated translation 6917522333561434546 --> <string name="searching_vcard_message" product="nosdcard" msgid="8987993391730721760">"Suche nach einer vCard-Information auf der SD-Karte"</string>
+ <string name="searching_vcard_message" product="default" msgid="6917522333561434546">"Suche nach einer vCard-Information auf der SD-Karte"</string>
+ <!-- outdated translation 3506782007953167180 --> <string name="scanning_sdcard_failed_title" product="nosdcard" msgid="5451697520220712906">"Fehler beim Lesen der SD-Karte"</string>
+ <string name="scanning_sdcard_failed_title" product="default" msgid="3506782007953167180">"Fehler beim Lesen der SD-Karte"</string>
+ <!-- outdated translation 3761992500690182922 --> <string name="scanning_sdcard_failed_message" product="nosdcard" msgid="264566842682850873">"Fehler beim Lesen der SD-Karte. Grund: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
+ <string name="scanning_sdcard_failed_message" product="default" msgid="3761992500690182922">"Fehler beim Lesen der SD-Karte. Grund: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
<string name="fail_reason_io_error" msgid="5922864781066136340">"E/A-Fehler"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"Die vCard konnte aus einem unbekannten Grund nicht geparst werden."</string>
<string name="fail_reason_vcard_not_supported_error" msgid="655208100451286027">"Beim Parsen der vCard ist ein Fehler aufgetreten. Obwohl die vCard anscheinend ein gültiges Format aufweist, wird sie von der aktuellen Implementierung nicht unterstützt."</string>
- <string name="fail_reason_no_vcard_file" msgid="6376516175882881595">"Keine VCard-Datei auf der SD-Karte gefunden"</string>
+ <!-- outdated translation 6376516175882881595 --> <string name="fail_reason_no_vcard_file" product="nosdcard" msgid="6099852462800299180">"Keine VCard-Datei auf der SD-Karte gefunden"</string>
+ <string name="fail_reason_no_vcard_file" product="default" msgid="6376516175882881595">"Keine VCard-Datei auf der SD-Karte gefunden"</string>
<string name="fail_reason_failed_to_read_files" msgid="3659521123567134029">"Fehler beim Import einer oder mehrerer Dateien (%s)"</string>
<string name="fail_reason_unknown" msgid="999034019513096768">"Unbekannter Fehler"</string>
<string name="select_vcard_title" msgid="3968948173786172468">"vCard-Datei auswählen"</string>
@@ -233,7 +243,8 @@
<string name="exporting_contact_failed_title" msgid="585823094820602526">"Fehler beim Exportieren von Kontaktdaten"</string>
<string name="exporting_contact_failed_message" msgid="4151348002470298092">"Fehler beim Exportieren der Kontaktdaten."\n"Fehlerursache: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
<string name="fail_reason_no_exportable_contact" msgid="4919714086648344495">"Es ist kein exportierbarer Kontakt vorhanden"</string>
- <string name="fail_reason_too_many_vcard" msgid="7084146295639672658">"Zu viele vCard-Dateien auf der SD-Karte"</string>
+ <!-- outdated translation 7084146295639672658 --> <string name="fail_reason_too_many_vcard" product="nosdcard" msgid="6603952032405558414">"Zu viele vCard-Dateien auf der SD-Karte"</string>
+ <string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"Zu viele vCard-Dateien auf der SD-Karte"</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"Erforderlicher Dateiname ist zu lang (\"<xliff:g id="FILENAME">%s</xliff:g>\")"</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"Kontaktdaten werden exportiert."</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"Kontaktdaten werden in \"<xliff:g id="FILE_NAME">%s</xliff:g>\" exportiert."</string>
@@ -334,7 +345,7 @@
<string name="map_custom" msgid="6184363799976265281">"<xliff:g id="CUSTOM">%s</xliff:g>-Adresse anzeigen"</string>
<string name="chat_aim" msgid="2588492205291249142">"Chat über AIM"</string>
<string name="chat_msn" msgid="8041633440091073484">"Chat über Windows Live"</string>
- <string name="chat_yahoo" msgid="6629211142719943666">"Chat über Yahoo"</string>
+ <string name="chat_yahoo" msgid="6629211142719943666">"Chat über Yahoo!"</string>
<string name="chat_skype" msgid="1210045020427480566">"Chat über Skype"</string>
<string name="chat_qq" msgid="4294637812847719693">"Chat über QQ"</string>
<string name="chat_gtalk" msgid="981575737258117697">"Chat über Google Talk"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index ec645a5..6dc7158 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -16,6 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sharedUserLabel" msgid="7965035505237135241">"Βασικές εφαρμογές Android"</string>
<string name="contactsList" msgid="8661624236494819731">"Επαφές"</string>
<string name="launcherDialer" msgid="8636288196618486553">"Τηλέφωνο"</string>
<string name="shortcutContact" msgid="749243779392912958">"Επαφή"</string>
@@ -70,6 +71,7 @@
<string name="editContact_title_insert" msgid="9125600232291405757">"Νέα επαφή"</string>
<string name="label_phonetic_name" msgid="2288082649573927286">"Φωνητική"</string>
<string name="label_notes" msgid="8337354953278341042">"Σημειώσεις"</string>
+ <string name="label_sip_address" msgid="124073911714324974">"Κλήση Internet"</string>
<string name="label_ringtone" msgid="8833166825330686244">"Ήχος κλήσης"</string>
<string name="ghostData_name" msgid="6490954238641157585">"Όνομα και επίθετο"</string>
<string name="ghostData_phonetic_name" msgid="7852749081984070902">"Φωνητικό όνομα"</string>
@@ -202,23 +204,31 @@
<string name="description_contact_photo" msgid="3387458082667894062">"φωτογραφία επαφής"</string>
<string name="description_minus_button" msgid="387136707700230172">"μείον"</string>
<string name="description_plus_button" msgid="515164827856229880">"συν"</string>
- <string name="no_sdcard_title" msgid="5911758680339949273">"Δεν υπάρχει κάρτα SD"</string>
- <string name="no_sdcard_message" msgid="6019391476490445358">"Δεν ανιχνεύθηκε κάρτα SD"</string>
+ <!-- outdated translation 5911758680339949273 --> <string name="no_sdcard_title" product="nosdcard" msgid="1432254751491952259">"Δεν υπάρχει κάρτα SD"</string>
+ <string name="no_sdcard_title" product="default" msgid="5911758680339949273">"Δεν υπάρχει κάρτα SD"</string>
+ <!-- outdated translation 6019391476490445358 --> <string name="no_sdcard_message" product="nosdcard" msgid="545247788569631436">"Δεν ανιχνεύθηκε κάρτα SD"</string>
+ <string name="no_sdcard_message" product="default" msgid="6019391476490445358">"Δεν ανιχνεύθηκε κάρτα SD"</string>
<string name="searching_vcard_title" msgid="4970508055399376813">"Αναζήτηση κάρτας vCard"</string>
<string name="import_from_sim" msgid="3859272228033941659">"Εισαγωγή από κάρτα SIM"</string>
- <string name="import_from_sdcard" msgid="8550360976693202816">"Εισαγωγή από κάρτα SD"</string>
- <string name="export_to_sdcard" msgid="2597105442616166277">"Εξαγωγή σε κάρτα SD"</string>
+ <!-- outdated translation 8550360976693202816 --> <string name="import_from_sdcard" product="nosdcard" msgid="7450489361553523938">"Εισαγωγή από κάρτα SD"</string>
+ <string name="import_from_sdcard" product="default" msgid="8550360976693202816">"Εισαγωγή από κάρτα SD"</string>
+ <!-- outdated translation 2597105442616166277 --> <string name="export_to_sdcard" product="nosdcard" msgid="2322839933356280686">"Εξαγωγή σε κάρτα SD"</string>
+ <string name="export_to_sdcard" product="default" msgid="2597105442616166277">"Εξαγωγή σε κάρτα SD"</string>
<string name="share_visible_contacts" msgid="890150378880783797">"Κοινή χρήση ορατών επαφών"</string>
<string name="import_one_vcard_string" msgid="9059163467020328433">"Εισαγωγή ενός αρχείου VCard"</string>
<string name="import_multiple_vcard_string" msgid="3810226492811062392">"Εισαγωγή πολλαπλών αρχείων vCard"</string>
<string name="import_all_vcard_string" msgid="5518136113853448474">"Εισαγωγή όλων των αρχείων vCard"</string>
- <string name="searching_vcard_message" msgid="6917522333561434546">"Αναζήτηση για δεδομένα vCard στην κάρτα SD"</string>
- <string name="scanning_sdcard_failed_title" msgid="3506782007953167180">"Η σάρωση της κάρτας SD απέτυχε"</string>
- <string name="scanning_sdcard_failed_message" msgid="3761992500690182922">"Η σάρωση της κάρτας SD απέτυχε (Αιτία:\"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string>
+ <!-- outdated translation 6917522333561434546 --> <string name="searching_vcard_message" product="nosdcard" msgid="8987993391730721760">"Αναζήτηση για δεδομένα vCard στην κάρτα SD"</string>
+ <string name="searching_vcard_message" product="default" msgid="6917522333561434546">"Αναζήτηση για δεδομένα vCard στην κάρτα SD"</string>
+ <!-- outdated translation 3506782007953167180 --> <string name="scanning_sdcard_failed_title" product="nosdcard" msgid="5451697520220712906">"Η σάρωση της κάρτας SD απέτυχε"</string>
+ <string name="scanning_sdcard_failed_title" product="default" msgid="3506782007953167180">"Η σάρωση της κάρτας SD απέτυχε"</string>
+ <!-- outdated translation 3761992500690182922 --> <string name="scanning_sdcard_failed_message" product="nosdcard" msgid="264566842682850873">"Η σάρωση της κάρτας SD απέτυχε (Αιτία:\"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string>
+ <string name="scanning_sdcard_failed_message" product="default" msgid="3761992500690182922">"Η σάρωση της κάρτας SD απέτυχε (Αιτία:\"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string>
<string name="fail_reason_io_error" msgid="5922864781066136340">"Σφάλμα I/O"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"Η ανάλυση της κάρτας vCard απέτυχε εξαιτίας μη αναμενόμενου συμβάντος"</string>
<string name="fail_reason_vcard_not_supported_error" msgid="655208100451286027">"Αν και το VCard φαίνεται να βρίσκεται σε έγκυρη μορφή, η ανάλυσή του απέτυχε, εφόσον η τρέχουσα εφαρμογή δεν το υποστηρίζει"</string>
- <string name="fail_reason_no_vcard_file" msgid="6376516175882881595">"Δεν βρέθηκε αρχείο VCard στην κάρτα SD"</string>
+ <!-- outdated translation 6376516175882881595 --> <string name="fail_reason_no_vcard_file" product="nosdcard" msgid="6099852462800299180">"Δεν βρέθηκε αρχείο VCard στην κάρτα SD"</string>
+ <string name="fail_reason_no_vcard_file" product="default" msgid="6376516175882881595">"Δεν βρέθηκε αρχείο VCard στην κάρτα SD"</string>
<string name="fail_reason_failed_to_read_files" msgid="3659521123567134029">"Η εισαγωγή ενός ή περισσοτέρων αρχείων απέτυχε (%s)."</string>
<string name="fail_reason_unknown" msgid="999034019513096768">"Άγνωστο σφάλμα"</string>
<string name="select_vcard_title" msgid="3968948173786172468">"Επιλογή αρχείου vCard"</string>
@@ -228,12 +238,13 @@
<string name="reading_vcard_failed_title" msgid="4923008144735294994">"Η ανάγνωση των δεδομένων vCard απέτυχε"</string>
<string name="reading_vcard_contacts" msgid="3066834102042012868">"<xliff:g id="CURRENT_NUMBER">%1$s</xliff:g> από <xliff:g id="TOTAL_NUMBER">%2$s</xliff:g> επαφές"</string>
<string name="reading_vcard_files" msgid="34180143726972661">"<xliff:g id="CURRENT_NUMBER">%1$s</xliff:g> από <xliff:g id="TOTAL_NUMBER">%2$s</xliff:g> αρχεία"</string>
- <string name="confirm_export_title" msgid="7648747763127442983">"Επιβεβαίωση\nεξαγωγής"</string>
+ <string name="confirm_export_title" msgid="7648747763127442983">"Επιβεβαίωση εξαγωγής"</string>
<string name="confirm_export_message" msgid="3875683519257829750">"Είστε σίγουροι ότι θέλετε να εξαγάγετε τη λίστα των επαφών σας στο \"<xliff:g id="VCARD_FILENAME">%s</xliff:g>\";"</string>
<string name="exporting_contact_failed_title" msgid="585823094820602526">"Αποτυχία εξαγωγής δεδομένων επαφής"</string>
<string name="exporting_contact_failed_message" msgid="4151348002470298092">"Αποτυχία εξαγωγής δεδομένων επαφής."\n"Αιτία αποτυχίας: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
<string name="fail_reason_no_exportable_contact" msgid="4919714086648344495">"Δεν υπάρχει επαφή με δυνατότητα εξαγωγής"</string>
- <string name="fail_reason_too_many_vcard" msgid="7084146295639672658">"Υπερβολικά μεγάλος όγκος αρχείων VCard στην κάρτα SD"</string>
+ <!-- outdated translation 7084146295639672658 --> <string name="fail_reason_too_many_vcard" product="nosdcard" msgid="6603952032405558414">"Υπερβολικά μεγάλος όγκος αρχείων VCard στην κάρτα SD"</string>
+ <string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"Υπερβολικά μεγάλος όγκος αρχείων VCard στην κάρτα SD"</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"Το απαιτούμενο όνομα αρχείου είναι υπερβολικά μεγάλο (\"<xliff:g id="FILENAME">%s</xliff:g>\")"</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"Εξαγωγή δεδομένων επαφών"</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"Εξαγωγή δεδομένων επαφών προς \"<xliff:g id="FILE_NAME">%s</xliff:g>\""</string>
@@ -272,7 +283,7 @@
<string name="edit_read_only" msgid="8158629550655830981">"Αυτή η επαφή είναι μόνο για ανάγνωση"</string>
<string name="edit_secondary_collapse" msgid="5371618426594477103">"Περισσότερα"</string>
<string name="dialog_primary_name" msgid="5521591005692614833">"Κύριο όνομα"</string>
- <string name="dialog_new_contact_account" msgid="9044704073286262197">"Δημιουργία επαφής\nστον λογαριασμό"</string>
+ <string name="dialog_new_contact_account" msgid="9044704073286262197">"Δημιουργία επαφής στον λογαριασμό"</string>
<string name="menu_sync_remove" msgid="3266725887008450161">"Κατάργηση ομάδας συγχρονισμού"</string>
<string name="dialog_sync_add" msgid="8267045393119375803">"Προσθήκη ομάδας συγχρονισμού"</string>
<string name="display_more_groups" msgid="2682547080423434170">"Περισσότερες ομάδες…"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 5c430d3..946dd68 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -16,6 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sharedUserLabel" msgid="7965035505237135241">"Aplicaciones del núcleo de Androide"</string>
<string name="contactsList" msgid="8661624236494819731">"Contactos"</string>
<string name="launcherDialer" msgid="8636288196618486553">"Teléfono"</string>
<string name="shortcutContact" msgid="749243779392912958">"Contacto"</string>
@@ -70,6 +71,7 @@
<string name="editContact_title_insert" msgid="9125600232291405757">"Nuevo contacto"</string>
<string name="label_phonetic_name" msgid="2288082649573927286">"Fonético"</string>
<string name="label_notes" msgid="8337354953278341042">"Notas"</string>
+ <string name="label_sip_address" msgid="124073911714324974">"Llamada de Internet"</string>
<string name="label_ringtone" msgid="8833166825330686244">"Tono de llamada"</string>
<string name="ghostData_name" msgid="6490954238641157585">"Primero y último"</string>
<string name="ghostData_phonetic_name" msgid="7852749081984070902">"Nombre fonético"</string>
@@ -202,23 +204,31 @@
<string name="description_contact_photo" msgid="3387458082667894062">"foto de contacto"</string>
<string name="description_minus_button" msgid="387136707700230172">"negativo"</string>
<string name="description_plus_button" msgid="515164827856229880">"más"</string>
- <string name="no_sdcard_title" msgid="5911758680339949273">"No hay tarjeta SD"</string>
- <string name="no_sdcard_message" msgid="6019391476490445358">"No se ha detectado ninguna tarjeta SD"</string>
+ <!-- outdated translation 5911758680339949273 --> <string name="no_sdcard_title" product="nosdcard" msgid="1432254751491952259">"No hay tarjeta SD"</string>
+ <string name="no_sdcard_title" product="default" msgid="5911758680339949273">"No hay tarjeta SD"</string>
+ <!-- outdated translation 6019391476490445358 --> <string name="no_sdcard_message" product="nosdcard" msgid="545247788569631436">"No se ha detectado ninguna tarjeta SD"</string>
+ <string name="no_sdcard_message" product="default" msgid="6019391476490445358">"No se ha detectado ninguna tarjeta SD"</string>
<string name="searching_vcard_title" msgid="4970508055399376813">"Buscando vCard"</string>
<string name="import_from_sim" msgid="3859272228033941659">"Importar de la tarjeta SIM"</string>
- <string name="import_from_sdcard" msgid="8550360976693202816">"Importar de la tarjeta SD"</string>
- <string name="export_to_sdcard" msgid="2597105442616166277">"Exportar a la tarjeta SD"</string>
+ <!-- outdated translation 8550360976693202816 --> <string name="import_from_sdcard" product="nosdcard" msgid="7450489361553523938">"Importar de la tarjeta SD"</string>
+ <string name="import_from_sdcard" product="default" msgid="8550360976693202816">"Importar de la tarjeta SD"</string>
+ <!-- outdated translation 2597105442616166277 --> <string name="export_to_sdcard" product="nosdcard" msgid="2322839933356280686">"Exportar a la tarjeta SD"</string>
+ <string name="export_to_sdcard" product="default" msgid="2597105442616166277">"Exportar a la tarjeta SD"</string>
<string name="share_visible_contacts" msgid="890150378880783797">"Compartir contactos visibles"</string>
<string name="import_one_vcard_string" msgid="9059163467020328433">"Importar un archivo de vCard"</string>
<string name="import_multiple_vcard_string" msgid="3810226492811062392">"Importar múltiples archivos de vCard"</string>
<string name="import_all_vcard_string" msgid="5518136113853448474">"Importar todos los archivos de vCard"</string>
- <string name="searching_vcard_message" msgid="6917522333561434546">"Buscando datos de vCard en la tarjeta SD"</string>
- <string name="scanning_sdcard_failed_title" msgid="3506782007953167180">"No se ha podido explorar la tarjeta SD"</string>
- <string name="scanning_sdcard_failed_message" msgid="3761992500690182922">"No se ha podido explorar la tarjeta SD. (Motivo: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string>
+ <!-- outdated translation 6917522333561434546 --> <string name="searching_vcard_message" product="nosdcard" msgid="8987993391730721760">"Buscando datos de vCard en la tarjeta SD"</string>
+ <string name="searching_vcard_message" product="default" msgid="6917522333561434546">"Buscando datos de vCard en la tarjeta SD"</string>
+ <!-- outdated translation 3506782007953167180 --> <string name="scanning_sdcard_failed_title" product="nosdcard" msgid="5451697520220712906">"No se ha podido explorar la tarjeta SD"</string>
+ <string name="scanning_sdcard_failed_title" product="default" msgid="3506782007953167180">"No se ha podido explorar la tarjeta SD"</string>
+ <!-- outdated translation 3761992500690182922 --> <string name="scanning_sdcard_failed_message" product="nosdcard" msgid="264566842682850873">"No se ha podido explorar la tarjeta SD. (Motivo: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string>
+ <string name="scanning_sdcard_failed_message" product="default" msgid="3761992500690182922">"No se ha podido explorar la tarjeta SD. (Motivo: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string>
<string name="fail_reason_io_error" msgid="5922864781066136340">"Error de E/S"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"No se ha podido analizar vCard debido a un motivo inesperado"</string>
<string name="fail_reason_vcard_not_supported_error" msgid="655208100451286027">"No se ha podido analizar vCard aunque el formato parece válido, ya que la implementación actual no lo admite"</string>
- <string name="fail_reason_no_vcard_file" msgid="6376516175882881595">"No se ha encontrado un archivo de vCard en la Tarjeta SD."</string>
+ <!-- outdated translation 6376516175882881595 --> <string name="fail_reason_no_vcard_file" product="nosdcard" msgid="6099852462800299180">"No se ha encontrado un archivo de vCard en la Tarjeta SD."</string>
+ <string name="fail_reason_no_vcard_file" product="default" msgid="6376516175882881595">"No se ha encontrado un archivo de vCard en la Tarjeta SD."</string>
<string name="fail_reason_failed_to_read_files" msgid="3659521123567134029">"No se pudieron importar uno o más archivos (%s)."</string>
<string name="fail_reason_unknown" msgid="999034019513096768">"Error desconocido"</string>
<string name="select_vcard_title" msgid="3968948173786172468">"Seleccionar archivo de vCard"</string>
@@ -233,7 +243,8 @@
<string name="exporting_contact_failed_title" msgid="585823094820602526">"No se han podido exportar los datos de contacto"</string>
<string name="exporting_contact_failed_message" msgid="4151348002470298092">"No se han podido exportar los datos de contacto."\n"Motivo: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
<string name="fail_reason_no_exportable_contact" msgid="4919714086648344495">"No hay ningún contacto exportable"</string>
- <string name="fail_reason_too_many_vcard" msgid="7084146295639672658">"Demasiados archivos de vCard en la tarjeta SD"</string>
+ <!-- outdated translation 7084146295639672658 --> <string name="fail_reason_too_many_vcard" product="nosdcard" msgid="6603952032405558414">"Demasiados archivos de vCard en la tarjeta SD"</string>
+ <string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"Demasiados archivos de vCard en la tarjeta SD"</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"El nombre de archivo requerido es demasiado largo (\"<xliff:g id="FILENAME">%s</xliff:g>\")"</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"Exportando datos de contacto"</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"Exportando datos de contacto a \"<xliff:g id="FILE_NAME">%s</xliff:g>\""</string>
@@ -290,7 +301,7 @@
<string name="call_other" msgid="8563753966926932052">"Llamar"</string>
<string name="call_callback" msgid="1910165691349426858">"Llamar a devolución de llamada"</string>
<string name="call_car" msgid="3280537320306436445">"Llamar al auto"</string>
- <string name="call_company_main" msgid="6105120947138711257">"Llamar empresa principal "</string>
+ <string name="call_company_main" msgid="6105120947138711257">"Llamar empresa principal"</string>
<string name="call_isdn" msgid="1541590690193403411">"Llamar a ISDN"</string>
<string name="call_main" msgid="6082900571803441339">"Llamada principal"</string>
<string name="call_other_fax" msgid="5745314124619636674">"Llamar a fax"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index d689638..0cd4ab0 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -16,6 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sharedUserLabel" msgid="7965035505237135241">"Aplicaciones básicas"</string>
<string name="contactsList" msgid="8661624236494819731">"Contactos"</string>
<string name="launcherDialer" msgid="8636288196618486553">"Teléfono"</string>
<string name="shortcutContact" msgid="749243779392912958">"Contacto"</string>
@@ -64,12 +65,13 @@
<string name="readOnlyContactDeleteConfirmation" msgid="2137170726670196909">"Este contacto contiene información de varias cuentas. La información de las cuentas de solo lectura se ocultará en las listas de contactos, pero no se eliminará."</string>
<string name="multipleContactDeleteConfirmation" msgid="938900978442960800">"Si se elimina este contacto, se eliminará la información de varias cuentas."</string>
<string name="deleteConfirmation" msgid="811706994761610640">"El contacto se eliminará."</string>
- <string name="menu_done" msgid="796017761764190697">"Listo"</string>
+ <string name="menu_done" msgid="796017761764190697">"OK"</string>
<string name="menu_doNotSave" msgid="2174577548513895144">"Volver"</string>
<string name="editContact_title_edit" msgid="7678695190666836093">"Editar contacto"</string>
<string name="editContact_title_insert" msgid="9125600232291405757">"Contacto nuevo"</string>
<string name="label_phonetic_name" msgid="2288082649573927286">"Pronunciación"</string>
<string name="label_notes" msgid="8337354953278341042">"Notas"</string>
+ <string name="label_sip_address" msgid="124073911714324974">"Llamada de Internet"</string>
<string name="label_ringtone" msgid="8833166825330686244">"Tono"</string>
<string name="ghostData_name" msgid="6490954238641157585">"Nombre y apellido"</string>
<string name="ghostData_phonetic_name" msgid="7852749081984070902">"Transcripción fonética del nombre"</string>
@@ -133,7 +135,7 @@
<string name="contactsIconLabel" msgid="7666609097606552806">"Contactos"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Favoritos"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"Teléfono"</string>
- <string name="recentCallsIconLabel" msgid="1419116422359067949">"Registro"</string>
+ <string name="recentCallsIconLabel" msgid="1419116422359067949">"Llamadas"</string>
<string name="liveFolderAll" msgid="4789010460767506206">"Todos los contactos"</string>
<string name="liveFolderFavorites" msgid="3100957542927222282">"Contactos destacados"</string>
<string name="liveFolderPhone" msgid="3739376066610926780">"Contactos con números de teléfono"</string>
@@ -202,23 +204,31 @@
<string name="description_contact_photo" msgid="3387458082667894062">"foto de contacto"</string>
<string name="description_minus_button" msgid="387136707700230172">"menos"</string>
<string name="description_plus_button" msgid="515164827856229880">"más"</string>
- <string name="no_sdcard_title" msgid="5911758680339949273">"Falta la tarjeta SD."</string>
- <string name="no_sdcard_message" msgid="6019391476490445358">"No se ha detectado ninguna tarjeta SD."</string>
+ <!-- outdated translation 5911758680339949273 --> <string name="no_sdcard_title" product="nosdcard" msgid="1432254751491952259">"Falta la tarjeta SD."</string>
+ <string name="no_sdcard_title" product="default" msgid="5911758680339949273">"Falta la tarjeta SD."</string>
+ <!-- outdated translation 6019391476490445358 --> <string name="no_sdcard_message" product="nosdcard" msgid="545247788569631436">"No se ha detectado ninguna tarjeta SD."</string>
+ <string name="no_sdcard_message" product="default" msgid="6019391476490445358">"No se ha detectado ninguna tarjeta SD."</string>
<string name="searching_vcard_title" msgid="4970508055399376813">"Buscando vCard"</string>
<string name="import_from_sim" msgid="3859272228033941659">"Importar contactos desde la tarjeta SIM"</string>
- <string name="import_from_sdcard" msgid="8550360976693202816">"Importar contactos desde la tarjeta SD"</string>
- <string name="export_to_sdcard" msgid="2597105442616166277">"Exportar contactos a la tarjeta SD"</string>
+ <!-- outdated translation 8550360976693202816 --> <string name="import_from_sdcard" product="nosdcard" msgid="7450489361553523938">"Importar contactos desde la tarjeta SD"</string>
+ <string name="import_from_sdcard" product="default" msgid="8550360976693202816">"Importar contactos desde la tarjeta SD"</string>
+ <!-- outdated translation 2597105442616166277 --> <string name="export_to_sdcard" product="nosdcard" msgid="2322839933356280686">"Exportar contactos a la tarjeta SD"</string>
+ <string name="export_to_sdcard" product="default" msgid="2597105442616166277">"Exportar contactos a la tarjeta SD"</string>
<string name="share_visible_contacts" msgid="890150378880783797">"Compartir contactos visibles"</string>
<string name="import_one_vcard_string" msgid="9059163467020328433">"Importar un archivo de vCard"</string>
<string name="import_multiple_vcard_string" msgid="3810226492811062392">"Importar varios archivos de vCard"</string>
<string name="import_all_vcard_string" msgid="5518136113853448474">"Importar todos los archivos de vCard"</string>
- <string name="searching_vcard_message" msgid="6917522333561434546">"Buscando datos de vCard en la tarjeta SD"</string>
- <string name="scanning_sdcard_failed_title" msgid="3506782007953167180">"Error al buscar en la tarjeta SD"</string>
- <string name="scanning_sdcard_failed_message" msgid="3761992500690182922">"Error al buscar en la tarjeta SD (motivo: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string>
+ <!-- outdated translation 6917522333561434546 --> <string name="searching_vcard_message" product="nosdcard" msgid="8987993391730721760">"Buscando datos de vCard en la tarjeta SD"</string>
+ <string name="searching_vcard_message" product="default" msgid="6917522333561434546">"Buscando datos de vCard en la tarjeta SD"</string>
+ <!-- outdated translation 3506782007953167180 --> <string name="scanning_sdcard_failed_title" product="nosdcard" msgid="5451697520220712906">"Error al buscar en la tarjeta SD"</string>
+ <string name="scanning_sdcard_failed_title" product="default" msgid="3506782007953167180">"Error al buscar en la tarjeta SD"</string>
+ <!-- outdated translation 3761992500690182922 --> <string name="scanning_sdcard_failed_message" product="nosdcard" msgid="264566842682850873">"Error al buscar en la tarjeta SD (motivo: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string>
+ <string name="scanning_sdcard_failed_message" product="default" msgid="3761992500690182922">"Error al buscar en la tarjeta SD (motivo: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string>
<string name="fail_reason_io_error" msgid="5922864781066136340">"Error de E/S"</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>
<string name="fail_reason_vcard_not_supported_error" msgid="655208100451286027">"No se ha podido analizar el archivo de vCard (a pesar de que su formato parece ser válido) porque no es compatible con la implementación actual."</string>
- <string name="fail_reason_no_vcard_file" msgid="6376516175882881595">"No se ha encontrado ningún archivo de vCard en la tarjeta SD."</string>
+ <!-- outdated translation 6376516175882881595 --> <string name="fail_reason_no_vcard_file" product="nosdcard" msgid="6099852462800299180">"No se ha encontrado ningún archivo de vCard en la tarjeta SD."</string>
+ <string name="fail_reason_no_vcard_file" product="default" msgid="6376516175882881595">"No se ha encontrado ningún archivo de vCard en la tarjeta SD."</string>
<string name="fail_reason_failed_to_read_files" msgid="3659521123567134029">"No ha sido posible importar uno o varios archivos (%s)."</string>
<string name="fail_reason_unknown" msgid="999034019513096768">"Error desconocido"</string>
<string name="select_vcard_title" msgid="3968948173786172468">"Seleccionar archivo de vCard"</string>
@@ -233,7 +243,8 @@
<string name="exporting_contact_failed_title" msgid="585823094820602526">"Error al exportar los datos del contacto"</string>
<string name="exporting_contact_failed_message" msgid="4151348002470298092">"Se ha producido un error al exportar los datos del contacto."\n"Motivo del error: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
<string name="fail_reason_no_exportable_contact" msgid="4919714086648344495">"No hay contactos que exportar."</string>
- <string name="fail_reason_too_many_vcard" msgid="7084146295639672658">"Hay demasiados archivos de vCard en la tarjeta SD."</string>
+ <!-- outdated translation 7084146295639672658 --> <string name="fail_reason_too_many_vcard" product="nosdcard" msgid="6603952032405558414">"Hay demasiados archivos de vCard en la tarjeta SD."</string>
+ <string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"Hay demasiados archivos de vCard en la tarjeta SD."</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"El nombre de archivo necesario es demasiado largo (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"Exportando datos de contacto"</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"Exportando datos de contacto a \"<xliff:g id="FILE_NAME">%s</xliff:g>\"..."</string>
@@ -325,7 +336,7 @@
<string name="email_home" msgid="8573740658148184279">"Enviar email a casa"</string>
<string name="email_mobile" msgid="2042889209787989814">"Enviar email al móvil"</string>
<string name="email_work" msgid="2807430017302722689">"Enviar email a trabajo"</string>
- <string name="email_other" msgid="3454004077967657109">"Enviar correo electrónico"</string>
+ <string name="email_other" msgid="3454004077967657109">"Enviar email"</string>
<string name="email_custom" msgid="7548003991586214105">"Correo electrónico <xliff:g id="CUSTOM">%s</xliff:g>"</string>
<string name="email" msgid="5668400997660065897">"Correo electrónico"</string>
<string name="map_home" msgid="1243547733423343982">"Ver dirección de casa"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index aed36e1..ae2e863 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -16,6 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sharedUserLabel" msgid="7965035505237135241">"Applications de base Android"</string>
<string name="contactsList" msgid="8661624236494819731">"Contacts"</string>
<string name="launcherDialer" msgid="8636288196618486553">"Téléphone"</string>
<string name="shortcutContact" msgid="749243779392912958">"Contact"</string>
@@ -70,6 +71,7 @@
<string name="editContact_title_insert" msgid="9125600232291405757">"Nouveau contact"</string>
<string name="label_phonetic_name" msgid="2288082649573927286">"Prononciation phonétique"</string>
<string name="label_notes" msgid="8337354953278341042">"Notes"</string>
+ <string name="label_sip_address" msgid="124073911714324974">"Appel VoIP"</string>
<string name="label_ringtone" msgid="8833166825330686244">"Sonnerie"</string>
<string name="ghostData_name" msgid="6490954238641157585">"Nom et prénom"</string>
<string name="ghostData_phonetic_name" msgid="7852749081984070902">"Nom phonétique"</string>
@@ -202,23 +204,31 @@
<string name="description_contact_photo" msgid="3387458082667894062">"photo du contact"</string>
<string name="description_minus_button" msgid="387136707700230172">"moins"</string>
<string name="description_plus_button" msgid="515164827856229880">"plus"</string>
- <string name="no_sdcard_title" msgid="5911758680339949273">"Aucune carte SD trouvée"</string>
- <string name="no_sdcard_message" msgid="6019391476490445358">"Aucune carte SD n\'a été détectée."</string>
+ <!-- outdated translation 5911758680339949273 --> <string name="no_sdcard_title" product="nosdcard" msgid="1432254751491952259">"Aucune carte SD trouvée"</string>
+ <string name="no_sdcard_title" product="default" msgid="5911758680339949273">"Aucune carte SD trouvée"</string>
+ <!-- outdated translation 6019391476490445358 --> <string name="no_sdcard_message" product="nosdcard" msgid="545247788569631436">"Aucune carte SD n\'a été détectée."</string>
+ <string name="no_sdcard_message" product="default" msgid="6019391476490445358">"Aucune carte SD n\'a été détectée."</string>
<string name="searching_vcard_title" msgid="4970508055399376813">"Recherche des données VCard"</string>
<string name="import_from_sim" msgid="3859272228033941659">"Importer à partir de la carte SIM"</string>
- <string name="import_from_sdcard" msgid="8550360976693202816">"Importer à partir de la carte SD"</string>
- <string name="export_to_sdcard" msgid="2597105442616166277">"Exporter vers la carte SD"</string>
+ <!-- outdated translation 8550360976693202816 --> <string name="import_from_sdcard" product="nosdcard" msgid="7450489361553523938">"Importer à partir de la carte SD"</string>
+ <string name="import_from_sdcard" product="default" msgid="8550360976693202816">"Importer à partir de la carte SD"</string>
+ <!-- outdated translation 2597105442616166277 --> <string name="export_to_sdcard" product="nosdcard" msgid="2322839933356280686">"Exporter vers la carte SD"</string>
+ <string name="export_to_sdcard" product="default" msgid="2597105442616166277">"Exporter vers la carte SD"</string>
<string name="share_visible_contacts" msgid="890150378880783797">"Partager les contacts visibles"</string>
<string name="import_one_vcard_string" msgid="9059163467020328433">"Importer un fichier vCard"</string>
<string name="import_multiple_vcard_string" msgid="3810226492811062392">"Importer plusieurs fichiers vCard"</string>
<string name="import_all_vcard_string" msgid="5518136113853448474">"Importer tous les fichiers vCard"</string>
- <string name="searching_vcard_message" msgid="6917522333561434546">"Recherche de données VCard sur la carte SD"</string>
- <string name="scanning_sdcard_failed_title" msgid="3506782007953167180">"Échec de l\'analyse de la carte SD"</string>
- <string name="scanning_sdcard_failed_message" msgid="3761992500690182922">"Échec de l\'analyse de la carte SD (Raison : \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string>
+ <!-- outdated translation 6917522333561434546 --> <string name="searching_vcard_message" product="nosdcard" msgid="8987993391730721760">"Recherche de données VCard sur la carte SD"</string>
+ <string name="searching_vcard_message" product="default" msgid="6917522333561434546">"Recherche de données VCard sur la carte SD"</string>
+ <!-- outdated translation 3506782007953167180 --> <string name="scanning_sdcard_failed_title" product="nosdcard" msgid="5451697520220712906">"Échec de l\'analyse de la carte SD"</string>
+ <string name="scanning_sdcard_failed_title" product="default" msgid="3506782007953167180">"Échec de l\'analyse de la carte SD"</string>
+ <!-- outdated translation 3761992500690182922 --> <string name="scanning_sdcard_failed_message" product="nosdcard" msgid="264566842682850873">"Échec de l\'analyse de la carte SD (Raison : \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string>
+ <string name="scanning_sdcard_failed_message" product="default" msgid="3761992500690182922">"Échec de l\'analyse de la carte SD (Raison : \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string>
<string name="fail_reason_io_error" msgid="5922864781066136340">"Erreur d\'E/S"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"Échec de l\'analyse des données VCard pour une raison inattendue"</string>
<string name="fail_reason_vcard_not_supported_error" msgid="655208100451286027">"Échec de l\'analyse des données VCard. Le format semble valide, mais l\'implémentation actuelle ne le prend pas en charge."</string>
- <string name="fail_reason_no_vcard_file" msgid="6376516175882881595">"Aucun fichier VCard n\'a été trouvé sur la carte SD."</string>
+ <!-- outdated translation 6376516175882881595 --> <string name="fail_reason_no_vcard_file" product="nosdcard" msgid="6099852462800299180">"Aucun fichier VCard n\'a été trouvé sur la carte SD."</string>
+ <string name="fail_reason_no_vcard_file" product="default" msgid="6376516175882881595">"Aucun fichier VCard n\'a été trouvé sur la carte SD."</string>
<string name="fail_reason_failed_to_read_files" msgid="3659521123567134029">"Échec de l\'importation d\'un ou de plusieurs fichiers (%s)"</string>
<string name="fail_reason_unknown" msgid="999034019513096768">"Erreur inconnue"</string>
<string name="select_vcard_title" msgid="3968948173786172468">"Sélectionner un fichier VCard"</string>
@@ -233,7 +243,8 @@
<string name="exporting_contact_failed_title" msgid="585823094820602526">"Échec lors de l\'exportation des données du contact"</string>
<string name="exporting_contact_failed_message" msgid="4151348002470298092">"Échec lors de l\'exportation des données du contact."\n"Motif : \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
<string name="fail_reason_no_exportable_contact" msgid="4919714086648344495">"Aucun contact exportable"</string>
- <string name="fail_reason_too_many_vcard" msgid="7084146295639672658">"La carte SD contient trop de fichiers VCard."</string>
+ <!-- outdated translation 7084146295639672658 --> <string name="fail_reason_too_many_vcard" product="nosdcard" msgid="6603952032405558414">"La carte SD contient trop de fichiers VCard."</string>
+ <string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"La carte SD contient trop de fichiers VCard."</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"Le nom de fichier requis est trop long (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"Exportation des données des contacts"</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"Exportation des données des contacts vers \"<xliff:g id="FILE_NAME">%s</xliff:g>\""</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 791d23e..e0c8e21 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -16,6 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sharedUserLabel" msgid="7965035505237135241">"Android Core Apps"</string>
<string name="contactsList" msgid="8661624236494819731">"Contatti"</string>
<string name="launcherDialer" msgid="8636288196618486553">"Telefono"</string>
<string name="shortcutContact" msgid="749243779392912958">"Contatto"</string>
@@ -70,6 +71,7 @@
<string name="editContact_title_insert" msgid="9125600232291405757">"Nuovo contatto"</string>
<string name="label_phonetic_name" msgid="2288082649573927286">"Fonetica"</string>
<string name="label_notes" msgid="8337354953278341042">"Note"</string>
+ <string name="label_sip_address" msgid="124073911714324974">"Chiamata Internet"</string>
<string name="label_ringtone" msgid="8833166825330686244">"Suoneria"</string>
<string name="ghostData_name" msgid="6490954238641157585">"Nome e cognome"</string>
<string name="ghostData_phonetic_name" msgid="7852749081984070902">"Nome fonetico"</string>
@@ -202,23 +204,31 @@
<string name="description_contact_photo" msgid="3387458082667894062">"foto contatto"</string>
<string name="description_minus_button" msgid="387136707700230172">"meno"</string>
<string name="description_plus_button" msgid="515164827856229880">"più"</string>
- <string name="no_sdcard_title" msgid="5911758680339949273">"Nessuna scheda SD"</string>
- <string name="no_sdcard_message" msgid="6019391476490445358">"Nessuna scheda SD rilevata"</string>
+ <!-- outdated translation 5911758680339949273 --> <string name="no_sdcard_title" product="nosdcard" msgid="1432254751491952259">"Nessuna scheda SD"</string>
+ <string name="no_sdcard_title" product="default" msgid="5911758680339949273">"Nessuna scheda SD"</string>
+ <!-- outdated translation 6019391476490445358 --> <string name="no_sdcard_message" product="nosdcard" msgid="545247788569631436">"Nessuna scheda SD rilevata"</string>
+ <string name="no_sdcard_message" product="default" msgid="6019391476490445358">"Nessuna scheda SD rilevata"</string>
<string name="searching_vcard_title" msgid="4970508055399376813">"Ricerca vCard"</string>
<string name="import_from_sim" msgid="3859272228033941659">"Importa da scheda SIM"</string>
- <string name="import_from_sdcard" msgid="8550360976693202816">"Importa da scheda SD"</string>
- <string name="export_to_sdcard" msgid="2597105442616166277">"Esporta su scheda SD"</string>
+ <!-- outdated translation 8550360976693202816 --> <string name="import_from_sdcard" product="nosdcard" msgid="7450489361553523938">"Importa da scheda SD"</string>
+ <string name="import_from_sdcard" product="default" msgid="8550360976693202816">"Importa da scheda SD"</string>
+ <!-- outdated translation 2597105442616166277 --> <string name="export_to_sdcard" product="nosdcard" msgid="2322839933356280686">"Esporta su scheda SD"</string>
+ <string name="export_to_sdcard" product="default" msgid="2597105442616166277">"Esporta su scheda SD"</string>
<string name="share_visible_contacts" msgid="890150378880783797">"Condividi contatti visibili"</string>
<string name="import_one_vcard_string" msgid="9059163467020328433">"Importa un file vCard"</string>
<string name="import_multiple_vcard_string" msgid="3810226492811062392">"Importa più file vCard"</string>
<string name="import_all_vcard_string" msgid="5518136113853448474">"Importa tutti i file vCard"</string>
- <string name="searching_vcard_message" msgid="6917522333561434546">"Ricerca dati vCard su scheda SD"</string>
- <string name="scanning_sdcard_failed_title" msgid="3506782007953167180">"Analisi scheda SD non riuscita"</string>
- <string name="scanning_sdcard_failed_message" msgid="3761992500690182922">"Analisi scheda SD non riuscita (motivo: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string>
+ <!-- outdated translation 6917522333561434546 --> <string name="searching_vcard_message" product="nosdcard" msgid="8987993391730721760">"Ricerca dati vCard su scheda SD"</string>
+ <string name="searching_vcard_message" product="default" msgid="6917522333561434546">"Ricerca dati vCard su scheda SD"</string>
+ <!-- outdated translation 3506782007953167180 --> <string name="scanning_sdcard_failed_title" product="nosdcard" msgid="5451697520220712906">"Analisi scheda SD non riuscita"</string>
+ <string name="scanning_sdcard_failed_title" product="default" msgid="3506782007953167180">"Analisi scheda SD non riuscita"</string>
+ <!-- outdated translation 3761992500690182922 --> <string name="scanning_sdcard_failed_message" product="nosdcard" msgid="264566842682850873">"Analisi scheda SD non riuscita (motivo: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string>
+ <string name="scanning_sdcard_failed_message" product="default" msgid="3761992500690182922">"Analisi scheda SD non riuscita (motivo: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string>
<string name="fail_reason_io_error" msgid="5922864781066136340">"Errore I/O"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"Impossibile analizzare la vCard per motivi imprevisti"</string>
<string name="fail_reason_vcard_not_supported_error" msgid="655208100451286027">"Impossibile analizzare la vCard nonostante sembri avere un formato valido perché l\'implementazione corrente non la supporta"</string>
- <string name="fail_reason_no_vcard_file" msgid="6376516175882881595">"Nessun file vCard trovato sulla scheda SD"</string>
+ <!-- outdated translation 6376516175882881595 --> <string name="fail_reason_no_vcard_file" product="nosdcard" msgid="6099852462800299180">"Nessun file vCard trovato sulla scheda SD"</string>
+ <string name="fail_reason_no_vcard_file" product="default" msgid="6376516175882881595">"Nessun file vCard trovato sulla scheda SD"</string>
<string name="fail_reason_failed_to_read_files" msgid="3659521123567134029">"Impossibile importare uno o più file (%s)."</string>
<string name="fail_reason_unknown" msgid="999034019513096768">"Errore sconosciuto"</string>
<string name="select_vcard_title" msgid="3968948173786172468">"Seleziona file vCard"</string>
@@ -233,7 +243,8 @@
<string name="exporting_contact_failed_title" msgid="585823094820602526">"Esportazione dati contatti non riuscita"</string>
<string name="exporting_contact_failed_message" msgid="4151348002470298092">"Esportazione dati contatti non riuscita."\n"Motivo dell\'errore: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
<string name="fail_reason_no_exportable_contact" msgid="4919714086648344495">"Nessun contatto esportabile"</string>
- <string name="fail_reason_too_many_vcard" msgid="7084146295639672658">"Troppi dati vCard sulla scheda SD"</string>
+ <!-- outdated translation 7084146295639672658 --> <string name="fail_reason_too_many_vcard" product="nosdcard" msgid="6603952032405558414">"Troppi dati vCard sulla scheda SD"</string>
+ <string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"Troppi dati vCard sulla scheda SD"</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"Il nome file richiesto è troppo lungo (\"<xliff:g id="FILENAME">%s</xliff:g>\")"</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"Esportazione dati di contatto"</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"Esportazione dati di contatto in \"<xliff:g id="FILE_NAME">%s</xliff:g>\""</string>
@@ -283,8 +294,8 @@
<string name="call_custom" msgid="7756571794763171802">"Chiama n. <xliff:g id="CUSTOM">%s</xliff:g>"</string>
<string name="call_home" msgid="1990519474420545392">"Chiama casa"</string>
<string name="call_mobile" msgid="7502236805487609178">"Chiama cellulare"</string>
- <string name="call_work" msgid="5328785911463744028">"Chiama ufficio"</string>
- <string name="call_fax_work" msgid="7467763592359059243">"Chiama fax ufficio"</string>
+ <string name="call_work" msgid="5328785911463744028">"Chiama n. lavoro"</string>
+ <string name="call_fax_work" msgid="7467763592359059243">"Chiama fax lavoro"</string>
<string name="call_fax_home" msgid="8342175628887571876">"Chiama n. fax casa"</string>
<string name="call_pager" msgid="9003902812293983281">"Chiama cercapersone"</string>
<string name="call_other" msgid="8563753966926932052">"Chiama"</string>
@@ -298,14 +309,14 @@
<string name="call_telex" msgid="2223170774548648114">"Chiama telex"</string>
<string name="call_tty_tdd" msgid="8951266948204379604">"Chiama n. TTY/TDD"</string>
<string name="call_work_mobile" msgid="8707874281430105394">"Chiama cellulare lavoro"</string>
- <string name="call_work_pager" msgid="3419348514157949008">"Chiama cercapersone ufficio"</string>
+ <string name="call_work_pager" msgid="3419348514157949008">"Chiama cercapersone lavoro"</string>
<string name="call_assistant" msgid="2141641383068514308">"Chiama <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
<string name="call_mms" msgid="6274041545876221437">"Chiama n. MMS"</string>
<string name="sms_custom" msgid="5932736853732191825">"Invia SMS a n. <xliff:g id="CUSTOM">%s</xliff:g>"</string>
<string name="sms_home" msgid="7524332261493162995">"Invia SMS a n. casa"</string>
<string name="sms_mobile" msgid="5200107250451030769">"Invia SMS a cellulare"</string>
- <string name="sms_work" msgid="2269624156655267740">"Invia SMS a ufficio"</string>
- <string name="sms_fax_work" msgid="8028189067816907075">"Invia SMS a fax ufficio"</string>
+ <string name="sms_work" msgid="2269624156655267740">"Invia SMS a n. lavoro"</string>
+ <string name="sms_fax_work" msgid="8028189067816907075">"Invia SMS a fax lavoro"</string>
<string name="sms_fax_home" msgid="9204042076306809634">"Invia SMS a n. fax casa"</string>
<string name="sms_pager" msgid="7730404569637015192">"Invia SMS a n. cercapersone"</string>
<string name="sms_other" msgid="806127844607642331">"Invia SMS a n."</string>
@@ -319,17 +330,17 @@
<string name="sms_telex" msgid="9034802430065267848">"Invia SMS a n. telex"</string>
<string name="sms_tty_tdd" msgid="6782284969132531532">"Invia SMS a n. TTY/TDD"</string>
<string name="sms_work_mobile" msgid="2459939960512702560">"Invia SMS a cellulare lavoro"</string>
- <string name="sms_work_pager" msgid="5566924423316960597">"Invia SMS a cercapersone ufficio"</string>
+ <string name="sms_work_pager" msgid="5566924423316960597">"SMS a cercapersone lavoro"</string>
<string name="sms_assistant" msgid="2773424339923116234">"Invia testo a <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
<string name="sms_mms" msgid="4069352461380762677">"Invia SMS a n. MMS"</string>
<string name="email_home" msgid="8573740658148184279">"Invia email a ind. casa"</string>
<string name="email_mobile" msgid="2042889209787989814">"Invia email a ind. cellulare"</string>
- <string name="email_work" msgid="2807430017302722689">"Invia email a ind. ufficio"</string>
+ <string name="email_work" msgid="2807430017302722689">"Invia email a ind. lavoro"</string>
<string name="email_other" msgid="3454004077967657109">"Invia email"</string>
<string name="email_custom" msgid="7548003991586214105">"Invia email a ind. <xliff:g id="CUSTOM">%s</xliff:g>"</string>
<string name="email" msgid="5668400997660065897">"Email"</string>
<string name="map_home" msgid="1243547733423343982">"Visualizza indirizzo casa"</string>
- <string name="map_work" msgid="1360474076921878088">"Visualizza indirizzo ufficio"</string>
+ <string name="map_work" msgid="1360474076921878088">"Visualizza indirizzo lavoro"</string>
<string name="map_other" msgid="3817820803587012641">"Visualizza indirizzo"</string>
<string name="map_custom" msgid="6184363799976265281">"Visualizza indirizzo <xliff:g id="CUSTOM">%s</xliff:g>"</string>
<string name="chat_aim" msgid="2588492205291249142">"Chatta su AIM"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 957aefb..d07bf03 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -16,6 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sharedUserLabel" msgid="7965035505237135241">"Android Core Apps"</string>
<string name="contactsList" msgid="8661624236494819731">"連絡先"</string>
<string name="launcherDialer" msgid="8636288196618486553">"電話"</string>
<string name="shortcutContact" msgid="749243779392912958">"連絡先"</string>
@@ -70,6 +71,7 @@
<string name="editContact_title_insert" msgid="9125600232291405757">"連絡先を新規登録"</string>
<string name="label_phonetic_name" msgid="2288082649573927286">"読み"</string>
<string name="label_notes" msgid="8337354953278341042">"メモ"</string>
+ <string name="label_sip_address" msgid="124073911714324974">"インターネット通話"</string>
<string name="label_ringtone" msgid="8833166825330686244">"着信音"</string>
<string name="ghostData_name" msgid="6490954238641157585">"名前"</string>
<string name="ghostData_phonetic_name" msgid="7852749081984070902">"よみがな"</string>
@@ -202,23 +204,31 @@
<string name="description_contact_photo" msgid="3387458082667894062">"連絡先の写真"</string>
<string name="description_minus_button" msgid="387136707700230172">"マイナス"</string>
<string name="description_plus_button" msgid="515164827856229880">"プラス"</string>
- <string name="no_sdcard_title" msgid="5911758680339949273">"SDカードがありません"</string>
- <string name="no_sdcard_message" msgid="6019391476490445358">"SDカードを検出できませんでした"</string>
+ <!-- outdated translation 5911758680339949273 --> <string name="no_sdcard_title" product="nosdcard" msgid="1432254751491952259">"SDカードがありません"</string>
+ <string name="no_sdcard_title" product="default" msgid="5911758680339949273">"SDカードがありません"</string>
+ <!-- outdated translation 6019391476490445358 --> <string name="no_sdcard_message" product="nosdcard" msgid="545247788569631436">"SDカードを検出できませんでした"</string>
+ <string name="no_sdcard_message" product="default" msgid="6019391476490445358">"SDカードを検出できませんでした"</string>
<string name="searching_vcard_title" msgid="4970508055399376813">"vCardを検索中"</string>
<string name="import_from_sim" msgid="3859272228033941659">"SIMカードからインポート"</string>
- <string name="import_from_sdcard" msgid="8550360976693202816">"SDカードからインポート"</string>
- <string name="export_to_sdcard" msgid="2597105442616166277">"SDカードにエクスポート"</string>
+ <!-- outdated translation 8550360976693202816 --> <string name="import_from_sdcard" product="nosdcard" msgid="7450489361553523938">"SDカードからインポート"</string>
+ <string name="import_from_sdcard" product="default" msgid="8550360976693202816">"SDカードからインポート"</string>
+ <!-- outdated translation 2597105442616166277 --> <string name="export_to_sdcard" product="nosdcard" msgid="2322839933356280686">"SDカードにエクスポート"</string>
+ <string name="export_to_sdcard" product="default" msgid="2597105442616166277">"SDカードにエクスポート"</string>
<string name="share_visible_contacts" msgid="890150378880783797">"表示可能な連絡先を共有"</string>
<string name="import_one_vcard_string" msgid="9059163467020328433">"vCardファイルを1つインポート"</string>
<string name="import_multiple_vcard_string" msgid="3810226492811062392">"複数のvCardファイルをインポート"</string>
<string name="import_all_vcard_string" msgid="5518136113853448474">"すべてのvCardファイルをインポート"</string>
- <string name="searching_vcard_message" msgid="6917522333561434546">"SDカードのvCardデータを検索しています"</string>
- <string name="scanning_sdcard_failed_title" msgid="3506782007953167180">"SDカードのスキャンに失敗しました"</string>
- <string name="scanning_sdcard_failed_message" msgid="3761992500690182922">"SDカードのスキャンに失敗しました（理由: <xliff:g id="FAIL_REASON">%s</xliff:g>）"</string>
+ <!-- outdated translation 6917522333561434546 --> <string name="searching_vcard_message" product="nosdcard" msgid="8987993391730721760">"SDカードのvCardデータを検索しています"</string>
+ <string name="searching_vcard_message" product="default" msgid="6917522333561434546">"SDカードのvCardデータを検索しています"</string>
+ <!-- outdated translation 3506782007953167180 --> <string name="scanning_sdcard_failed_title" product="nosdcard" msgid="5451697520220712906">"SDカードのスキャンに失敗しました"</string>
+ <string name="scanning_sdcard_failed_title" product="default" msgid="3506782007953167180">"SDカードのスキャンに失敗しました"</string>
+ <!-- outdated translation 3761992500690182922 --> <string name="scanning_sdcard_failed_message" product="nosdcard" msgid="264566842682850873">"SDカードのスキャンに失敗しました（理由: <xliff:g id="FAIL_REASON">%s</xliff:g>）"</string>
+ <string name="scanning_sdcard_failed_message" product="default" msgid="3761992500690182922">"SDカードのスキャンに失敗しました（理由: <xliff:g id="FAIL_REASON">%s</xliff:g>）"</string>
<string name="fail_reason_io_error" msgid="5922864781066136340">"送受信エラー"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"予期しない理由によりvCardの解析に失敗しました"</string>
<string name="fail_reason_vcard_not_supported_error" msgid="655208100451286027">"vCardの解析に失敗しました。正しいフォーマットですが、現在サポートされていません。"</string>
- <string name="fail_reason_no_vcard_file" msgid="6376516175882881595">"SDカードでvCardファイルが見つかりません"</string>
+ <!-- outdated translation 6376516175882881595 --> <string name="fail_reason_no_vcard_file" product="nosdcard" msgid="6099852462800299180">"SDカードでvCardファイルが見つかりません"</string>
+ <string name="fail_reason_no_vcard_file" product="default" msgid="6376516175882881595">"SDカードでvCardファイルが見つかりません"</string>
<string name="fail_reason_failed_to_read_files" msgid="3659521123567134029">"1つ以上のファイルをインポートできませんでした（%s）。"</string>
<string name="fail_reason_unknown" msgid="999034019513096768">"不明なエラー"</string>
<string name="select_vcard_title" msgid="3968948173786172468">"vCardファイルの選択"</string>
@@ -233,7 +243,8 @@
<string name="exporting_contact_failed_title" msgid="585823094820602526">"連絡先データのエクスポートに失敗しました"</string>
<string name="exporting_contact_failed_message" msgid="4151348002470298092">"連絡先データのエクスポートに失敗しました。"\n"理由: 「<xliff:g id="FAIL_REASON">%s</xliff:g>」"</string>
<string name="fail_reason_no_exportable_contact" msgid="4919714086648344495">"エクスポートできる連絡先がありません"</string>
- <string name="fail_reason_too_many_vcard" msgid="7084146295639672658">"SDカードのvCardファイルが多すぎます"</string>
+ <!-- outdated translation 7084146295639672658 --> <string name="fail_reason_too_many_vcard" product="nosdcard" msgid="6603952032405558414">"SDカードのvCardファイルが多すぎます"</string>
+ <string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"SDカードのvCardファイルが多すぎます"</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"指定したファイル名が長すぎます（「<xliff:g id="FILENAME">%s</xliff:g>」）"</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"連絡先データのエクスポート"</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"連絡先データを\"<xliff:g id="FILE_NAME">%s</xliff:g>\"にエクスポートしています"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index a9802b8..142242d 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -16,6 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sharedUserLabel" msgid="7965035505237135241">"Android Core 애플리케이션"</string>
<string name="contactsList" msgid="8661624236494819731">"주소록"</string>
<string name="launcherDialer" msgid="8636288196618486553">"휴대전화"</string>
<string name="shortcutContact" msgid="749243779392912958">"연락처"</string>
@@ -46,13 +47,13 @@
<string name="menu_viewAddress" msgid="1814744325763202024">"지도상의 주소"</string>
<string name="menu_makeDefaultNumber" msgid="4838759253316649534">"기본 번호로 설정"</string>
<string name="menu_makeDefaultEmail" msgid="2599044610375789994">"기본 이메일로 설정"</string>
- <string name="menu_splitAggregate" msgid="8368636463748691868">"분할"</string>
+ <string name="menu_splitAggregate" msgid="8368636463748691868">"분리"</string>
<string name="contactsSplitMessage" msgid="5253490235863170269">"연락처가 분할되었습니다."</string>
- <string name="splitConfirmation_title" msgid="6716467920283502570">"연락처 분할"</string>
- <string name="splitConfirmation" msgid="1150797297503944823">"연락처 하나를 여러 주소록으로 분할하시겠습니까? 가입된 연락처 정보 세트마다 하나씩 만드시겠습니까?"</string>
- <string name="menu_joinAggregate" msgid="5027981918265667970">"결합"</string>
- <string name="titleJoinContactDataWith" msgid="7684875775798635354">"연락처 결합"</string>
- <string name="blurbJoinContactDataWith" msgid="995870557595050304">"<xliff:g id="NAME">%s</xliff:g>와(과) 결합할 연락처를 선택하세요."</string>
+ <string name="splitConfirmation_title" msgid="6716467920283502570">"연락처 분리"</string>
+ <string name="splitConfirmation" msgid="1150797297503944823">"연락처 하나를 여러 주소록으로 분리하시겠습니까? 가입된 연락처 정보 세트마다 하나씩 만드시겠습니까?"</string>
+ <string name="menu_joinAggregate" msgid="5027981918265667970">"통합"</string>
+ <string name="titleJoinContactDataWith" msgid="7684875775798635354">"연락처 통합"</string>
+ <string name="blurbJoinContactDataWith" msgid="995870557595050304">"<xliff:g id="NAME">%s</xliff:g>와(과) 통합할 연락처를 선택하세요."</string>
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"모든 연락처 표시"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"추천 연락처"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"모든 연락처"</string>
@@ -70,6 +71,7 @@
<string name="editContact_title_insert" msgid="9125600232291405757">"새 연락처"</string>
<string name="label_phonetic_name" msgid="2288082649573927286">"소리나는 대로"</string>
<string name="label_notes" msgid="8337354953278341042">"메모"</string>
+ <string name="label_sip_address" msgid="124073911714324974">"인터넷 통화"</string>
<string name="label_ringtone" msgid="8833166825330686244">"벨소리"</string>
<string name="ghostData_name" msgid="6490954238641157585">"이름"</string>
<string name="ghostData_phonetic_name" msgid="7852749081984070902">"이름(소리나는 대로)"</string>
@@ -202,23 +204,31 @@
<string name="description_contact_photo" msgid="3387458082667894062">"주소록 사진"</string>
<string name="description_minus_button" msgid="387136707700230172">"빼기"</string>
<string name="description_plus_button" msgid="515164827856229880">"더하기"</string>
- <string name="no_sdcard_title" msgid="5911758680339949273">"SD 카드 없음"</string>
- <string name="no_sdcard_message" msgid="6019391476490445358">"SD 카드가 발견되지 않았습니다."</string>
+ <!-- outdated translation 5911758680339949273 --> <string name="no_sdcard_title" product="nosdcard" msgid="1432254751491952259">"SD 카드 없음"</string>
+ <string name="no_sdcard_title" product="default" msgid="5911758680339949273">"SD 카드 없음"</string>
+ <!-- outdated translation 6019391476490445358 --> <string name="no_sdcard_message" product="nosdcard" msgid="545247788569631436">"SD 카드가 발견되지 않았습니다."</string>
+ <string name="no_sdcard_message" product="default" msgid="6019391476490445358">"SD 카드가 발견되지 않았습니다."</string>
<string name="searching_vcard_title" msgid="4970508055399376813">"vCard 검색"</string>
<string name="import_from_sim" msgid="3859272228033941659">"SIM 카드에서 가져오기"</string>
- <string name="import_from_sdcard" msgid="8550360976693202816">"SD 카드에서 가져오기"</string>
- <string name="export_to_sdcard" msgid="2597105442616166277">"SD 카드로 내보내기"</string>
+ <!-- outdated translation 8550360976693202816 --> <string name="import_from_sdcard" product="nosdcard" msgid="7450489361553523938">"SD 카드에서 가져오기"</string>
+ <string name="import_from_sdcard" product="default" msgid="8550360976693202816">"SD 카드에서 가져오기"</string>
+ <!-- outdated translation 2597105442616166277 --> <string name="export_to_sdcard" product="nosdcard" msgid="2322839933356280686">"SD 카드로 내보내기"</string>
+ <string name="export_to_sdcard" product="default" msgid="2597105442616166277">"SD 카드로 내보내기"</string>
<string name="share_visible_contacts" msgid="890150378880783797">"표시되는 연락처 공유"</string>
<string name="import_one_vcard_string" msgid="9059163467020328433">"vCard 파일 한 개 가져오기"</string>
<string name="import_multiple_vcard_string" msgid="3810226492811062392">"vCard 파일 여러 개 가져오기"</string>
<string name="import_all_vcard_string" msgid="5518136113853448474">"모든 vCard 파일 가져오기"</string>
- <string name="searching_vcard_message" msgid="6917522333561434546">"SD 카드의 vCard 데이터 검색"</string>
- <string name="scanning_sdcard_failed_title" msgid="3506782007953167180">"SD 카드 스캔 실패"</string>
- <string name="scanning_sdcard_failed_message" msgid="3761992500690182922">"SD 카드 스캔 실패(이유: \'<xliff:g id="FAIL_REASON">%s</xliff:g>\')"</string>
+ <!-- outdated translation 6917522333561434546 --> <string name="searching_vcard_message" product="nosdcard" msgid="8987993391730721760">"SD 카드의 vCard 데이터 검색"</string>
+ <string name="searching_vcard_message" product="default" msgid="6917522333561434546">"SD 카드의 vCard 데이터 검색"</string>
+ <!-- outdated translation 3506782007953167180 --> <string name="scanning_sdcard_failed_title" product="nosdcard" msgid="5451697520220712906">"SD 카드 스캔 실패"</string>
+ <string name="scanning_sdcard_failed_title" product="default" msgid="3506782007953167180">"SD 카드 스캔 실패"</string>
+ <!-- outdated translation 3761992500690182922 --> <string name="scanning_sdcard_failed_message" product="nosdcard" msgid="264566842682850873">"SD 카드 스캔 실패(이유: \'<xliff:g id="FAIL_REASON">%s</xliff:g>\')"</string>
+ <string name="scanning_sdcard_failed_message" product="default" msgid="3761992500690182922">"SD 카드 스캔 실패(이유: \'<xliff:g id="FAIL_REASON">%s</xliff:g>\')"</string>
<string name="fail_reason_io_error" msgid="5922864781066136340">"I/O 오류"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"예기치 못한 이유로 인해 vCard를 구문분석하지 못했습니다."</string>
<string name="fail_reason_vcard_not_supported_error" msgid="655208100451286027">"올바른 형식처럼 보이지만 현재 구현 환경에서는 VCard를 지원하지 않기 때문에 VCard 구문 분석에 실패했습니다."</string>
- <string name="fail_reason_no_vcard_file" msgid="6376516175882881595">"SD 카드에 VCard 파일이 없습니다."</string>
+ <!-- outdated translation 6376516175882881595 --> <string name="fail_reason_no_vcard_file" product="nosdcard" msgid="6099852462800299180">"SD 카드에 VCard 파일이 없습니다."</string>
+ <string name="fail_reason_no_vcard_file" product="default" msgid="6376516175882881595">"SD 카드에 VCard 파일이 없습니다."</string>
<string name="fail_reason_failed_to_read_files" msgid="3659521123567134029">"하나 이상의 파일을 가져오지 못했습니다(%s)."</string>
<string name="fail_reason_unknown" msgid="999034019513096768">"알 수 없는 오류"</string>
<string name="select_vcard_title" msgid="3968948173786172468">"vCard 파일 선택"</string>
@@ -233,7 +243,8 @@
<string name="exporting_contact_failed_title" msgid="585823094820602526">"연락처 데이터를 내보내지 못했습니다."</string>
<string name="exporting_contact_failed_message" msgid="4151348002470298092">"연락처 데이터를 내보내지 못했습니다."\n"실패 이유: \'<xliff:g id="FAIL_REASON">%s</xliff:g>\'"</string>
<string name="fail_reason_no_exportable_contact" msgid="4919714086648344495">"내보낼 수 있는 연락처가 없습니다."</string>
- <string name="fail_reason_too_many_vcard" msgid="7084146295639672658">"SD 카드에 vCard 파일이 너무 많습니다."</string>
+ <!-- outdated translation 7084146295639672658 --> <string name="fail_reason_too_many_vcard" product="nosdcard" msgid="6603952032405558414">"SD 카드에 vCard 파일이 너무 많습니다."</string>
+ <string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"SD 카드에 vCard 파일이 너무 많습니다."</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"필수 파일 이름이 너무 깁니다(\'<xliff:g id="FILENAME">%s</xliff:g>\')."</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"연락처 데이터 내보내기"</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"연락처 데이터를 \'<xliff:g id="FILE_NAME">%s</xliff:g>\'(으)로 내보내는 중"</string>
@@ -350,7 +361,7 @@
<string name="postal_country" msgid="7638264508416368690">"국가"</string>
<string name="name_given" msgid="1687286314106019813">"이름"</string>
<string name="name_family" msgid="3416695586119999058">"성"</string>
- <string name="name_prefix" msgid="59756378548779822">"이름 접두어"</string>
+ <string name="name_prefix" msgid="59756378548779822">"경칭"</string>
<string name="name_middle" msgid="8467433655992690326">"중간 이름"</string>
<string name="name_suffix" msgid="3855278445375651441">"이름 접미어"</string>
<string name="name_phonetic_given" msgid="6853570431394449191">"이름(소리나는 대로)"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 73d2e19..b7949af 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -16,6 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sharedUserLabel" msgid="7965035505237135241">"Kjerneprogrammer for Android"</string>
<string name="contactsList" msgid="8661624236494819731">"Kontakter"</string>
<string name="launcherDialer" msgid="8636288196618486553">"Telefon"</string>
<string name="shortcutContact" msgid="749243779392912958">"Kontakt"</string>
@@ -70,6 +71,7 @@
<string name="editContact_title_insert" msgid="9125600232291405757">"Ny kontakt"</string>
<string name="label_phonetic_name" msgid="2288082649573927286">"Fonetisk"</string>
<string name="label_notes" msgid="8337354953278341042">"Notater"</string>
+ <string name="label_sip_address" msgid="124073911714324974">"Internett-anrop"</string>
<string name="label_ringtone" msgid="8833166825330686244">"Ringetone"</string>
<string name="ghostData_name" msgid="6490954238641157585">"For- og etternavn"</string>
<string name="ghostData_phonetic_name" msgid="7852749081984070902">"Fonetisk navn"</string>
@@ -202,23 +204,31 @@
<string name="description_contact_photo" msgid="3387458082667894062">"kontaktens bilde"</string>
<string name="description_minus_button" msgid="387136707700230172">"minusknapp"</string>
<string name="description_plus_button" msgid="515164827856229880">"plussknapp"</string>
- <string name="no_sdcard_title" msgid="5911758680339949273">"Mangler minnekort"</string>
- <string name="no_sdcard_message" msgid="6019391476490445358">"Fant ikke noe minnekort"</string>
+ <!-- outdated translation 5911758680339949273 --> <string name="no_sdcard_title" product="nosdcard" msgid="1432254751491952259">"Mangler minnekort"</string>
+ <string name="no_sdcard_title" product="default" msgid="5911758680339949273">"Mangler minnekort"</string>
+ <!-- outdated translation 6019391476490445358 --> <string name="no_sdcard_message" product="nosdcard" msgid="545247788569631436">"Fant ikke noe minnekort"</string>
+ <string name="no_sdcard_message" product="default" msgid="6019391476490445358">"Fant ikke noe minnekort"</string>
<string name="searching_vcard_title" msgid="4970508055399376813">"Leter etter VCard"</string>
<string name="import_from_sim" msgid="3859272228033941659">"Importér fra SIM-kort"</string>
- <string name="import_from_sdcard" msgid="8550360976693202816">"Importér fra minnekort"</string>
- <string name="export_to_sdcard" msgid="2597105442616166277">"Eksportér til minnekort"</string>
+ <!-- outdated translation 8550360976693202816 --> <string name="import_from_sdcard" product="nosdcard" msgid="7450489361553523938">"Importér fra minnekort"</string>
+ <string name="import_from_sdcard" product="default" msgid="8550360976693202816">"Importér fra minnekort"</string>
+ <!-- outdated translation 2597105442616166277 --> <string name="export_to_sdcard" product="nosdcard" msgid="2322839933356280686">"Eksportér til minnekort"</string>
+ <string name="export_to_sdcard" product="default" msgid="2597105442616166277">"Eksportér til minnekort"</string>
<string name="share_visible_contacts" msgid="890150378880783797">"Del synlige kontakter"</string>
<string name="import_one_vcard_string" msgid="9059163467020328433">"Importer én VCard-fil"</string>
<string name="import_multiple_vcard_string" msgid="3810226492811062392">"Importer flere vCard-filer"</string>
<string name="import_all_vcard_string" msgid="5518136113853448474">"Importer alle vCard-filer"</string>
- <string name="searching_vcard_message" msgid="6917522333561434546">"Leter etter VCard-data på minnekort"</string>
- <string name="scanning_sdcard_failed_title" msgid="3506782007953167180">"Kunne ikke scanne minnekort"</string>
- <string name="scanning_sdcard_failed_message" msgid="3761992500690182922">"Kunne ikke skanne minnekort (grunn: «<xliff:g id="FAIL_REASON">%s</xliff:g>»)"</string>
+ <!-- outdated translation 6917522333561434546 --> <string name="searching_vcard_message" product="nosdcard" msgid="8987993391730721760">"Leter etter VCard-data på minnekort"</string>
+ <string name="searching_vcard_message" product="default" msgid="6917522333561434546">"Leter etter VCard-data på minnekort"</string>
+ <!-- outdated translation 3506782007953167180 --> <string name="scanning_sdcard_failed_title" product="nosdcard" msgid="5451697520220712906">"Kunne ikke scanne minnekort"</string>
+ <string name="scanning_sdcard_failed_title" product="default" msgid="3506782007953167180">"Kunne ikke scanne minnekort"</string>
+ <!-- outdated translation 3761992500690182922 --> <string name="scanning_sdcard_failed_message" product="nosdcard" msgid="264566842682850873">"Kunne ikke skanne minnekort (grunn: «<xliff:g id="FAIL_REASON">%s</xliff:g>»)"</string>
+ <string name="scanning_sdcard_failed_message" product="default" msgid="3761992500690182922">"Kunne ikke skanne minnekort (grunn: «<xliff:g id="FAIL_REASON">%s</xliff:g>»)"</string>
<string name="fail_reason_io_error" msgid="5922864781066136340">"Inn/ut-feil (årsak: «FAIL_REASON»)"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"Kan ikke analysere VCard av uventet årsak"</string>
<string name="fail_reason_vcard_not_supported_error" msgid="655208100451286027">"Kan ikke analysere VCard selv om det ser ut til å være i riktig format, fordi den aktuelle implementeringen ikke støtter det."</string>
- <string name="fail_reason_no_vcard_file" msgid="6376516175882881595">"Fant ingen VCard-filer på minnekortet"</string>
+ <!-- outdated translation 6376516175882881595 --> <string name="fail_reason_no_vcard_file" product="nosdcard" msgid="6099852462800299180">"Fant ingen VCard-filer på minnekortet"</string>
+ <string name="fail_reason_no_vcard_file" product="default" msgid="6376516175882881595">"Fant ingen VCard-filer på minnekortet"</string>
<string name="fail_reason_failed_to_read_files" msgid="3659521123567134029">"Importeringen av én eller flere filer mislyktes (%s)"</string>
<string name="fail_reason_unknown" msgid="999034019513096768">"Ukjent feil"</string>
<string name="select_vcard_title" msgid="3968948173786172468">"Velg VCard-fil"</string>
@@ -233,7 +243,8 @@
<string name="exporting_contact_failed_title" msgid="585823094820602526">"Kunne ikke eksportere kontaktlisten"</string>
<string name="exporting_contact_failed_message" msgid="4151348002470298092">"Eksport av kontaktdata mislyktes"\n"Årsak til feil: «<xliff:g id="FAIL_REASON">%s</xliff:g>»"</string>
<string name="fail_reason_no_exportable_contact" msgid="4919714086648344495">"Det finnes ingen eksporterbar kontakt."</string>
- <string name="fail_reason_too_many_vcard" msgid="7084146295639672658">"For mange VCard-datafiler på minnekortet"</string>
+ <!-- outdated translation 7084146295639672658 --> <string name="fail_reason_too_many_vcard" product="nosdcard" msgid="6603952032405558414">"For mange VCard-datafiler på minnekortet"</string>
+ <string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"For mange VCard-datafiler på minnekortet"</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"For langt filnavn kreves («<xliff:g id="FILENAME">%s</xliff:g>»)"</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"Eksporterer kontaktdata"</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"Eksporterer kontaktdata til «<xliff:g id="FILE_NAME">%s</xliff:g>»"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 22214fa..8d7a76e 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -16,6 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sharedUserLabel" msgid="7965035505237135241">"Android-kerntoepassingen"</string>
<string name="contactsList" msgid="8661624236494819731">"Contacten"</string>
<string name="launcherDialer" msgid="8636288196618486553">"Telefoon"</string>
<string name="shortcutContact" msgid="749243779392912958">"Contacten"</string>
@@ -70,6 +71,7 @@
<string name="editContact_title_insert" msgid="9125600232291405757">"Nieuw contact"</string>
<string name="label_phonetic_name" msgid="2288082649573927286">"Fonetisch"</string>
<string name="label_notes" msgid="8337354953278341042">"Opmerkingen"</string>
+ <string name="label_sip_address" msgid="124073911714324974">"Internetoproep"</string>
<string name="label_ringtone" msgid="8833166825330686244">"Beltoon"</string>
<string name="ghostData_name" msgid="6490954238641157585">"Voor- en achternaam"</string>
<string name="ghostData_phonetic_name" msgid="7852749081984070902">"Fonetisch gespelde naam"</string>
@@ -202,23 +204,31 @@
<string name="description_contact_photo" msgid="3387458082667894062">"contactfoto"</string>
<string name="description_minus_button" msgid="387136707700230172">"min"</string>
<string name="description_plus_button" msgid="515164827856229880">"plus"</string>
- <string name="no_sdcard_title" msgid="5911758680339949273">"Geen SD-kaart"</string>
- <string name="no_sdcard_message" msgid="6019391476490445358">"Geen SD-kaart gedetecteerd"</string>
+ <!-- outdated translation 5911758680339949273 --> <string name="no_sdcard_title" product="nosdcard" msgid="1432254751491952259">"Geen SD-kaart"</string>
+ <string name="no_sdcard_title" product="default" msgid="5911758680339949273">"Geen SD-kaart"</string>
+ <!-- outdated translation 6019391476490445358 --> <string name="no_sdcard_message" product="nosdcard" msgid="545247788569631436">"Geen SD-kaart gedetecteerd"</string>
+ <string name="no_sdcard_message" product="default" msgid="6019391476490445358">"Geen SD-kaart gedetecteerd"</string>
<string name="searching_vcard_title" msgid="4970508055399376813">"Zoeken naar vCard"</string>
<string name="import_from_sim" msgid="3859272228033941659">"Importeren van SIM-kaart"</string>
- <string name="import_from_sdcard" msgid="8550360976693202816">"Importeren van SD-kaart"</string>
- <string name="export_to_sdcard" msgid="2597105442616166277">"Exporteren naar SD-kaart"</string>
+ <!-- outdated translation 8550360976693202816 --> <string name="import_from_sdcard" product="nosdcard" msgid="7450489361553523938">"Importeren van SD-kaart"</string>
+ <string name="import_from_sdcard" product="default" msgid="8550360976693202816">"Importeren van SD-kaart"</string>
+ <!-- outdated translation 2597105442616166277 --> <string name="export_to_sdcard" product="nosdcard" msgid="2322839933356280686">"Exporteren naar SD-kaart"</string>
+ <string name="export_to_sdcard" product="default" msgid="2597105442616166277">"Exporteren naar SD-kaart"</string>
<string name="share_visible_contacts" msgid="890150378880783797">"Zichtbare contacten delen"</string>
<string name="import_one_vcard_string" msgid="9059163467020328433">"Eén vCard-bestand importeren"</string>
<string name="import_multiple_vcard_string" msgid="3810226492811062392">"Meerdere vCard-bestanden importeren"</string>
<string name="import_all_vcard_string" msgid="5518136113853448474">"Alle vCard-bestanden importeren"</string>
- <string name="searching_vcard_message" msgid="6917522333561434546">"Zoeken naar vCard-gegevens op SD-kaart"</string>
- <string name="scanning_sdcard_failed_title" msgid="3506782007953167180">"Scannen van SD-kaart is mislukt"</string>
- <string name="scanning_sdcard_failed_message" msgid="3761992500690182922">"Scannen van SD-kaart is mislukt: (Reden: \'<xliff:g id="FAIL_REASON">%s</xliff:g>\')"</string>
+ <!-- outdated translation 6917522333561434546 --> <string name="searching_vcard_message" product="nosdcard" msgid="8987993391730721760">"Zoeken naar vCard-gegevens op SD-kaart"</string>
+ <string name="searching_vcard_message" product="default" msgid="6917522333561434546">"Zoeken naar vCard-gegevens op SD-kaart"</string>
+ <!-- outdated translation 3506782007953167180 --> <string name="scanning_sdcard_failed_title" product="nosdcard" msgid="5451697520220712906">"Scannen van SD-kaart is mislukt"</string>
+ <string name="scanning_sdcard_failed_title" product="default" msgid="3506782007953167180">"Scannen van SD-kaart is mislukt"</string>
+ <!-- outdated translation 3761992500690182922 --> <string name="scanning_sdcard_failed_message" product="nosdcard" msgid="264566842682850873">"Scannen van SD-kaart is mislukt: (Reden: \'<xliff:g id="FAIL_REASON">%s</xliff:g>\')"</string>
+ <string name="scanning_sdcard_failed_message" product="default" msgid="3761992500690182922">"Scannen van SD-kaart is mislukt: (Reden: \'<xliff:g id="FAIL_REASON">%s</xliff:g>\')"</string>
<string name="fail_reason_io_error" msgid="5922864781066136340">"I/O-fout"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"Parseren van vCard is mislukt om onbekende reden"</string>
<string name="fail_reason_vcard_not_supported_error" msgid="655208100451286027">"Kan vCard niet parseren, ook al lijkt de indeling geldig. vCard wordt niet ondersteund door de huidige implementatie"</string>
- <string name="fail_reason_no_vcard_file" msgid="6376516175882881595">"Geen vCard-bestand gevonden op SD-kaart"</string>
+ <!-- outdated translation 6376516175882881595 --> <string name="fail_reason_no_vcard_file" product="nosdcard" msgid="6099852462800299180">"Geen vCard-bestand gevonden op SD-kaart"</string>
+ <string name="fail_reason_no_vcard_file" product="default" msgid="6376516175882881595">"Geen vCard-bestand gevonden op SD-kaart"</string>
<string name="fail_reason_failed_to_read_files" msgid="3659521123567134029">"Een of meer bestanden kunnen niet worden geïmporteerd (%s)"</string>
<string name="fail_reason_unknown" msgid="999034019513096768">"Onbekende fout"</string>
<string name="select_vcard_title" msgid="3968948173786172468">"vCard-bestand selecteren"</string>
@@ -233,7 +243,8 @@
<string name="exporting_contact_failed_title" msgid="585823094820602526">"Exporteren van contactgegevens mislukt"</string>
<string name="exporting_contact_failed_message" msgid="4151348002470298092">"Exporteren van contactgegevens mislukt."\n"Reden voor de fout: \'<xliff:g id="FAIL_REASON">%s</xliff:g>\'"</string>
<string name="fail_reason_no_exportable_contact" msgid="4919714086648344495">"Er is geen contact dat geëxporteerd kan worden"</string>
- <string name="fail_reason_too_many_vcard" msgid="7084146295639672658">"Te veel vCard-gegevens op de SD-kaart"</string>
+ <!-- outdated translation 7084146295639672658 --> <string name="fail_reason_too_many_vcard" product="nosdcard" msgid="6603952032405558414">"Te veel vCard-gegevens op de SD-kaart"</string>
+ <string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"Te veel vCard-gegevens op de SD-kaart"</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"Vereiste bestandsnaam is te lang (\'<xliff:g id="FILENAME">%s</xliff:g>\')"</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"Contactgegevens exporteren"</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"Contactgegevens exporteren naar \'<xliff:g id="FILE_NAME">%s</xliff:g>\'"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index aa050dd..94bf91d 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -16,6 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sharedUserLabel" msgid="7965035505237135241">"Aplikacje główne systemu Android"</string>
<string name="contactsList" msgid="8661624236494819731">"Kontakty"</string>
<string name="launcherDialer" msgid="8636288196618486553">"Telefon"</string>
<string name="shortcutContact" msgid="749243779392912958">"Kontakt"</string>
@@ -70,6 +71,7 @@
<string name="editContact_title_insert" msgid="9125600232291405757">"Nowy kontakt"</string>
<string name="label_phonetic_name" msgid="2288082649573927286">"Fonetycznie"</string>
<string name="label_notes" msgid="8337354953278341042">"Notatki"</string>
+ <string name="label_sip_address" msgid="124073911714324974">"Rozmowa internetowa"</string>
<string name="label_ringtone" msgid="8833166825330686244">"Dzwonek"</string>
<string name="ghostData_name" msgid="6490954238641157585">"Imię i nazwisko"</string>
<string name="ghostData_phonetic_name" msgid="7852749081984070902">"Nazwisko (fonetycznie)"</string>
@@ -202,23 +204,31 @@
<string name="description_contact_photo" msgid="3387458082667894062">"zdjęcie kontaktu"</string>
<string name="description_minus_button" msgid="387136707700230172">"minus"</string>
<string name="description_plus_button" msgid="515164827856229880">"plus"</string>
- <string name="no_sdcard_title" msgid="5911758680339949273">"Brak karty SD"</string>
- <string name="no_sdcard_message" msgid="6019391476490445358">"Nie wykryto karty SD"</string>
+ <!-- outdated translation 5911758680339949273 --> <string name="no_sdcard_title" product="nosdcard" msgid="1432254751491952259">"Brak karty SD"</string>
+ <string name="no_sdcard_title" product="default" msgid="5911758680339949273">"Brak karty SD"</string>
+ <!-- outdated translation 6019391476490445358 --> <string name="no_sdcard_message" product="nosdcard" msgid="545247788569631436">"Nie wykryto karty SD"</string>
+ <string name="no_sdcard_message" product="default" msgid="6019391476490445358">"Nie wykryto karty SD"</string>
<string name="searching_vcard_title" msgid="4970508055399376813">"Wyszukiwanie danych vCard"</string>
<string name="import_from_sim" msgid="3859272228033941659">"Importuj z karty SIM"</string>
- <string name="import_from_sdcard" msgid="8550360976693202816">"Importuj z karty SD"</string>
- <string name="export_to_sdcard" msgid="2597105442616166277">"Eksportuj na kartę SD"</string>
+ <!-- outdated translation 8550360976693202816 --> <string name="import_from_sdcard" product="nosdcard" msgid="7450489361553523938">"Importuj z karty SD"</string>
+ <string name="import_from_sdcard" product="default" msgid="8550360976693202816">"Importuj z karty SD"</string>
+ <!-- outdated translation 2597105442616166277 --> <string name="export_to_sdcard" product="nosdcard" msgid="2322839933356280686">"Eksportuj na kartę SD"</string>
+ <string name="export_to_sdcard" product="default" msgid="2597105442616166277">"Eksportuj na kartę SD"</string>
<string name="share_visible_contacts" msgid="890150378880783797">"Udostępnij widoczne kontakty"</string>
<string name="import_one_vcard_string" msgid="9059163467020328433">"Importuj jeden plik vCard"</string>
<string name="import_multiple_vcard_string" msgid="3810226492811062392">"Importuj wiele plików vCard"</string>
<string name="import_all_vcard_string" msgid="5518136113853448474">"Importuj wszystkie pliki vCard"</string>
- <string name="searching_vcard_message" msgid="6917522333561434546">"Wyszukiwanie danych vCard na karcie SD"</string>
- <string name="scanning_sdcard_failed_title" msgid="3506782007953167180">"Skanowanie karty SD nie powiodło się"</string>
- <string name="scanning_sdcard_failed_message" msgid="3761992500690182922">"Skanowanie karty SD nie powiodło się (przyczyna: „<xliff:g id="FAIL_REASON">%s</xliff:g>”)"</string>
+ <!-- outdated translation 6917522333561434546 --> <string name="searching_vcard_message" product="nosdcard" msgid="8987993391730721760">"Wyszukiwanie danych vCard na karcie SD"</string>
+ <string name="searching_vcard_message" product="default" msgid="6917522333561434546">"Wyszukiwanie danych vCard na karcie SD"</string>
+ <!-- outdated translation 3506782007953167180 --> <string name="scanning_sdcard_failed_title" product="nosdcard" msgid="5451697520220712906">"Skanowanie karty SD nie powiodło się"</string>
+ <string name="scanning_sdcard_failed_title" product="default" msgid="3506782007953167180">"Skanowanie karty SD nie powiodło się"</string>
+ <!-- outdated translation 3761992500690182922 --> <string name="scanning_sdcard_failed_message" product="nosdcard" msgid="264566842682850873">"Skanowanie karty SD nie powiodło się (przyczyna: „<xliff:g id="FAIL_REASON">%s</xliff:g>”)"</string>
+ <string name="scanning_sdcard_failed_message" product="default" msgid="3761992500690182922">"Skanowanie karty SD nie powiodło się (przyczyna: „<xliff:g id="FAIL_REASON">%s</xliff:g>”)"</string>
<string name="fail_reason_io_error" msgid="5922864781066136340">"Błąd wejścia/wyjścia"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"Nie można zanalizować pliku vCard z nieoczekiwanego powodu"</string>
<string name="fail_reason_vcard_not_supported_error" msgid="655208100451286027">"Nie można zanalizować pliku vCard, mimo że prawdopodobnie ma on prawidłowy format. Bieżąca wersja go nie obsługuje."</string>
- <string name="fail_reason_no_vcard_file" msgid="6376516175882881595">"Na karcie SD nie znaleziono żadnego pliku vCard"</string>
+ <!-- outdated translation 6376516175882881595 --> <string name="fail_reason_no_vcard_file" product="nosdcard" msgid="6099852462800299180">"Na karcie SD nie znaleziono żadnego pliku vCard"</string>
+ <string name="fail_reason_no_vcard_file" product="default" msgid="6376516175882881595">"Na karcie SD nie znaleziono żadnego pliku vCard"</string>
<string name="fail_reason_failed_to_read_files" msgid="3659521123567134029">"Nie można zaimportować co najmniej jednego pliku (%s)."</string>
<string name="fail_reason_unknown" msgid="999034019513096768">"Nieznany błąd"</string>
<string name="select_vcard_title" msgid="3968948173786172468">"Wybierz plik vCard"</string>
@@ -233,7 +243,8 @@
<string name="exporting_contact_failed_title" msgid="585823094820602526">"Nie można wyeksportować danych kontaktu"</string>
<string name="exporting_contact_failed_message" msgid="4151348002470298092">"Nie można wyeksportować danych kontaktu."\n"Przyczyna niepowodzenia: „<xliff:g id="FAIL_REASON">%s</xliff:g>”."</string>
<string name="fail_reason_no_exportable_contact" msgid="4919714086648344495">"Brak kontaktów, które można wyeksportować"</string>
- <string name="fail_reason_too_many_vcard" msgid="7084146295639672658">"Zbyt dużo plików vCard na karcie SD"</string>
+ <!-- outdated translation 7084146295639672658 --> <string name="fail_reason_too_many_vcard" product="nosdcard" msgid="6603952032405558414">"Zbyt dużo plików vCard na karcie SD"</string>
+ <string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"Zbyt dużo plików vCard na karcie SD"</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"Wymagana nazwa pliku jest zbyt długa („<xliff:g id="FILENAME">%s</xliff:g>”)"</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"Eksportowanie danych kontaktowych"</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"Eksportowanie danych kontaktowych do pliku „<xliff:g id="FILE_NAME">%s</xliff:g>”"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 8a2d0a8..e15ccbb 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -16,6 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sharedUserLabel" msgid="7965035505237135241">"Aplicações Principais do Android"</string>
<string name="contactsList" msgid="8661624236494819731">"Contactos"</string>
<string name="launcherDialer" msgid="8636288196618486553">"Telefone"</string>
<string name="shortcutContact" msgid="749243779392912958">"Contacto"</string>
@@ -70,6 +71,7 @@
<string name="editContact_title_insert" msgid="9125600232291405757">"Novo contacto"</string>
<string name="label_phonetic_name" msgid="2288082649573927286">"Fonético"</string>
<string name="label_notes" msgid="8337354953278341042">"Notas"</string>
+ <string name="label_sip_address" msgid="124073911714324974">"Chamada por internet"</string>
<string name="label_ringtone" msgid="8833166825330686244">"Toque"</string>
<string name="ghostData_name" msgid="6490954238641157585">"Primeiro e último"</string>
<string name="ghostData_phonetic_name" msgid="7852749081984070902">"Nome fonético"</string>
@@ -202,23 +204,31 @@
<string name="description_contact_photo" msgid="3387458082667894062">"fotografia do contacto"</string>
<string name="description_minus_button" msgid="387136707700230172">"menos"</string>
<string name="description_plus_button" msgid="515164827856229880">"mais"</string>
- <string name="no_sdcard_title" msgid="5911758680339949273">"Nenhum cartão SD"</string>
- <string name="no_sdcard_message" msgid="6019391476490445358">"Não foi detectado nenhum cartão SD"</string>
+ <!-- outdated translation 5911758680339949273 --> <string name="no_sdcard_title" product="nosdcard" msgid="1432254751491952259">"Nenhum cartão SD"</string>
+ <string name="no_sdcard_title" product="default" msgid="5911758680339949273">"Nenhum cartão SD"</string>
+ <!-- outdated translation 6019391476490445358 --> <string name="no_sdcard_message" product="nosdcard" msgid="545247788569631436">"Não foi detectado nenhum cartão SD"</string>
+ <string name="no_sdcard_message" product="default" msgid="6019391476490445358">"Não foi detectado nenhum cartão SD"</string>
<string name="searching_vcard_title" msgid="4970508055399376813">"A procurar vCard"</string>
<string name="import_from_sim" msgid="3859272228033941659">"Importar do cartão SIM"</string>
- <string name="import_from_sdcard" msgid="8550360976693202816">"Importar do cartão SD"</string>
- <string name="export_to_sdcard" msgid="2597105442616166277">"Exportar para cartão SD"</string>
+ <!-- outdated translation 8550360976693202816 --> <string name="import_from_sdcard" product="nosdcard" msgid="7450489361553523938">"Importar do cartão SD"</string>
+ <string name="import_from_sdcard" product="default" msgid="8550360976693202816">"Importar do cartão SD"</string>
+ <!-- outdated translation 2597105442616166277 --> <string name="export_to_sdcard" product="nosdcard" msgid="2322839933356280686">"Exportar para cartão SD"</string>
+ <string name="export_to_sdcard" product="default" msgid="2597105442616166277">"Exportar para cartão SD"</string>
<string name="share_visible_contacts" msgid="890150378880783797">"Partilhar contactos visíveis"</string>
<string name="import_one_vcard_string" msgid="9059163467020328433">"Importar um ficheiro VCard"</string>
<string name="import_multiple_vcard_string" msgid="3810226492811062392">"Importar vários ficheiros vCard"</string>
<string name="import_all_vcard_string" msgid="5518136113853448474">"Importar todos os ficheiros VCard"</string>
- <string name="searching_vcard_message" msgid="6917522333561434546">"Procurar dados do vCard no cartão SD"</string>
- <string name="scanning_sdcard_failed_title" msgid="3506782007953167180">"Falha na análise do cartão SD"</string>
- <string name="scanning_sdcard_failed_message" msgid="3761992500690182922">"Falha na análise do cartão SD (Motivo: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string>
+ <!-- outdated translation 6917522333561434546 --> <string name="searching_vcard_message" product="nosdcard" msgid="8987993391730721760">"Procurar dados do vCard no cartão SD"</string>
+ <string name="searching_vcard_message" product="default" msgid="6917522333561434546">"Procurar dados do vCard no cartão SD"</string>
+ <!-- outdated translation 3506782007953167180 --> <string name="scanning_sdcard_failed_title" product="nosdcard" msgid="5451697520220712906">"Falha na análise do cartão SD"</string>
+ <string name="scanning_sdcard_failed_title" product="default" msgid="3506782007953167180">"Falha na análise do cartão SD"</string>
+ <!-- outdated translation 3761992500690182922 --> <string name="scanning_sdcard_failed_message" product="nosdcard" msgid="264566842682850873">"Falha na análise do cartão SD (Motivo: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string>
+ <string name="scanning_sdcard_failed_message" product="default" msgid="3761992500690182922">"Falha na análise do cartão SD (Motivo: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string>
<string name="fail_reason_io_error" msgid="5922864781066136340">"Erro de E/S"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"Falha na análise do vCard por motivo inesperado"</string>
<string name="fail_reason_vcard_not_supported_error" msgid="655208100451286027">"Falha na análise do vCard embora o formato pareça válido, uma vez que não é suportado pela implementação actual"</string>
- <string name="fail_reason_no_vcard_file" msgid="6376516175882881595">"Não foi encontrado nenhum ficheiro vCard no cartão SD"</string>
+ <!-- outdated translation 6376516175882881595 --> <string name="fail_reason_no_vcard_file" product="nosdcard" msgid="6099852462800299180">"Não foi encontrado nenhum ficheiro vCard no cartão SD"</string>
+ <string name="fail_reason_no_vcard_file" product="default" msgid="6376516175882881595">"Não foi encontrado nenhum ficheiro vCard no cartão SD"</string>
<string name="fail_reason_failed_to_read_files" msgid="3659521123567134029">"A importação de um ou vários ficheiros falhou (%s)."</string>
<string name="fail_reason_unknown" msgid="999034019513096768">"Erro desconhecido"</string>
<string name="select_vcard_title" msgid="3968948173786172468">"Seleccionar ficheiro vCard"</string>
@@ -233,7 +243,8 @@
<string name="exporting_contact_failed_title" msgid="585823094820602526">"Falha ao exportar dados de contacto"</string>
<string name="exporting_contact_failed_message" msgid="4151348002470298092">"Falha na exportação de dados de contacto."\n"Motivo da falha: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
<string name="fail_reason_no_exportable_contact" msgid="4919714086648344495">"Não existe um contacto exportável"</string>
- <string name="fail_reason_too_many_vcard" msgid="7084146295639672658">"Demasiados ficheiros vCard no cartão SD"</string>
+ <!-- outdated translation 7084146295639672658 --> <string name="fail_reason_too_many_vcard" product="nosdcard" msgid="6603952032405558414">"Demasiados ficheiros vCard no cartão SD"</string>
+ <string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"Demasiados ficheiros vCard no cartão SD"</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"Nome de ficheiro demasiado longo (\"<xliff:g id="FILENAME">%s</xliff:g>\")"</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"Exportar dados do contacto"</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"Exportar dados do contacto para \"<xliff:g id="FILE_NAME">%s</xliff:g>\""</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index e53f68e..eff330c 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -16,6 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sharedUserLabel" msgid="7965035505237135241">"Principais aplicativos do Android"</string>
<string name="contactsList" msgid="8661624236494819731">"Contatos"</string>
<string name="launcherDialer" msgid="8636288196618486553">"Telefone"</string>
<string name="shortcutContact" msgid="749243779392912958">"Contato"</string>
@@ -70,6 +71,7 @@
<string name="editContact_title_insert" msgid="9125600232291405757">"Novo contato"</string>
<string name="label_phonetic_name" msgid="2288082649573927286">"Fonética"</string>
<string name="label_notes" msgid="8337354953278341042">"Observações"</string>
+ <string name="label_sip_address" msgid="124073911714324974">"Chamada da internet"</string>
<string name="label_ringtone" msgid="8833166825330686244">"Toque"</string>
<string name="ghostData_name" msgid="6490954238641157585">"Nome e sobrenome"</string>
<string name="ghostData_phonetic_name" msgid="7852749081984070902">"Nome fonético"</string>
@@ -202,23 +204,31 @@
<string name="description_contact_photo" msgid="3387458082667894062">"foto do contato"</string>
<string name="description_minus_button" msgid="387136707700230172">"menos"</string>
<string name="description_plus_button" msgid="515164827856229880">"mais"</string>
- <string name="no_sdcard_title" msgid="5911758680339949273">"Nenhum cartão SD"</string>
- <string name="no_sdcard_message" msgid="6019391476490445358">"Nenhum cartão SD detectado"</string>
+ <!-- outdated translation 5911758680339949273 --> <string name="no_sdcard_title" product="nosdcard" msgid="1432254751491952259">"Nenhum cartão SD"</string>
+ <string name="no_sdcard_title" product="default" msgid="5911758680339949273">"Nenhum cartão SD"</string>
+ <!-- outdated translation 6019391476490445358 --> <string name="no_sdcard_message" product="nosdcard" msgid="545247788569631436">"Nenhum cartão SD detectado"</string>
+ <string name="no_sdcard_message" product="default" msgid="6019391476490445358">"Nenhum cartão SD detectado"</string>
<string name="searching_vcard_title" msgid="4970508055399376813">"Pesquisando vCard"</string>
<string name="import_from_sim" msgid="3859272228033941659">"Importar do cartão SIM"</string>
- <string name="import_from_sdcard" msgid="8550360976693202816">"Importar do cartão SD"</string>
- <string name="export_to_sdcard" msgid="2597105442616166277">"Exportar para cartão SD"</string>
+ <!-- outdated translation 8550360976693202816 --> <string name="import_from_sdcard" product="nosdcard" msgid="7450489361553523938">"Importar do cartão SD"</string>
+ <string name="import_from_sdcard" product="default" msgid="8550360976693202816">"Importar do cartão SD"</string>
+ <!-- outdated translation 2597105442616166277 --> <string name="export_to_sdcard" product="nosdcard" msgid="2322839933356280686">"Exportar para cartão SD"</string>
+ <string name="export_to_sdcard" product="default" msgid="2597105442616166277">"Exportar para cartão SD"</string>
<string name="share_visible_contacts" msgid="890150378880783797">"Compartilhar contatos visíveis"</string>
<string name="import_one_vcard_string" msgid="9059163467020328433">"Importar um arquivo do vCard"</string>
<string name="import_multiple_vcard_string" msgid="3810226492811062392">"Importar vários arquivos do vCard"</string>
<string name="import_all_vcard_string" msgid="5518136113853448474">"Importar todos os arquivos do vCard"</string>
- <string name="searching_vcard_message" msgid="6917522333561434546">"Procurando dados do vCard no cartão SD"</string>
- <string name="scanning_sdcard_failed_title" msgid="3506782007953167180">"Falha na verificação do cartão SD"</string>
- <string name="scanning_sdcard_failed_message" msgid="3761992500690182922">"Falha na verificação do cartão SD (Motivo: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string>
+ <!-- outdated translation 6917522333561434546 --> <string name="searching_vcard_message" product="nosdcard" msgid="8987993391730721760">"Procurando dados do vCard no cartão SD"</string>
+ <string name="searching_vcard_message" product="default" msgid="6917522333561434546">"Procurando dados do vCard no cartão SD"</string>
+ <!-- outdated translation 3506782007953167180 --> <string name="scanning_sdcard_failed_title" product="nosdcard" msgid="5451697520220712906">"Falha na verificação do cartão SD"</string>
+ <string name="scanning_sdcard_failed_title" product="default" msgid="3506782007953167180">"Falha na verificação do cartão SD"</string>
+ <!-- outdated translation 3761992500690182922 --> <string name="scanning_sdcard_failed_message" product="nosdcard" msgid="264566842682850873">"Falha na verificação do cartão SD (Motivo: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string>
+ <string name="scanning_sdcard_failed_message" product="default" msgid="3761992500690182922">"Falha na verificação do cartão SD (Motivo: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string>
<string name="fail_reason_io_error" msgid="5922864781066136340">"Erro E/S"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"Falha ao analisar o vCard por razão inesperada"</string>
<string name="fail_reason_vcard_not_supported_error" msgid="655208100451286027">"Falha ao analisar o vCard. Embora o formato pareça ser válido, a implementação atual não oferece suporte a ele."</string>
- <string name="fail_reason_no_vcard_file" msgid="6376516175882881595">"Nenhum arquivo de vCard encontrado no cartão SD"</string>
+ <!-- outdated translation 6376516175882881595 --> <string name="fail_reason_no_vcard_file" product="nosdcard" msgid="6099852462800299180">"Nenhum arquivo de vCard encontrado no cartão SD"</string>
+ <string name="fail_reason_no_vcard_file" product="default" msgid="6376516175882881595">"Nenhum arquivo de vCard encontrado no cartão SD"</string>
<string name="fail_reason_failed_to_read_files" msgid="3659521123567134029">"Falha na importação de um ou mais arquivos (%s)."</string>
<string name="fail_reason_unknown" msgid="999034019513096768">"Erro desconhecido"</string>
<string name="select_vcard_title" msgid="3968948173786172468">"Selecionar arquivo do vCard"</string>
@@ -233,7 +243,8 @@
<string name="exporting_contact_failed_title" msgid="585823094820602526">"Falha ao exportar dados do contato"</string>
<string name="exporting_contact_failed_message" msgid="4151348002470298092">"Falha ao exportar dados dos contatos."\n"Motivo da falha: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
<string name="fail_reason_no_exportable_contact" msgid="4919714086648344495">"Não há contatos exportáveis"</string>
- <string name="fail_reason_too_many_vcard" msgid="7084146295639672658">"Muitos arquivos do vCard no cartão SD"</string>
+ <!-- outdated translation 7084146295639672658 --> <string name="fail_reason_too_many_vcard" product="nosdcard" msgid="6603952032405558414">"Muitos arquivos do vCard no cartão SD"</string>
+ <string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"Muitos arquivos do vCard no cartão SD"</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"O nome de arquivo exigido é muito longo (\"<xliff:g id="FILENAME">%s</xliff:g>\")"</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"Exportando dados do contato"</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"Exportando dados do contato para \"<xliff:g id="FILE_NAME">%s</xliff:g>\""</string>
@@ -367,7 +378,7 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"Visualizar nomes de contato como"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"Nome primeiro"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"Sobrenome primeiro"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"Pesquisar contatos "</string>
+ <string name="search_bar_hint" msgid="1012756309632856553">"Pesquisar contatos"</string>
<string name="search_for_all_contacts" msgid="6644963335787294131">"Pesquisar em todos os contatos"</string>
<string name="take_photo" msgid="7496128293167402354">"Tirar foto"</string>
<string name="pick_photo" msgid="448886509158039462">"Selecionar foto da Galeria"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 121c25a..7232c44 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -16,6 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sharedUserLabel" msgid="7965035505237135241">"Основные приложения Android"</string>
<string name="contactsList" msgid="8661624236494819731">"Контакты"</string>
<string name="launcherDialer" msgid="8636288196618486553">"Телефон"</string>
<string name="shortcutContact" msgid="749243779392912958">"Контакт"</string>
@@ -70,6 +71,7 @@
<string name="editContact_title_insert" msgid="9125600232291405757">"Новый контакт"</string>
<string name="label_phonetic_name" msgid="2288082649573927286">"Произношение"</string>
<string name="label_notes" msgid="8337354953278341042">"Примечания"</string>
+ <string name="label_sip_address" msgid="124073911714324974">"Интернет-вызов"</string>
<string name="label_ringtone" msgid="8833166825330686244">"Мелодия"</string>
<string name="ghostData_name" msgid="6490954238641157585">"Имя и фамилия"</string>
<string name="ghostData_phonetic_name" msgid="7852749081984070902">"Произношение имени"</string>
@@ -202,23 +204,31 @@
<string name="description_contact_photo" msgid="3387458082667894062">"фотография контакта"</string>
<string name="description_minus_button" msgid="387136707700230172">"минус"</string>
<string name="description_plus_button" msgid="515164827856229880">"плюс"</string>
- <string name="no_sdcard_title" msgid="5911758680339949273">"Нет SD-карты"</string>
- <string name="no_sdcard_message" msgid="6019391476490445358">"SD-карта не обнаружена"</string>
+ <!-- outdated translation 5911758680339949273 --> <string name="no_sdcard_title" product="nosdcard" msgid="1432254751491952259">"Нет SD-карты"</string>
+ <string name="no_sdcard_title" product="default" msgid="5911758680339949273">"Нет SD-карты"</string>
+ <!-- outdated translation 6019391476490445358 --> <string name="no_sdcard_message" product="nosdcard" msgid="545247788569631436">"SD-карта не обнаружена"</string>
+ <string name="no_sdcard_message" product="default" msgid="6019391476490445358">"SD-карта не обнаружена"</string>
<string name="searching_vcard_title" msgid="4970508055399376813">"Поиск vCard"</string>
<string name="import_from_sim" msgid="3859272228033941659">"Импортировать с SIM-карты"</string>
- <string name="import_from_sdcard" msgid="8550360976693202816">"Импортировать с SD-карты"</string>
- <string name="export_to_sdcard" msgid="2597105442616166277">"Экспортировать на SD-карту"</string>
+ <!-- outdated translation 8550360976693202816 --> <string name="import_from_sdcard" product="nosdcard" msgid="7450489361553523938">"Импортировать с SD-карты"</string>
+ <string name="import_from_sdcard" product="default" msgid="8550360976693202816">"Импортировать с SD-карты"</string>
+ <!-- outdated translation 2597105442616166277 --> <string name="export_to_sdcard" product="nosdcard" msgid="2322839933356280686">"Экспортировать на SD-карту"</string>
+ <string name="export_to_sdcard" product="default" msgid="2597105442616166277">"Экспортировать на SD-карту"</string>
<string name="share_visible_contacts" msgid="890150378880783797">"Передать видимые контакты"</string>
<string name="import_one_vcard_string" msgid="9059163467020328433">"Импорт одного файла VCard"</string>
<string name="import_multiple_vcard_string" msgid="3810226492811062392">"Импорт нескольких файлов vCard"</string>
<string name="import_all_vcard_string" msgid="5518136113853448474">"Импорт всех файлов VCard"</string>
- <string name="searching_vcard_message" msgid="6917522333561434546">"Поиск данных vCard на SD-карте"</string>
- <string name="scanning_sdcard_failed_title" msgid="3506782007953167180">"Не удалось сканировать SD-карту."</string>
- <string name="scanning_sdcard_failed_message" msgid="3761992500690182922">"Не удалось просканировать SD-карту (причина: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string>
+ <!-- outdated translation 6917522333561434546 --> <string name="searching_vcard_message" product="nosdcard" msgid="8987993391730721760">"Поиск данных vCard на SD-карте"</string>
+ <string name="searching_vcard_message" product="default" msgid="6917522333561434546">"Поиск данных vCard на SD-карте"</string>
+ <!-- outdated translation 3506782007953167180 --> <string name="scanning_sdcard_failed_title" product="nosdcard" msgid="5451697520220712906">"Не удалось сканировать SD-карту."</string>
+ <string name="scanning_sdcard_failed_title" product="default" msgid="3506782007953167180">"Не удалось сканировать SD-карту."</string>
+ <!-- outdated translation 3761992500690182922 --> <string name="scanning_sdcard_failed_message" product="nosdcard" msgid="264566842682850873">"Не удалось просканировать SD-карту (причина: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string>
+ <string name="scanning_sdcard_failed_message" product="default" msgid="3761992500690182922">"Не удалось просканировать SD-карту (причина: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string>
<string name="fail_reason_io_error" msgid="5922864781066136340">"Ошибка ввода-вывода"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"Не удалось обработать vCard по неизвестной причине."</string>
<string name="fail_reason_vcard_not_supported_error" msgid="655208100451286027">"Не удалось обработать vCard. Файл правильного формата, но не поддерживается в текущей реализации."</string>
- <string name="fail_reason_no_vcard_file" msgid="6376516175882881595">"На SD-карте не найдены файлы VCard"</string>
+ <!-- outdated translation 6376516175882881595 --> <string name="fail_reason_no_vcard_file" product="nosdcard" msgid="6099852462800299180">"На SD-карте не найдены файлы VCard"</string>
+ <string name="fail_reason_no_vcard_file" product="default" msgid="6376516175882881595">"На SD-карте не найдены файлы VCard"</string>
<string name="fail_reason_failed_to_read_files" msgid="3659521123567134029">"Не удалось импортировать один или несколько файлов (%s)."</string>
<string name="fail_reason_unknown" msgid="999034019513096768">"Неизвестная ошибка"</string>
<string name="select_vcard_title" msgid="3968948173786172468">"Выберите файл vCard"</string>
@@ -233,7 +243,8 @@
<string name="exporting_contact_failed_title" msgid="585823094820602526">"Не удалось экспортировать данные контакта."</string>
<string name="exporting_contact_failed_message" msgid="4151348002470298092">"Не удалось экспортировать данные контакта."\n"Причина: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
<string name="fail_reason_no_exportable_contact" msgid="4919714086648344495">"Нет контактов, которые можно экспортировать."</string>
- <string name="fail_reason_too_many_vcard" msgid="7084146295639672658">"Слишком много файлов VCard на SD-карте."</string>
+ <!-- outdated translation 7084146295639672658 --> <string name="fail_reason_too_many_vcard" product="nosdcard" msgid="6603952032405558414">"Слишком много файлов VCard на SD-карте."</string>
+ <string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"Слишком много файлов VCard на SD-карте."</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"Название файла слишком длинное (<xliff:g id="FILENAME">%s</xliff:g>)."</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"Экспорт данных контакта"</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"Экспорт данных контакта в \"<xliff:g id="FILE_NAME">%s</xliff:g>\""</string>
@@ -350,9 +361,9 @@
<string name="postal_country" msgid="7638264508416368690">"Страна"</string>
<string name="name_given" msgid="1687286314106019813">"Имя"</string>
<string name="name_family" msgid="3416695586119999058">"Фамилия"</string>
- <string name="name_prefix" msgid="59756378548779822">"Префикс имени"</string>
+ <string name="name_prefix" msgid="59756378548779822">"Форма обращения"</string>
<string name="name_middle" msgid="8467433655992690326">"Отчество"</string>
- <string name="name_suffix" msgid="3855278445375651441">"Суффикс имени"</string>
+ <string name="name_suffix" msgid="3855278445375651441">"Звание/титул"</string>
<string name="name_phonetic_given" msgid="6853570431394449191">"Имя (транскрипция)"</string>
<string name="name_phonetic_middle" msgid="8643721493320405200">"Отчество (транскрипция)"</string>
<string name="name_phonetic_family" msgid="462095502140180305">"Фамилия (транскрипция)"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 1a68355..4e0bbe8 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -16,6 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sharedUserLabel" msgid="7965035505237135241">"Android Core Apps"</string>
<string name="contactsList" msgid="8661624236494819731">"Kontakter"</string>
<string name="launcherDialer" msgid="8636288196618486553">"Telefon"</string>
<string name="shortcutContact" msgid="749243779392912958">"Kontakt"</string>
@@ -70,6 +71,7 @@
<string name="editContact_title_insert" msgid="9125600232291405757">"Ny kontakt"</string>
<string name="label_phonetic_name" msgid="2288082649573927286">"Fonetiskt"</string>
<string name="label_notes" msgid="8337354953278341042">"Anteckningar"</string>
+ <string name="label_sip_address" msgid="124073911714324974">"Internetsamtal"</string>
<string name="label_ringtone" msgid="8833166825330686244">"Ringsignal"</string>
<string name="ghostData_name" msgid="6490954238641157585">"För- och efternamn"</string>
<string name="ghostData_phonetic_name" msgid="7852749081984070902">"Fonetiskt namn"</string>
@@ -202,23 +204,31 @@
<string name="description_contact_photo" msgid="3387458082667894062">"kontaktbild"</string>
<string name="description_minus_button" msgid="387136707700230172">"minus"</string>
<string name="description_plus_button" msgid="515164827856229880">"plus"</string>
- <string name="no_sdcard_title" msgid="5911758680339949273">"Inget SD-kort"</string>
- <string name="no_sdcard_message" msgid="6019391476490445358">"Inget SD-kort hittades"</string>
+ <!-- outdated translation 5911758680339949273 --> <string name="no_sdcard_title" product="nosdcard" msgid="1432254751491952259">"Inget SD-kort"</string>
+ <string name="no_sdcard_title" product="default" msgid="5911758680339949273">"Inget SD-kort"</string>
+ <!-- outdated translation 6019391476490445358 --> <string name="no_sdcard_message" product="nosdcard" msgid="545247788569631436">"Inget SD-kort hittades"</string>
+ <string name="no_sdcard_message" product="default" msgid="6019391476490445358">"Inget SD-kort hittades"</string>
<string name="searching_vcard_title" msgid="4970508055399376813">"Söker efter vCard"</string>
<string name="import_from_sim" msgid="3859272228033941659">"Importera från SIM-kort"</string>
- <string name="import_from_sdcard" msgid="8550360976693202816">"Importera från SD-kort"</string>
- <string name="export_to_sdcard" msgid="2597105442616166277">"Exportera till SD-kort"</string>
+ <!-- outdated translation 8550360976693202816 --> <string name="import_from_sdcard" product="nosdcard" msgid="7450489361553523938">"Importera från SD-kort"</string>
+ <string name="import_from_sdcard" product="default" msgid="8550360976693202816">"Importera från SD-kort"</string>
+ <!-- outdated translation 2597105442616166277 --> <string name="export_to_sdcard" product="nosdcard" msgid="2322839933356280686">"Exportera till SD-kort"</string>
+ <string name="export_to_sdcard" product="default" msgid="2597105442616166277">"Exportera till SD-kort"</string>
<string name="share_visible_contacts" msgid="890150378880783797">"Dela synliga kontakter"</string>
<string name="import_one_vcard_string" msgid="9059163467020328433">"Importera en vCard-fil"</string>
<string name="import_multiple_vcard_string" msgid="3810226492811062392">"Importera flera vCard-filer"</string>
<string name="import_all_vcard_string" msgid="5518136113853448474">"Importera alla vCard-filer"</string>
- <string name="searching_vcard_message" msgid="6917522333561434546">"Söker efter vCard-data på SD-kort"</string>
- <string name="scanning_sdcard_failed_title" msgid="3506782007953167180">"Det gick inte att läsa SD-kort"</string>
- <string name="scanning_sdcard_failed_message" msgid="3761992500690182922">"Det gick inte att skanna SD-kortet (orsak: <xliff:g id="FAIL_REASON">%s</xliff:g>)"</string>
+ <!-- outdated translation 6917522333561434546 --> <string name="searching_vcard_message" product="nosdcard" msgid="8987993391730721760">"Söker efter vCard-data på SD-kort"</string>
+ <string name="searching_vcard_message" product="default" msgid="6917522333561434546">"Söker efter vCard-data på SD-kort"</string>
+ <!-- outdated translation 3506782007953167180 --> <string name="scanning_sdcard_failed_title" product="nosdcard" msgid="5451697520220712906">"Det gick inte att läsa SD-kort"</string>
+ <string name="scanning_sdcard_failed_title" product="default" msgid="3506782007953167180">"Det gick inte att läsa SD-kort"</string>
+ <!-- outdated translation 3761992500690182922 --> <string name="scanning_sdcard_failed_message" product="nosdcard" msgid="264566842682850873">"Det gick inte att skanna SD-kortet (orsak: <xliff:g id="FAIL_REASON">%s</xliff:g>)"</string>
+ <string name="scanning_sdcard_failed_message" product="default" msgid="3761992500690182922">"Det gick inte att skanna SD-kortet (orsak: <xliff:g id="FAIL_REASON">%s</xliff:g>)"</string>
<string name="fail_reason_io_error" msgid="5922864781066136340">"I/O-fel"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"Det gick inte att analysera vCard av okänd anledning"</string>
<string name="fail_reason_vcard_not_supported_error" msgid="655208100451286027">"Det gick inte att analysera vCard trots att formatet verkar vara giltigt. Den aktuella implementeringen stöder inte det."</string>
- <string name="fail_reason_no_vcard_file" msgid="6376516175882881595">"Ingen vCard-fil hittades på SD-kortet"</string>
+ <!-- outdated translation 6376516175882881595 --> <string name="fail_reason_no_vcard_file" product="nosdcard" msgid="6099852462800299180">"Ingen vCard-fil hittades på SD-kortet"</string>
+ <string name="fail_reason_no_vcard_file" product="default" msgid="6376516175882881595">"Ingen vCard-fil hittades på SD-kortet"</string>
<string name="fail_reason_failed_to_read_files" msgid="3659521123567134029">"En eller flera filer kunde inte importeras: (%s)."</string>
<string name="fail_reason_unknown" msgid="999034019513096768">"Okänt fel"</string>
<string name="select_vcard_title" msgid="3968948173786172468">"Välj vCard-fil"</string>
@@ -233,7 +243,8 @@
<string name="exporting_contact_failed_title" msgid="585823094820602526">"Det gick inte att exportera kontaktdata"</string>
<string name="exporting_contact_failed_message" msgid="4151348002470298092">"Det gick inte att exportera kontaktdata."\n"Orsak: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
<string name="fail_reason_no_exportable_contact" msgid="4919714086648344495">"Det finns ingen kontakt som kan exporteras"</string>
- <string name="fail_reason_too_many_vcard" msgid="7084146295639672658">"För många vCard-filer på SD-kortet"</string>
+ <!-- outdated translation 7084146295639672658 --> <string name="fail_reason_too_many_vcard" product="nosdcard" msgid="6603952032405558414">"För många vCard-filer på SD-kortet"</string>
+ <string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"För många vCard-filer på SD-kortet"</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"Det obligatoriska filnamnet är för långt (\"<xliff:g id="FILENAME">%s</xliff:g>\")"</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"Exporterar kontaktuppgifter"</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"Exporterar kontaktuppgifter till: <xliff:g id="FILE_NAME">%s</xliff:g>"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index b360da8..d1af5f3 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -16,6 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sharedUserLabel" msgid="7965035505237135241">"Android Core Apps"</string>
<string name="contactsList" msgid="8661624236494819731">"Kişiler"</string>
<string name="launcherDialer" msgid="8636288196618486553">"Telefon"</string>
<string name="shortcutContact" msgid="749243779392912958">"Kişi"</string>
@@ -70,6 +71,7 @@
<string name="editContact_title_insert" msgid="9125600232291405757">"Yeni kişi"</string>
<string name="label_phonetic_name" msgid="2288082649573927286">"Fonetik"</string>
<string name="label_notes" msgid="8337354953278341042">"Notlar"</string>
+ <string name="label_sip_address" msgid="124073911714324974">"İnternet çağrısı"</string>
<string name="label_ringtone" msgid="8833166825330686244">"Zil sesi"</string>
<string name="ghostData_name" msgid="6490954238641157585">"Adı ve Soyadı"</string>
<string name="ghostData_phonetic_name" msgid="7852749081984070902">"Fonetik adı"</string>
@@ -202,23 +204,31 @@
<string name="description_contact_photo" msgid="3387458082667894062">"kişi fotoğrafı"</string>
<string name="description_minus_button" msgid="387136707700230172">"eksi"</string>
<string name="description_plus_button" msgid="515164827856229880">"artı"</string>
- <string name="no_sdcard_title" msgid="5911758680339949273">"SD kart yok"</string>
- <string name="no_sdcard_message" msgid="6019391476490445358">"Hiçbir SD kart tespit edilmedi"</string>
+ <!-- outdated translation 5911758680339949273 --> <string name="no_sdcard_title" product="nosdcard" msgid="1432254751491952259">"SD kart yok"</string>
+ <string name="no_sdcard_title" product="default" msgid="5911758680339949273">"SD kart yok"</string>
+ <!-- outdated translation 6019391476490445358 --> <string name="no_sdcard_message" product="nosdcard" msgid="545247788569631436">"Hiçbir SD kart tespit edilmedi"</string>
+ <string name="no_sdcard_message" product="default" msgid="6019391476490445358">"Hiçbir SD kart tespit edilmedi"</string>
<string name="searching_vcard_title" msgid="4970508055399376813">"vCard aranıyor"</string>
<string name="import_from_sim" msgid="3859272228033941659">"SIM karttan içe aktar"</string>
- <string name="import_from_sdcard" msgid="8550360976693202816">"SD karttan içe aktar"</string>
- <string name="export_to_sdcard" msgid="2597105442616166277">"SD karta dışa aktar"</string>
+ <!-- outdated translation 8550360976693202816 --> <string name="import_from_sdcard" product="nosdcard" msgid="7450489361553523938">"SD karttan içe aktar"</string>
+ <string name="import_from_sdcard" product="default" msgid="8550360976693202816">"SD karttan içe aktar"</string>
+ <!-- outdated translation 2597105442616166277 --> <string name="export_to_sdcard" product="nosdcard" msgid="2322839933356280686">"SD karta dışa aktar"</string>
+ <string name="export_to_sdcard" product="default" msgid="2597105442616166277">"SD karta dışa aktar"</string>
<string name="share_visible_contacts" msgid="890150378880783797">"Görülebilir kişileri paylaş"</string>
<string name="import_one_vcard_string" msgid="9059163467020328433">"Bir vCard dosyasını içe aktar"</string>
<string name="import_multiple_vcard_string" msgid="3810226492811062392">"Birden fazla vCard dosyasını içe aktar"</string>
<string name="import_all_vcard_string" msgid="5518136113853448474">"Tüm vCard dosyalarını içe aktar"</string>
- <string name="searching_vcard_message" msgid="6917522333561434546">"SD kartta vCard verileri aranıyor"</string>
- <string name="scanning_sdcard_failed_title" msgid="3506782007953167180">"SD kart taranamadı"</string>
- <string name="scanning_sdcard_failed_message" msgid="3761992500690182922">"SD kart taraması başarısız oldu (Neden: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string>
+ <!-- outdated translation 6917522333561434546 --> <string name="searching_vcard_message" product="nosdcard" msgid="8987993391730721760">"SD kartta vCard verileri aranıyor"</string>
+ <string name="searching_vcard_message" product="default" msgid="6917522333561434546">"SD kartta vCard verileri aranıyor"</string>
+ <!-- outdated translation 3506782007953167180 --> <string name="scanning_sdcard_failed_title" product="nosdcard" msgid="5451697520220712906">"SD kart taranamadı"</string>
+ <string name="scanning_sdcard_failed_title" product="default" msgid="3506782007953167180">"SD kart taranamadı"</string>
+ <!-- outdated translation 3761992500690182922 --> <string name="scanning_sdcard_failed_message" product="nosdcard" msgid="264566842682850873">"SD kart taraması başarısız oldu (Neden: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string>
+ <string name="scanning_sdcard_failed_message" product="default" msgid="3761992500690182922">"SD kart taraması başarısız oldu (Neden: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string>
<string name="fail_reason_io_error" msgid="5922864781066136340">"G/Ç Hatası"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"Beklenmedik bir nedenden dolayı vCard ayrıştırılamadı"</string>
<string name="fail_reason_vcard_not_supported_error" msgid="655208100451286027">"Geçerli biçimde görünmesine rağmen vCard ayrıştırılamadı, çünkü şu anki uygulama vCard\'ı desteklemiyor"</string>
- <string name="fail_reason_no_vcard_file" msgid="6376516175882881595">"SD kartta hiçbir vCard dosyası bulunamadı"</string>
+ <!-- outdated translation 6376516175882881595 --> <string name="fail_reason_no_vcard_file" product="nosdcard" msgid="6099852462800299180">"SD kartta hiçbir vCard dosyası bulunamadı"</string>
+ <string name="fail_reason_no_vcard_file" product="default" msgid="6376516175882881595">"SD kartta hiçbir vCard dosyası bulunamadı"</string>
<string name="fail_reason_failed_to_read_files" msgid="3659521123567134029">"İçe aktarılamayan bir veya birden fazla dosya (%s)."</string>
<string name="fail_reason_unknown" msgid="999034019513096768">"Bilinmeyen hata"</string>
<string name="select_vcard_title" msgid="3968948173786172468">"vCard dosyasını seç"</string>
@@ -233,7 +243,8 @@
<string name="exporting_contact_failed_title" msgid="585823094820602526">"Kişi verileri dışa aktarılamadı"</string>
<string name="exporting_contact_failed_message" msgid="4151348002470298092">"Kişi verileri dışa aktarılamadı."\n"Hata nedeni: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
<string name="fail_reason_no_exportable_contact" msgid="4919714086648344495">"Dışa aktarılabilen hiçbir kişi yok"</string>
- <string name="fail_reason_too_many_vcard" msgid="7084146295639672658">"SD kartta çok fazla vCard dosyası var"</string>
+ <!-- outdated translation 7084146295639672658 --> <string name="fail_reason_too_many_vcard" product="nosdcard" msgid="6603952032405558414">"SD kartta çok fazla vCard dosyası var"</string>
+ <string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"SD kartta çok fazla vCard dosyası var"</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"Gereken dosya adı çok uzun (\"<xliff:g id="FILENAME">%s</xliff:g>\")"</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"Kişi verileri dışa aktarılıyor"</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"Kişi verileri \"<xliff:g id="FILE_NAME">%s</xliff:g>\" dosyasına dışa aktarılıyor"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 65af296..fca1170 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -16,6 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sharedUserLabel" msgid="7965035505237135241">"Android 核心应用程序"</string>
<string name="contactsList" msgid="8661624236494819731">"通讯录"</string>
<string name="launcherDialer" msgid="8636288196618486553">"拨号"</string>
<string name="shortcutContact" msgid="749243779392912958">"联系人"</string>
@@ -70,6 +71,7 @@
<string name="editContact_title_insert" msgid="9125600232291405757">"新建联系人"</string>
<string name="label_phonetic_name" msgid="2288082649573927286">"拼音"</string>
<string name="label_notes" msgid="8337354953278341042">"备注"</string>
+ <string name="label_sip_address" msgid="124073911714324974">"互联网通话"</string>
<string name="label_ringtone" msgid="8833166825330686244">"铃声"</string>
<string name="ghostData_name" msgid="6490954238641157585">"姓名"</string>
<string name="ghostData_phonetic_name" msgid="7852749081984070902">"姓名拼音"</string>
@@ -202,23 +204,31 @@
<string name="description_contact_photo" msgid="3387458082667894062">"联系人照片"</string>
<string name="description_minus_button" msgid="387136707700230172">"删除"</string>
<string name="description_plus_button" msgid="515164827856229880">"添加"</string>
- <string name="no_sdcard_title" msgid="5911758680339949273">"无 SD 卡"</string>
- <string name="no_sdcard_message" msgid="6019391476490445358">"未检测到 SD 卡"</string>
+ <!-- outdated translation 5911758680339949273 --> <string name="no_sdcard_title" product="nosdcard" msgid="1432254751491952259">"无 SD 卡"</string>
+ <string name="no_sdcard_title" product="default" msgid="5911758680339949273">"无 SD 卡"</string>
+ <!-- outdated translation 6019391476490445358 --> <string name="no_sdcard_message" product="nosdcard" msgid="545247788569631436">"未检测到 SD 卡"</string>
+ <string name="no_sdcard_message" product="default" msgid="6019391476490445358">"未检测到 SD 卡"</string>
<string name="searching_vcard_title" msgid="4970508055399376813">"正在搜索 vCard"</string>
<string name="import_from_sim" msgid="3859272228033941659">"从 SIM 卡导入"</string>
- <string name="import_from_sdcard" msgid="8550360976693202816">"从 SD 卡导入"</string>
- <string name="export_to_sdcard" msgid="2597105442616166277">"导出到 SD 卡"</string>
+ <!-- outdated translation 8550360976693202816 --> <string name="import_from_sdcard" product="nosdcard" msgid="7450489361553523938">"从 SD 卡导入"</string>
+ <string name="import_from_sdcard" product="default" msgid="8550360976693202816">"从 SD 卡导入"</string>
+ <!-- outdated translation 2597105442616166277 --> <string name="export_to_sdcard" product="nosdcard" msgid="2322839933356280686">"导出到 SD 卡"</string>
+ <string name="export_to_sdcard" product="default" msgid="2597105442616166277">"导出到 SD 卡"</string>
<string name="share_visible_contacts" msgid="890150378880783797">"分享可见的联系人"</string>
<string name="import_one_vcard_string" msgid="9059163467020328433">"导入一个 vCard 文件"</string>
<string name="import_multiple_vcard_string" msgid="3810226492811062392">"导入多个 vCard 文件"</string>
<string name="import_all_vcard_string" msgid="5518136113853448474">"导入所有 vCard 文件"</string>
- <string name="searching_vcard_message" msgid="6917522333561434546">"正在 SD 卡中搜索 vCard 数据"</string>
- <string name="scanning_sdcard_failed_title" msgid="3506782007953167180">"扫描 SD 卡失败"</string>
- <string name="scanning_sdcard_failed_message" msgid="3761992500690182922">"扫描 SD 卡失败（原因：“<xliff:g id="FAIL_REASON">%s</xliff:g>”）"</string>
+ <!-- outdated translation 6917522333561434546 --> <string name="searching_vcard_message" product="nosdcard" msgid="8987993391730721760">"正在 SD 卡中搜索 vCard 数据"</string>
+ <string name="searching_vcard_message" product="default" msgid="6917522333561434546">"正在 SD 卡中搜索 vCard 数据"</string>
+ <!-- outdated translation 3506782007953167180 --> <string name="scanning_sdcard_failed_title" product="nosdcard" msgid="5451697520220712906">"扫描 SD 卡失败"</string>
+ <string name="scanning_sdcard_failed_title" product="default" msgid="3506782007953167180">"扫描 SD 卡失败"</string>
+ <!-- outdated translation 3761992500690182922 --> <string name="scanning_sdcard_failed_message" product="nosdcard" msgid="264566842682850873">"扫描 SD 卡失败（原因：“<xliff:g id="FAIL_REASON">%s</xliff:g>”）"</string>
+ <string name="scanning_sdcard_failed_message" product="default" msgid="3761992500690182922">"扫描 SD 卡失败（原因：“<xliff:g id="FAIL_REASON">%s</xliff:g>”）"</string>
<string name="fail_reason_io_error" msgid="5922864781066136340">"I/O 错误"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"由于意外原因而无法解析 vCard"</string>
<string name="fail_reason_vcard_not_supported_error" msgid="655208100451286027">"虽然 vCard 似乎使用了有效的格式，但系统无法对其进行解析，因为当前的实现方案不支持该格式。"</string>
- <string name="fail_reason_no_vcard_file" msgid="6376516175882881595">"未在 SD 卡上找到 vCard 文件"</string>
+ <!-- outdated translation 6376516175882881595 --> <string name="fail_reason_no_vcard_file" product="nosdcard" msgid="6099852462800299180">"未在 SD 卡上找到 vCard 文件"</string>
+ <string name="fail_reason_no_vcard_file" product="default" msgid="6376516175882881595">"未在 SD 卡上找到 vCard 文件"</string>
<string name="fail_reason_failed_to_read_files" msgid="3659521123567134029">"一个或多个文件导入失败 (%s)。"</string>
<string name="fail_reason_unknown" msgid="999034019513096768">"未知错误"</string>
<string name="select_vcard_title" msgid="3968948173786172468">"选择 vCard 文件"</string>
@@ -233,7 +243,8 @@
<string name="exporting_contact_failed_title" msgid="585823094820602526">"导出联系人数据失败"</string>
<string name="exporting_contact_failed_message" msgid="4151348002470298092">"导出联系人数据失败。"\n"失败原因：“<xliff:g id="FAIL_REASON">%s</xliff:g>”"</string>
<string name="fail_reason_no_exportable_contact" msgid="4919714086648344495">"没有可导出的联系人"</string>
- <string name="fail_reason_too_many_vcard" msgid="7084146295639672658">"SD 卡中的 vCard 文件太多"</string>
+ <!-- outdated translation 7084146295639672658 --> <string name="fail_reason_too_many_vcard" product="nosdcard" msgid="6603952032405558414">"SD 卡中的 vCard 文件太多"</string>
+ <string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"SD 卡中的 vCard 文件太多"</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"所需文件名太长（“<xliff:g id="FILENAME">%s</xliff:g>”）"</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"正在导出联系人数据"</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"正在向“<xliff:g id="FILE_NAME">%s</xliff:g>”导出联系人数据"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 4f0c93e..d4a3222 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -16,6 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sharedUserLabel" msgid="7965035505237135241">"Android 核心應用程式"</string>
<string name="contactsList" msgid="8661624236494819731">"聯絡人"</string>
<string name="launcherDialer" msgid="8636288196618486553">"電話"</string>
<string name="shortcutContact" msgid="749243779392912958">"聯絡人"</string>
@@ -70,6 +71,7 @@
<string name="editContact_title_insert" msgid="9125600232291405757">"新增聯絡人"</string>
<string name="label_phonetic_name" msgid="2288082649573927286">"拼音"</string>
<string name="label_notes" msgid="8337354953278341042">"附註"</string>
+ <string name="label_sip_address" msgid="124073911714324974">"網路電話"</string>
<string name="label_ringtone" msgid="8833166825330686244">"鈴聲"</string>
<string name="ghostData_name" msgid="6490954238641157585">"姓名"</string>
<string name="ghostData_phonetic_name" msgid="7852749081984070902">"姓名拼音"</string>
@@ -202,23 +204,31 @@
<string name="description_contact_photo" msgid="3387458082667894062">"聯絡人相片"</string>
<string name="description_minus_button" msgid="387136707700230172">"負號"</string>
<string name="description_plus_button" msgid="515164827856229880">"加號"</string>
- <string name="no_sdcard_title" msgid="5911758680339949273">"無 SD 卡"</string>
- <string name="no_sdcard_message" msgid="6019391476490445358">"未偵測到 SD 卡"</string>
+ <!-- outdated translation 5911758680339949273 --> <string name="no_sdcard_title" product="nosdcard" msgid="1432254751491952259">"無 SD 卡"</string>
+ <string name="no_sdcard_title" product="default" msgid="5911758680339949273">"無 SD 卡"</string>
+ <!-- outdated translation 6019391476490445358 --> <string name="no_sdcard_message" product="nosdcard" msgid="545247788569631436">"未偵測到 SD 卡"</string>
+ <string name="no_sdcard_message" product="default" msgid="6019391476490445358">"未偵測到 SD 卡"</string>
<string name="searching_vcard_title" msgid="4970508055399376813">"正在搜尋 VCard"</string>
<string name="import_from_sim" msgid="3859272228033941659">"從 SIM 卡匯入"</string>
- <string name="import_from_sdcard" msgid="8550360976693202816">"從 SD 卡匯入"</string>
- <string name="export_to_sdcard" msgid="2597105442616166277">"匯出至 SD 卡"</string>
+ <!-- outdated translation 8550360976693202816 --> <string name="import_from_sdcard" product="nosdcard" msgid="7450489361553523938">"從 SD 卡匯入"</string>
+ <string name="import_from_sdcard" product="default" msgid="8550360976693202816">"從 SD 卡匯入"</string>
+ <!-- outdated translation 2597105442616166277 --> <string name="export_to_sdcard" product="nosdcard" msgid="2322839933356280686">"匯出至 SD 卡"</string>
+ <string name="export_to_sdcard" product="default" msgid="2597105442616166277">"匯出至 SD 卡"</string>
<string name="share_visible_contacts" msgid="890150378880783797">"分享正常顯示的聯絡人"</string>
<string name="import_one_vcard_string" msgid="9059163467020328433">"匯入一個 vCard 檔案"</string>
<string name="import_multiple_vcard_string" msgid="3810226492811062392">"匯入多個 vCard 檔案"</string>
<string name="import_all_vcard_string" msgid="5518136113853448474">"匯入所有 vCard 檔案"</string>
- <string name="searching_vcard_message" msgid="6917522333561434546">"在 SD 卡上搜尋 VCard 資料"</string>
- <string name="scanning_sdcard_failed_title" msgid="3506782007953167180">"無法掃描 SD 卡"</string>
- <string name="scanning_sdcard_failed_message" msgid="3761992500690182922">"無法掃描 SD 卡 (原因：「<xliff:g id="FAIL_REASON">%s</xliff:g>」)"</string>
+ <!-- outdated translation 6917522333561434546 --> <string name="searching_vcard_message" product="nosdcard" msgid="8987993391730721760">"在 SD 卡上搜尋 VCard 資料"</string>
+ <string name="searching_vcard_message" product="default" msgid="6917522333561434546">"在 SD 卡上搜尋 VCard 資料"</string>
+ <!-- outdated translation 3506782007953167180 --> <string name="scanning_sdcard_failed_title" product="nosdcard" msgid="5451697520220712906">"無法掃描 SD 卡"</string>
+ <string name="scanning_sdcard_failed_title" product="default" msgid="3506782007953167180">"無法掃描 SD 卡"</string>
+ <!-- outdated translation 3761992500690182922 --> <string name="scanning_sdcard_failed_message" product="nosdcard" msgid="264566842682850873">"無法掃描 SD 卡 (原因：「<xliff:g id="FAIL_REASON">%s</xliff:g>」)"</string>
+ <string name="scanning_sdcard_failed_message" product="default" msgid="3761992500690182922">"無法掃描 SD 卡 (原因：「<xliff:g id="FAIL_REASON">%s</xliff:g>」)"</string>
<string name="fail_reason_io_error" msgid="5922864781066136340">"I/O 錯誤"</string>
<string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"因未預期原因，無法剖析 VCard"</string>
<string name="fail_reason_vcard_not_supported_error" msgid="655208100451286027">"VCard 格式正確，但目前的實作系統不支援此格式，因此無法剖析"</string>
- <string name="fail_reason_no_vcard_file" msgid="6376516175882881595">"SD 卡上沒有 vCard 檔案"</string>
+ <!-- outdated translation 6376516175882881595 --> <string name="fail_reason_no_vcard_file" product="nosdcard" msgid="6099852462800299180">"SD 卡上沒有 vCard 檔案"</string>
+ <string name="fail_reason_no_vcard_file" product="default" msgid="6376516175882881595">"SD 卡上沒有 vCard 檔案"</string>
<string name="fail_reason_failed_to_read_files" msgid="3659521123567134029">"無法匯入一或多個檔案 (%s)。"</string>
<string name="fail_reason_unknown" msgid="999034019513096768">"未知的錯誤"</string>
<string name="select_vcard_title" msgid="3968948173786172468">"選取 VCard 檔案"</string>
@@ -233,7 +243,8 @@
<string name="exporting_contact_failed_title" msgid="585823094820602526">"無法匯出聯絡人資料"</string>
<string name="exporting_contact_failed_message" msgid="4151348002470298092">"匯出聯絡人資料失敗。"\n"失敗原因：「<xliff:g id="FAIL_REASON">%s</xliff:g>」"</string>
<string name="fail_reason_no_exportable_contact" msgid="4919714086648344495">"沒有可匯出的聯絡人"</string>
- <string name="fail_reason_too_many_vcard" msgid="7084146295639672658">"SD 卡中的 VCard 檔案過多"</string>
+ <!-- outdated translation 7084146295639672658 --> <string name="fail_reason_too_many_vcard" product="nosdcard" msgid="6603952032405558414">"SD 卡中的 VCard 檔案過多"</string>
+ <string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"SD 卡中的 VCard 檔案過多"</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"要求的檔案名稱過長 (「<xliff:g id="FILENAME">%s</xliff:g>」)"</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"正在匯出聯絡人資料"</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"正在將聯絡人資料匯出至「<xliff:g id="FILE_NAME">%s</xliff:g>」"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 893394c..6a420ef 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -14,6 +14,10 @@
limitations under the License.
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Label for this app's shared user ID (and thus for all other
+ apps sharing the uid). -->
+ <string name="sharedUserLabel">Android Core Apps</string>
+
<!-- Title for the activity that shows contacts. This is the name
used in the Launcher icon. -->
<string name="contactsList">Contacts</string>
@@ -189,6 +193,9 @@
<!-- The label describing the Notes field of a contact. This field allows free form text entry about a contact -->
<string name="label_notes">Notes</string>
+ <!-- The label describing the SIP address field of a contact. [CHAR LIMIT=20] -->
+ <string name="label_sip_address">Internet call</string>
+
<!-- The label describing the custom ringtone for a contact -->
<string name="label_ringtone">Ringtone</string>
@@ -652,11 +659,15 @@
-->
<string name="description_plus_button">plus</string>
+ <!-- Dialog title shown when shared storage does not exist [CHAR LIMIT=25] -->
+ <string name="no_sdcard_title" product="nosdcard">Shared storage unavailable</string>
<!-- Dialog title shown when SD Card does not exist -->
- <string name="no_sdcard_title">No SD card</string>
+ <string name="no_sdcard_title" product="default">No SD card</string>
+ <!-- Dialog message shown when shared storage does not exist [CHAR LIMIT=30] -->
+ <string name="no_sdcard_message" product="nosdcard">No shared storage detected</string>
<!-- Dialog message shown when SDcard does not exist -->
- <string name="no_sdcard_message">No SD card detected</string>
+ <string name="no_sdcard_message" product="default">No SD card detected</string>
<!-- Dialog title shown when searching VCard data from SD Card -->
<string name="searching_vcard_title">Searching for vCard</string>
@@ -664,11 +675,15 @@
<!-- Action string for selecting SIM for importing contacts -->
<string name="import_from_sim">Import from SIM card</string>
+ <!-- Action string for selecting shared storage for importing contacts [CHAR LIMIT=25] -->
+ <string name="import_from_sdcard" product="nosdcard">Import from shared storage</string>
<!-- Action string for selecting SD Card for importing contacts -->
- <string name="import_from_sdcard">Import from SD card</string>
+ <string name="import_from_sdcard" product="default">Import from SD card</string>
+ <!-- Action that exports all contacts to shared storage [CHAR LIMIT=25] -->
+ <string name="export_to_sdcard" product="nosdcard">Export to shared storage</string>
<!-- Action that exports all contacts to SD Card -->
- <string name="export_to_sdcard">Export to SD card</string>
+ <string name="export_to_sdcard" product="default">Export to SD card</string>
<!-- Action that shares visible contacts -->
<string name="share_visible_contacts">Share visible contacts</string>
@@ -688,15 +703,22 @@
than one vCard files available in the system. -->
<string name="import_all_vcard_string">Import all vCard files</string>
+ <!-- Dialog message shown when searching VCard data from SD Card [CHAR LIMIT=NONE] -->
+ <string name="searching_vcard_message" product="nosdcard">Searching for vCard data in shared storage</string>
<!-- Dialog message shown when searching VCard data from SD Card -->
- <string name="searching_vcard_message">Searching for vCard data on SD card</string>
+ <string name="searching_vcard_message" product="default">Searching for vCard data on SD card</string>
+ <!-- Dialog title shown when scanning VCard data failed. [CHAR LIMIT=NONE] -->
+ <string name="scanning_sdcard_failed_title" product="nosdcard">Scanning shared storage failed</string>
<!-- Dialog title shown when scanning VCard data failed. -->
- <string name="scanning_sdcard_failed_title">Scanning SD card failed</string>
+ <string name="scanning_sdcard_failed_title" product="default">Scanning SD card failed</string>
<!-- Dialog message shown when searching VCard data failed.
+ An exact reason for the failure should [CHAR LIMIT=NONE] -->
+ <string name="scanning_sdcard_failed_message" product="nosdcard">Scanning shared storage failed (Reason: \"<xliff:g id="fail_reason">%s</xliff:g>\")</string>
+ <!-- Dialog message shown when searching VCard data failed.
An exact reason for the failure should -->
- <string name="scanning_sdcard_failed_message">Scanning SD card failed (Reason: \"<xliff:g id="fail_reason">%s</xliff:g>\")</string>
+ <string name="scanning_sdcard_failed_message" product="default">Scanning SD card failed (Reason: \"<xliff:g id="fail_reason">%s</xliff:g>\")</string>
<!-- The failed reason shown when Contacts app (especially vCard importer/exporter)
emitted some I/O error. Exact reason will be appended by the system. -->
@@ -714,8 +736,11 @@
<string name="fail_reason_vcard_not_supported_error">Failed to parse vCard though it seems in valid format, since the current implementation does not support it</string>
<!-- The failed reason shown when the system could not find any vCard file
+ (with extension ".vcf" in SDCard.) [CHAR LIMIT=NONE] -->
+ <string name="fail_reason_no_vcard_file" product="nosdcard">No vCard file found in the shared storage</string>
+ <!-- The failed reason shown when the system could not find any vCard file
(with extension ".vcf" in SDCard.) -->
- <string name="fail_reason_no_vcard_file">No vCard file found on the SD card</string>
+ <string name="fail_reason_no_vcard_file" product="default">No vCard file found on the SD card</string>
<!-- The failed reason shown when the import of some of vCard files failed during multiple vCard
files import. It includes the case where all files were failed to be imported. -->
@@ -765,8 +790,11 @@
<string name="fail_reason_no_exportable_contact">There is no exportable contact</string>
<!-- The failed reason shown when vCard exporter could not create a file for the vCard since
+ there are too many files relevant to vCard. [CHAR LIMIT=NONE] -->
+ <string name="fail_reason_too_many_vcard" product="nosdcard">Too many vCard files on the shared storage</string>
+ <!-- The failed reason shown when vCard exporter could not create a file for the vCard since
there are too many files relevant to vCard. -->
- <string name="fail_reason_too_many_vcard">Too many vCard files on the SD card</string>
+ <string name="fail_reason_too_many_vcard" product="default">Too many vCard files on the SD card</string>
<!-- The failed reason shown when the given file name is too long for the system.
The length limit of each file is different in each Android device, so we don't need to
@@ -907,7 +935,7 @@
<!-- Title for data source when creating or editing a contact that doesn't
belong to a specific account. This contact will only exist on the phone
and will not be synced. -->
- <string name="account_phone">Phone-only (unsynced)</string>
+ <string name="account_phone">Phone-only, unsynced</string>
<!-- Action string for calling a custom phone number -->
<string name="call_custom">Call <xliff:g id="custom">%s</xliff:g></string>
diff --git a/src/com/android/contacts/ContactsListActivity.java b/src/com/android/contacts/ContactsListActivity.java
index 0d2c7eb..a53f469 100644
--- a/src/com/android/contacts/ContactsListActivity.java
+++ b/src/com/android/contacts/ContactsListActivity.java
@@ -1024,6 +1024,13 @@
}
@Override
+ protected void onStart() {
+ super.onStart();
+
+ mContactsPrefs.registerChangeListener(mPreferencesChangeListener);
+ }
+
+ @Override
protected void onPause() {
super.onPause();
unregisterProviderStatusObserver();
@@ -1205,6 +1212,7 @@
protected void onStop() {
super.onStop();
+ mContactsPrefs.unregisterChangeListener();
mAdapter.setSuggestionsCursor(null);
mAdapter.changeCursor(null);
@@ -1528,7 +1536,8 @@
case SUBACTIVITY_NEW_CONTACT:
if (resultCode == RESULT_OK) {
returnPickerResult(null, data.getStringExtra(Intent.EXTRA_SHORTCUT_NAME),
- data.getData());
+ data.getData(), (mMode & MODE_MASK_PICKER) != 0
+ ? Intent.FLAG_GRANT_READ_URI_PERMISSION : 0);
}
break;
@@ -1839,7 +1848,7 @@
final Intent intent = new Intent(Intent.ACTION_VIEW, uri);
startActivityForResult(intent, SUBACTIVITY_VIEW_CONTACT);
} else if (mMode == MODE_JOIN_CONTACT) {
- returnPickerResult(null, null, uri);
+ returnPickerResult(null, null, uri, 0);
} else if (mMode == MODE_QUERY_PICK_TO_VIEW) {
// Started with query that should launch to view contact
final Intent intent = new Intent(Intent.ACTION_VIEW, uri);
@@ -1847,14 +1856,16 @@
finish();
} else if (mMode == MODE_PICK_PHONE || mMode == MODE_QUERY_PICK_PHONE) {
Cursor c = (Cursor) mAdapter.getItem(position);
- returnPickerResult(c, c.getString(PHONE_DISPLAY_NAME_COLUMN_INDEX), uri);
+ returnPickerResult(c, c.getString(PHONE_DISPLAY_NAME_COLUMN_INDEX), uri,
+ Intent.FLAG_GRANT_READ_URI_PERMISSION);
} else if ((mMode & MODE_MASK_PICKER) != 0) {
Cursor c = (Cursor) mAdapter.getItem(position);
- returnPickerResult(c, c.getString(getSummaryDisplayNameColumnIndex()), uri);
+ returnPickerResult(c, c.getString(getSummaryDisplayNameColumnIndex()), uri,
+ Intent.FLAG_GRANT_READ_URI_PERMISSION);
} else if (mMode == MODE_PICK_POSTAL
|| mMode == MODE_LEGACY_PICK_POSTAL
|| mMode == MODE_LEGACY_PICK_PHONE) {
- returnPickerResult(null, null, uri);
+ returnPickerResult(null, null, uri, Intent.FLAG_GRANT_READ_URI_PERMISSION);
}
} else {
signalError();
@@ -1872,7 +1883,7 @@
* @param selectedUri In most cases, this should be a lookup {@link Uri}, possibly
* generated through {@link Contacts#getLookupUri(long, String)}.
*/
- private void returnPickerResult(Cursor c, String name, Uri selectedUri) {
+ private void returnPickerResult(Cursor c, String name, Uri selectedUri, int uriPerms) {
final Intent intent = new Intent();
if (mShortcutAction != null) {
@@ -1924,6 +1935,7 @@
setResult(RESULT_OK, intent);
} else {
intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, name);
+ intent.addFlags(uriPerms);
setResult(RESULT_OK, intent.setData(selectedUri));
}
finish();
@@ -3582,4 +3594,14 @@
}
}
}
+
+ private ContactsPreferences.ChangeListener mPreferencesChangeListener =
+ new ContactsPreferences.ChangeListener() {
+ @Override
+ public void onChange() {
+ // When returning from DisplayOptions, onActivityResult ensures that we reload the list,
+ // so we do not have to do anything here. However, ContactsPreferences requires a change
+ // listener, otherwise it would not reload its settings.
+ }
+ };
}
diff --git a/src/com/android/contacts/DialtactsActivity.java b/src/com/android/contacts/DialtactsActivity.java
index afb8606..05adb7c 100644
--- a/src/com/android/contacts/DialtactsActivity.java
+++ b/src/com/android/contacts/DialtactsActivity.java
@@ -119,7 +119,7 @@
}
editor.putInt(PREF_LAST_MANUALLY_SELECTED_TAB, mLastManuallySelectedTab);
- editor.commit();
+ editor.apply();
}
private void fixIntent(Intent intent) {
diff --git a/src/com/android/contacts/ExportVCardActivity.java b/src/com/android/contacts/ExportVCardActivity.java
index 5bccc7a..ceeecfc 100644
--- a/src/com/android/contacts/ExportVCardActivity.java
+++ b/src/com/android/contacts/ExportVCardActivity.java
@@ -26,6 +26,7 @@
import android.os.Handler;
import android.os.PowerManager;
import android.pim.vcard.VCardComposer;
+import android.pim.vcard.VCardConfig;
import android.text.TextUtils;
import android.util.Log;
@@ -146,10 +147,9 @@
return;
}
- composer = new VCardComposer(ExportVCardActivity.this, mVCardTypeStr, true);
- /*int vcardType = (VCardConfig.VCARD_TYPE_V21_GENERIC |
- VCardConfig.FLAG_USE_QP_TO_PRIMARY_PROPERTIES);
- composer = new VCardComposer(ExportVCardActivity.this, vcardType, true);*/
+ // composer = new VCardComposer(ExportVCardActivity.this, mVCardTypeStr, true);
+ int vcardType = VCardConfig.VCARD_TYPE_V30_GENERIC;
+ composer = new VCardComposer(ExportVCardActivity.this, vcardType, true);
composer.addHandler(composer.new HandlerForOutputStream(outputStream));
diff --git a/src/com/android/contacts/ImportVCardActivity.java b/src/com/android/contacts/ImportVCardActivity.java
index 0a324fe..46cdf32 100644
--- a/src/com/android/contacts/ImportVCardActivity.java
+++ b/src/com/android/contacts/ImportVCardActivity.java
@@ -16,6 +16,9 @@
package com.android.contacts;
+import com.android.contacts.model.Sources;
+import com.android.contacts.util.AccountSelectionUtil;
+
import android.accounts.Account;
import android.app.Activity;
import android.app.AlertDialog;
@@ -25,9 +28,9 @@
import android.content.ContentUris;
import android.content.Context;
import android.content.DialogInterface;
-import android.content.Intent;
import android.content.DialogInterface.OnCancelListener;
import android.content.DialogInterface.OnClickListener;
+import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.os.Environment;
@@ -39,6 +42,7 @@
import android.pim.vcard.VCardEntryCounter;
import android.pim.vcard.VCardInterpreter;
import android.pim.vcard.VCardInterpreterCollection;
+import android.pim.vcard.VCardParser;
import android.pim.vcard.VCardParser_V21;
import android.pim.vcard.VCardParser_V30;
import android.pim.vcard.VCardSourceDetector;
@@ -53,9 +57,6 @@
import android.text.style.RelativeSizeSpan;
import android.util.Log;
-import com.android.contacts.model.Sources;
-import com.android.contacts.util.AccountSelectionUtil;
-
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -107,6 +108,10 @@
private static final String LOG_TAG = "ImportVCardActivity";
private static final boolean DO_PERFORMANCE_PROFILE = false;
+ private final static int VCARD_VERSION_V21 = 1;
+ private final static int VCARD_VERSION_V30 = 2;
+ private final static int VCARD_VERSION_V40 = 3;
+
// Run on the UI thread. Must not be null except after onDestroy().
private Handler mHandler = new Handler();
@@ -155,7 +160,7 @@
private class VCardReadThread extends Thread
implements DialogInterface.OnCancelListener {
private ContentResolver mResolver;
- private VCardParser_V21 mVCardParser;
+ private VCardParser mVCardParser;
private boolean mCanceled;
private PowerManager.WakeLock mWakeLock;
private Uri mUri;
@@ -213,20 +218,25 @@
if (DO_PERFORMANCE_PROFILE) {
start = System.currentTimeMillis();
}
- VCardEntryCounter counter = new VCardEntryCounter();
- VCardSourceDetector detector = new VCardSourceDetector();
- VCardInterpreterCollection builderCollection = new VCardInterpreterCollection(
- Arrays.asList(counter, detector));
+ final VCardEntryCounter counter = new VCardEntryCounter();
+ final VCardSourceDetector detector = new VCardSourceDetector();
+ final VCardInterpreterCollection builderCollection =
+ new VCardInterpreterCollection(Arrays.asList(counter, detector));
boolean result;
try {
- result = readOneVCardFile(targetUri,
- VCardConfig.DEFAULT_CHARSET, builderCollection, null, true, null);
+ // We don't know which type should be useld to parse the Uri.
+ // It is possble to misinterpret the vCard, but we expect the parser
+ // lets VCardSourceDetector detect the type before the misinterpretation.
+ result = readOneVCardFile(targetUri, VCardConfig.VCARD_TYPE_UNKNOWN,
+ builderCollection, true, null);
} catch (VCardNestedException e) {
try {
+ final int estimatedVCardType = detector.getEstimatedType();
+ final String estimatedCharset = detector.getEstimatedCharset();
// Assume that VCardSourceDetector was able to detect the source.
// Try again with the detector.
- result = readOneVCardFile(targetUri,
- VCardConfig.DEFAULT_CHARSET, counter, detector, false, null);
+ result = readOneVCardFile(targetUri, estimatedVCardType,
+ counter, false, null);
} catch (VCardNestedException e2) {
result = false;
Log.e(LOG_TAG, "Must not reach here. " + e2);
@@ -247,7 +257,7 @@
mProgressDialogForReadVCard.setIndeterminate(false);
mProgressDialogForReadVCard.setMax(counter.getCount());
String charset = detector.getEstimatedCharset();
- createdUri = doActuallyReadOneVCard(targetUri, null, charset, true, detector,
+ createdUri = doActuallyReadOneVCard(targetUri, mAccount, true, detector,
mErrorFileNameList);
} else { // Read multiple files.
mProgressDialogForReadVCard.setProgressNumberFormat(
@@ -260,13 +270,11 @@
return;
}
// TODO: detect scheme!
- final Uri targetUri =
- Uri.parse("file://" + vcardFile.getCanonicalPath());
-
+ final Uri targetUri = Uri.parse("file://" + vcardFile.getCanonicalPath());
VCardSourceDetector detector = new VCardSourceDetector();
try {
- if (!readOneVCardFile(targetUri, VCardConfig.DEFAULT_CHARSET,
- detector, null, true, mErrorFileNameList)) {
+ if (!readOneVCardFile(targetUri, VCardConfig.VCARD_TYPE_UNKNOWN,
+ detector, true, mErrorFileNameList)) {
continue;
}
} catch (VCardNestedException e) {
@@ -274,7 +282,7 @@
}
String charset = detector.getEstimatedCharset();
doActuallyReadOneVCard(targetUri, mAccount,
- charset, false, detector, mErrorFileNameList);
+ false, detector, mErrorFileNameList);
mProgressDialogForReadVCard.incrementProgressBy(1);
}
}
@@ -327,20 +335,19 @@
}
private Uri doActuallyReadOneVCard(Uri uri, Account account,
- String charset, boolean showEntryParseProgress,
+ boolean showEntryParseProgress,
VCardSourceDetector detector, List<String> errorFileNameList) {
final Context context = ImportVCardActivity.this;
- VCardEntryConstructor builder;
- final String currentLanguage = Locale.getDefault().getLanguage();
- int vcardType = VCardConfig.getVCardTypeFromString(
- context.getString(R.string.config_import_vcard_type));
- if (charset != null) {
- builder = new VCardEntryConstructor(charset, charset, false, vcardType, mAccount);
- } else {
- charset = VCardConfig.DEFAULT_CHARSET;
- builder = new VCardEntryConstructor(null, null, false, vcardType, mAccount);
+ int vcardType = detector.getEstimatedType();
+ if (vcardType == VCardConfig.VCARD_TYPE_UNKNOWN) {
+ vcardType = VCardConfig.getVCardTypeFromString(
+ context.getString(R.string.config_import_vcard_type));
}
- VCardEntryCommitter committer = new VCardEntryCommitter(mResolver);
+ final String estimatedCharset = detector.getEstimatedCharset();
+ final String currentLanguage = Locale.getDefault().getLanguage();
+ VCardEntryConstructor builder;
+ builder = new VCardEntryConstructor(vcardType, mAccount, estimatedCharset);
+ final VCardEntryCommitter committer = new VCardEntryCommitter(mResolver);
builder.addEntryHandler(committer);
if (showEntryParseProgress) {
builder.addEntryHandler(new ProgressShower(mProgressDialogForReadVCard,
@@ -350,7 +357,7 @@
}
try {
- if (!readOneVCardFile(uri, charset, builder, detector, false, null)) {
+ if (!readOneVCardFile(uri, vcardType, builder, false, null)) {
return null;
}
} catch (VCardNestedException e) {
@@ -360,31 +367,42 @@
return (createdUris == null || createdUris.size() != 1) ? null : createdUris.get(0);
}
- private boolean readOneVCardFile(Uri uri, String charset,
- VCardInterpreter builder, VCardSourceDetector detector,
+ /**
+ * Charset should be handled by {@link VCardEntryConstructor}.
+ */
+ private boolean readOneVCardFile(Uri uri, int vcardType,
+ VCardInterpreter interpreter,
boolean throwNestedException, List<String> errorFileNameList)
throws VCardNestedException {
InputStream is;
try {
is = mResolver.openInputStream(uri);
- mVCardParser = new VCardParser_V21(detector);
+ mVCardParser = new VCardParser_V21(vcardType);
try {
- mVCardParser.parse(is, charset, builder, mCanceled);
+ mVCardParser.parse(is, interpreter);
} catch (VCardVersionException e1) {
try {
is.close();
} catch (IOException e) {
}
- if (builder instanceof VCardEntryConstructor) {
+ if (interpreter instanceof VCardEntryConstructor) {
// Let the object clean up internal temporal objects,
- ((VCardEntryConstructor)builder).clear();
+ ((VCardEntryConstructor)interpreter).clear();
+ } else if (interpreter instanceof VCardInterpreterCollection) {
+ for (VCardInterpreter elem :
+ ((VCardInterpreterCollection) interpreter).getCollection()) {
+ if (elem instanceof VCardEntryConstructor) {
+ ((VCardEntryConstructor)elem).clear();
+ }
+ }
}
+
is = mResolver.openInputStream(uri);
try {
- mVCardParser = new VCardParser_V30();
- mVCardParser.parse(is, charset, builder, mCanceled);
+ mVCardParser = new VCardParser_V30(vcardType);
+ mVCardParser.parse(is, interpreter);
} catch (VCardVersionException e2) {
throw new VCardException("vCard with unspported version.");
}
diff --git a/src/com/android/contacts/RecentCallsListActivity.java b/src/com/android/contacts/RecentCallsListActivity.java
index ccd1ce3..8e7b4bc 100644
--- a/src/com/android/contacts/RecentCallsListActivity.java
+++ b/src/com/android/contacts/RecentCallsListActivity.java
@@ -47,10 +47,12 @@
import android.os.SystemClock;
import android.provider.CallLog;
import android.provider.CallLog.Calls;
-import android.provider.ContactsContract.Intents.Insert;
-import android.provider.ContactsContract.Contacts;
-import android.provider.ContactsContract.PhoneLookup;
import android.provider.ContactsContract.CommonDataKinds.Phone;
+import android.provider.ContactsContract.CommonDataKinds.SipAddress;
+import android.provider.ContactsContract.Contacts;
+import android.provider.ContactsContract.Data;
+import android.provider.ContactsContract.Intents.Insert;
+import android.provider.ContactsContract.PhoneLookup;
import android.telephony.PhoneNumberUtils;
import android.telephony.TelephonyManager;
import android.text.SpannableStringBuilder;
@@ -208,8 +210,16 @@
public void onClick(View view) {
String number = (String) view.getTag();
if (!TextUtils.isEmpty(number)) {
- Uri telUri = Uri.fromParts("tel", number, null);
- startActivity(new Intent(Intent.ACTION_CALL_PRIVILEGED, telUri));
+ // Here, "number" can either be a PSTN phone number or a
+ // SIP address. So turn it into either a tel: URI or a
+ // sip: URI, as appropriate.
+ Uri callUri;
+ if (PhoneNumberUtils.isUriNumber(number)) {
+ callUri = Uri.fromParts("sip", number, null);
+ } else {
+ callUri = Uri.fromParts("tel", number, null);
+ }
+ startActivity(new Intent(Intent.ACTION_CALL_PRIVILEGED, callUri));
}
}
@@ -342,29 +352,103 @@
if (info != null && info != ContactInfo.EMPTY) {
return true;
} else {
- Cursor phonesCursor =
- RecentCallsListActivity.this.getContentResolver().query(
- Uri.withAppendedPath(PhoneLookup.CONTENT_FILTER_URI,
- Uri.encode(ciq.number)),
- PHONES_PROJECTION, null, null, null);
- if (phonesCursor != null) {
- if (phonesCursor.moveToFirst()) {
- info = new ContactInfo();
- info.personId = phonesCursor.getLong(PERSON_ID_COLUMN_INDEX);
- info.name = phonesCursor.getString(NAME_COLUMN_INDEX);
- info.type = phonesCursor.getInt(PHONE_TYPE_COLUMN_INDEX);
- info.label = phonesCursor.getString(LABEL_COLUMN_INDEX);
- info.number = phonesCursor.getString(MATCHED_NUMBER_COLUMN_INDEX);
+ // Ok, do a fresh Contacts lookup for ciq.number.
+ boolean infoUpdated = false;
- // New incoming phone number invalidates our formatted
- // cache. Any cache fills happen only on the GUI thread.
- info.formattedNumber = null;
+ if (PhoneNumberUtils.isUriNumber(ciq.number)) {
+ // This "number" is really a SIP address.
- mContactInfo.put(ciq.number, info);
- // Inform list to update this item, if in view
- needNotify = true;
+ // TODO: This code is duplicated from the
+ // CallerInfoAsyncQuery class. To avoid that, could the
+ // code here just use CallerInfoAsyncQuery, rather than
+ // manually running ContentResolver.query() itself?
+
+ // We look up SIP addresses directly in the Data table:
+ Uri contactRef = Data.CONTENT_URI;
+
+ // Note Data.DATA1 and SipAddress.SIP_ADDRESS are equivalent.
+ //
+ // Also note we use "upper(data1)" in the WHERE clause, and
+ // uppercase the incoming SIP address, in order to do a
+ // case-insensitive match.
+ //
+ // TODO: May also need to normalize by adding "sip:" as a
+ // prefix, if we start storing SIP addresses that way in the
+ // database.
+ String selection = "upper(" + Data.DATA1 + ")=?"
+ + " AND "
+ + Data.MIMETYPE + "='" + SipAddress.CONTENT_ITEM_TYPE + "'";
+ String[] selectionArgs = new String[] { ciq.number.toUpperCase() };
+
+ Cursor dataTableCursor =
+ RecentCallsListActivity.this.getContentResolver().query(
+ contactRef,
+ null, // projection
+ selection, // selection
+ selectionArgs, // selectionArgs
+ null); // sortOrder
+
+ if (dataTableCursor != null) {
+ if (dataTableCursor.moveToFirst()) {
+ info = new ContactInfo();
+
+ // TODO: we could slightly speed this up using an
+ // explicit projection (and thus not have to do
+ // those getColumnIndex() calls) but the benefit is
+ // very minimal.
+
+ // Note the Data.CONTACT_ID column here is
+ // equivalent to the PERSON_ID_COLUMN_INDEX column
+ // we use with "phonesCursor" below.
+ info.personId = dataTableCursor.getLong(
+ dataTableCursor.getColumnIndex(Data.CONTACT_ID));
+ info.name = dataTableCursor.getString(
+ dataTableCursor.getColumnIndex(Data.DISPLAY_NAME));
+ // "type" and "label" are currently unused for SIP addresses
+ info.type = SipAddress.TYPE_OTHER;
+ info.label = null;
+
+ // And "number" is the SIP address.
+ // Note Data.DATA1 and SipAddress.SIP_ADDRESS are equivalent.
+ info.number = dataTableCursor.getString(
+ dataTableCursor.getColumnIndex(Data.DATA1));
+
+ infoUpdated = true;
+ }
+ dataTableCursor.close();
}
- phonesCursor.close();
+ } else {
+ // "number" is a regular phone number, so use the
+ // PhoneLookup table:
+ Cursor phonesCursor =
+ RecentCallsListActivity.this.getContentResolver().query(
+ Uri.withAppendedPath(PhoneLookup.CONTENT_FILTER_URI,
+ Uri.encode(ciq.number)),
+ PHONES_PROJECTION, null, null, null);
+ if (phonesCursor != null) {
+ if (phonesCursor.moveToFirst()) {
+ info = new ContactInfo();
+ info.personId = phonesCursor.getLong(PERSON_ID_COLUMN_INDEX);
+ info.name = phonesCursor.getString(NAME_COLUMN_INDEX);
+ info.type = phonesCursor.getInt(PHONE_TYPE_COLUMN_INDEX);
+ info.label = phonesCursor.getString(LABEL_COLUMN_INDEX);
+ info.number = phonesCursor.getString(MATCHED_NUMBER_COLUMN_INDEX);
+
+ infoUpdated = true;
+ }
+ phonesCursor.close();
+ }
+ }
+
+ if (infoUpdated) {
+ // New incoming phone number invalidates our formatted
+ // cache. Any cache fills happen only on the GUI thread.
+ info.formattedNumber = null;
+
+ mContactInfo.put(ciq.number, info);
+
+ // Inform list to update this item, if in view
+ needNotify = true;
}
}
if (info != null) {
@@ -590,8 +674,13 @@
if (!TextUtils.isEmpty(name)) {
views.line1View.setText(name);
views.labelView.setVisibility(View.VISIBLE);
- CharSequence numberLabel = Phone.getDisplayLabel(context, ntype, label,
- mLabelArray);
+
+ // "type" and "label" are currently unused for SIP addresses.
+ CharSequence numberLabel = null;
+ if (!PhoneNumberUtils.isUriNumber(number)) {
+ numberLabel = Phone.getDisplayLabel(context, ntype, label,
+ mLabelArray);
+ }
views.numberView.setVisibility(View.VISIBLE);
views.numberView.setText(formattedNumber);
if (!TextUtils.isEmpty(numberLabel)) {
@@ -609,7 +698,8 @@
views.callView.setVisibility(View.INVISIBLE);
} else if (number.equals(CallerInfo.PAYPHONE_NUMBER)) {
number = getString(R.string.payphone);
- } else if (number.equals(mVoiceMailNumber)) {
+ } else if (PhoneNumberUtils.extractNetworkPortion(number)
+ .equals(mVoiceMailNumber)) {
number = getString(R.string.voicemail);
} else {
// Just a raw number, and no cache, so format it nicely
@@ -798,6 +888,11 @@
return "";
}
+ // If "number" is really a SIP address, don't try to do any formatting at all.
+ if (PhoneNumberUtils.isUriNumber(number)) {
+ return number;
+ }
+
// Cache formatting type if not already present
if (sFormattingType == FORMATTING_TYPE_INVALID) {
sFormattingType = PhoneNumberUtils.getFormatTypeForLocale(Locale.getDefault());
@@ -853,16 +948,20 @@
String number = cursor.getString(NUMBER_COLUMN_INDEX);
Uri numberUri = null;
boolean isVoicemail = false;
+ boolean isSipNumber = false;
if (number.equals(CallerInfo.UNKNOWN_NUMBER)) {
number = getString(R.string.unknown);
} else if (number.equals(CallerInfo.PRIVATE_NUMBER)) {
number = getString(R.string.private_num);
} else if (number.equals(CallerInfo.PAYPHONE_NUMBER)) {
number = getString(R.string.payphone);
- } else if (number.equals(mVoiceMailNumber)) {
+ } else if (PhoneNumberUtils.extractNetworkPortion(number).equals(mVoiceMailNumber)) {
number = getString(R.string.voicemail);
numberUri = Uri.parse("voicemail:x");
isVoicemail = true;
+ } else if (PhoneNumberUtils.isUriNumber(number)) {
+ numberUri = Uri.fromParts("sip", number, null);
+ isSipNumber = true;
} else {
numberUri = Uri.fromParts("tel", number, null);
}
@@ -887,14 +986,26 @@
ContentUris.withAppendedId(Contacts.CONTENT_URI, info.personId)));
}
- if (numberUri != null && !isVoicemail) {
+ if (numberUri != null && !isVoicemail && !isSipNumber) {
menu.add(0, 0, 0, R.string.recentCalls_editNumberBeforeCall)
.setIntent(new Intent(Intent.ACTION_DIAL, numberUri));
menu.add(0, 0, 0, R.string.menu_sendTextMessage)
.setIntent(new Intent(Intent.ACTION_SENDTO,
Uri.fromParts("sms", number, null)));
}
- if (!contactInfoPresent && numberUri != null && !isVoicemail) {
+
+ // "Add to contacts" item, if this entry isn't already associated with a contact
+ if (!contactInfoPresent && numberUri != null && !isVoicemail && !isSipNumber) {
+ // TODO: This item is currently disabled for SIP addresses, because
+ // the Insert.PHONE extra only works correctly for PSTN numbers.
+ //
+ // To fix this for SIP addresses, we need to:
+ // - define ContactsContract.Intents.Insert.SIP_ADDRESS, and use it here if
+ // the current number is a SIP address
+ // - update the contacts UI code to handle Insert.SIP_ADDRESS by
+ // updating the SipAddress field
+ // and then we can remove the "!isSipNumber" check above.
+
Intent intent = new Intent(Intent.ACTION_INSERT_OR_EDIT);
intent.setType(Contacts.CONTENT_ITEM_TYPE);
intent.putExtra(Insert.PHONE, number);
@@ -1070,8 +1181,8 @@
// most recent entry.
position = 0;
}
- final Cursor cursor = mAdapter.getCursor();
- if (cursor != null && cursor.moveToPosition(position)) {
+ final Cursor cursor = (Cursor)mAdapter.getItem(position);
+ if (cursor != null) {
String number = cursor.getString(NUMBER_COLUMN_INDEX);
if (TextUtils.isEmpty(number)
|| number.equals(CallerInfo.UNKNOWN_NUMBER)
@@ -1080,16 +1191,24 @@
// This number can't be called, do nothing
return;
}
-
- int callType = cursor.getInt(CALL_TYPE_COLUMN_INDEX);
- if (!number.startsWith("+") &&
- (callType == Calls.INCOMING_TYPE
- || callType == Calls.MISSED_TYPE)) {
- // If the caller-id matches a contact with a better qualified number, use it
- number = getBetterNumberFromContacts(number);
+ Intent intent;
+ // If "number" is really a SIP address, construct a sip: URI.
+ if (PhoneNumberUtils.isUriNumber(number)) {
+ intent = new Intent(Intent.ACTION_CALL_PRIVILEGED,
+ Uri.fromParts("sip", number, null));
+ } else {
+ // We're calling a regular PSTN phone number.
+ // Construct a tel: URI, but do some other possible cleanup first.
+ int callType = cursor.getInt(CALL_TYPE_COLUMN_INDEX);
+ if (!number.startsWith("+") &&
+ (callType == Calls.INCOMING_TYPE
+ || callType == Calls.MISSED_TYPE)) {
+ // If the caller-id matches a contact with a better qualified number, use it
+ number = getBetterNumberFromContacts(number);
+ }
+ intent = new Intent(Intent.ACTION_CALL_PRIVILEGED,
+ Uri.fromParts("tel", number, null));
}
- Intent intent = new Intent(Intent.ACTION_CALL_PRIVILEGED,
- Uri.fromParts("tel", number, null));
intent.setFlags(
Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
startActivity(intent);
diff --git a/src/com/android/contacts/TwelveKeyDialer.java b/src/com/android/contacts/TwelveKeyDialer.java
index 07927de..53c59f3 100644
--- a/src/com/android/contacts/TwelveKeyDialer.java
+++ b/src/com/android/contacts/TwelveKeyDialer.java
@@ -302,6 +302,7 @@
if (Intent.ACTION_DIAL.equals(action) || Intent.ACTION_VIEW.equals(action)) {
// see if we are "adding a call" from the InCallScreen; false by default.
mIsAddCallMode = intent.getBooleanExtra(ADD_CALL_MODE_KEY, false);
+
Uri uri = intent.getData();
if (uri != null) {
if ("tel".equals(uri.getScheme())) {
@@ -324,6 +325,16 @@
}
}
}
+ } else {
+ // ACTION_DIAL or ACTION_VIEW with no data.
+ // This behaves basically like ACTION_MAIN: If there's
+ // already an active call, bring up an intermediate UI to
+ // make the user confirm what they really want to do.
+ // Be sure *not* to show the dialpad chooser if this is an
+ // explicit "Add call" action, though.
+ if (!mIsAddCallMode && phoneIsInUse()) {
+ needToShowDialpadChooser = true;
+ }
}
} else if (Intent.ACTION_MAIN.equals(action)) {
// The MAIN action means we're bringing up a blank dialer
diff --git a/src/com/android/contacts/ViewContactActivity.java b/src/com/android/contacts/ViewContactActivity.java
index ead6a4a..80214ac 100644
--- a/src/com/android/contacts/ViewContactActivity.java
+++ b/src/com/android/contacts/ViewContactActivity.java
@@ -68,6 +68,7 @@
import android.provider.ContactsContract.CommonDataKinds.Note;
import android.provider.ContactsContract.CommonDataKinds.Organization;
import android.provider.ContactsContract.CommonDataKinds.Phone;
+import android.provider.ContactsContract.CommonDataKinds.SipAddress;
import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;
import android.provider.ContactsContract.CommonDataKinds.Website;
import android.telephony.PhoneNumberUtils;
@@ -782,7 +783,7 @@
int index = mListView.getSelectedItemPosition();
if (index != -1) {
ViewEntry entry = ViewAdapter.getEntry(mSections, index, SHOW_SEPARATORS);
- if (entry != null &&
+ if (entry != null && entry.intent != null &&
entry.intent.getAction() == Intent.ACTION_CALL_PRIVILEGED) {
startActivity(entry.intent);
return true;
@@ -1004,7 +1005,7 @@
entry.maxLines = 100;
mOtherEntries.add(entry);
} else if (Website.CONTENT_ITEM_TYPE.equals(mimeType) && hasData) {
- // Build note entries
+ // Build Website entries
entry.uri = null;
entry.maxLines = 10;
try {
@@ -1015,6 +1016,19 @@
Log.e(TAG, "Couldn't parse website: " + entry.data);
}
mOtherEntries.add(entry);
+ } else if (SipAddress.CONTENT_ITEM_TYPE.equals(mimeType) && hasData) {
+ // Build SipAddress entries
+ entry.uri = null;
+ entry.maxLines = 1;
+ entry.intent = new Intent(Intent.ACTION_CALL_PRIVILEGED,
+ Uri.fromParts(Constants.SCHEME_SIP, entry.data, null));
+ mOtherEntries.add(entry);
+ // TODO: Consider moving the SipAddress into its own
+ // section (rather than lumping it in with mOtherEntries)
+ // so that we can reposition it right under the phone number.
+ // (Then, we'd also update FallbackSource.java to set
+ // secondary=false for this field, and tweak the weight
+ // of its DataKind.)
} else {
// Handle showing custom rows
entry.intent = new Intent(Intent.ACTION_VIEW, entry.uri);
diff --git a/src/com/android/contacts/model/FallbackSource.java b/src/com/android/contacts/model/FallbackSource.java
index 9cc855c..f36752a 100644
--- a/src/com/android/contacts/model/FallbackSource.java
+++ b/src/com/android/contacts/model/FallbackSource.java
@@ -32,6 +32,7 @@
import android.provider.ContactsContract.CommonDataKinds.Organization;
import android.provider.ContactsContract.CommonDataKinds.Phone;
import android.provider.ContactsContract.CommonDataKinds.Photo;
+import android.provider.ContactsContract.CommonDataKinds.SipAddress;
import android.provider.ContactsContract.CommonDataKinds.StructuredName;
import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;
import android.provider.ContactsContract.CommonDataKinds.Website;
@@ -56,6 +57,9 @@
protected static final int FLAGS_POSTAL = EditorInfo.TYPE_CLASS_TEXT
| EditorInfo.TYPE_TEXT_VARIATION_POSTAL_ADDRESS | EditorInfo.TYPE_TEXT_FLAG_CAP_WORDS
| EditorInfo.TYPE_TEXT_FLAG_MULTI_LINE;
+ protected static final int FLAGS_SIP_ADDRESS = EditorInfo.TYPE_CLASS_TEXT
+ | EditorInfo.TYPE_TEXT_VARIATION_EMAIL_ADDRESS; // since SIP addresses have the same
+ // basic format as email addresses
public FallbackSource() {
this.accountType = null;
@@ -77,6 +81,7 @@
inflateNote(context, inflateLevel);
inflateWebsite(context, inflateLevel);
inflateEvent(context, inflateLevel);
+ inflateSipAddress(context, inflateLevel);
setInflatedLevel(inflateLevel);
@@ -435,6 +440,36 @@
return kind;
}
+ protected DataKind inflateSipAddress(Context context, int inflateLevel) {
+ DataKind kind = getKindForMimetype(SipAddress.CONTENT_ITEM_TYPE);
+ if (kind == null) {
+ // The icon specified here is the one that gets displayed for
+ // "Internet call" items, in the "view contact" UI within the
+ // Contacts app.
+ //
+ // This is independent of the "SIP call" icon that gets
+ // displayed in the Quick Contacts widget, which comes from
+ // the android:icon attribute of the SIP-related
+ // intent-filters in the Phone app's manifest.
+
+ kind = addKind(new DataKind(SipAddress.CONTENT_ITEM_TYPE,
+ R.string.label_sip_address, android.R.drawable.sym_action_call, 130, true));
+
+ kind.isList = false;
+ kind.secondary = true;
+ kind.actionHeader = new SimpleInflater(R.string.label_sip_address);
+ kind.actionBody = new SimpleInflater(SipAddress.SIP_ADDRESS);
+ }
+
+ if (inflateLevel >= ContactsSource.LEVEL_CONSTRAINTS) {
+ kind.fieldList = Lists.newArrayList();
+ kind.fieldList.add(new EditField(SipAddress.SIP_ADDRESS,
+ R.string.label_sip_address, FLAGS_SIP_ADDRESS));
+ }
+
+ return kind;
+ }
+
/**
* Simple inflater that assumes a string resource has a "%s" that will be
* filled from the given column.
diff --git a/src/com/android/contacts/model/GoogleSource.java b/src/com/android/contacts/model/GoogleSource.java
index 90abc92..d6dfbb6 100644
--- a/src/com/android/contacts/model/GoogleSource.java
+++ b/src/com/android/contacts/model/GoogleSource.java
@@ -66,6 +66,7 @@
inflateNote(context, inflateLevel);
inflateWebsite(context, inflateLevel);
inflateEvent(context, inflateLevel);
+ inflateSipAddress(context, inflateLevel);
// TODO: GOOGLE: GROUPMEMBERSHIP
@@ -74,16 +75,6 @@
}
@Override
- protected DataKind inflateStructuredName(Context context, int inflateLevel) {
- return super.inflateStructuredName(context, inflateLevel);
- }
-
- @Override
- protected DataKind inflateNickname(Context context, int inflateLevel) {
- return super.inflateNickname(context, inflateLevel);
- }
-
- @Override
protected DataKind inflatePhone(Context context, int inflateLevel) {
final DataKind kind = super.inflatePhone(context, ContactsSource.LEVEL_MIMETYPES);
@@ -127,36 +118,6 @@
return kind;
}
- @Override
- protected DataKind inflateStructuredPostal(Context context, int inflateLevel) {
- return super.inflateStructuredPostal(context, inflateLevel);
- }
-
- @Override
- protected DataKind inflateIm(Context context, int inflateLevel) {
- return super.inflateIm(context, inflateLevel);
- }
-
- @Override
- protected DataKind inflateOrganization(Context context, int inflateLevel) {
- return super.inflateOrganization(context, inflateLevel);
- }
-
- @Override
- protected DataKind inflatePhoto(Context context, int inflateLevel) {
- return super.inflatePhoto(context, inflateLevel);
- }
-
- @Override
- protected DataKind inflateNote(Context context, int inflateLevel) {
- return super.inflateNote(context, inflateLevel);
- }
-
- @Override
- protected DataKind inflateWebsite(Context context, int inflateLevel) {
- return super.inflateWebsite(context, inflateLevel);
- }
-
// TODO: this should come from resource in the future
// Note that frameworks/base/core/java/android/pim/vcard/VCardEntry.java also wants
// this String.
diff --git a/src/com/android/contacts/ui/ContactsPreferences.java b/src/com/android/contacts/ui/ContactsPreferences.java
index 49a49ef..14c6e05 100644
--- a/src/com/android/contacts/ui/ContactsPreferences.java
+++ b/src/com/android/contacts/ui/ContactsPreferences.java
@@ -21,6 +21,7 @@
import android.content.ContentResolver;
import android.content.Context;
import android.database.ContentObserver;
+import android.os.Handler;
import android.provider.ContactsContract;
import android.provider.Settings;
import android.provider.Settings.SettingNotFoundException;
@@ -28,20 +29,17 @@
/**
* Manages user preferences for contacts.
*/
-public final class ContactsPreferences {
-
+public final class ContactsPreferences extends ContentObserver {
private Context mContext;
- private ContentResolver mContentResolver;
private int mSortOrder = -1;
private int mDisplayOrder = -1;
- private SettingsObserver mSettingsObserver;
+ private ChangeListener mListener = null;
+ private Handler mHandler;
public ContactsPreferences(Context context) {
+ super(null);
mContext = context;
- mContentResolver = context.getContentResolver();
-
- mSettingsObserver = new SettingsObserver();
- mSettingsObserver.register();
+ mHandler = new Handler();
}
public boolean isSortOrderUserChangeable() {
@@ -112,27 +110,45 @@
ContactsContract.Preferences.DISPLAY_ORDER, displayOrder);
}
- private class SettingsObserver extends ContentObserver {
+ public void registerChangeListener(ChangeListener listener) {
+ if (mListener != null) unregisterChangeListener();
- public SettingsObserver() {
- super(null);
+ // We didn't watch before, so ensure that we actually forget our cache here
+ mSortOrder = -1;
+ mDisplayOrder = -1;
+
+ mListener = listener;
+ final ContentResolver contentResolver = mContext.getContentResolver();
+ contentResolver.registerContentObserver(
+ Settings.System.getUriFor(
+ ContactsContract.Preferences.SORT_ORDER), false, this);
+ contentResolver.registerContentObserver(
+ Settings.System.getUriFor(
+ ContactsContract.Preferences.DISPLAY_ORDER), false, this);
+ }
+
+ public void unregisterChangeListener() {
+ if (mListener != null) {
+ mContext.getContentResolver().unregisterContentObserver(this);
+ mListener = null;
}
+ }
- public void register() {
- mContentResolver.registerContentObserver(
- Settings.System.getUriFor(
- ContactsContract.Preferences.SORT_ORDER), false, this);
- mContentResolver.registerContentObserver(
- Settings.System.getUriFor(
- ContactsContract.Preferences.DISPLAY_ORDER), false, this);
- }
+ @Override
+ public void onChange(boolean selfChange) {
+ // This notification is not sent on the Ui thread. Use the previously created Handler
+ // to switch to the Ui thread
+ mHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ mSortOrder = -1;
+ mDisplayOrder = -1;
+ if (mListener != null) mListener.onChange();
+ }
+ });
+ }
- @Override
- public void onChange(boolean selfChange) {
- mSortOrder = -1;
- mDisplayOrder = -1;
-
- // TODO send a message to parent context to notify of the change
- }
+ public interface ChangeListener {
+ void onChange();
}
}
diff --git a/src/com/android/contacts/ui/ContactsPreferencesActivity.java b/src/com/android/contacts/ui/ContactsPreferencesActivity.java
index 5a89745..6bc9be8 100644
--- a/src/com/android/contacts/ui/ContactsPreferencesActivity.java
+++ b/src/com/android/contacts/ui/ContactsPreferencesActivity.java
@@ -245,7 +245,6 @@
};
return new AlertDialog.Builder(this)
- .setIcon(com.android.internal.R.drawable.ic_dialog_menu_generic)
.setTitle(R.string.display_options_sort_list_by)
.setSingleChoiceItems(items, -1, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) {
@@ -264,7 +263,6 @@
};
return new AlertDialog.Builder(this)
- .setIcon(com.android.internal.R.drawable.ic_dialog_menu_generic)
.setTitle(R.string.display_options_view_names_as)
.setSingleChoiceItems(items, -1, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) {
@@ -845,7 +843,7 @@
Editor editor = mPrefs.edit();
editor.putBoolean(Prefs.DISPLAY_ONLY_PHONES, displayOnlyPhones);
- editor.commit();
+ editor.apply();
mAdapter.setChildDescripWithPhones(displayOnlyPhones);
mAdapter.notifyDataSetChanged();
diff --git a/src/com/android/contacts/ui/EditContactActivity.java b/src/com/android/contacts/ui/EditContactActivity.java
index 3e248ea..e37aade 100644
--- a/src/com/android/contacts/ui/EditContactActivity.java
+++ b/src/com/android/contacts/ui/EditContactActivity.java
@@ -144,6 +144,7 @@
private static final int STATUS_SAVING = 2;
private int mStatus;
+ private boolean mActivityActive; // true after onCreate/onResume, false at onPause
EntitySet mState;
@@ -172,6 +173,8 @@
// Handle initial actions only when existing state missing
final boolean hasIncomingState = icicle != null && icicle.containsKey(KEY_EDIT_STATE);
+ mActivityActive = true;
+
if (Intent.ACTION_EDIT.equals(action) && !hasIncomingState) {
setTitle(R.string.editContact_title_edit);
mStatus = STATUS_LOADING;
@@ -191,6 +194,18 @@
}
}
+ @Override
+ protected void onResume() {
+ super.onResume();
+ mActivityActive = true;
+ }
+
+ @Override
+ protected void onPause() {
+ super.onResume();
+ mActivityActive = false;
+ }
+
private static class QueryEntitiesTask extends
WeakAsyncTask<Intent, Void, EntitySet, EditContactActivity> {
@@ -1211,6 +1226,10 @@
@Override
protected void onPostExecute(final EditContactActivity target, ArrayList<Account> accounts) {
+ if (!target.mActivityActive) {
+ // A monkey or very fast user.
+ return;
+ }
target.selectAccountAndCreateContact(accounts);
}
}
diff --git a/src/com/android/contacts/ui/QuickContactWindow.java b/src/com/android/contacts/ui/QuickContactWindow.java
index 20d5bfd..5e03493 100644
--- a/src/com/android/contacts/ui/QuickContactWindow.java
+++ b/src/com/android/contacts/ui/QuickContactWindow.java
@@ -55,6 +55,7 @@
import android.provider.ContactsContract.CommonDataKinds.Im;
import android.provider.ContactsContract.CommonDataKinds.Phone;
import android.provider.ContactsContract.CommonDataKinds.Photo;
+import android.provider.ContactsContract.CommonDataKinds.SipAddress;
import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;
import android.provider.ContactsContract.CommonDataKinds.Website;
import android.text.TextUtils;
@@ -217,6 +218,7 @@
*/
private static final String[] PRECEDING_MIMETYPES = new String[] {
Phone.CONTENT_ITEM_TYPE,
+ SipAddress.CONTENT_ITEM_TYPE,
Contacts.CONTENT_ITEM_TYPE,
Constants.MIME_SMS_ADDRESS,
Email.CONTENT_ITEM_TYPE,
@@ -770,7 +772,18 @@
final Uri callUri = Uri.fromParts(Constants.SCHEME_TEL, number, null);
mIntent = new Intent(Intent.ACTION_CALL_PRIVILEGED, callUri);
}
-
+ } else if (SipAddress.CONTENT_ITEM_TYPE.equals(mimeType)) {
+ final String address = getAsString(cursor, SipAddress.SIP_ADDRESS);
+ if (!TextUtils.isEmpty(address)) {
+ final Uri callUri = Uri.fromParts(Constants.SCHEME_SIP, address, null);
+ mIntent = new Intent(Intent.ACTION_CALL_PRIVILEGED, callUri);
+ // Note that this item will get a SIP-specific variant
+ // of the "call phone" icon, rather than the standard
+ // app icon for the Phone app (which we show for
+ // regular phone numbers.) That's because the phone
+ // app explicitly specifies an android:icon attribute
+ // for the SIP-related intent-filters in its manifest.
+ }
} else if (Constants.MIME_SMS_ADDRESS.equals(mimeType)) {
final String number = getAsString(cursor, Phone.NUMBER);
if (!TextUtils.isEmpty(number)) {
diff --git a/src/com/android/contacts/util/Constants.java b/src/com/android/contacts/util/Constants.java
index e0178ad..a94608b 100644
--- a/src/com/android/contacts/util/Constants.java
+++ b/src/com/android/contacts/util/Constants.java
@@ -35,5 +35,6 @@
public static final String SCHEME_SMSTO = "smsto";
public static final String SCHEME_MAILTO = "mailto";
public static final String SCHEME_IMTO = "imto";
+ public static final String SCHEME_SIP = "sip";
}
