diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index d570a49..3d248fd 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -71,8 +71,8 @@
     <string name="title_from_google" msgid="2554633992366572820">"ከGoogle"</string>
     <string name="title_from_other_accounts" msgid="7813596336566711843">"ከ<xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="menu_set_ring_tone" msgid="8876328286439724181">"የጥሪ ድምፅ አዘጋጅ"</string>
-    <string name="menu_redirect_calls_to_vm" msgid="3027178444991878913">"ወደ ድምፅ መልዕክት አስተላልፍ"</string>
-    <string name="menu_unredirect_calls_to_vm" msgid="2294919685954790892">"ወደ ድምፅ መልዕክት መተላለፍን አስቀር"</string>
+    <string name="menu_redirect_calls_to_vm" msgid="3027178444991878913">"ወደ ድምጽ መልዕክት አስተላልፍ"</string>
+    <string name="menu_unredirect_calls_to_vm" msgid="2294919685954790892">"ወደ ድምጽ መልዕክት መተላለፍን አስቀር"</string>
     <string name="readOnlyContactWarning" msgid="4158660823025751201">"ይህ እውቂያ ተበባቢ-ብቻ ነው። መሰረዝ አይችልም። ነገር ግን ሊደብቁት ይችላሉ።"</string>
     <string name="readOnlyContactWarning_positive_button" msgid="2602676689104338036">"እውቂያ ደብቅ"</string>
     <string name="readOnlyContactDeleteConfirmation" msgid="2759786078454970110">"በዚህ እውቂያ ውስጥ ያሉ ተነባቢ-ብቻ መለያዎች ይደበቃሉ፣ ወይም ይሰረዛሉ።"</string>
@@ -166,7 +166,7 @@
     <string name="copy_text" msgid="6835250673373028909">"ወደ ቅንጥብ ሰሌዳ ገልብጥ"</string>
     <string name="set_default" msgid="3704074175618702225">"ነባሪ አዘጋጅ"</string>
     <string name="clear_default" msgid="2055883863621491533">"ነባሪ አጽዳ"</string>
-    <string name="toast_text_copied" msgid="845906090076228771">"ጽሁፍ ገልብጧል"</string>
+    <string name="toast_text_copied" msgid="845906090076228771">"ፅሁፍ ገልብጧል"</string>
     <string name="cancel_confirmation_dialog_message" msgid="7486892574762212762">"ለውጦች ይወገዱ?"</string>
     <string name="cancel_confirmation_dialog_cancel_editing_button" msgid="8280294641821133477">"አስወግድ"</string>
     <string name="cancel_confirmation_dialog_keep_editing_button" msgid="7117943783437253341">"ተወው"</string>
@@ -256,22 +256,22 @@
     <string name="sms_mobile" msgid="433949735070334192">"የ ተንቀሳቃሽፅሁፍ"</string>
     <string name="sms_work" msgid="7784676780449153911">"የፅሁፍ ሥራ"</string>
     <string name="sms_fax_work" msgid="8239716828120939345">"የፅሁፍ ሥራፋክስ"</string>
-    <string name="sms_fax_home" msgid="6887675360794775735">"የመነሻ ጽሁፍ ፋክስ"</string>
+    <string name="sms_fax_home" msgid="6887675360794775735">"የመነሻ ፅሁፍ ፋክስ"</string>
     <string name="sms_pager" msgid="1052540072760129272">"የፅሁፍ ምልክት  ማድረጊያ"</string>
-    <string name="sms_other" msgid="3584200156296349098">"ጽሁፍ"</string>
-    <string name="sms_callback" msgid="6932315941997609031">"የተዘዋዋሪ ጥሪ ጽሁፍ"</string>
+    <string name="sms_other" msgid="3584200156296349098">"ፅሁፍ"</string>
+    <string name="sms_callback" msgid="6932315941997609031">"የተዘዋዋሪ ጥሪ ፅሁፍ"</string>
     <string name="sms_car" msgid="6051606941547979352">"የፅሁፍ ማሽን"</string>
     <string name="sms_company_main" msgid="4801585186677340070">"የኩባንያ ዋናፅሁፍ"</string>
-    <string name="sms_isdn" msgid="8093269429091061478">"የ ISDN ጽሁፍ"</string>
-    <string name="sms_main" msgid="624730854551629076">"የዋና ጽሁፍ"</string>
-    <string name="sms_other_fax" msgid="8272996838482574564">"የፋክስ ጽሁፍ"</string>
+    <string name="sms_isdn" msgid="8093269429091061478">"የ ISDN ፅሁፍ"</string>
+    <string name="sms_main" msgid="624730854551629076">"የዋና ፅሁፍ"</string>
+    <string name="sms_other_fax" msgid="8272996838482574564">"የፋክስ ፅሁፍ"</string>
     <string name="sms_radio" msgid="3703466526430351408">"የፅሁፍ ሬዲዮ"</string>
     <string name="sms_telex" msgid="5926595248188984691">"የፅሁፍ ቴሌክስ"</string>
-    <string name="sms_tty_tdd" msgid="5517202384458721064">"TTY/TDD ጽሁፍ"</string>
+    <string name="sms_tty_tdd" msgid="5517202384458721064">"TTY/TDD ፅሁፍ"</string>
     <string name="sms_work_mobile" msgid="1170012557483816931">"የፅሁፍ ሥራ ተንቀሳቃሽ"</string>
     <string name="sms_work_pager" msgid="8827367747655005608">"የፅሁፍ ሥራ ምልክት  ማድረጊያ"</string>
-    <string name="sms_assistant" msgid="245045451580096547">"ጽሁፍ <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="7395133080765833725">"የMMS ጽሁፍ"</string>
+    <string name="sms_assistant" msgid="245045451580096547">"ፅሁፍ <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
+    <string name="sms_mms" msgid="7395133080765833725">"የMMS ፅሁፍ"</string>
     <string name="sms_by_shortcut" msgid="4682340916268521006">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (መልዕክት)"</string>
     <string name="description_video_call" msgid="4956825008907720371">"የቪዲዮ ጥሪ ያድርጉ"</string>
     <string name="clearFrequentsConfirmation_title" msgid="9194415661170740437">"በተደጋጋሚ ያገኝዋቸው ይጽዱ?"</string>
@@ -375,7 +375,7 @@
     <string name="import_from_vcf_file_confirmation_message" msgid="8579284961401472204">"እውቂያዎች ከvCard ይምጡ?"</string>
     <string name="cancel_import_confirmation_message" msgid="1007412828398265611">"የ<xliff:g id="FILENAME">%s</xliff:g>ወደ ውስጥ ማስገባት ይቅር?"</string>
     <string name="cancel_export_confirmation_message" msgid="370693160959236239">"የ<xliff:g id="FILENAME">%s</xliff:g> ወደ ውጭ መላክ ይቅር?"</string>
-    <string name="cancel_vcard_import_or_export_failed" msgid="3041814872516288484">"vCard ማስመጣት/ወደ ውጭ መላክ ይቅር ማለት አልተቻለም"</string>
+    <string name="cancel_vcard_import_or_export_failed" msgid="3041814872516288484">"vCard ማስመጣት/ወደ ውጪ መላክ ይቅር ማለት አልተቻለም"</string>
     <string name="fail_reason_unknown" msgid="3721044979355043778">"ያልታወቀ ስህተት"</string>
     <string name="fail_reason_could_not_open_file" msgid="6015509564074145162">"\"<xliff:g id="FILE_NAME">%1$s</xliff:g>\" ፡<xliff:g id="EXACT_REASON">%2$s</xliff:g> መክፈት አልተቻለም"</string>
     <string name="fail_reason_could_not_initialize_exporter" msgid="4145819808407973981">"ላኪው፡\"<xliff:g id="EXACT_REASON">%s</xliff:g>\"  ለማስነሳት አልተቻለም"</string>
@@ -386,7 +386,7 @@
     <string name="fail_reason_low_memory_during_import" msgid="4525361860523306991">"በቂ ማህደረ ትውስታ የለም፡፡ፋይሉ ምናልባት በጣም ትልቅ ይሆናል፡፡"</string>
     <string name="fail_reason_not_supported" msgid="6449916670421646290">"ቅርፀቱ አይታገዝም"</string>
     <string name="exporting_vcard_finished_title" msgid="1984393609140969504">"<xliff:g id="FILENAME">%s</xliff:g> መላክ ጨርሷል"</string>
-    <string name="exporting_vcard_finished_title_fallback" msgid="9029067439586573959">"እውቂያዎችን ወደ ውጭ መላክ ተጠናቅቋል።"</string>
+    <string name="exporting_vcard_finished_title_fallback" msgid="9029067439586573959">"እውቂያዎችን ወደ ውጪ መላክ ተጠናቅቋል።"</string>
     <string name="exporting_vcard_finished_toast" msgid="5463125514187187782">"እውቂያዎችን ወደ ውጭ መላክ ተጠናቅቋል፣ እውቂያዎችን ለማጋራት ማሳወቂያውን ጠቅ ያድርጉ።"</string>
     <string name="touch_to_share_contacts" msgid="7678194978416052577">"እውቂያዎችን ለማጋራት መታ ያድርጉ።"</string>
     <string name="exporting_vcard_canceled_title" msgid="1287529222628052526">"መላክ <xliff:g id="FILENAME">%s</xliff:g> ተሰርዟል::"</string>
@@ -441,7 +441,7 @@
     <string name="hint_findContacts" msgid="5554298639062659655">"እውቂያዎችን ይፈልጉ"</string>
     <string name="contactsFavoritesLabel" msgid="8339645684721732714">"ተወዳጆች"</string>
     <string name="menu_import" msgid="2206768098740726906">"አምጣ"</string>
-    <string name="menu_export" msgid="1217402092617629429">"ወደ ውጭ ላክ"</string>
+    <string name="menu_export" msgid="1217402092617629429">"ወደ ውጪ ላክ"</string>
     <string name="menu_blocked_numbers" msgid="7064680515202657609">"የታገዱ ቁጥሮች"</string>
     <string name="contact_status_update_attribution" msgid="5051874518046969847">"በ<xliff:g id="SOURCE">%1$s</xliff:g> በኩል"</string>
     <string name="contact_status_update_attribution_with_date" msgid="2195847657702455703">"<xliff:g id="DATE">%1$s</xliff:g>በ<xliff:g id="SOURCE">%2$s</xliff:g> በኩል"</string>
@@ -450,7 +450,7 @@
     <string name="select_account_dialog_title" msgid="5047523441152129207">"መለያ"</string>
     <string name="set_default_account" msgid="9194321110211682396">"ለጥሪዎች ሁልጊዜ ይህንን ተጠቀም"</string>
     <string name="call_with_a_note" msgid="2463785820399287281">"ከማስታወሻ ጋር ደውል"</string>
-    <string name="call_subject_hint" msgid="7056652101889538157">"ከውይይት ጋር ለመላክ የማስታወሻ ጽሁፍ ይተይቡ…"</string>
+    <string name="call_subject_hint" msgid="7056652101889538157">"ከውይይት ጋር ለመላክ የማስታወሻ ጽሑፍ ይተይቡ…"</string>
     <string name="send_and_call_button" msgid="4851257959568592699">"ላክ እና ደውል"</string>
     <string name="call_subject_limit" msgid="5679166729627777474">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
     <string name="call_subject_type_and_number" msgid="134754147019287616">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
@@ -465,7 +465,7 @@
     <string name="account_filter_view_not_checked" msgid="5782705545786455847">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> ምልክት አልተደረገበትም"</string>
     <string name="description_search_video_call" msgid="1768558141309418755">"የቪዲዮ ጥሪ አስቀምጥ"</string>
     <string name="description_delete_contact" msgid="8110643050235441400">"ሰርዝ"</string>
-    <string name="description_no_name_header" msgid="8596201864512339003">"ሦስት ነጥብ"</string>
+    <string name="description_no_name_header" msgid="8596201864512339003">"ሶስት ነጥብ"</string>
     <string name="dynamic_shortcut_disabled_message" msgid="8770462908102469878">"ይህ አቋራጭ ተወግዷል"</string>
     <string name="dynamic_shortcut_contact_removed_message" msgid="8331735243566193974">"እውቂያ ተወግዷል"</string>
     <string name="sim_import_button_text" msgid="2845608246304396009">"ከውጭ አምጣ"</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 3a77900..97be770 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -84,8 +84,8 @@
     <string name="deleteConfirmation" msgid="3727809366015979585">"এই সম্পৰ্কটো মচিবনে?"</string>
     <string name="deleteConfirmation_positive_button" msgid="1604511403421785160">"মচক"</string>
     <string name="invalidContactMessage" msgid="6204402264821083362">"এই সম্পৰ্কটো নাই।"</string>
-    <string name="createContactShortcutSuccessful_NoName" msgid="532242135930208299">"সম্পৰ্কক গৃহ স্ক্ৰীনত যোগ কৰা হ’ল।"</string>
-    <string name="createContactShortcutSuccessful" msgid="6980032407920515698">"<xliff:g id="NAME">%s</xliff:g>ক গৃহ স্ক্ৰীনত যোগ কৰা হ’ল।"</string>
+    <string name="createContactShortcutSuccessful_NoName" msgid="532242135930208299">"সম্পৰ্কক গৃহ স্ক্ৰীণত যোগ কৰা হ’ল।"</string>
+    <string name="createContactShortcutSuccessful" msgid="6980032407920515698">"<xliff:g id="NAME">%s</xliff:g>ক গৃহ স্ক্ৰীণত যোগ কৰা হ’ল।"</string>
     <string name="photoPickerNotFoundText" msgid="6535222297923110991">"এই ডিভাইচত কোনো চিত্ৰ নাই।"</string>
     <string name="attach_photo_dialog_title" msgid="7948754072673745235">"সম্পৰ্ক ব্য়ক্তিৰ ফট\'"</string>
     <string name="customLabelPickerTitle" msgid="816694850254307154">"উপযোগিতা অনুসৰি লেবেলৰ নাম"</string>
@@ -170,7 +170,7 @@
     <string name="cancel_confirmation_dialog_message" msgid="7486892574762212762">"সলনি কৰা কার্যসমূহ প্ৰত্য়াখ্য়ান কৰিবনে?"</string>
     <string name="cancel_confirmation_dialog_cancel_editing_button" msgid="8280294641821133477">"প্ৰত্যাখ্যান কৰক"</string>
     <string name="cancel_confirmation_dialog_keep_editing_button" msgid="7117943783437253341">"বাতিল কৰক"</string>
-    <string name="leave_customize_confirmation_dialog_message" msgid="5330853530872707231">"উপযোগিতা অনুসৰি সৃষ্টি কৰা স্ক্ৰীন প্ৰত্যাখ্যান কৰিবনে?"</string>
+    <string name="leave_customize_confirmation_dialog_message" msgid="5330853530872707231">"উপযোগিতা অনুসৰি সৃষ্টি কৰা স্ক্ৰীণ প্ৰত্যাখ্যান কৰিবনে?"</string>
     <string name="enter_contact_name" msgid="521859148893732679">"সম্পৰ্কসূচীত সন্ধান কৰক"</string>
     <string name="title_edit_group" msgid="4246193439931854759">"সম্পৰ্কসমূহ আঁতৰাওক"</string>
     <string name="local_profile_title" msgid="1613784248702623410">"মোৰ স্থানীয় প্ৰ\'ফাইল"</string>
@@ -403,9 +403,9 @@
     <string name="importing_vcard_canceled_title" msgid="8165471996631186776">"<xliff:g id="FILENAME">%s</xliff:g>ৰ আমদানি কৰা কাৰ্য বাতিল কৰা হ’ল"</string>
     <string name="vcard_import_will_start_message" msgid="4514702035621833178">"<xliff:g id="FILENAME">%s</xliff:g> শীঘ্ৰেই আমদানি কৰা হ\'ব।"</string>
     <string name="vcard_import_will_start_message_with_default_name" msgid="8205422202924103470">"এই ফাইলটো শীঘ্ৰেই আমদানি কৰা হ\'ব।"</string>
-    <string name="vcard_import_request_rejected_message" msgid="4754292694777189540">"ভি-কাৰ্ড আমদানি কৰা অনুৰোধ অগ্ৰাহ্য় কৰা হ’ল। পাছত আকৌ চেষ্টা কৰক।"</string>
+    <string name="vcard_import_request_rejected_message" msgid="4754292694777189540">"ভি-কাৰ্ড আমদানি কৰা অনুৰোধ অগ্ৰাহ্য় কৰা হ’ল। পিছত আকৌ চেষ্টা কৰক।"</string>
     <string name="contacts_export_will_start_message" msgid="6428126265599715944">"সম্পৰ্কসমূহক সোনকালে ৰপ্তানি কৰা হ\'ব।"</string>
-    <string name="vcard_export_request_rejected_message" msgid="6455336845734884740">"ভি-কাৰ্ড ৰপ্তানি কৰা অনুৰোধ অগ্ৰাহ্য় কৰা হ’ল। পাছত আকৌ চেষ্টা কৰক।"</string>
+    <string name="vcard_export_request_rejected_message" msgid="6455336845734884740">"ভি-কাৰ্ড ৰপ্তানি কৰা অনুৰোধ অগ্ৰাহ্য় কৰা হ’ল। পিছত আকৌ চেষ্টা কৰক।"</string>
     <string name="vcard_unknown_filename" msgid="8320954544777782497">"সম্পৰ্ক"</string>
     <string name="caching_vcard_message" msgid="1879339732783666517">"ভি-কাৰ্ড(বোৰ)ক ডিভাইচৰ অস্থায়ী ষ্ট’ৰেজত কেশ্ব কৰি থকা হৈছে। আচল ইমপ’ৰ্ট কৰা কাৰ্য সোনকালে আৰম্ভ হ’ব।"</string>
     <string name="vcard_import_failed" msgid="37313715326741013">"vCard আমদানি কৰিব পৰা নগ\'ল।"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index fdf5078..f3fd114 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -230,7 +230,7 @@
     <string name="hamburger_feature_highlight_body" msgid="782935036630531528">"Упарадкуйце свае кантакты для зручнага выкарыстання"</string>
     <string name="undo" msgid="2446931036220975026">"Адрабіць"</string>
     <string name="call_custom" msgid="2844900154492073207">"Выклікаць <xliff:g id="CUSTOM_LABEL">%s</xliff:g>"</string>
-    <string name="call_home" msgid="2443904771140750492">"Выклік дамоў"</string>
+    <string name="call_home" msgid="2443904771140750492">"Патэлефанаваць на хатні нумар"</string>
     <string name="call_mobile" msgid="6504312789160309832">"Набраць нумар мабільнага тэлефону"</string>
     <string name="call_work" msgid="2414313348547560346">"Выклікаць працоўны нумар тэлефона"</string>
     <string name="call_fax_work" msgid="5026843006300760797">"Набраць нумар працоўнага факса"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 9e2c696..2703025 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -482,7 +482,7 @@
     <string name="turn_auto_sync_on_dialog_title" msgid="3812155064863594938">"স্বতঃ-সিঙ্ক চালু করবেন?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="5386810641905184682">"Google পরিচিতিগুলি ছাড়াও, সমস্ত অ্যাপ এবং অ্যাকাউন্টে আপনার করা পরিবর্তনগুলি, ওয়েব এবং আপনার ডিভাইসগুলির মধ্যে আপ টু ডেট রাখা হবে।"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="5575717918836806519">"চালু করুন"</string>
-    <string name="connection_error_message" msgid="7446131881946138093">"কোনও কানেকশন নেই"</string>
+    <string name="connection_error_message" msgid="7446131881946138093">"কোনো সংযোগ নেই"</string>
     <string name="single_sim_display_label" msgid="264062966309455515">"সিম"</string>
     <string name="show_more_content_description" msgid="6298277298495491712">"আরও দেখান"</string>
     <string name="importing_sim_finished_title" msgid="6436721150882268416">"সিম কার্ড আমদানি করা সমাপ্ত হয়েছে"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 5135ef4..702cd61 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -344,7 +344,7 @@
     <string name="chat_icq" msgid="4289041376069626281">"Chat mediante ICQ"</string>
     <string name="chat_jabber" msgid="1097960594943864847">"Chat mediante Jabber"</string>
     <string name="chat" msgid="8390862712584830532">"Chat"</string>
-    <string name="description_minus_button" msgid="1305985971158054217">"borrar"</string>
+    <string name="description_minus_button" msgid="1305985971158054217">"Eliminar"</string>
     <string name="expand_name_fields_description" msgid="6059558159338959487">"Mostrar más campos de nombre"</string>
     <string name="collapse_name_fields_description" msgid="7950435675716414477">"Contraer campos de nombre"</string>
     <string name="expand_phonetic_name_fields_description" msgid="7414340689396399173">"Mostrar más campos de nombre fonético"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 85aadbf..f1f48d5 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -134,7 +134,7 @@
     <string name="group_name_dialog_hint" msgid="6023999218213062973">"Etiketaren izena"</string>
     <string name="label_name_dialog_hint" msgid="7027635439255596191">"Etiketa-izena"</string>
     <string name="audio_chat" msgid="5921525823973697372">"Ahots-txata"</string>
-    <string name="video_chat" msgid="2477295971622477433">"Bideodeia"</string>
+    <string name="video_chat" msgid="2477295971622477433">"Bideo-txata"</string>
     <string name="account_type_format" msgid="4926968760755013450">"<xliff:g id="SOURCE">%1$s</xliff:g> kontaktua"</string>
     <string name="google_account_type_format" msgid="4046692740262396811">"<xliff:g id="SOURCE">%1$s</xliff:g> kontua"</string>
     <string name="take_photo" msgid="820071555236547516">"Atera argazkia"</string>
@@ -273,7 +273,7 @@
     <string name="sms_assistant" msgid="245045451580096547">"Bidali testu-mezua <xliff:g id="ASSISTANT">%s</xliff:g> zenbakira"</string>
     <string name="sms_mms" msgid="7395133080765833725">"Bidali testu-mezua MMS zenbakira"</string>
     <string name="sms_by_shortcut" msgid="4682340916268521006">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (bidali SMS mezua)"</string>
-    <string name="description_video_call" msgid="4956825008907720371">"Egin bideodeia"</string>
+    <string name="description_video_call" msgid="4956825008907720371">"Egin bideo-deia"</string>
     <string name="clearFrequentsConfirmation_title" msgid="9194415661170740437">"Sarri erabilitako kontaktuak garbitu?"</string>
     <string name="clearFrequentsConfirmation" msgid="2120741757522063938">"Kontaktuak eta Telefonoa aplikazioetako maiz erabilitako kontaktuen zerrenda garbituko duzu. Beraz, berriro ikasi beharko dituzte helbideen hobespenak posta elektronikoaren aplikazioek."</string>
     <string name="clearFrequentsProgress_title" msgid="8271935295080659743">"Sarri erabilitako kontaktuak garbitzen…"</string>
@@ -463,7 +463,7 @@
     <string name="url_open_error_toast" msgid="4885855620824048385">"Ezin izan da ireki URLa."</string>
     <string name="account_filter_view_checked" msgid="4740544238806346376">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> hautatu da"</string>
     <string name="account_filter_view_not_checked" msgid="5782705545786455847">"Ez da hautatu <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
-    <string name="description_search_video_call" msgid="1768558141309418755">"Egin bideodeia"</string>
+    <string name="description_search_video_call" msgid="1768558141309418755">"Egin bideo-deia"</string>
     <string name="description_delete_contact" msgid="8110643050235441400">"Ezabatu"</string>
     <string name="description_no_name_header" msgid="8596201864512339003">"Etenpuntuak"</string>
     <string name="dynamic_shortcut_disabled_message" msgid="8770462908102469878">"Lasterbidea desgaitu egin da"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index e70f763..045d1d8 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -221,8 +221,8 @@
     <string name="editor_delete_view_description_short" msgid="6471032197042328181">"Poista <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
     <string name="menu_assistant" msgid="3980364519724237934">"Ehdotukset"</string>
     <string name="menu_assistant_new_badge" msgid="1992049406019853898">"Uusi"</string>
-    <string name="navigation_drawer_open" msgid="3428713515765555712">"Avaa navigointipaneeli"</string>
-    <string name="navigation_drawer_close" msgid="3052989100471689722">"Sulje navigointipaneeli"</string>
+    <string name="navigation_drawer_open" msgid="3428713515765555712">"Avaa navigoinnin vetopaneeli"</string>
+    <string name="navigation_drawer_close" msgid="3052989100471689722">"Sulje navigoinnin vetopaneeli"</string>
     <string name="navigation_drawer_label" msgid="8391863484838783638">"Tunniste <xliff:g id="LABEL_NAME">%s</xliff:g>"</string>
     <string name="menu_title_groups" msgid="3722199658759568221">"Tunnisteet"</string>
     <string name="menu_title_filters" msgid="349866121417914494">"Tilit"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index f1d8c95..a71fd0b 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -299,10 +299,10 @@
     <string name="name_prefix" msgid="8857117624713905211">"Forma de tratamento"</string>
     <string name="name_middle" msgid="7330498948136181042">"Segundo nome"</string>
     <string name="name_suffix" msgid="4502958221763936999">"Título académico ou profesional"</string>
-    <string name="name_phonetic" msgid="4746541275769990740">"Nome (pronuncia)"</string>
-    <string name="name_phonetic_given" msgid="425534279190047812">"Nome (pronuncia)"</string>
-    <string name="name_phonetic_middle" msgid="6528822054594516485">"Segundo nome (pronuncia)"</string>
-    <string name="name_phonetic_family" msgid="1690852801039809448">"Apelidos (pronuncia)"</string>
+    <string name="name_phonetic" msgid="4746541275769990740">"Nome (pronunciación)"</string>
+    <string name="name_phonetic_given" msgid="425534279190047812">"Nome (pronunciación)"</string>
+    <string name="name_phonetic_middle" msgid="6528822054594516485">"Segundo nome (pronunciación)"</string>
+    <string name="name_phonetic_family" msgid="1690852801039809448">"Apelidos (pronunciación)"</string>
     <string name="phoneLabelsGroup" msgid="2746758650001801885">"Teléfono"</string>
     <string name="emailLabelsGroup" msgid="3360719560200449554">"Correo electrónico"</string>
     <string name="postalLabelsGroup" msgid="7534317297587527570">"Enderezo"</string>
@@ -414,7 +414,7 @@
     <string name="progress_notifier_message" msgid="8522060892889599746">"Importando <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
     <string name="export_to_vcf_file" msgid="3096479544575798192">"Exportar a ficheiro .vcf"</string>
     <string name="display_options_sort_list_by" msgid="4333658089057400431">"Ordenar por"</string>
-    <string name="display_options_phonetic_name_fields" msgid="1857564544755287298">"Nome (pronuncia)"</string>
+    <string name="display_options_phonetic_name_fields" msgid="1857564544755287298">"Nome (pronunciación)"</string>
     <string name="editor_options_always_show_phonetic_names" msgid="3612488836474257715">"Mostrar sempre"</string>
     <string name="editor_options_hide_phonetic_names_if_empty" msgid="2693314301550366143">"Ocultar se está baleiro"</string>
     <string name="display_options_sort_by_given_name" msgid="893781924536349248">"Nome"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 47fce4d..604ebb3 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -310,7 +310,7 @@
     <string name="organizationLabelsGroup" msgid="2342482097897299099">"સંસ્થા"</string>
     <string name="relationLabelsGroup" msgid="8931615792208307291">"સંબંધ"</string>
     <string name="eventLabelsGroup" msgid="8625868552164376823">"વિશિષ્ટ તારીખ"</string>
-    <string name="sms" msgid="4246338112764847384">"ટેક્સ્ટ મેસેજ"</string>
+    <string name="sms" msgid="4246338112764847384">"ટેક્સ્ટ સંદેશ"</string>
     <string name="postal_address" msgid="5031809899673855074">"સરનામું"</string>
     <string name="ghostData_company" msgid="3873500610390675876">"કંપની"</string>
     <string name="ghostData_department" msgid="8610642449404163799">"વિભાગ"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 85fd23c..5347af6 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -295,14 +295,14 @@
     <string name="nameLabelsGroup" msgid="513809148312046843">"नाम"</string>
     <string name="nicknameLabelsGroup" msgid="794390116782033956">"प्रचलित नाम"</string>
     <string name="name_given" msgid="3883661251894628431">"पहला नाम"</string>
-    <string name="name_family" msgid="2907432135923624482">"सरनेम"</string>
+    <string name="name_family" msgid="2907432135923624482">"उपनाम"</string>
     <string name="name_prefix" msgid="8857117624713905211">"नाम के पहले का टाइटल"</string>
     <string name="name_middle" msgid="7330498948136181042">"मध्य नाम"</string>
     <string name="name_suffix" msgid="4502958221763936999">"नाम का आखिरी भाग"</string>
     <string name="name_phonetic" msgid="4746541275769990740">"फ़ोनेटिक नाम"</string>
     <string name="name_phonetic_given" msgid="425534279190047812">"फ़ोनेटिक नाम"</string>
     <string name="name_phonetic_middle" msgid="6528822054594516485">"फ़ोनेटिक मध्य नाम"</string>
-    <string name="name_phonetic_family" msgid="1690852801039809448">"फ़ोनेटिक सरनेम"</string>
+    <string name="name_phonetic_family" msgid="1690852801039809448">"फ़ोनेटिक उपनाम"</string>
     <string name="phoneLabelsGroup" msgid="2746758650001801885">"फ़ोन"</string>
     <string name="emailLabelsGroup" msgid="3360719560200449554">"ईमेल"</string>
     <string name="postalLabelsGroup" msgid="7534317297587527570">"पता"</string>
@@ -354,7 +354,7 @@
     <string name="announce_expanded_fields" msgid="8410808184164186871">"विस्तृत किया गया"</string>
     <string name="announce_collapsed_fields" msgid="7611318715383228182">"संक्षिप्त किया गया"</string>
     <string name="list_filter_all_accounts" msgid="6173785387972096770">"सभी संपर्क"</string>
-    <string name="list_filter_all_starred" msgid="2582865760150432568">"स्टार के निशान वाले"</string>
+    <string name="list_filter_all_starred" msgid="2582865760150432568">"तारांकित"</string>
     <string name="list_filter_customize" msgid="2368900508906139537">"पसंद के मुताबिक"</string>
     <string name="list_filter_single" msgid="6003845379327432129">"संपर्क"</string>
     <string name="display_ungrouped" msgid="4823012484407759332">"अन्य सभी संपर्क"</string>
@@ -418,10 +418,10 @@
     <string name="editor_options_always_show_phonetic_names" msgid="3612488836474257715">"हमेशा दिखाएं"</string>
     <string name="editor_options_hide_phonetic_names_if_empty" msgid="2693314301550366143">"अगर खाली है तो छिपाएं"</string>
     <string name="display_options_sort_by_given_name" msgid="893781924536349248">"पहला नाम"</string>
-    <string name="display_options_sort_by_family_name" msgid="1282763552330910876">"सरनेम"</string>
+    <string name="display_options_sort_by_family_name" msgid="1282763552330910876">"उपनाम"</string>
     <string name="display_options_view_names_as" msgid="4060686468465916565">"नाम का फ़ॉर्मैट"</string>
     <string name="display_options_view_given_name_first" msgid="383885125505521383">"पहला नाम पहले"</string>
-    <string name="display_options_view_family_name_first" msgid="6597077054231296007">"सरनेम पहले"</string>
+    <string name="display_options_view_family_name_first" msgid="6597077054231296007">"उपनाम पहले"</string>
     <string name="settings_accounts" msgid="119582613811929994">"खाते"</string>
     <string name="default_editor_account" msgid="4810392921888877149">"नए संपर्कों के लिए डिफ़ॉल्ट खाता"</string>
     <string name="settings_my_info_title" msgid="6236848378653551341">"मेरी जानकारी"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 731f79a..35ac669 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -381,7 +381,7 @@
     <string name="fail_reason_could_not_initialize_exporter" msgid="4145819808407973981">"Tidak dapat memulai pengeskpor: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
     <string name="fail_reason_no_exportable_contact" msgid="487925011719622851">"Tidak ada kontak yang dapat diekspor."</string>
     <string name="missing_required_permission" msgid="1308037728470791436">"Anda telah menonaktifkan izin yang diperlukan."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="6179270404825288837">"Terjadi error saat ekspor: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
+    <string name="fail_reason_error_occurred_during_export" msgid="6179270404825288837">"Terjadi kesalahan saat ekspor: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
     <string name="fail_reason_io_error" msgid="6364839914349999408">"Kesalahan I/O"</string>
     <string name="fail_reason_low_memory_during_import" msgid="4525361860523306991">"Memori tidak cukup. File mungkin terlalu besar."</string>
     <string name="fail_reason_not_supported" msgid="6449916670421646290">"Format tidak didukung."</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index cdefb2e..b93a153 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -65,9 +65,9 @@
     <string name="contacts_deleted_one_named_toast" msgid="2707266264779781309">"מחקת את <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contacts_deleted_two_named_toast" msgid="6908761620236434380">"<xliff:g id="NAME_0">%1$s</xliff:g> ו-<xliff:g id="NAME_1">%2$s</xliff:g> נמחקו"</string>
     <string name="contacts_deleted_many_named_toast" msgid="4879197068250337298">"<xliff:g id="NAME_0">%1$s</xliff:g>, <xliff:g id="NAME_1">%2$s</xliff:g>, <xliff:g id="NAME_2">%3$s</xliff:g>... נמחקו"</string>
-    <string name="contacts_deleted_toast" msgid="3185825083067357305">"{count,plural, =1{איש הקשר נמחק}one{אנשי הקשר נמחקו}two{אנשי הקשר נמחקו}other{אנשי הקשר נמחקו}}"</string>
-    <string name="contacts_count" msgid="92227640680327707">"{count,plural, =1{איש קשר אחד}one{# אנשי קשר}two{# אנשי קשר}other{# אנשי קשר}}"</string>
-    <string name="contacts_count_with_account" msgid="3921405666045433256">"{count,plural, =1{איש קשר אחד · {account}}one{# אנשי קשר · {account}}two{# אנשי קשר · {account}}other{# אנשי קשר · {account}}}"</string>
+    <string name="contacts_deleted_toast" msgid="3185825083067357305">"{count,plural, =1{איש הקשר נמחק}two{אנשי הקשר נמחקו}many{אנשי הקשר נמחקו}other{אנשי הקשר נמחקו}}"</string>
+    <string name="contacts_count" msgid="92227640680327707">"{count,plural, =1{איש קשר אחד}two{# אנשי קשר}many{# אנשי קשר}other{# אנשי קשר}}"</string>
+    <string name="contacts_count_with_account" msgid="3921405666045433256">"{count,plural, =1{איש קשר אחד · {account}}two{# אנשי קשר · {account}}many{# אנשי קשר · {account}}other{# אנשי קשר · {account}}}"</string>
     <string name="title_from_google" msgid="2554633992366572820">"‏מ-Google"</string>
     <string name="title_from_other_accounts" msgid="7813596336566711843">"מ-<xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="menu_set_ring_tone" msgid="8876328286439724181">"בחירת רינגטון"</string>
@@ -127,7 +127,7 @@
     <string name="menu_share" msgid="6343022811796001773">"שיתוף"</string>
     <string name="menu_add_contact" msgid="5822356185421997656">"הוספה לאנשי הקשר"</string>
     <string name="menu_add_contacts" msgid="7114262784903366463">"הוספה"</string>
-    <string name="title_share_via" msgid="3300082736229182956">"{count,plural, =1{שיתוף איש הקשר באמצעות}one{שיתוף אנשי הקשר באמצעות}two{שיתוף אנשי הקשר באמצעות}other{שיתוף אנשי הקשר באמצעות}}"</string>
+    <string name="title_share_via" msgid="3300082736229182956">"{count,plural, =1{שיתוף איש הקשר באמצעות}two{שיתוף אנשי הקשר באמצעות}many{שיתוף אנשי הקשר באמצעות}other{שיתוף אנשי הקשר באמצעות}}"</string>
     <string name="dialog_new_group_account" msgid="4326402875327788728">"בחירת חשבון"</string>
     <string name="group_name_dialog_insert_title" msgid="5495572488613178283">"יצירת תווית"</string>
     <string name="group_name_dialog_update_title" msgid="3955919589366745101">"שינוי שם התווית"</string>
@@ -156,10 +156,10 @@
     <string name="organization_entry_all_field" msgid="6724345890324437167">"<xliff:g id="COMPANY">%1$s</xliff:g> • <xliff:g id="DEPARTMENT">%2$s</xliff:g> • <xliff:g id="TITLE">%3$s</xliff:g>"</string>
     <string name="non_phone_caption" msgid="7343449684187013327">"מספר טלפון"</string>
     <string name="non_phone_add_to_contacts" msgid="5472784294274676663">"הוסף לאנשי הקשר"</string>
-    <string name="non_phone_close" msgid="2792373584950696532">"סגירה"</string>
+    <string name="non_phone_close" msgid="2792373584950696532">"סגור"</string>
     <string name="date_year_toggle" msgid="8930759990426623823">"ציין שנה"</string>
     <string name="contacts_unavailable_add_account" msgid="5196453892411710750">"הוספת חשבון"</string>
-    <string name="contacts_unavailable_import_contacts" msgid="4914180876114104054">"ייבוא"</string>
+    <string name="contacts_unavailable_import_contacts" msgid="4914180876114104054">"ייבא"</string>
     <string name="create_group_item_label" msgid="921929508079162463">"צור חדשה…"</string>
     <string name="delete_group_dialog_message" msgid="754082019928025404">"למחוק את התווית \"<xliff:g id="GROUP_LABEL">%1$s</xliff:g>\"? (אנשי הקשר המסומנים בתווית לא יימחקו)."</string>
     <string name="toast_join_with_empty_contact" msgid="3886468280665325350">"הקלד שם של איש קשר לפני קישורו לאחר."</string>
@@ -368,8 +368,8 @@
     <string name="dialog_new_contact_account" msgid="5652018124788855057">"איפה יישמרו אנשי הקשר שמיובאים:"</string>
     <string name="import_from_sim" msgid="7825280799813847991">"‏כרטיס SIM"</string>
     <string name="import_from_sim_summary_fmt" msgid="4234771828377985321">"‏כרטיס SIM‏ <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_sim_secondary_contact_count_fmt" msgid="4406774701661271748">"{count,plural, =1{איש קשר אחד}one{# אנשי קשר}two{# אנשי קשר}other{# אנשי קשר}}"</string>
-    <string name="import_from_sim_secondary_template" msgid="7574306746844258362">"{count,plural, =1{איש קשר אחד · <xliff:g id="PHONE_NUMBER_0">^1</xliff:g>}one{# אנשי קשר · <xliff:g id="PHONE_NUMBER_1">^1</xliff:g>}two{# אנשי קשר · <xliff:g id="PHONE_NUMBER_1">^1</xliff:g>}other{# אנשי קשר · <xliff:g id="PHONE_NUMBER_1">^1</xliff:g>}}"</string>
+    <string name="import_from_sim_secondary_contact_count_fmt" msgid="4406774701661271748">"{count,plural, =1{איש קשר אחד}two{# אנשי קשר}many{# אנשי קשר}other{# אנשי קשר}}"</string>
+    <string name="import_from_sim_secondary_template" msgid="7574306746844258362">"{count,plural, =1{איש קשר אחד · <xliff:g id="PHONE_NUMBER_0">^1</xliff:g>}two{# אנשי קשר · <xliff:g id="PHONE_NUMBER_1">^1</xliff:g>}many{# אנשי קשר · <xliff:g id="PHONE_NUMBER_1">^1</xliff:g>}other{# אנשי קשר · <xliff:g id="PHONE_NUMBER_1">^1</xliff:g>}}"</string>
     <string name="import_from_vcf_file" msgid="6776403212804361301">"‏קובץ vcf."</string>
     <string name="nothing_to_import_message" msgid="2594519620375509783">"אין מה לייבא"</string>
     <string name="import_from_vcf_file_confirmation_message" msgid="8579284961401472204">"‏האם לייבא את אנשי הקשר מ-vCard?"</string>
@@ -468,11 +468,11 @@
     <string name="description_no_name_header" msgid="8596201864512339003">"שלוש נקודות"</string>
     <string name="dynamic_shortcut_disabled_message" msgid="8770462908102469878">"קיצור הדרך הזה הושבת"</string>
     <string name="dynamic_shortcut_contact_removed_message" msgid="8331735243566193974">"איש הקשר הוסר"</string>
-    <string name="sim_import_button_text" msgid="2845608246304396009">"ייבוא"</string>
+    <string name="sim_import_button_text" msgid="2845608246304396009">"ייבא"</string>
     <string name="sim_import_title_none_selected" msgid="3527680774575468781">"בחירת אנשי קשר"</string>
     <string name="sim_import_empty_message" msgid="7238368542566545854">"‏אין אף איש קשר בכרטיס ה-SIM"</string>
     <string name="sim_import_contact_exists_toast" msgid="8423212007841229749">"איש הקשר כבר קיים ברשימה"</string>
-    <string name="sim_import_success_toast_fmt" msgid="7645974841482481503">"{count,plural, =1{‏איש קשר אחד יובא מכרטיס ה-SIM}one{‏# אנשי קשר יובאו מכרטיס ה-SIM}two{‏# אנשי קשר יובאו מכרטיס ה-SIM}other{‏# אנשי קשר יובאו מכרטיס ה-SIM}}"</string>
+    <string name="sim_import_success_toast_fmt" msgid="7645974841482481503">"{count,plural, =1{‏איש קשר אחד יובא מכרטיס ה-SIM}two{‏# אנשי קשר יובאו מכרטיס ה-SIM}many{‏# אנשי קשר יובאו מכרטיס ה-SIM}other{‏# אנשי קשר יובאו מכרטיס ה-SIM}}"</string>
     <string name="sim_import_failed_toast" msgid="358117391138073786">"‏לא ניתן היה לייבא את אנשי הקשר מכרטיס ה-SIM"</string>
     <string name="sim_import_title" msgid="8202961146093040684">"‏ייבוא מכרטיס SIM"</string>
     <string name="sim_import_cancel_content_description" msgid="4746065462808862682">"ביטול"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 0f5a481..65b5336 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -88,7 +88,7 @@
     <string name="createContactShortcutSuccessful" msgid="6980032407920515698">"<xliff:g id="NAME">%s</xliff:g> Башкы экранга кошулду."</string>
     <string name="photoPickerNotFoundText" msgid="6535222297923110991">"Түзмөктө бир да сүрөт жок."</string>
     <string name="attach_photo_dialog_title" msgid="7948754072673745235">"Байланыштын сүрөтү"</string>
-    <string name="customLabelPickerTitle" msgid="816694850254307154">"Аталышы"</string>
+    <string name="customLabelPickerTitle" msgid="816694850254307154">"Ыңгайлаштырылган энбелгинин аталышы"</string>
     <string name="removePhoto" msgid="1190099414600730001">"Сүрөттү алып салуу"</string>
     <string name="noContacts" msgid="3030512741779213810">"Байланыштар тизмеңиз бош"</string>
     <string name="emptyGroup" msgid="8598261660865081152">"Бул энбелги коюлган бир дагы байланыш жок"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 02e4bc6..573360b 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -120,7 +120,7 @@
     <string name="listFoundAllContactsZero" msgid="1933842282916988563">"കോൺടാക്റ്റുകളൊന്നുമില്ല"</string>
     <string name="add_contact_dlg_message_fmt" msgid="7498024710169591375">"കോൺടാക്റ്റുകളിലേക്ക് \"<xliff:g id="EMAIL">%s</xliff:g>\" ചേർക്കണോ?"</string>
     <string name="search_settings_description" msgid="5630675648560839920">"നിങ്ങളുടെ കോൺടാക്റ്റുകളുടെ പേരുകൾ"</string>
-    <string name="quickcontact_transparent_view_description" msgid="7783027850792852265">"മുമ്പത്തെ സ്‌ക്രീനിലേക്ക് മടങ്ങാൻ ക്ലിക്ക് ചെയ്യുക"</string>
+    <string name="quickcontact_transparent_view_description" msgid="7783027850792852265">"മുമ്പത്തെ സ്‌ക്രീനിലേക്ക് മടങ്ങാൻ ക്ലിക്കുചെയ്യുക"</string>
     <string name="quickcontact_add_phone_number" msgid="1683577288080727862">"ഫോണ്‍ നമ്പര്‍ ചേര്‍ക്കുക"</string>
     <string name="quickcontact_add_email" msgid="1442894568471116797">"ഇമെയില്‍‌ ചേര്‍‌ക്കുക"</string>
     <string name="missing_app" msgid="5674389915738964148">"ഈ പ്രവർത്തനം കൈകാര്യം ചെയ്യാൻ അപ്ലിക്കേഷനുകളൊന്നും കണ്ടെത്തിയില്ല."</string>
@@ -387,7 +387,7 @@
     <string name="fail_reason_not_supported" msgid="6449916670421646290">"ഫോർമാറ്റിനെ പിന്തുണയ്‌ക്കില്ല."</string>
     <string name="exporting_vcard_finished_title" msgid="1984393609140969504">"<xliff:g id="FILENAME">%s</xliff:g> എക്‌സ്‌പോർട്ടുചെയ്യൽ പൂർത്തിയായി."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="9029067439586573959">"കോൺടാക്റ്റുകൾ എക്‌സ്‌പോർട്ടുചെയ്യൽ പൂർത്തിയായി."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5463125514187187782">"കോൺടാക്റ്റുകൾ എക്‌സ്‌പോർട്ടുചെയ്യൽ പൂർത്തിയായി, കോൺടാക്റ്റുകൾ പങ്കിടുന്നതിന് അറിയിപ്പിൽ ക്ലിക്ക് ചെയ്യുക."</string>
+    <string name="exporting_vcard_finished_toast" msgid="5463125514187187782">"കോൺടാക്റ്റുകൾ എക്‌സ്‌പോർട്ടുചെയ്യൽ പൂർത്തിയായി, കോൺടാക്റ്റുകൾ പങ്കിടുന്നതിന് അറിയിപ്പിൽ ക്ലിക്കുചെയ്യുക."</string>
     <string name="touch_to_share_contacts" msgid="7678194978416052577">"കോൺടാക്റ്റുകൾ പങ്കിടാൻ ടാപ്പുചെയ്യുക."</string>
     <string name="exporting_vcard_canceled_title" msgid="1287529222628052526">"<xliff:g id="FILENAME">%s</xliff:g> എക്‌സ്‌പോർട്ടുചെയ്യൽ റദ്ദാക്കി."</string>
     <string name="exporting_contact_list_title" msgid="6599904516394311592">"കോൺടാക്റ്റ് ഡാറ്റ എക്‌സ്‌പോർട്ടുചെയ്യുന്നു"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index ac65941..b4ba64f 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -36,7 +36,7 @@
     <string name="menu_deleteContact" msgid="15161764025276217">"हटवा"</string>
     <string name="menu_change_photo" msgid="4911246106907208055">"फोटो बदला"</string>
     <string name="menu_create_contact_shortcut" msgid="8983436328557825860">"शॉर्टकट तयार करा"</string>
-    <string name="menu_splitAggregate" msgid="2062290275288905833">"अनलिंक करा"</string>
+    <string name="menu_splitAggregate" msgid="2062290275288905833">"दुवा रद्द करा"</string>
     <string name="menu_editGroup" msgid="8706562583754054622">"संपर्क काढा"</string>
     <string name="menu_renameGroup" msgid="2685886609399776475">"लेबल पुनर्नामित करा"</string>
     <string name="menu_deleteGroup" msgid="1180215594530228294">"लेबल हटवा"</string>
@@ -45,23 +45,23 @@
     <string name="menu_addContactsToGroup" msgid="4549318978482280577">"संपर्क जोडा"</string>
     <string name="menu_removeFromGroup" msgid="8753799091967887958">"लेबलवरून काढा"</string>
     <string name="menu_new_group_action_bar" msgid="1670312283925872483">"लेबल तयार करा"</string>
-    <string name="splitConfirmation" msgid="4750158900636307469">"एकाधिक संपर्कांमध्‍ये हा संपर्क अनलिंक करायचा?"</string>
-    <string name="splitConfirmation_positive_button" msgid="3109235536045409854">"अनलिंक करा"</string>
-    <string name="splitConfirmationWithPendingChanges" msgid="8617395780141069527">"तुम्ही आधीपासून केलेले बदल सेव्ह करून एकाधिक संपर्कांशी हा संपर्क लिंक करू इच्छिता?"</string>
-    <string name="splitConfirmationWithPendingChanges_positive_button" msgid="131293000921403021">"सेव्ह करा आणि अनलिंक करा"</string>
-    <string name="joinConfirmation" msgid="1245184431169363397">"तुम्ही आधीपासून केलेले बदल सेव्ह करून निवडलेले संपर्क लिंक करू इच्छिता?"</string>
-    <string name="joinConfirmation_positive_button" msgid="8300713422725610480">"सेव्ह करा आणि लिंक करा"</string>
-    <string name="contacts_linking_progress_bar" msgid="7922930766022513619">"लिंक करत आहे"</string>
-    <string name="contacts_unlinking_progress_bar" msgid="5696679068872394167">"अनलिंक करत आहे"</string>
-    <string name="menu_joinAggregate" msgid="3116395302755287038">"लिंक करा"</string>
-    <string name="menu_linkedContacts" msgid="6363718333551613063">"लिंक केलेले संपर्क"</string>
+    <string name="splitConfirmation" msgid="4750158900636307469">"एकाधिक संपर्कांमध्‍ये या संपर्काचा दुवा रद्द करायचा?"</string>
+    <string name="splitConfirmation_positive_button" msgid="3109235536045409854">"दुवा रद्द करा"</string>
+    <string name="splitConfirmationWithPendingChanges" msgid="8617395780141069527">"तुम्ही आधीपासून केलेले बदल तुम्ही सेव्ह करू आणि एकाधिक संपर्कांमध्‍ये या संपर्काचा दुवा रद्द करू इच्छिता?"</string>
+    <string name="splitConfirmationWithPendingChanges_positive_button" msgid="131293000921403021">"सेव्ह करा आणि दुवा रद्द करा"</string>
+    <string name="joinConfirmation" msgid="1245184431169363397">"तुम्ही आधीपासून केलेले बदल तुम्ही सेव्ह करू आणि निवडलेल्या संपर्काशी दुवा जोडू इच्छिता?"</string>
+    <string name="joinConfirmation_positive_button" msgid="8300713422725610480">"सेव्ह करा आणि दुवा जोडा"</string>
+    <string name="contacts_linking_progress_bar" msgid="7922930766022513619">"दुवा साधत आहे"</string>
+    <string name="contacts_unlinking_progress_bar" msgid="5696679068872394167">"दुवा रद्द करत आहे"</string>
+    <string name="menu_joinAggregate" msgid="3116395302755287038">"दुवा साधा"</string>
+    <string name="menu_linkedContacts" msgid="6363718333551613063">"दुवा जोडलेले संपर्क"</string>
     <string name="menu_save" msgid="7204524700499687371">"सेव्ह करा"</string>
-    <string name="titleJoinContactDataWith" msgid="7342386037654890242">"संपर्क लिंक करा"</string>
-    <string name="blurbJoinContactDataWith" msgid="132105056919797709">"तुम्ही <xliff:g id="NAME">%s</xliff:g> सह जे संपर्क लिंक करू इच्छिता तो निवडा:"</string>
+    <string name="titleJoinContactDataWith" msgid="7342386037654890242">"संपर्कांचा दुवा साधा"</string>
+    <string name="blurbJoinContactDataWith" msgid="132105056919797709">"तुम्ही <xliff:g id="NAME">%s</xliff:g> सह ज्या संपर्काचा दुवा जोडू इच्छिता तो निवडा:"</string>
     <string name="separatorJoinAggregateSuggestions" msgid="8347769365870796983">"सूचित संपर्क"</string>
     <string name="separatorJoinAggregateAll" msgid="5378346138684490784">"सर्व संपर्क"</string>
-    <string name="contactsJoinedNamedMessage" msgid="8732933595873458166">"<xliff:g id="NAME">%s</xliff:g> लिंक केले"</string>
-    <string name="contactsJoinedMessage" msgid="7605856897709458707">"संपर्क लिंक केले"</string>
+    <string name="contactsJoinedNamedMessage" msgid="8732933595873458166">"<xliff:g id="NAME">%s</xliff:g> चा दुवा जोडला"</string>
+    <string name="contactsJoinedMessage" msgid="7605856897709458707">"संपर्कांचा दुवा साधला"</string>
     <string name="contacts_deleted_one_named_toast" msgid="2707266264779781309">"<xliff:g id="NAME">%1$s</xliff:g> हटविले"</string>
     <string name="contacts_deleted_two_named_toast" msgid="6908761620236434380">"<xliff:g id="NAME_0">%1$s</xliff:g> आणि <xliff:g id="NAME_1">%2$s</xliff:g> हटविले"</string>
     <string name="contacts_deleted_many_named_toast" msgid="4879197068250337298">"<xliff:g id="NAME_0">%1$s</xliff:g>, <xliff:g id="NAME_1">%2$s</xliff:g>, <xliff:g id="NAME_2">%3$s</xliff:g>... हटविले"</string>
@@ -96,10 +96,10 @@
     <string name="emptyMainList" msgid="3266182207039677163">"तुमची संपर्क सूची रिक्त आहे"</string>
     <string name="contactSavedNamedToast" msgid="3067050290584834386">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> सेव्ह केले"</string>
     <string name="contactSavedToast" msgid="4370392215196995301">"संपर्क सेव्ह केला"</string>
-    <string name="contactUnlinkedToast" msgid="6791720274141804377">"संपर्क अनलिंक केले"</string>
+    <string name="contactUnlinkedToast" msgid="6791720274141804377">"संपर्कांचा दुवा रद्द केला"</string>
     <string name="contactSavedErrorToast" msgid="3213619905154956918">"संपर्क बदल सेव्ह करणे शक्य झाले नाही"</string>
-    <string name="contactUnlinkErrorToast" msgid="7289356996668886841">"संपर्क अनलिंक करता आले नाहीत"</string>
-    <string name="contactJoinErrorToast" msgid="1222155997933362787">"संपर्क लिंक करता आले नाहीत"</string>
+    <string name="contactUnlinkErrorToast" msgid="7289356996668886841">"संपर्काचा दुवा रद्द करणे शक्य झाले नाही"</string>
+    <string name="contactJoinErrorToast" msgid="1222155997933362787">"संपर्काचा दुवा जोडणे शक्य झाले नाही"</string>
     <string name="contactGenericErrorToast" msgid="5689457475864876100">"संपर्क सेव्ह करताना एरर"</string>
     <string name="contactPhotoSavedErrorToast" msgid="8568460180541397272">"संपर्क फोटो बदल सेव्ह करणे शक्य झाले नाही"</string>
     <string name="groupLoadErrorToast" msgid="4141488223976370583">"लेबल लोड करण्यात अयशस्वी झाले"</string>
@@ -162,7 +162,7 @@
     <string name="contacts_unavailable_import_contacts" msgid="4914180876114104054">"इंपोर्ट करा"</string>
     <string name="create_group_item_label" msgid="921929508079162463">"नवीन तयार करा…"</string>
     <string name="delete_group_dialog_message" msgid="754082019928025404">"\"<xliff:g id="GROUP_LABEL">%1$s</xliff:g>\" लेबल हटवायचे? (संपर्क आपणहून हटविले जाणार नाहीत.)"</string>
-    <string name="toast_join_with_empty_contact" msgid="3886468280665325350">"दुसर्‍यासह लिंक करण्यापूर्वी संपर्क नाव टाइप करा."</string>
+    <string name="toast_join_with_empty_contact" msgid="3886468280665325350">"दुसर्‍यासह दुवा जोडण्‍याआधी संपर्क नाव टाइप करा."</string>
     <string name="copy_text" msgid="6835250673373028909">"क्लिपबोर्डवर कॉपी करा"</string>
     <string name="set_default" msgid="3704074175618702225">"डीफॉल्ट म्हणून सेट करा"</string>
     <string name="clear_default" msgid="2055883863621491533">"डीफॉल्ट साफ करा"</string>
@@ -182,9 +182,9 @@
     <string name="contact_editor_title_existing_contact" msgid="3647774955741654029">"संपर्क संपादित करा"</string>
     <string name="contact_editor_title_read_only_contact" msgid="5494810291515292596">"केवळ दर्शनीय"</string>
     <string name="contact_editor_pick_raw_contact_to_edit_dialog_title" msgid="4478782370280424187">"संपादित करण्यासाठी संपर्क निवडा"</string>
-    <string name="contact_editor_pick_linked_contact_dialog_title" msgid="3332134735168016293">"लिंक केलेले संपर्क"</string>
+    <string name="contact_editor_pick_linked_contact_dialog_title" msgid="3332134735168016293">"दुवा साधलेले संपर्क"</string>
     <string name="contact_editor_add_linked_contact" msgid="2895453741206196138">"जोडा"</string>
-    <string name="contact_editor_unlink_contacts" msgid="8399419729744305687">"अनलिंक करा"</string>
+    <string name="contact_editor_unlink_contacts" msgid="8399419729744305687">"दुवा रद्द करा"</string>
     <string name="add_account" msgid="3071396624500839020">"खाते जोडा"</string>
     <string name="add_new_account" msgid="573368229646104110">"नवीन खाते जोडा"</string>
     <string name="menu_export_database" msgid="1658249125751926885">"डेटाबेस फाइल एक्सपोर्ट करा"</string>
@@ -212,11 +212,11 @@
     <string name="editor_failed_to_load" msgid="2328074829787373644">"संपादक उघडण्यात अयशस्वी."</string>
     <string name="editor_account_selector_title" msgid="3190515989740696043">"यावर सेव्ह करत आहे"</string>
     <string name="editor_account_selector_read_only_title" msgid="4870485850053962114">"<xliff:g id="ACCOUNT">%s</xliff:g> वरील संपर्क माहिती संपादनयोग्य नाही"</string>
-    <string name="quickcontact_suggestion_link_button" msgid="3485212664301802371">"संपर्क लिंक करा"</string>
+    <string name="quickcontact_suggestion_link_button" msgid="3485212664301802371">"संपर्कांचा दुवा साधा"</string>
     <string name="quickcontact_suggestion_cancel_button" msgid="8851156850681440055">"रद्द करा"</string>
     <string name="suggestion_card_this_contact_title" msgid="8851257599121989253">"हा संपर्क"</string>
     <string name="suggestion_card_duplicates_title" msgid="2623890874933696454">"संभाव्य डुप्लिकेट"</string>
-    <string name="suggestion_card_help_message" msgid="8367379652312412794">"हे संपर्क म्हणजे कदाचित एकच व्यक्ती असू शकते. तुम्ही त्या सर्वांना एकच लिंक म्हणून एकत्र जोडू शकता."</string>
+    <string name="suggestion_card_help_message" msgid="8367379652312412794">"हे संपर्क म्हणजे कदाचित एकच व्यक्ती असू शकते. तुम्ही त्या सर्वांना एकल दुवा म्हणून एकत्र जोडू शकता."</string>
     <string name="editor_delete_view_description" msgid="4549610631864383156">"<xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g> हटवा"</string>
     <string name="editor_delete_view_description_short" msgid="6471032197042328181">"<xliff:g id="DATA_KIND">%s</xliff:g> हटवा"</string>
     <string name="menu_assistant" msgid="3980364519724237934">"सूचना"</string>
@@ -384,7 +384,7 @@
     <string name="fail_reason_error_occurred_during_export" msgid="6179270404825288837">"एक्सपोर्ट दरम्‍यान एरर आलीt: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
     <string name="fail_reason_io_error" msgid="6364839914349999408">"I/O एरर"</string>
     <string name="fail_reason_low_memory_during_import" msgid="4525361860523306991">"पुरेशी मेमरी नाही. फाइल कदाचित खूप मोठी असू शकते."</string>
-    <string name="fail_reason_not_supported" msgid="6449916670421646290">"फॉरमॅटला सपोर्ट नाही."</string>
+    <string name="fail_reason_not_supported" msgid="6449916670421646290">"स्वरूपन समर्थित नाही."</string>
     <string name="exporting_vcard_finished_title" msgid="1984393609140969504">"<xliff:g id="FILENAME">%s</xliff:g> एक्सपोर्ट करणे समाप्त झाले."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="9029067439586573959">"संपर्क इंपोर्ट करणे समाप्त झाले"</string>
     <string name="exporting_vcard_finished_toast" msgid="5463125514187187782">"संपर्क एक्सपोर्ट करणे समाप्त झाले, संपर्क शेअर करण्यासाठी सूचनेवर क्लिक करा."</string>
@@ -442,7 +442,7 @@
     <string name="contactsFavoritesLabel" msgid="8339645684721732714">"आवडते"</string>
     <string name="menu_import" msgid="2206768098740726906">"इंपोर्ट करा"</string>
     <string name="menu_export" msgid="1217402092617629429">"एक्सपोर्ट"</string>
-    <string name="menu_blocked_numbers" msgid="7064680515202657609">"ब्लॉक केलेले नंबर"</string>
+    <string name="menu_blocked_numbers" msgid="7064680515202657609">"अवरोधित केलेले नंबर"</string>
     <string name="contact_status_update_attribution" msgid="5051874518046969847">"<xliff:g id="SOURCE">%1$s</xliff:g> द्वारे"</string>
     <string name="contact_status_update_attribution_with_date" msgid="2195847657702455703">"<xliff:g id="SOURCE">%2$s</xliff:g> द्वारे <xliff:g id="DATE">%1$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="683765774264585732">"शोध थांबवा"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 017fbf6..ec945f0 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -413,7 +413,7 @@
     <string name="caching_vcard_title" msgid="6333926052524937628">"Bufrer"</string>
     <string name="progress_notifier_message" msgid="8522060892889599746">"Importerer <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
     <string name="export_to_vcf_file" msgid="3096479544575798192">"Eksportér til .vcf-fil"</string>
-    <string name="display_options_sort_list_by" msgid="4333658089057400431">"Sorter etter"</string>
+    <string name="display_options_sort_list_by" msgid="4333658089057400431">"Sortér etter"</string>
     <string name="display_options_phonetic_name_fields" msgid="1857564544755287298">"Fonetisk navn"</string>
     <string name="editor_options_always_show_phonetic_names" msgid="3612488836474257715">"Vis alltid"</string>
     <string name="editor_options_hide_phonetic_names_if_empty" msgid="2693314301550366143">"Skjul hvis feltet er tomt"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 1dbd162..5770c01 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="8908212014470937609">"ଯୋଗାଯୋଗ"</string>
     <string name="contactsList" msgid="4456188358262700898">"ଯୋଗାଯୋଗ"</string>
-    <string name="shortcut_add_contact" msgid="7949342235528657981">"ଯୋଗାଯୋଗକୁ ଯୋଗ କରନ୍ତୁ"</string>
+    <string name="shortcut_add_contact" msgid="7949342235528657981">"ଯୋଗାଯୋଗଙ୍କୁ ଯୋଡ଼ନ୍ତୁ"</string>
     <string name="shortcutContact" msgid="8009736387364461511">"ଯୋଗାଯୋଗ"</string>
     <string name="shortcutDialContact" msgid="155367248069127153">"ଡାଇରେକ୍ଟ କଲ୍ କରନ୍ତୁ"</string>
     <string name="shortcutMessageContact" msgid="9123517151981679277">"ଡାଇରେକ୍ଟ ମେସେଜ୍‍ ପଠାନ୍ତୁ"</string>
@@ -149,8 +149,8 @@
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"ବନ୍ଦ କରନ୍ତୁ"</string>
     <string name="aggregation_suggestion_edit_dialog_message" msgid="4339333746086996062">"ଚୟନିତ ଯୋଗାଯୋଗ ଏଡିଟ୍ କରିବା ପାଇଁ ସ୍ୱିଚ୍ କରିବେ? ଏପର୍ଯ୍ୟନ୍ତ ଆପଣ ଦେଇଥିବା ସୂଚନାକୁ କପୀ କରାଯିବ।"</string>
     <string name="contact_directory_description" msgid="1773630547110881835">"ଡାଇରେକ୍ଟୋରୀ <xliff:g id="TYPE">%1$s</xliff:g>"</string>
-    <string name="activity_title_settings" msgid="4004290638426915162">"ସେଟିଂସ"</string>
-    <string name="menu_settings" msgid="3524924670246877187">"ସେଟିଂସ"</string>
+    <string name="activity_title_settings" msgid="4004290638426915162">"ସେଟିଙ୍ଗ"</string>
+    <string name="menu_settings" msgid="3524924670246877187">"ସେଟିଙ୍ଗ"</string>
     <string name="menu_help" msgid="287801702920372292">"ସହାୟତା ଓ ମତାମତ"</string>
     <string name="organization_entry_two_field" msgid="6034934619269052455">"<xliff:g id="FIRST">%1$s</xliff:g> • <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="organization_entry_all_field" msgid="6724345890324437167">"<xliff:g id="COMPANY">%1$s</xliff:g> • <xliff:g id="DEPARTMENT">%2$s</xliff:g> • <xliff:g id="TITLE">%3$s</xliff:g>"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 05fd133..eb19685 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -403,9 +403,9 @@
     <string name="importing_vcard_canceled_title" msgid="8165471996631186776">"A importação de <xliff:g id="FILENAME">%s</xliff:g> foi cancelada"</string>
     <string name="vcard_import_will_start_message" msgid="4514702035621833178">"<xliff:g id="FILENAME">%s</xliff:g> será importado em breve."</string>
     <string name="vcard_import_will_start_message_with_default_name" msgid="8205422202924103470">"O ficheiro será importado em breve."</string>
-    <string name="vcard_import_request_rejected_message" msgid="4754292694777189540">"O pedido de importação do vCard foi rejeitado. Tente mais tarde."</string>
+    <string name="vcard_import_request_rejected_message" msgid="4754292694777189540">"O pedido de importação do vCard foi rejeitado. Tente novamente mais tarde."</string>
     <string name="contacts_export_will_start_message" msgid="6428126265599715944">"Os contactos serão exportados em breve."</string>
-    <string name="vcard_export_request_rejected_message" msgid="6455336845734884740">"O pedido de exportação do vCard foi rejeitado. Tente mais tarde."</string>
+    <string name="vcard_export_request_rejected_message" msgid="6455336845734884740">"O pedido de exportação do vCard foi rejeitado. Tente novamente mais tarde."</string>
     <string name="vcard_unknown_filename" msgid="8320954544777782497">"contacto"</string>
     <string name="caching_vcard_message" msgid="1879339732783666517">"A colocar vCard(s) em cache no armazenamento temporário local. A importação efetiva começará brevemente."</string>
     <string name="vcard_import_failed" msgid="37313715326741013">"Não foi possível importar o vCard."</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 76eca41..fc4da6f 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -29,7 +29,7 @@
     <string name="header_entry_contact_list_adapter_header_title" msgid="4098233078586958762">"కొత్త కాంటాక్ట్‌ క్రియేట్ చేయి"</string>
     <string name="searchHint" msgid="1487501532610025473">"కాంటాక్ట్‌లను సెర్చ్ చేయండి"</string>
     <string name="menu_addStar" msgid="4903812703386825130">"ఇష్టమైనవాటికి జోడించు"</string>
-    <string name="menu_removeStar" msgid="3707373931808303701">"ఇష్టమైనవాటి నుండి తీసివేయండి"</string>
+    <string name="menu_removeStar" msgid="3707373931808303701">"ఇష్టమైనవాటి నుండి తీసివేయి"</string>
     <string name="description_action_menu_remove_star" msgid="4044390281910122890">"ఇష్టమైనవి నుండి తీసివేయబడింది"</string>
     <string name="description_action_menu_add_star" msgid="7316521132809388851">"ఇష్టమైనవికి జోడించబడింది"</string>
     <string name="menu_editContact" msgid="5039663761025630208">"ఎడిట్"</string>
@@ -43,7 +43,7 @@
     <string name="menu_addToGroup" msgid="5034813446697655310">"కాంటాక్ట్‌ను జోడించండి"</string>
     <string name="menu_selectForGroup" msgid="6386553337569514850">"కాంటాక్ట్‌లను ఎంచుకోండి"</string>
     <string name="menu_addContactsToGroup" msgid="4549318978482280577">"కాంటాక్ట్‌లను జోడించండి"</string>
-    <string name="menu_removeFromGroup" msgid="8753799091967887958">"లేబుల్ నుండి తీసివేయండి"</string>
+    <string name="menu_removeFromGroup" msgid="8753799091967887958">"లేబుల్ నుండి తీసివేయి"</string>
     <string name="menu_new_group_action_bar" msgid="1670312283925872483">"లేబుల్‌ను క్రియేట్ చేయండి"</string>
     <string name="splitConfirmation" msgid="4750158900636307469">"ఈ కాంటాక్ట్‌ను పలు కాంటాక్ట్‌లుగా అన్‌లింక్ చేయాలా?"</string>
     <string name="splitConfirmation_positive_button" msgid="3109235536045409854">"వేరు చేయి"</string>
@@ -89,7 +89,7 @@
     <string name="photoPickerNotFoundText" msgid="6535222297923110991">"పరికరంలో చిత్రాలు ఏవీ అందుబాటులో లేవు."</string>
     <string name="attach_photo_dialog_title" msgid="7948754072673745235">"కాంటాక్ట్ ఫోటో"</string>
     <string name="customLabelPickerTitle" msgid="816694850254307154">"అనుకూల లేబుల్ పేరు"</string>
-    <string name="removePhoto" msgid="1190099414600730001">"ఫోటోను తీసివేయండి"</string>
+    <string name="removePhoto" msgid="1190099414600730001">"ఫోటోను తీసివేయి"</string>
     <string name="noContacts" msgid="3030512741779213810">"మీ కాంటాక్ట్‌ల లిస్ట్‌ ఖాళీగా ఉంది"</string>
     <string name="emptyGroup" msgid="8598261660865081152">"ఈ లేబుల్‌తో కాంటాక్ట్‌లు ఏవీ లేవు"</string>
     <string name="emptyAccount" msgid="7450843210977018582">"ఈ ఖాతాలో కాంటాక్ట్‌లు ఏవీ లేవు"</string>
@@ -106,7 +106,7 @@
     <string name="groupDeletedToast" msgid="7774363940327847515">"లేబుల్ తొలగించబడింది"</string>
     <string name="groupCreatedToast" msgid="1685148819468403239">"లేబుల్ క్రియేట్ చేయబడింది"</string>
     <string name="groupCreateFailedToast" msgid="1836425392831964024">"లేబుల్‌ను క్రియేట్ చేయడం సాధ్యపడదు"</string>
-    <string name="groupUpdatedToast" msgid="3381549467345607379">"లేబుల్ అప్‌డేట్ చేయబడింది"</string>
+    <string name="groupUpdatedToast" msgid="3381549467345607379">"లేబుల్ నవీకరించబడింది"</string>
     <string name="groupMembersRemovedToast" msgid="8019566066934628011">"లేబుల్ నుండి తీసివేయబడ్డాయి"</string>
     <string name="groupMembersAddedToast" msgid="1939782548900157287">"లేబుల్‌కు జోడించబడింది/జోడించబడ్డాయి"</string>
     <string name="groupSavedErrorToast" msgid="8456912862816145318">"లేబుల్ మార్పులను సేవ్ చేయలేకపోయింది"</string>
@@ -123,7 +123,7 @@
     <string name="quickcontact_transparent_view_description" msgid="7783027850792852265">"మునుపటి స్క్రీన్‌కి తిరిగి రావడానికి క్లిక్ చేయండి"</string>
     <string name="quickcontact_add_phone_number" msgid="1683577288080727862">"ఫోన్ నంబర్‌ను జోడించండి"</string>
     <string name="quickcontact_add_email" msgid="1442894568471116797">"ఈమెయిల్‌ జోడించండి"</string>
-    <string name="missing_app" msgid="5674389915738964148">"ఈ చర్యను మేనేజ్ చేయడానికి యాప్‌ ఏదీ కనుగొనబడలేదు."</string>
+    <string name="missing_app" msgid="5674389915738964148">"ఈ చర్యను నిర్వహించడానికి యాప్‌ ఏదీ కనుగొనబడలేదు."</string>
     <string name="menu_share" msgid="6343022811796001773">"షేర్ చేయి"</string>
     <string name="menu_add_contact" msgid="5822356185421997656">"కాంటాక్ట్‌లకు జోడించండి"</string>
     <string name="menu_add_contacts" msgid="7114262784903366463">"జోడించండి"</string>
@@ -159,7 +159,7 @@
     <string name="non_phone_close" msgid="2792373584950696532">"మూసివేయి"</string>
     <string name="date_year_toggle" msgid="8930759990426623823">"సంవత్సరాన్ని చేర్చు"</string>
     <string name="contacts_unavailable_add_account" msgid="5196453892411710750">"ఖాతాను జోడించు"</string>
-    <string name="contacts_unavailable_import_contacts" msgid="4914180876114104054">"దిగుమతి చేయండి"</string>
+    <string name="contacts_unavailable_import_contacts" msgid="4914180876114104054">"దిగుమతి చేయి"</string>
     <string name="create_group_item_label" msgid="921929508079162463">"కొత్తది క్రియేట్ చేయండి…"</string>
     <string name="delete_group_dialog_message" msgid="754082019928025404">"\"<xliff:g id="GROUP_LABEL">%1$s</xliff:g>\" లేబుల్‌ని తొలగించాలా? (కాంటాక్ట్‌లు వాటంతట అవే తొలగించబడవు.)"</string>
     <string name="toast_join_with_empty_contact" msgid="3886468280665325350">"మరొకదానితో లింక్ చేయడానికి ముందు కాంటాక్ట్ పేరు టైప్ చేయండి."</string>
@@ -359,8 +359,8 @@
     <string name="list_filter_single" msgid="6003845379327432129">"కాంటాక్ట్"</string>
     <string name="display_ungrouped" msgid="4823012484407759332">"అన్ని ఇతర కాంటాక్ట్‌లు"</string>
     <string name="display_all_contacts" msgid="1281067776483704512">"అన్ని కాంటాక్ట్‌లు"</string>
-    <string name="menu_sync_remove" msgid="7523335046562082188">"సింక్‌ గ్రూప్‌ను తీసివేయండి"</string>
-    <string name="dialog_sync_add" msgid="8012361965908515959">"సింక్‌ గ్రూప్‌ను జోడించండి"</string>
+    <string name="menu_sync_remove" msgid="7523335046562082188">"సింక్‌ సమూహాన్ని తీసివేయి"</string>
+    <string name="dialog_sync_add" msgid="8012361965908515959">"సింక్‌ సమూహాన్ని జోడించండి"</string>
     <string name="display_more_groups" msgid="8398232980355188133">"మరిన్ని గ్రూప్‌లు…"</string>
     <string name="display_warn_remove_ungrouped" msgid="522866344738506017">"సింక్‌ నుండి \"<xliff:g id="GROUP">%s</xliff:g>\"ని తీసివేయడం వలన సింక్‌ నుండి గ్రూప్ చేయబడని కాంటాక్ట్‌లు కూడా తీసివేయబడతాయి."</string>
     <string name="savingDisplayGroups" msgid="6779839417901711381">"ప్రదర్శన ఎంపికలను సేవ్ చేస్తోంది…"</string>
@@ -436,11 +436,11 @@
     <string name="no_contact_to_share" msgid="6285287228557175749">"షేర్ చేయడానికి కాంటాక్ట్‌లు ఏవీ లేవు."</string>
     <string name="menu_contacts_filter" msgid="5854584270038139275">"డిస్‌ప్లే చేయాల్సిన కాంటాక్ట్‌లు"</string>
     <string name="activity_title_contacts_filter" msgid="6340531582631006680">"డిస్‌ప్లే చేయాల్సిన కాంటాక్ట్‌లు"</string>
-    <string name="custom_list_filter" msgid="2544327670202891979">"అనుకూలంగా మార్చిన వీక్షణ"</string>
+    <string name="custom_list_filter" msgid="2544327670202891979">"అనుకూలీకరించిన వీక్షణ"</string>
     <string name="menu_custom_filter_save" msgid="2412959737200856930">"సేవ్ చేయి"</string>
     <string name="hint_findContacts" msgid="5554298639062659655">"కాంటాక్ట్‌లను సెర్చ్ చేయండి"</string>
     <string name="contactsFavoritesLabel" msgid="8339645684721732714">"ఇష్టమైనవి"</string>
-    <string name="menu_import" msgid="2206768098740726906">"దిగుమతి చేయండి"</string>
+    <string name="menu_import" msgid="2206768098740726906">"దిగుమతి చేయి"</string>
     <string name="menu_export" msgid="1217402092617629429">"ఎగుమతి చేయి"</string>
     <string name="menu_blocked_numbers" msgid="7064680515202657609">"బ్లాక్ చేయబడిన నంబర్‌లు"</string>
     <string name="contact_status_update_attribution" msgid="5051874518046969847">"<xliff:g id="SOURCE">%1$s</xliff:g> ద్వారా"</string>
@@ -457,7 +457,7 @@
     <string name="about_build_version" msgid="5870642814752351712">"బిల్డ్ వెర్షన్‌"</string>
     <string name="about_open_source_licenses" msgid="1617836621315557445">"ఓపెన్ సోర్స్ లైసెన్స్‌లు"</string>
     <string name="about_open_source_licenses_summary" msgid="4843627659117423491">"ఓపెన్ సోర్స్ సాఫ్ట్‌వేర్ యొక్క లైసెన్స్ వివరాలు"</string>
-    <string name="about_privacy_policy" msgid="4581488375200402678">"గోప్యతా పాలసీ"</string>
+    <string name="about_privacy_policy" msgid="4581488375200402678">"గోప్యతా విధానం"</string>
     <string name="about_terms_of_service" msgid="7419670771785057738">"సేవా నిబంధనలు"</string>
     <string name="activity_title_licenses" msgid="6434398894019119709">"ఓపెన్ సోర్స్ లైసెన్స్‌లు"</string>
     <string name="url_open_error_toast" msgid="4885855620824048385">"urlని తెరవడంలో విఫలమైంది."</string>
@@ -468,7 +468,7 @@
     <string name="description_no_name_header" msgid="8596201864512339003">"అధ్యాహారం"</string>
     <string name="dynamic_shortcut_disabled_message" msgid="8770462908102469878">"ఈ షార్ట్‌కట్‌ నిలిపివేయబడింది"</string>
     <string name="dynamic_shortcut_contact_removed_message" msgid="8331735243566193974">"కాంటాక్ట్ తీసివేయబడింది"</string>
-    <string name="sim_import_button_text" msgid="2845608246304396009">"దిగుమతి చేయండి"</string>
+    <string name="sim_import_button_text" msgid="2845608246304396009">"దిగుమతి చేయి"</string>
     <string name="sim_import_title_none_selected" msgid="3527680774575468781">"కాంటాక్ట్‌లను ఎంచుకోండి"</string>
     <string name="sim_import_empty_message" msgid="7238368542566545854">"మీ SIM కార్డ్‌లో కాంటాక్ట్‌లు ఏవీ లేవు"</string>
     <string name="sim_import_contact_exists_toast" msgid="8423212007841229749">"కాంటాక్ట్ మీ లిస్ట్‌లో ఇప్పటికే ఉంది"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 3ba641b..698cadb 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -251,7 +251,7 @@
     <string name="call_assistant" msgid="8556909944379826616">"<xliff:g id="CUSTOM_LABEL">%s</xliff:g> کو کال کریں"</string>
     <string name="call_mms" msgid="1760746475672950386">"‏MMS نمبر پر کال کریں"</string>
     <string name="call_by_shortcut" msgid="5707329943368933423">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (کال کریں)"</string>
-    <string name="sms_custom" msgid="3684453744622817362">"<xliff:g id="CUSTOM_LABEL">%s</xliff:g> پر ٹیکسٹ پیغام بھیجیں"</string>
+    <string name="sms_custom" msgid="3684453744622817362">"<xliff:g id="CUSTOM_LABEL">%s</xliff:g> پر متنی پیغام بھیجیں"</string>
     <string name="sms_home" msgid="6132392861245316613">"گھر کے نمبر پر متن بھیجیں"</string>
     <string name="sms_mobile" msgid="433949735070334192">"موبائل پر متن بھیجیں"</string>
     <string name="sms_work" msgid="7784676780449153911">"دفتر کے نمبر پر متن بھیجیں"</string>
@@ -310,7 +310,7 @@
     <string name="organizationLabelsGroup" msgid="2342482097897299099">"تنظیم"</string>
     <string name="relationLabelsGroup" msgid="8931615792208307291">"رشتہ"</string>
     <string name="eventLabelsGroup" msgid="8625868552164376823">"خاص تاریخ"</string>
-    <string name="sms" msgid="4246338112764847384">"ٹیکسٹ پیغام"</string>
+    <string name="sms" msgid="4246338112764847384">"متنی پیغام"</string>
     <string name="postal_address" msgid="5031809899673855074">"پتہ"</string>
     <string name="ghostData_company" msgid="3873500610390675876">"کمپنی"</string>
     <string name="ghostData_department" msgid="8610642449404163799">"محکمہ"</string>
diff --git a/src/com/android/contacts/NfcHandler.java b/src/com/android/contacts/NfcHandler.java
deleted file mode 100644
index 07b3f06..0000000
--- a/src/com/android/contacts/NfcHandler.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.contacts;
-
-import android.app.Activity;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.net.Uri;
-import android.nfc.NdefMessage;
-import android.nfc.NdefRecord;
-import android.nfc.NfcAdapter;
-import android.nfc.NfcEvent;
-import android.provider.ContactsContract.Contacts;
-import android.provider.ContactsContract.Profile;
-import android.util.Log;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
-  * This class implements sharing the currently displayed
-  * contact to another device using NFC. NFC sharing is only
-  * enabled when the activity is in the foreground and resumed.
-  * When an NFC link is established, {@link #createMessage}
-  * will be called to create the data to be sent over the link,
-  * which is a vCard in this case.
-  */
-public class NfcHandler implements NfcAdapter.CreateNdefMessageCallback {
-
-    private static final String TAG = "ContactNfcHandler";
-    private static final String PROFILE_LOOKUP_KEY = "profile";
-    private final Context mContext;
-    private final Uri mContactUri;
-
-    /* Register NFC handler. This should be called in activities' onCreate(), or similar methods */
-    public static void register(Activity activity, Uri contactUri) {
-        NfcAdapter adapter = NfcAdapter.getDefaultAdapter(activity.getApplicationContext());
-        if (adapter == null) {
-            return;  // NFC not available on this device
-        }
-        adapter.setNdefPushMessageCallback(new NfcHandler(activity, contactUri), activity);
-    }
-
-    public NfcHandler(Context context, Uri contactUri) {
-        mContext = context;
-        mContactUri = contactUri;
-    }
-
-    @Override
-    public NdefMessage createNdefMessage(NfcEvent event) {
-        ContentResolver resolver = mContext.getContentResolver();
-        if (mContactUri != null) {
-            final String lookupKey = Uri.encode(mContactUri.getPathSegments().get(2));
-            final Uri shareUri;
-            // TODO find out where to get this constant from, or find another way
-            // of determining this.
-            if (lookupKey.equals(PROFILE_LOOKUP_KEY)) {
-                shareUri = Profile.CONTENT_VCARD_URI.buildUpon().
-                appendQueryParameter(Contacts.QUERY_PARAMETER_VCARD_NO_PHOTO, "true").
-                build();
-            } else {
-                shareUri = Contacts.CONTENT_VCARD_URI.buildUpon().
-                appendPath(lookupKey).
-                appendQueryParameter(Contacts.QUERY_PARAMETER_VCARD_NO_PHOTO, "true").
-                build();
-            }
-            ByteArrayOutputStream ndefBytes = new ByteArrayOutputStream();
-            byte[] buffer = new byte[1024];
-            int r;
-            try {
-                InputStream vcardInputStream = resolver.openInputStream(shareUri);
-                while ((r = vcardInputStream.read(buffer)) > 0) {
-                    ndefBytes.write(buffer, 0, r);
-                }
-
-                NdefRecord record = NdefRecord.createMime("text/x-vcard", ndefBytes.toByteArray());
-                return new NdefMessage(record);
-            } catch (IOException e) {
-                Log.e(TAG, "IOException creating vcard.");
-                return null;
-            }
-        } else {
-            Log.w(TAG, "No contact URI to share.");
-            return null;
-        }
-    }
-}
diff --git a/src/com/android/contacts/activities/ContactEditorSpringBoardActivity.java b/src/com/android/contacts/activities/ContactEditorSpringBoardActivity.java
index cf2ce9c..64283d2 100644
--- a/src/com/android/contacts/activities/ContactEditorSpringBoardActivity.java
+++ b/src/com/android/contacts/activities/ContactEditorSpringBoardActivity.java
@@ -242,6 +242,7 @@
         finish();
     }
 
+    @SuppressWarnings("MissingSuperCall") // TODO: Fix me
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         // Ignore failed requests
diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index 412c067..ceb3d59 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -421,6 +421,7 @@
         getWindow().setBackgroundDrawable(null);
     }
 
+    @SuppressWarnings("MissingSuperCall") // TODO: Fix me
     @Override
     protected void onNewIntent(Intent intent) {
         final String action = intent.getAction();
@@ -603,6 +604,7 @@
         onSyncStateUpdated();
     }
 
+    @SuppressWarnings("MissingSuperCall") // TODO: Fix me
     @Override
     public void onMultiWindowModeChanged(boolean entering) {
         initializeHomeVisibility();
diff --git a/src/com/android/contacts/editor/ContactEditorFragment.java b/src/com/android/contacts/editor/ContactEditorFragment.java
index ce4b9bc..52c20e6 100755
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -98,6 +98,7 @@
 import com.google.common.collect.Lists;
 
 import java.io.FileNotFoundException;
+import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -132,11 +133,10 @@
     private static final String KEY_PHOTO_RAW_CONTACT_ID = "photo_raw_contact_id";
     private static final String KEY_UPDATED_PHOTOS = "updated_photos";
 
-    private static final List<String> VALID_INTENT_ACTIONS = new ArrayList<String>() {{
-        add(Intent.ACTION_EDIT);
-        add(Intent.ACTION_INSERT);
-        add(ContactEditorActivity.ACTION_SAVE_COMPLETED);
-    }};
+    private static final List<String> VALID_INTENT_ACTIONS = Arrays.asList(
+            Intent.ACTION_EDIT,
+            Intent.ACTION_INSERT,
+            ContactEditorActivity.ACTION_SAVE_COMPLETED);
 
     private static final String KEY_ACTION = "action";
     private static final String KEY_URI = "uri";
diff --git a/src/com/android/contacts/editor/SuggestionEditConfirmationDialogFragment.java b/src/com/android/contacts/editor/SuggestionEditConfirmationDialogFragment.java
index df22773..461a752 100644
--- a/src/com/android/contacts/editor/SuggestionEditConfirmationDialogFragment.java
+++ b/src/com/android/contacts/editor/SuggestionEditConfirmationDialogFragment.java
@@ -47,7 +47,7 @@
         return new AlertDialog.Builder(getActivity())
                 .setIconAttribute(android.R.attr.alertDialogIcon)
                 .setMessage(R.string.aggregation_suggestion_edit_dialog_message)
-                .setPositiveButton(android.R.string.yes,
+                .setPositiveButton(android.R.string.ok,
                         new DialogInterface.OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int whichButton) {
@@ -61,7 +61,7 @@
                             }
                         }
                 )
-                .setNegativeButton(android.R.string.no, null)
+                .setNegativeButton(android.R.string.cancel, null)
                 .create();
     }
 }
diff --git a/src/com/android/contacts/group/GroupMembersFragment.java b/src/com/android/contacts/group/GroupMembersFragment.java
index 3b66739..b0369c7 100644
--- a/src/com/android/contacts/group/GroupMembersFragment.java
+++ b/src/com/android/contacts/group/GroupMembersFragment.java
@@ -90,7 +90,6 @@
 
     private static final int LOADER_GROUP_METADATA = 100;
     private static final int MSG_FAIL_TO_LOAD = 1;
-    private static final int RESULT_GROUP_ADD_MEMBER = 100;
 
     /** Filters out duplicate contacts. */
     private class FilterCursorWrapper extends CursorWrapper {
@@ -448,7 +447,7 @@
 
     private void startGroupAddMemberActivity() {
         startActivityForResult(GroupUtil.createPickMemberIntent(getContext(), mGroupMetaData,
-                getMemberContactIds()), RESULT_GROUP_ADD_MEMBER);
+                getMemberContactIds()), GroupUtil.RESULT_GROUP_ADD_MEMBER);
     }
 
     @Override
@@ -504,7 +503,7 @@
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (resultCode != Activity.RESULT_OK || data == null
-                || requestCode != RESULT_GROUP_ADD_MEMBER) {
+                || requestCode != GroupUtil.RESULT_GROUP_ADD_MEMBER) {
             return;
         }
 
@@ -776,7 +775,7 @@
             @Override
             public void onClick(View v) {
                 startActivityForResult(GroupUtil.createPickMemberIntent(getContext(),
-                        mGroupMetaData, getMemberContactIds()), RESULT_GROUP_ADD_MEMBER);
+                        mGroupMetaData, getMemberContactIds()), GroupUtil.RESULT_GROUP_ADD_MEMBER);
             }
         });
         return view;
diff --git a/src/com/android/contacts/group/GroupUtil.java b/src/com/android/contacts/group/GroupUtil.java
index dae4f4e..17998f8 100644
--- a/src/com/android/contacts/group/GroupUtil.java
+++ b/src/com/android/contacts/group/GroupUtil.java
@@ -58,7 +58,8 @@
     public static final String ACTION_SWITCH_GROUP = "switchGroup";
     public static final String ACTION_UPDATE_GROUP = "updateGroup";
 
-    public static final int RESULT_SEND_TO_SELECTION = 100;
+    public static final int RESULT_GROUP_ADD_MEMBER = 100;
+    public static final int RESULT_SEND_TO_SELECTION = 200;
 
     // System IDs of FFC groups in Google accounts
     private static final Set<String> FFC_GROUPS =
diff --git a/src/com/android/contacts/list/CustomContactListFilterActivity.java b/src/com/android/contacts/list/CustomContactListFilterActivity.java
index 425ee7e..5bc3c35 100644
--- a/src/com/android/contacts/list/CustomContactListFilterActivity.java
+++ b/src/com/android/contacts/list/CustomContactListFilterActivity.java
@@ -982,8 +982,8 @@
         public Dialog onCreateDialog(Bundle savedInstanceState) {
             return new AlertDialog.Builder(getActivity(), getTheme())
                     .setMessage(R.string.leave_customize_confirmation_dialog_message)
-                    .setNegativeButton(android.R.string.no, null)
-                    .setPositiveButton(android.R.string.yes, this)
+                    .setNegativeButton(android.R.string.cancel, null)
+                    .setPositiveButton(android.R.string.ok, this)
                     .create();
         }
 
diff --git a/src/com/android/contacts/model/SimContact.java b/src/com/android/contacts/model/SimContact.java
index 820e346..ee0e6dc 100644
--- a/src/com/android/contacts/model/SimContact.java
+++ b/src/com/android/contacts/model/SimContact.java
@@ -172,11 +172,7 @@
 
     @Override
     public int hashCode() {
-        int result = (int) (mRecordNumber ^ (mRecordNumber >>> 32));
-        result = 31 * result + (mName != null ? mName.hashCode() : 0);
-        result = 31 * result + (mPhone != null ? mPhone.hashCode() : 0);
-        result = 31 * result + Arrays.hashCode(mEmails);
-        return result;
+        return Objects.hash(mRecordNumber, mName, mPhone, Arrays.hashCode(mEmails));
     }
 
     @Override
diff --git a/src/com/android/contacts/model/dataitem/ImDataItem.java b/src/com/android/contacts/model/dataitem/ImDataItem.java
index a0e087c..a142585 100644
--- a/src/com/android/contacts/model/dataitem/ImDataItem.java
+++ b/src/com/android/contacts/model/dataitem/ImDataItem.java
@@ -23,6 +23,8 @@
 import android.provider.ContactsContract.CommonDataKinds.Im;
 import android.text.TextUtils;
 
+import java.util.Objects;
+
 /**
  * Represents an IM data item, wrapping the columns in
  * {@link ContactsContract.CommonDataKinds.Im}.
@@ -101,7 +103,7 @@
                 return that.getProtocol() == Im.PROTOCOL_CUSTOM;
             }
             return true;
-        } else if (getProtocol() != that.getProtocol()) {
+        } else if (!Objects.equals(getProtocol(), that.getProtocol())) {
             return false;
         } else if (getProtocol() == Im.PROTOCOL_CUSTOM &&
                 !TextUtils.equals(getCustomProtocol(), that.getCustomProtocol())) {
diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index 5b144e1..35fc2cc 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -104,7 +104,6 @@
 import com.android.contacts.ContactsActivity;
 import com.android.contacts.ContactsUtils;
 import com.android.contacts.DynamicShortcuts;
-import com.android.contacts.NfcHandler;
 import com.android.contacts.R;
 import com.android.contacts.ShortcutIntentBuilder;
 import com.android.contacts.ShortcutIntentBuilder.OnShortcutIntentCreatedListener;
@@ -990,7 +989,6 @@
             }
         };
         mEntriesAndActionsTask.execute();
-        NfcHandler.register(this, mContactData.getLookupUri());
     }
 
     private void bindDataToCards(Cp2DataCardModel cp2DataCardModel) {
@@ -1486,6 +1484,11 @@
             final String dataString = event.buildDataStringForDisplay(context, kind);
             final Calendar cal = DateUtils.parseDate(dataString, false);
             if (cal != null) {
+                final int eventType = event.getContentValues().getAsInteger(Event.TYPE);
+                if (eventType == Event.TYPE_ANNIVERSARY || eventType == Event.TYPE_BIRTHDAY) {
+                    // setting the year to 0 makes a click open the coming birthday
+                    cal.set(Calendar.YEAR, 0);
+                }
                 final Date nextAnniversary =
                         DateUtils.getNextAnnualDate(cal);
                 final Uri.Builder builder = CalendarContract.CONTENT_URI.buildUpon();
diff --git a/src/com/android/contacts/vcard/ImportVCardDialogFragment.java b/src/com/android/contacts/vcard/ImportVCardDialogFragment.java
index 521a610..7ad67d1 100644
--- a/src/com/android/contacts/vcard/ImportVCardDialogFragment.java
+++ b/src/com/android/contacts/vcard/ImportVCardDialogFragment.java
@@ -68,7 +68,7 @@
         return new AlertDialog.Builder(getActivity())
                 .setIconAttribute(android.R.attr.alertDialogIcon)
                 .setMessage(R.string.import_from_vcf_file_confirmation_message)
-                .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
+                .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int whichButton) {
                         final Listener listener = (Listener) getActivity();
@@ -77,7 +77,7 @@
                         }
                     }
                 })
-                .setNegativeButton(android.R.string.no, new DialogInterface.OnClickListener() {
+                .setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int whichButton) {
                         final Listener listener = (Listener) getActivity();
diff --git a/src/com/android/contacts/vcard/VCardService.java b/src/com/android/contacts/vcard/VCardService.java
index 075d6bb..5e647c4 100644
--- a/src/com/android/contacts/vcard/VCardService.java
+++ b/src/com/android/contacts/vcard/VCardService.java
@@ -16,6 +16,7 @@
 package com.android.contacts.vcard;
 
 import android.app.Notification;
+import android.app.NotificationManager;
 import android.app.Service;
 import android.content.Intent;
 import android.media.MediaScannerConnection;
@@ -129,6 +130,10 @@
                     VCardCommonArguments.ARG_CALLING_ACTIVITY);
         } else {
             mCallingActivity = null;
+            // The intent will be null if the service is restarted after the app
+            // is killed but the notification may still exist so remove it.
+            NotificationManager nm = getSystemService(NotificationManager.class);
+            nm.cancelAll();
         }
         return START_STICKY;
     }
@@ -255,6 +260,9 @@
                 }
             }
         } else {
+            // In case notification of import is still present and app is killed remove it
+            NotificationManager nm = getSystemService(NotificationManager.class);
+            nm.cancel(NotificationImportExportListener.DEFAULT_NOTIFICATION_TAG, jobId);
             Log.w(LOG_TAG, String.format("Tried to remove unknown job (id: %d)", jobId));
         }
         stopServiceIfAppropriate();