Merge change 26967 into eclair * changes: Disable the call icon in the logs for private and unknown numbers.

commit: e291627b8c0d0a69d77a9fd0a37cdb48349d52f6 [log] [tgz]
author: Android (Google) Code Review <android-gerrit@google.com> Sun Sep 27 18:34:50 2009 -0400
committer: Android (Google) Code Review <android-gerrit@google.com> Sun Sep 27 18:34:50 2009 -0400
tree: fca5f0da69eb83adf2a2148599912d3dd8c08aac
parent: 6971f2ae45bbb2d89f22358e54afb9e7ccd5754d [diff]
parent: d63a9602ee06cdd276ef40309cc047c9c4b57a53 [diff]
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 4b0d4ee..2b3c3fc 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml

@@ -299,34 +299,11 @@
     <string name="nicknameLabelsGroup" msgid="2891682101053358010">"Přezdívka"</string>
     <string name="organizationLabelsGroup" msgid="2478611760751832035">"Organizace"</string>
     <string name="websiteLabelsGroup" msgid="4202998982804009261">"Webové stránky"</string>
-    <string name="type_home" msgid="1228039089996938949">"Domů"</string>
-    <string name="type_mobile" msgid="4202799691295960532">"Mobil"</string>
-    <string name="type_work" msgid="9046581192178244575">"Práce"</string>
-    <string name="type_fax_work" msgid="7056833051776335751">"Pracovní fax"</string>
-    <string name="type_fax_home" msgid="5188151910627934239">"Domácí fax"</string>
-    <string name="type_pager" msgid="6971533430192661440">"Pager"</string>
-    <string name="type_other" msgid="357858743316072535">"Ostatní"</string>
-    <string name="type_custom" msgid="546891906059234753">"Vlastní"</string>
     <string name="type_short_home" msgid="7770424864090605384">"D"</string>
     <string name="type_short_mobile" msgid="1655473281466676216">"M"</string>
     <string name="type_short_work" msgid="4925330752504537861">"P"</string>
     <string name="type_short_pager" msgid="2613818970827594238">"P"</string>
     <string name="type_short_other" msgid="5669407180177236769">"O"</string>
-    <string name="type_home_2" msgid="7576604544326827279">"Domů 2"</string>
-    <string name="type_work_2" msgid="4033954623350210826">"Práce 2"</string>
-    <string name="type_car" msgid="1882297602515019816">"Auto"</string>
-    <string name="type_company_main" msgid="1757801178953730800">"Firma (hlavní)"</string>
-    <string name="type_mms" msgid="7575994898038669673">"MMS"</string>
-    <string name="type_radio" msgid="7376516830366758196">"Radiostanice"</string>
-    <string name="type_assistant" msgid="4838160907811639910">"Asistent"</string>
-    <string name="type_im_aim" msgid="2227683604131341761">"AIM"</string>
-    <string name="type_im_msn" msgid="5322977067527283958">"Windows Live"</string>
-    <string name="type_im_yahoo" msgid="8093860976582856789">"Yahoo"</string>
-    <string name="type_im_skype" msgid="7847929379814316050">"Skype"</string>
-    <string name="type_im_qq" msgid="764805405209877788">"QQ"</string>
-    <string name="type_im_google_talk" msgid="4019292000925519902">"Google Talk"</string>
-    <string name="type_im_icq" msgid="7556014886862234019">"ICQ"</string>
-    <string name="type_im_jabber" msgid="5523148125631896131">"Jabber"</string>
     <string name="edit_secondary_collapse" msgid="1855127176548440583">"Sekundární podrobnosti"</string>
     <string name="dialog_primary_name" msgid="5521591005692614833">"Primární jméno"</string>
     <string name="dialog_new_contact_account" msgid="9044704073286262197">"Vytvořit kontakt na základě účtu"</string>
@@ -345,10 +322,7 @@
     <string name="call_fax_work" msgid="7467763592359059243">"Volat pracovní fax"</string>
     <string name="call_fax_home" msgid="8342175628887571876">"Volat domácí fax"</string>
     <string name="call_pager" msgid="9003902812293983281">"Volat pager"</string>
-    <string name="call_other" msgid="5605584621798108205">"Volat ostatní"</string>
     <string name="call_custom" msgid="7756571794763171802">"Volat kontakt <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home_2" msgid="310203419023725540">"Volat domů 2"</string>
-    <string name="call_work_2" msgid="4403999777434987049">"Volat do práce 2"</string>
     <string name="call_car" msgid="3280537320306436445">"Volat do auta"</string>
     <string name="call_company_main" msgid="6105120947138711257">"Volat firmu (hlavní)"</string>
     <string name="call_mms" msgid="6274041545876221437">"Volat MMS"</string>
@@ -361,8 +335,6 @@
     <string name="sms_pager" msgid="7730404569637015192">"Poslat SMS na pager"</string>
     <string name="sms_other" msgid="5131921487474531617">"Poslat SMS na ostatní"</string>
     <string name="sms_custom" msgid="5932736853732191825">"Poslat SMS na <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home_2" msgid="7944150531556566287">"Poslat SMS domů 2"</string>
-    <string name="sms_work_2" msgid="1652790306127907938">"Poslat SMS do práce 2"</string>
     <string name="sms_car" msgid="7444227058437359641">"Poslat SMS do auta"</string>
     <string name="sms_company_main" msgid="118970873419678087">"Poslat SMS do firmy (hlavní)"</string>
     <string name="sms_mms" msgid="4069352461380762677">"Poslat SMS na číslo MMS"</string>
@@ -385,7 +357,6 @@
     <string name="chat_gtalk" msgid="981575737258117697">"Chatovat pomocí Google Talk"</string>
     <string name="chat_icq" msgid="8438405386153745775">"Chatovat pomocí ICQ"</string>
     <string name="chat_jabber" msgid="7561444230307829609">"Chatovat pomocí Jabberu"</string>
-    <string name="chat_other" msgid="6023619161453269469">"Chat"</string>
     <string name="postal_street" msgid="8133143961580058972">"Ulice"</string>
     <string name="postal_pobox" msgid="4431938829180269821">"Číslo poštovní schránky"</string>
     <string name="postal_neighborhood" msgid="1450783874558956739">"Čtvrť"</string>

diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 3dffcd9..88d3563 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml

@@ -299,34 +299,11 @@
     <string name="nicknameLabelsGroup" msgid="2891682101053358010">"Kaldenavn"</string>
     <string name="organizationLabelsGroup" msgid="2478611760751832035">"Organisation"</string>
     <string name="websiteLabelsGroup" msgid="4202998982804009261">"Websted"</string>
-    <string name="type_home" msgid="1228039089996938949">"Start"</string>
-    <string name="type_mobile" msgid="4202799691295960532">"Mobil"</string>
-    <string name="type_work" msgid="9046581192178244575">"Arbejde"</string>
-    <string name="type_fax_work" msgid="7056833051776335751">"Arbejdsfax"</string>
-    <string name="type_fax_home" msgid="5188151910627934239">"Hjemmefax"</string>
-    <string name="type_pager" msgid="6971533430192661440">"Personsøger"</string>
-    <string name="type_other" msgid="357858743316072535">"Andre"</string>
-    <string name="type_custom" msgid="546891906059234753">"Tilpasset"</string>
     <string name="type_short_home" msgid="7770424864090605384">"H"</string>
     <string name="type_short_mobile" msgid="1655473281466676216">"M"</string>
     <string name="type_short_work" msgid="4925330752504537861">"O"</string>
     <string name="type_short_pager" msgid="2613818970827594238">"P"</string>
     <string name="type_short_other" msgid="5669407180177236769">"O"</string>
-    <string name="type_home_2" msgid="7576604544326827279">"Hjem 2"</string>
-    <string name="type_work_2" msgid="4033954623350210826">"Arbejde 2"</string>
-    <string name="type_car" msgid="1882297602515019816">"Bil"</string>
-    <string name="type_company_main" msgid="1757801178953730800">"Virksomhed (hovednummer)"</string>
-    <string name="type_mms" msgid="7575994898038669673">"MMS"</string>
-    <string name="type_radio" msgid="7376516830366758196">"Radio"</string>
-    <string name="type_assistant" msgid="4838160907811639910">"Assistent"</string>
-    <string name="type_im_aim" msgid="2227683604131341761">"AIM"</string>
-    <string name="type_im_msn" msgid="5322977067527283958">"Windows Live"</string>
-    <string name="type_im_yahoo" msgid="8093860976582856789">"Yahoo"</string>
-    <string name="type_im_skype" msgid="7847929379814316050">"Skype"</string>
-    <string name="type_im_qq" msgid="764805405209877788">"QQ"</string>
-    <string name="type_im_google_talk" msgid="4019292000925519902">"Google Talk"</string>
-    <string name="type_im_icq" msgid="7556014886862234019">"ICQ"</string>
-    <string name="type_im_jabber" msgid="5523148125631896131">"Jabber"</string>
     <string name="edit_secondary_collapse" msgid="1855127176548440583">"Sekundære detaljer"</string>
     <string name="dialog_primary_name" msgid="5521591005692614833">"Primærnavn"</string>
     <string name="dialog_new_contact_account" msgid="9044704073286262197">"Opret kontaktperson under konto"</string>
@@ -345,10 +322,7 @@
     <string name="call_fax_work" msgid="7467763592359059243">"Ring til arbejdsfax"</string>
     <string name="call_fax_home" msgid="8342175628887571876">"Ring til hjemmefax"</string>
     <string name="call_pager" msgid="9003902812293983281">"Ring til personsøger"</string>
-    <string name="call_other" msgid="5605584621798108205">"Ring til øvrige"</string>
     <string name="call_custom" msgid="7756571794763171802">"Ring til <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home_2" msgid="310203419023725540">"Ring til hjem 2"</string>
-    <string name="call_work_2" msgid="4403999777434987049">"Ring til arbejde 2"</string>
     <string name="call_car" msgid="3280537320306436445">"Ring til bil"</string>
     <string name="call_company_main" msgid="6105120947138711257">"Ring til arbejde (hovednummer)"</string>
     <string name="call_mms" msgid="6274041545876221437">"Ring til MMS"</string>
@@ -361,8 +335,6 @@
     <string name="sms_pager" msgid="7730404569637015192">"Sms til personsøger"</string>
     <string name="sms_other" msgid="5131921487474531617">"Sms til anden"</string>
     <string name="sms_custom" msgid="5932736853732191825">"Tekst <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home_2" msgid="7944150531556566287">"Sms til hjem 2"</string>
-    <string name="sms_work_2" msgid="1652790306127907938">"Sms til arbejde 2"</string>
     <string name="sms_car" msgid="7444227058437359641">"Sms til bil"</string>
     <string name="sms_company_main" msgid="118970873419678087">"Sms til arbejde (hovednummer)"</string>
     <string name="sms_mms" msgid="4069352461380762677">"Sms til MMS"</string>
@@ -385,7 +357,6 @@
     <string name="chat_gtalk" msgid="981575737258117697">"Chat ved hjælp af Google Talk"</string>
     <string name="chat_icq" msgid="8438405386153745775">"Chat ved hjælp af ICQ"</string>
     <string name="chat_jabber" msgid="7561444230307829609">"Chat ved hjælp af Jabber"</string>
-    <string name="chat_other" msgid="6023619161453269469">"chat"</string>
     <string name="postal_street" msgid="8133143961580058972">"Gade"</string>
     <string name="postal_pobox" msgid="4431938829180269821">"Postboks"</string>
     <string name="postal_neighborhood" msgid="1450783874558956739">"Nabolag"</string>

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index d3ddaf3..b45e33a 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml

@@ -299,34 +299,11 @@
     <string name="nicknameLabelsGroup" msgid="2891682101053358010">"Alias"</string>
     <string name="organizationLabelsGroup" msgid="2478611760751832035">"Firma/Organisation"</string>
     <string name="websiteLabelsGroup" msgid="4202998982804009261">"Website"</string>
-    <string name="type_home" msgid="1228039089996938949">"Privat"</string>
-    <string name="type_mobile" msgid="4202799691295960532">"Mobil"</string>
-    <string name="type_work" msgid="9046581192178244575">"Arbeit"</string>
-    <string name="type_fax_work" msgid="7056833051776335751">"Fax (Arbeit)"</string>
-    <string name="type_fax_home" msgid="5188151910627934239">"Fax (privat)"</string>
-    <string name="type_pager" msgid="6971533430192661440">"Pager"</string>
-    <string name="type_other" msgid="357858743316072535">"Andere"</string>
-    <string name="type_custom" msgid="546891906059234753">"Benutzerdefiniert"</string>
     <string name="type_short_home" msgid="7770424864090605384">"P"</string>
     <string name="type_short_mobile" msgid="1655473281466676216">"M"</string>
     <string name="type_short_work" msgid="4925330752504537861">"A"</string>
     <string name="type_short_pager" msgid="2613818970827594238">"P"</string>
     <string name="type_short_other" msgid="5669407180177236769">"S"</string>
-    <string name="type_home_2" msgid="7576604544326827279">"Privat 2"</string>
-    <string name="type_work_2" msgid="4033954623350210826">"Arbeit 2"</string>
-    <string name="type_car" msgid="1882297602515019816">"Auto"</string>
-    <string name="type_company_main" msgid="1757801178953730800">"Firma (Hauptnummer)"</string>
-    <string name="type_mms" msgid="7575994898038669673">"MMS"</string>
-    <string name="type_radio" msgid="7376516830366758196">"Radio"</string>
-    <string name="type_assistant" msgid="4838160907811639910">"Assistent"</string>
-    <string name="type_im_aim" msgid="2227683604131341761">"AIM"</string>
-    <string name="type_im_msn" msgid="5322977067527283958">"Windows Live"</string>
-    <string name="type_im_yahoo" msgid="8093860976582856789">"Yahoo"</string>
-    <string name="type_im_skype" msgid="7847929379814316050">"Skype"</string>
-    <string name="type_im_qq" msgid="764805405209877788">"QQ"</string>
-    <string name="type_im_google_talk" msgid="4019292000925519902">"Google Talk"</string>
-    <string name="type_im_icq" msgid="7556014886862234019">"ICQ"</string>
-    <string name="type_im_jabber" msgid="5523148125631896131">"Jabber"</string>
     <string name="edit_secondary_collapse" msgid="1855127176548440583">"Sekundäre Details"</string>
     <string name="dialog_primary_name" msgid="5521591005692614833">"Hauptname"</string>
     <string name="dialog_new_contact_account" msgid="9044704073286262197">"Neuen Kontakt unter Konto erstellen"</string>
@@ -345,10 +322,7 @@
     <string name="call_fax_work" msgid="7467763592359059243">"Anruf (Fax, Arbeit)"</string>
     <string name="call_fax_home" msgid="8342175628887571876">"Faxanruf (privat)"</string>
     <string name="call_pager" msgid="9003902812293983281">"Anruf (Pager)"</string>
-    <string name="call_other" msgid="5605584621798108205">"Anruf (sonstige)"</string>
     <string name="call_custom" msgid="7756571794763171802">"<xliff:g id="CUSTOM">%s</xliff:g> anrufen"</string>
-    <string name="call_home_2" msgid="310203419023725540">"Anruf (privat 2)"</string>
-    <string name="call_work_2" msgid="4403999777434987049">"Anruf (Arbeit 2)"</string>
     <string name="call_car" msgid="3280537320306436445">"Anruf (Auto)"</string>
     <string name="call_company_main" msgid="6105120947138711257">"Anruf (Firmenhauptnummer)"</string>
     <string name="call_mms" msgid="6274041545876221437">"Anruf (MMS)"</string>
@@ -361,8 +335,6 @@
     <string name="sms_pager" msgid="7730404569637015192">"Text-Pager"</string>
     <string name="sms_other" msgid="5131921487474531617">"Text (sonstige)"</string>
     <string name="sms_custom" msgid="5932736853732191825">"Text <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home_2" msgid="7944150531556566287">"Text (privat 2)"</string>
-    <string name="sms_work_2" msgid="1652790306127907938">"Text (Arbeit 2)"</string>
     <string name="sms_car" msgid="7444227058437359641">"Text (Auto)"</string>
     <string name="sms_company_main" msgid="118970873419678087">"Text (Firmenhauptnummer)"</string>
     <string name="sms_mms" msgid="4069352461380762677">"Text (MMS)"</string>
@@ -385,7 +357,6 @@
     <string name="chat_gtalk" msgid="981575737258117697">"Chat über Google Talk"</string>
     <string name="chat_icq" msgid="8438405386153745775">"Chat über ICQ"</string>
     <string name="chat_jabber" msgid="7561444230307829609">"Chat über Jabber"</string>
-    <string name="chat_other" msgid="6023619161453269469">"Chat"</string>
     <string name="postal_street" msgid="8133143961580058972">"Straße"</string>
     <string name="postal_pobox" msgid="4431938829180269821">"Postfach"</string>
     <string name="postal_neighborhood" msgid="1450783874558956739">"Nachbarschaft"</string>

diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 3618afa..ce6be87 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml

@@ -299,34 +299,11 @@
     <string name="nicknameLabelsGroup" msgid="2891682101053358010">"Ψευδώνυμο"</string>
     <string name="organizationLabelsGroup" msgid="2478611760751832035">"Οργανισμός"</string>
     <string name="websiteLabelsGroup" msgid="4202998982804009261">"Ιστότοπος"</string>
-    <string name="type_home" msgid="1228039089996938949">"Οικία"</string>
-    <string name="type_mobile" msgid="4202799691295960532">"Κινητές συσκευές"</string>
-    <string name="type_work" msgid="9046581192178244575">"Εργασία"</string>
-    <string name="type_fax_work" msgid="7056833051776335751">"Φαξ εργασίας"</string>
-    <string name="type_fax_home" msgid="5188151910627934239">"Φαξ οικίας"</string>
-    <string name="type_pager" msgid="6971533430192661440">"Βομβητής"</string>
-    <string name="type_other" msgid="357858743316072535">"Άλλο"</string>
-    <string name="type_custom" msgid="546891906059234753">"Προσαρμοσμένο"</string>
     <string name="type_short_home" msgid="7770424864090605384">"Ο"</string>
     <string name="type_short_mobile" msgid="1655473281466676216">"Κ"</string>
     <string name="type_short_work" msgid="4925330752504537861">"Ε"</string>
     <string name="type_short_pager" msgid="2613818970827594238">"Β"</string>
     <string name="type_short_other" msgid="5669407180177236769">"Α"</string>
-    <string name="type_home_2" msgid="7576604544326827279">"Οικία 2"</string>
-    <string name="type_work_2" msgid="4033954623350210826">"Εργασία 2"</string>
-    <string name="type_car" msgid="1882297602515019816">"Αυτοκίνητο"</string>
-    <string name="type_company_main" msgid="1757801178953730800">"Κύρια εταιρική γραμμή"</string>
-    <string name="type_mms" msgid="7575994898038669673">"MMS"</string>
-    <string name="type_radio" msgid="7376516830366758196">"Πομπός"</string>
-    <string name="type_assistant" msgid="4838160907811639910">"Βοηθός"</string>
-    <string name="type_im_aim" msgid="2227683604131341761">"AIM"</string>
-    <string name="type_im_msn" msgid="5322977067527283958">"Windows Live"</string>
-    <string name="type_im_yahoo" msgid="8093860976582856789">"Yahoo"</string>
-    <string name="type_im_skype" msgid="7847929379814316050">"Skype"</string>
-    <string name="type_im_qq" msgid="764805405209877788">"QQ"</string>
-    <string name="type_im_google_talk" msgid="4019292000925519902">"Google Talk"</string>
-    <string name="type_im_icq" msgid="7556014886862234019">"ICQ"</string>
-    <string name="type_im_jabber" msgid="5523148125631896131">"Jabber"</string>
     <string name="edit_secondary_collapse" msgid="1855127176548440583">"Δευτερεύουσες λεπτομέρειες"</string>
     <string name="dialog_primary_name" msgid="5521591005692614833">"Κύριο όνομα"</string>
     <string name="dialog_new_contact_account" msgid="9044704073286262197">"Δημιουργία επαφής\nστον λογαριασμό"</string>
@@ -345,10 +322,7 @@
     <string name="call_fax_work" msgid="7467763592359059243">"Κλήση φαξ εργασίας"</string>
     <string name="call_fax_home" msgid="8342175628887571876">"Κλήση φαξ οικίας"</string>
     <string name="call_pager" msgid="9003902812293983281">"Κλήση βομβητή"</string>
-    <string name="call_other" msgid="5605584621798108205">"Κλήση άλλο"</string>
     <string name="call_custom" msgid="7756571794763171802">"Κλήση <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home_2" msgid="310203419023725540">"Κλήση οικίας 2"</string>
-    <string name="call_work_2" msgid="4403999777434987049">"Κλήση εργασίας 2"</string>
     <string name="call_car" msgid="3280537320306436445">"Κλήση τηλεφώνου αυτοκινήτου"</string>
     <string name="call_company_main" msgid="6105120947138711257">"Κλήση κύριας εταιρικής γραμμής"</string>
     <string name="call_mms" msgid="6274041545876221437">"Κλήση MMS"</string>
@@ -361,8 +335,6 @@
     <string name="sms_pager" msgid="7730404569637015192">"Αποστολή μηνύματος κειμένου προς βομβητή"</string>
     <string name="sms_other" msgid="5131921487474531617">"Αποστολή μηνύματος κειμένου προς άλλο"</string>
     <string name="sms_custom" msgid="5932736853732191825">"Αποστολή μηνύματος κειμένου προς <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home_2" msgid="7944150531556566287">"Αποστολή μηνύματος κειμένου προς οικία 2"</string>
-    <string name="sms_work_2" msgid="1652790306127907938">"Αποστολή μηνύματος κειμένου προς εργασία 2"</string>
     <string name="sms_car" msgid="7444227058437359641">"Αποστολή μηνύματος κειμένου προς τηλέφωνο αυτοκινήτου"</string>
     <string name="sms_company_main" msgid="118970873419678087">"Αποστολή μηνύματος κειμένου προς κύρια εταιρική γραμμή"</string>
     <string name="sms_mms" msgid="4069352461380762677">"Αποστολή μηνύματος κειμένου ως MMS"</string>
@@ -385,7 +357,6 @@
     <string name="chat_gtalk" msgid="981575737258117697">"Συζήτηση μέσω Google Talk"</string>
     <string name="chat_icq" msgid="8438405386153745775">"Συζήτηση μέσω ICQ"</string>
     <string name="chat_jabber" msgid="7561444230307829609">"Συζήτηση μέσω Jabber"</string>
-    <string name="chat_other" msgid="6023619161453269469">"Συζήτηση"</string>
     <string name="postal_street" msgid="8133143961580058972">"Οδός"</string>
     <string name="postal_pobox" msgid="4431938829180269821">"Ταχυδρομική θυρίδα"</string>
     <string name="postal_neighborhood" msgid="1450783874558956739">"Γειτονιά"</string>

diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 64e356d..d051af8 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml

@@ -299,34 +299,11 @@
     <string name="nicknameLabelsGroup" msgid="2891682101053358010">"Apodo"</string>
     <string name="organizationLabelsGroup" msgid="2478611760751832035">"Organización"</string>
     <string name="websiteLabelsGroup" msgid="4202998982804009261">"Sitio web"</string>
-    <string name="type_home" msgid="1228039089996938949">"Página principal"</string>
-    <string name="type_mobile" msgid="4202799691295960532">"Celular"</string>
-    <string name="type_work" msgid="9046581192178244575">"Trabajo"</string>
-    <string name="type_fax_work" msgid="7056833051776335751">"Fax laboral"</string>
-    <string name="type_fax_home" msgid="5188151910627934239">"Fax personal"</string>
-    <string name="type_pager" msgid="6971533430192661440">"Localizador"</string>
-    <string name="type_other" msgid="357858743316072535">"Otros"</string>
-    <string name="type_custom" msgid="546891906059234753">"Personalizado"</string>
     <string name="type_short_home" msgid="7770424864090605384">"H"</string>
     <string name="type_short_mobile" msgid="1655473281466676216">"Lun."</string>
     <string name="type_short_work" msgid="4925330752504537861">"Mié."</string>
     <string name="type_short_pager" msgid="2613818970827594238">"P"</string>
     <string name="type_short_other" msgid="5669407180177236769">"Oct."</string>
-    <string name="type_home_2" msgid="7576604544326827279">"Página principal 2"</string>
-    <string name="type_work_2" msgid="4033954623350210826">"Trabajo 2"</string>
-    <string name="type_car" msgid="1882297602515019816">"Auto"</string>
-    <string name="type_company_main" msgid="1757801178953730800">"Empresa principal"</string>
-    <string name="type_mms" msgid="7575994898038669673">"de MMS"</string>
-    <string name="type_radio" msgid="7376516830366758196">"Radio"</string>
-    <string name="type_assistant" msgid="4838160907811639910">"Asistente"</string>
-    <string name="type_im_aim" msgid="2227683604131341761">"AIM"</string>
-    <string name="type_im_msn" msgid="5322977067527283958">"Windows Live"</string>
-    <string name="type_im_yahoo" msgid="8093860976582856789">"Yahoo"</string>
-    <string name="type_im_skype" msgid="7847929379814316050">"Skype"</string>
-    <string name="type_im_qq" msgid="764805405209877788">"QQ"</string>
-    <string name="type_im_google_talk" msgid="4019292000925519902">"Google Talk"</string>
-    <string name="type_im_icq" msgid="7556014886862234019">"ICQ"</string>
-    <string name="type_im_jabber" msgid="5523148125631896131">"Jabber"</string>
     <string name="edit_secondary_collapse" msgid="1855127176548440583">"Detalles secundarios"</string>
     <string name="dialog_primary_name" msgid="5521591005692614833">"Nombre principal"</string>
     <string name="dialog_new_contact_account" msgid="9044704073286262197">"Crear contacto según la cuenta"</string>
@@ -345,10 +322,7 @@
     <string name="call_fax_work" msgid="7467763592359059243">"Llamar al fax del trabajo"</string>
     <string name="call_fax_home" msgid="8342175628887571876">"Llamar al fax personal"</string>
     <string name="call_pager" msgid="9003902812293983281">"Llamar a localizador"</string>
-    <string name="call_other" msgid="5605584621798108205">"Llamar a otro"</string>
     <string name="call_custom" msgid="7756571794763171802">"Llamar a <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home_2" msgid="310203419023725540">"Llamar al hogar 2"</string>
-    <string name="call_work_2" msgid="4403999777434987049">"Llamar al trabajo 2"</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_mms" msgid="6274041545876221437">"Llamar a MMS"</string>
@@ -361,8 +335,6 @@
     <string name="sms_pager" msgid="7730404569637015192">"Enviar texto a localizador"</string>
     <string name="sms_other" msgid="5131921487474531617">"Enviar texto a otro"</string>
     <string name="sms_custom" msgid="5932736853732191825">"Texto <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home_2" msgid="7944150531556566287">"Enviar texto al hogar 2"</string>
-    <string name="sms_work_2" msgid="1652790306127907938">"Enviar texto al trabajo 2"</string>
     <string name="sms_car" msgid="7444227058437359641">"Enviar texto a auto"</string>
     <string name="sms_company_main" msgid="118970873419678087">"Enviar texto a empresa principal"</string>
     <string name="sms_mms" msgid="4069352461380762677">"Enviar texto MMS"</string>
@@ -385,7 +357,6 @@
     <string name="chat_gtalk" msgid="981575737258117697">"Chat mediante Google Talk"</string>
     <string name="chat_icq" msgid="8438405386153745775">"Chat mediante ICQ"</string>
     <string name="chat_jabber" msgid="7561444230307829609">"Chat mediante Jabber"</string>
-    <string name="chat_other" msgid="6023619161453269469">"Chat"</string>
     <string name="postal_street" msgid="8133143961580058972">"Dirección postal"</string>
     <string name="postal_pobox" msgid="4431938829180269821">"Apartado postal"</string>
     <string name="postal_neighborhood" msgid="1450783874558956739">"Barrio"</string>

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index bcc032b..ad45fb6 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml

@@ -299,34 +299,11 @@
     <string name="nicknameLabelsGroup" msgid="2891682101053358010">"Seudónimo"</string>
     <string name="organizationLabelsGroup" msgid="2478611760751832035">"Organización"</string>
     <string name="websiteLabelsGroup" msgid="4202998982804009261">"Sitio web"</string>
-    <string name="type_home" msgid="1228039089996938949">"Casa"</string>
-    <string name="type_mobile" msgid="4202799691295960532">"Móvil"</string>
-    <string name="type_work" msgid="9046581192178244575">"Trabajo"</string>
-    <string name="type_fax_work" msgid="7056833051776335751">"Fax del trabajo"</string>
-    <string name="type_fax_home" msgid="5188151910627934239">"Fax de casa"</string>
-    <string name="type_pager" msgid="6971533430192661440">"Buscapersonas"</string>
-    <string name="type_other" msgid="357858743316072535">"Otro"</string>
-    <string name="type_custom" msgid="546891906059234753">"Personalizar"</string>
     <string name="type_short_home" msgid="7770424864090605384">"H"</string>
     <string name="type_short_mobile" msgid="1655473281466676216">"M"</string>
     <string name="type_short_work" msgid="4925330752504537861">"W"</string>
     <string name="type_short_pager" msgid="2613818970827594238">"P"</string>
     <string name="type_short_other" msgid="5669407180177236769">"O"</string>
-    <string name="type_home_2" msgid="7576604544326827279">"Casa 2"</string>
-    <string name="type_work_2" msgid="4033954623350210826">"Trabajo 2"</string>
-    <string name="type_car" msgid="1882297602515019816">"Coche"</string>
-    <string name="type_company_main" msgid="1757801178953730800">"Teléfono principal de la empresa"</string>
-    <string name="type_mms" msgid="7575994898038669673">"MMS"</string>
-    <string name="type_radio" msgid="7376516830366758196">"Radio"</string>
-    <string name="type_assistant" msgid="4838160907811639910">"Asistente"</string>
-    <string name="type_im_aim" msgid="2227683604131341761">"MI de AOL"</string>
-    <string name="type_im_msn" msgid="5322977067527283958">"Windows Live"</string>
-    <string name="type_im_yahoo" msgid="8093860976582856789">"Yahoo!"</string>
-    <string name="type_im_skype" msgid="7847929379814316050">"Skype"</string>
-    <string name="type_im_qq" msgid="764805405209877788">"QQ"</string>
-    <string name="type_im_google_talk" msgid="4019292000925519902">"Google Talk"</string>
-    <string name="type_im_icq" msgid="7556014886862234019">"ICQ"</string>
-    <string name="type_im_jabber" msgid="5523148125631896131">"Jabber"</string>
     <string name="edit_secondary_collapse" msgid="1855127176548440583">"Información secundaria"</string>
     <string name="dialog_primary_name" msgid="5521591005692614833">"Nombre principal"</string>
     <string name="dialog_new_contact_account" msgid="9044704073286262197">"Crear contacto en la cuenta"</string>
@@ -345,10 +322,7 @@
     <string name="call_fax_work" msgid="7467763592359059243">"Llamar al fax del trabajo"</string>
     <string name="call_fax_home" msgid="8342175628887571876">"Llamar a fax de casa"</string>
     <string name="call_pager" msgid="9003902812293983281">"Llamar a buscapersonas"</string>
-    <string name="call_other" msgid="5605584621798108205">"Llamar a otro"</string>
     <string name="call_custom" msgid="7756571794763171802">"Llamar a <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home_2" msgid="310203419023725540">"Llamar a casa 2"</string>
-    <string name="call_work_2" msgid="4403999777434987049">"Llamar al trabajo 2"</string>
     <string name="call_car" msgid="3280537320306436445">"Llamar al coche"</string>
     <string name="call_company_main" msgid="6105120947138711257">"Llamar al teléfono principal de la empresa"</string>
     <string name="call_mms" msgid="6274041545876221437">"Llamar a MMS"</string>
@@ -361,8 +335,6 @@
     <string name="sms_pager" msgid="7730404569637015192">"Enviar un mensaje de texto al buscapersonas"</string>
     <string name="sms_other" msgid="5131921487474531617">"Enviar un mensaje de texto a otro"</string>
     <string name="sms_custom" msgid="5932736853732191825">"Enviar un mensaje de texto a <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home_2" msgid="7944150531556566287">"Enviar un mensaje de texto a casa 2"</string>
-    <string name="sms_work_2" msgid="1652790306127907938">"Enviar SMS a trabajo 2"</string>
     <string name="sms_car" msgid="7444227058437359641">"Enviar un mensaje de texto al coche"</string>
     <string name="sms_company_main" msgid="118970873419678087">"Enviar un mensaje de texto al teléfono principal de la empresa"</string>
     <string name="sms_mms" msgid="4069352461380762677">"Enviar un mensaje de texto a MMS"</string>
@@ -385,7 +357,6 @@
     <string name="chat_gtalk" msgid="981575737258117697">"Chatear con Google Talk"</string>
     <string name="chat_icq" msgid="8438405386153745775">"Chatear con ICQ"</string>
     <string name="chat_jabber" msgid="7561444230307829609">"Chatear con Jabber"</string>
-    <string name="chat_other" msgid="6023619161453269469">"Chat"</string>
     <string name="postal_street" msgid="8133143961580058972">"Calle"</string>
     <string name="postal_pobox" msgid="4431938829180269821">"Apartado postal"</string>
     <string name="postal_neighborhood" msgid="1450783874558956739">"Vecindario"</string>

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 51fa4d2..26b026b 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml

@@ -299,34 +299,11 @@
     <string name="nicknameLabelsGroup" msgid="2891682101053358010">"Pseudo"</string>
     <string name="organizationLabelsGroup" msgid="2478611760751832035">"Organisation"</string>
     <string name="websiteLabelsGroup" msgid="4202998982804009261">"Site Web"</string>
-    <string name="type_home" msgid="1228039089996938949">"Domicile"</string>
-    <string name="type_mobile" msgid="4202799691295960532">"Mobile"</string>
-    <string name="type_work" msgid="9046581192178244575">"Bureau"</string>
-    <string name="type_fax_work" msgid="7056833051776335751">"Télécopie bureau"</string>
-    <string name="type_fax_home" msgid="5188151910627934239">"Télécopie domicile"</string>
-    <string name="type_pager" msgid="6971533430192661440">"Téléavertisseur"</string>
-    <string name="type_other" msgid="357858743316072535">"Autre"</string>
-    <string name="type_custom" msgid="546891906059234753">"Personnalisé"</string>
     <string name="type_short_home" msgid="7770424864090605384">"D"</string>
     <string name="type_short_mobile" msgid="1655473281466676216">"M"</string>
     <string name="type_short_work" msgid="4925330752504537861">"B"</string>
     <string name="type_short_pager" msgid="2613818970827594238">"T"</string>
     <string name="type_short_other" msgid="5669407180177236769">"A"</string>
-    <string name="type_home_2" msgid="7576604544326827279">"Domicile 2"</string>
-    <string name="type_work_2" msgid="4033954623350210826">"Bureau 2"</string>
-    <string name="type_car" msgid="1882297602515019816">"Voiture"</string>
-    <string name="type_company_main" msgid="1757801178953730800">"Société (principal)"</string>
-    <string name="type_mms" msgid="7575994898038669673">"MMS"</string>
-    <string name="type_radio" msgid="7376516830366758196">"Radio"</string>
-    <string name="type_assistant" msgid="4838160907811639910">"Assistant"</string>
-    <string name="type_im_aim" msgid="2227683604131341761">"AIM"</string>
-    <string name="type_im_msn" msgid="5322977067527283958">"Windows Live"</string>
-    <string name="type_im_yahoo" msgid="8093860976582856789">"Yahoo"</string>
-    <string name="type_im_skype" msgid="7847929379814316050">"Skype"</string>
-    <string name="type_im_qq" msgid="764805405209877788">"QQ"</string>
-    <string name="type_im_google_talk" msgid="4019292000925519902">"Google Talk"</string>
-    <string name="type_im_icq" msgid="7556014886862234019">"ICQ"</string>
-    <string name="type_im_jabber" msgid="5523148125631896131">"Jabber"</string>
     <string name="edit_secondary_collapse" msgid="1855127176548440583">"Détails secondaires"</string>
     <string name="dialog_primary_name" msgid="5521591005692614833">"Nom principal"</string>
     <string name="dialog_new_contact_account" msgid="9044704073286262197">"Créer un contact sous le compte"</string>
@@ -345,10 +322,7 @@
     <string name="call_fax_work" msgid="7467763592359059243">"Composer télécopie (bureau)"</string>
     <string name="call_fax_home" msgid="8342175628887571876">"Composer fax (domicile)"</string>
     <string name="call_pager" msgid="9003902812293983281">"Appeler téléavertisseur"</string>
-    <string name="call_other" msgid="5605584621798108205">"Appeler autre"</string>
     <string name="call_custom" msgid="7756571794763171802">"Appeler <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home_2" msgid="310203419023725540">"Appeler domicile 2"</string>
-    <string name="call_work_2" msgid="4403999777434987049">"Appeler bureau 2"</string>
     <string name="call_car" msgid="3280537320306436445">"Appeler voiture"</string>
     <string name="call_company_main" msgid="6105120947138711257">"Appeler société (principal)"</string>
     <string name="call_mms" msgid="6274041545876221437">"Appeler MMS"</string>
@@ -361,8 +335,6 @@
     <string name="sms_pager" msgid="7730404569637015192">"Envoyer un SMS vers téléavertisseur"</string>
     <string name="sms_other" msgid="5131921487474531617">"Envoyer un SMS à autre"</string>
     <string name="sms_custom" msgid="5932736853732191825">"Envoyer un SMS à <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home_2" msgid="7944150531556566287">"Envoyer un SMS au domicile 2"</string>
-    <string name="sms_work_2" msgid="1652790306127907938">"Envoyer un SMS au bureau 2"</string>
     <string name="sms_car" msgid="7444227058437359641">"Envoyer un SMS vers voiture"</string>
     <string name="sms_company_main" msgid="118970873419678087">"Envoyer un SMS à société (principal)"</string>
     <string name="sms_mms" msgid="4069352461380762677">"Envoyer un MMS"</string>
@@ -385,7 +357,6 @@
     <string name="chat_gtalk" msgid="981575737258117697">"Chatter via Google Talk"</string>
     <string name="chat_icq" msgid="8438405386153745775">"Chatter via ICQ"</string>
     <string name="chat_jabber" msgid="7561444230307829609">"Chatter via Jabber"</string>
-    <string name="chat_other" msgid="6023619161453269469">"Chat"</string>
     <string name="postal_street" msgid="8133143961580058972">"Rue"</string>
     <string name="postal_pobox" msgid="4431938829180269821">"Boîte postale"</string>
     <string name="postal_neighborhood" msgid="1450783874558956739">"Voisinage"</string>

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 3807dd9..5797d61 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml

@@ -299,34 +299,11 @@
     <string name="nicknameLabelsGroup" msgid="2891682101053358010">"Nickname"</string>
     <string name="organizationLabelsGroup" msgid="2478611760751832035">"Organizzazione"</string>
     <string name="websiteLabelsGroup" msgid="4202998982804009261">"Sito web"</string>
-    <string name="type_home" msgid="1228039089996938949">"Casa"</string>
-    <string name="type_mobile" msgid="4202799691295960532">"Cellulare"</string>
-    <string name="type_work" msgid="9046581192178244575">"Ufficio"</string>
-    <string name="type_fax_work" msgid="7056833051776335751">"Fax ufficio"</string>
-    <string name="type_fax_home" msgid="5188151910627934239">"Fax casa"</string>
-    <string name="type_pager" msgid="6971533430192661440">"Cercapersone"</string>
-    <string name="type_other" msgid="357858743316072535">"Altro"</string>
-    <string name="type_custom" msgid="546891906059234753">"Personalizzato"</string>
     <string name="type_short_home" msgid="7770424864090605384">"H"</string>
     <string name="type_short_mobile" msgid="1655473281466676216">"M"</string>
     <string name="type_short_work" msgid="4925330752504537861">"W"</string>
     <string name="type_short_pager" msgid="2613818970827594238">"P"</string>
     <string name="type_short_other" msgid="5669407180177236769">"O"</string>
-    <string name="type_home_2" msgid="7576604544326827279">"Casa 2"</string>
-    <string name="type_work_2" msgid="4033954623350210826">"Ufficio 2"</string>
-    <string name="type_car" msgid="1882297602515019816">"Automobile"</string>
-    <string name="type_company_main" msgid="1757801178953730800">"Azienda, principale"</string>
-    <string name="type_mms" msgid="7575994898038669673">"MMS"</string>
-    <string name="type_radio" msgid="7376516830366758196">"Segnale cellulare"</string>
-    <string name="type_assistant" msgid="4838160907811639910">"Assistente"</string>
-    <string name="type_im_aim" msgid="2227683604131341761">"AIM"</string>
-    <string name="type_im_msn" msgid="5322977067527283958">"Windows Live"</string>
-    <string name="type_im_yahoo" msgid="8093860976582856789">"Yahoo"</string>
-    <string name="type_im_skype" msgid="7847929379814316050">"Skype"</string>
-    <string name="type_im_qq" msgid="764805405209877788">"QQ"</string>
-    <string name="type_im_google_talk" msgid="4019292000925519902">"Google Talk"</string>
-    <string name="type_im_icq" msgid="7556014886862234019">"ICQ"</string>
-    <string name="type_im_jabber" msgid="5523148125631896131">"Jabber"</string>
     <string name="edit_secondary_collapse" msgid="1855127176548440583">"Dettagli secondari"</string>
     <string name="dialog_primary_name" msgid="5521591005692614833">"Nome principale"</string>
     <string name="dialog_new_contact_account" msgid="9044704073286262197">"Crea contatto sotto account"</string>
@@ -345,10 +322,7 @@
     <string name="call_fax_work" msgid="7467763592359059243">"Chiama n. fax ufficio"</string>
     <string name="call_fax_home" msgid="8342175628887571876">"Chiama n. fax casa"</string>
     <string name="call_pager" msgid="9003902812293983281">"Chiama n. cercapersone"</string>
-    <string name="call_other" msgid="5605584621798108205">"Chiama altro"</string>
     <string name="call_custom" msgid="7756571794763171802">"Chiama n. <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home_2" msgid="310203419023725540">"Chiama n. casa 2"</string>
-    <string name="call_work_2" msgid="4403999777434987049">"Chiama n. ufficio 2"</string>
     <string name="call_car" msgid="3280537320306436445">"Chiama n. automobile"</string>
     <string name="call_company_main" msgid="6105120947138711257">"Chiama n. azienda, principale"</string>
     <string name="call_mms" msgid="6274041545876221437">"Chiama n. MMS"</string>
@@ -361,8 +335,6 @@
     <string name="sms_pager" msgid="7730404569637015192">"Invia SMS a n. cercapersone"</string>
     <string name="sms_other" msgid="5131921487474531617">"Invia SMS ad altro"</string>
     <string name="sms_custom" msgid="5932736853732191825">"Invia SMS a n. <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home_2" msgid="7944150531556566287">"Invia SMS a n. casa 2"</string>
-    <string name="sms_work_2" msgid="1652790306127907938">"Invia SMS a n. ufficio 2"</string>
     <string name="sms_car" msgid="7444227058437359641">"Invia SMS a n. automobile"</string>
     <string name="sms_company_main" msgid="118970873419678087">"Invia SMS a n. azienda, principale"</string>
     <string name="sms_mms" msgid="4069352461380762677">"Invia SMS a n. MMS"</string>
@@ -385,7 +357,6 @@
     <string name="chat_gtalk" msgid="981575737258117697">"Chatta tramite Google Talk"</string>
     <string name="chat_icq" msgid="8438405386153745775">"Chatta tramite ICQ"</string>
     <string name="chat_jabber" msgid="7561444230307829609">"Chatta tramite Jabber"</string>
-    <string name="chat_other" msgid="6023619161453269469">"Chatta"</string>
     <string name="postal_street" msgid="8133143961580058972">"Indirizzo postale"</string>
     <string name="postal_pobox" msgid="4431938829180269821">"Casella postale"</string>
     <string name="postal_neighborhood" msgid="1450783874558956739">"Zona"</string>

diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index ceb30a1..1e539dd 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml

@@ -299,34 +299,11 @@
     <string name="nicknameLabelsGroup" msgid="2891682101053358010">"ニックネーム"</string>
     <string name="organizationLabelsGroup" msgid="2478611760751832035">"所属"</string>
     <string name="websiteLabelsGroup" msgid="4202998982804009261">"ウェブサイト"</string>
-    <string name="type_home" msgid="1228039089996938949">"自宅"</string>
-    <string name="type_mobile" msgid="4202799691295960532">"携帯"</string>
-    <string name="type_work" msgid="9046581192178244575">"勤務先"</string>
-    <string name="type_fax_work" msgid="7056833051776335751">"FAX（勤務先）"</string>
-    <string name="type_fax_home" msgid="5188151910627934239">"FAX（自宅）"</string>
-    <string name="type_pager" msgid="6971533430192661440">"ポケベル"</string>
-    <string name="type_other" msgid="357858743316072535">"その他"</string>
-    <string name="type_custom" msgid="546891906059234753">"カスタム"</string>
     <string name="type_short_home" msgid="7770424864090605384">"自宅"</string>
     <string name="type_short_mobile" msgid="1655473281466676216">"携帯"</string>
     <string name="type_short_work" msgid="4925330752504537861">"勤務先"</string>
     <string name="type_short_pager" msgid="2613818970827594238">"ポケベル"</string>
     <string name="type_short_other" msgid="5669407180177236769">"その他"</string>
-    <string name="type_home_2" msgid="7576604544326827279">"自宅2"</string>
-    <string name="type_work_2" msgid="4033954623350210826">"勤務先2"</string>
-    <string name="type_car" msgid="1882297602515019816">"クルマ"</string>
-    <string name="type_company_main" msgid="1757801178953730800">"会社代表番号"</string>
-    <string name="type_mms" msgid="7575994898038669673">"MMS"</string>
-    <string name="type_radio" msgid="7376516830366758196">"無線"</string>
-    <string name="type_assistant" msgid="4838160907811639910">"アシスタント"</string>
-    <string name="type_im_aim" msgid="2227683604131341761">"AIM"</string>
-    <string name="type_im_msn" msgid="5322977067527283958">"Windows Live"</string>
-    <string name="type_im_yahoo" msgid="8093860976582856789">"Yahoo"</string>
-    <string name="type_im_skype" msgid="7847929379814316050">"Skype"</string>
-    <string name="type_im_qq" msgid="764805405209877788">"QQ"</string>
-    <string name="type_im_google_talk" msgid="4019292000925519902">"Googleトーク"</string>
-    <string name="type_im_icq" msgid="7556014886862234019">"ICQ"</string>
-    <string name="type_im_jabber" msgid="5523148125631896131">"Jabber"</string>
     <string name="edit_secondary_collapse" msgid="1855127176548440583">"その他の情報"</string>
     <string name="dialog_primary_name" msgid="5521591005692614833">"メインの名前"</string>
     <string name="dialog_new_contact_account" msgid="9044704073286262197">"アカウントに連絡先を作成"</string>
@@ -345,10 +322,7 @@
     <string name="call_fax_work" msgid="7467763592359059243">"勤務先FAXに発信"</string>
     <string name="call_fax_home" msgid="8342175628887571876">"自宅のFAXに発信"</string>
     <string name="call_pager" msgid="9003902812293983281">"ポケベルに発信"</string>
-    <string name="call_other" msgid="5605584621798108205">"その他に発信"</string>
     <string name="call_custom" msgid="7756571794763171802">"<xliff:g id="CUSTOM">%s</xliff:g>に発信"</string>
-    <string name="call_home_2" msgid="310203419023725540">"自宅2に発信"</string>
-    <string name="call_work_2" msgid="4403999777434987049">"勤務先2に発信"</string>
     <string name="call_car" msgid="3280537320306436445">"クルマに発信"</string>
     <string name="call_company_main" msgid="6105120947138711257">"会社代表番号に発信"</string>
     <string name="call_mms" msgid="6274041545876221437">"MMSに発信"</string>
@@ -361,8 +335,6 @@
     <string name="sms_pager" msgid="7730404569637015192">"ポケベルにSMS"</string>
     <string name="sms_other" msgid="5131921487474531617">"その他にSMS"</string>
     <string name="sms_custom" msgid="5932736853732191825">"<xliff:g id="CUSTOM">%s</xliff:g>にSMS"</string>
-    <string name="sms_home_2" msgid="7944150531556566287">"自宅2にSMS"</string>
-    <string name="sms_work_2" msgid="1652790306127907938">"勤務先2にSMS"</string>
     <string name="sms_car" msgid="7444227058437359641">"クルマにSMS"</string>
     <string name="sms_company_main" msgid="118970873419678087">"会社代表番号にSMS"</string>
     <string name="sms_mms" msgid="4069352461380762677">"MMSにSMS"</string>
@@ -385,7 +357,6 @@
     <string name="chat_gtalk" msgid="981575737258117697">"Googleトークでチャット"</string>
     <string name="chat_icq" msgid="8438405386153745775">"ICQでチャット"</string>
     <string name="chat_jabber" msgid="7561444230307829609">"Jabberでチャット"</string>
-    <string name="chat_other" msgid="6023619161453269469">"チャット"</string>
     <string name="postal_street" msgid="8133143961580058972">"番地"</string>
     <string name="postal_pobox" msgid="4431938829180269821">"私書箱"</string>
     <string name="postal_neighborhood" msgid="1450783874558956739">"近所"</string>

diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 80ac629..cd45ca9 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml

@@ -299,34 +299,11 @@
     <string name="nicknameLabelsGroup" msgid="2891682101053358010">"닉네임"</string>
     <string name="organizationLabelsGroup" msgid="2478611760751832035">"조직"</string>
     <string name="websiteLabelsGroup" msgid="4202998982804009261">"웹사이트"</string>
-    <string name="type_home" msgid="1228039089996938949">"집"</string>
-    <string name="type_mobile" msgid="4202799691295960532">"모바일"</string>
-    <string name="type_work" msgid="9046581192178244575">"직장"</string>
-    <string name="type_fax_work" msgid="7056833051776335751">"직장 팩스"</string>
-    <string name="type_fax_home" msgid="5188151910627934239">"집(팩스)"</string>
-    <string name="type_pager" msgid="6971533430192661440">"호출기"</string>
-    <string name="type_other" msgid="357858743316072535">"기타"</string>
-    <string name="type_custom" msgid="546891906059234753">"맞춤설정"</string>
     <string name="type_short_home" msgid="7770424864090605384">"H"</string>
     <string name="type_short_mobile" msgid="1655473281466676216">"M"</string>
     <string name="type_short_work" msgid="4925330752504537861">"W"</string>
     <string name="type_short_pager" msgid="2613818970827594238">"P"</string>
     <string name="type_short_other" msgid="5669407180177236769">"O"</string>
-    <string name="type_home_2" msgid="7576604544326827279">"집 2"</string>
-    <string name="type_work_2" msgid="4033954623350210826">"직장 2"</string>
-    <string name="type_car" msgid="1882297602515019816">"카폰"</string>
-    <string name="type_company_main" msgid="1757801178953730800">"회사 기본전화"</string>
-    <string name="type_mms" msgid="7575994898038669673">"MMS"</string>
-    <string name="type_radio" msgid="7376516830366758196">"무선통신"</string>
-    <string name="type_assistant" msgid="4838160907811639910">"비서"</string>
-    <string name="type_im_aim" msgid="2227683604131341761">"AIM"</string>
-    <string name="type_im_msn" msgid="5322977067527283958">"Windows Live"</string>
-    <string name="type_im_yahoo" msgid="8093860976582856789">"Yahoo"</string>
-    <string name="type_im_skype" msgid="7847929379814316050">"Skype"</string>
-    <string name="type_im_qq" msgid="764805405209877788">"QQ"</string>
-    <string name="type_im_google_talk" msgid="4019292000925519902">"Google 토크"</string>
-    <string name="type_im_icq" msgid="7556014886862234019">"ICQ"</string>
-    <string name="type_im_jabber" msgid="5523148125631896131">"Jabber"</string>
     <string name="edit_secondary_collapse" msgid="1855127176548440583">"보조 세부정보"</string>
     <string name="dialog_primary_name" msgid="5521591005692614833">"기본 이름"</string>
     <string name="dialog_new_contact_account" msgid="9044704073286262197">"계정에서 연락처 만들기"</string>
@@ -345,10 +322,7 @@
     <string name="call_fax_work" msgid="7467763592359059243">"직장 팩스로 전화걸기"</string>
     <string name="call_fax_home" msgid="8342175628887571876">"집 팩스로 전화걸기"</string>
     <string name="call_pager" msgid="9003902812293983281">"호출기로 전화걸기"</string>
-    <string name="call_other" msgid="5605584621798108205">"기타 연락처로 전화걸기"</string>
     <string name="call_custom" msgid="7756571794763171802">"<xliff:g id="CUSTOM">%s</xliff:g>(으)로 전화걸기"</string>
-    <string name="call_home_2" msgid="310203419023725540">"집 2로 전화걸기"</string>
-    <string name="call_work_2" msgid="4403999777434987049">"직장 2로 전화걸기"</string>
     <string name="call_car" msgid="3280537320306436445">"카폰으로 전화걸기"</string>
     <string name="call_company_main" msgid="6105120947138711257">"회사 기본전화로 전화걸기"</string>
     <string name="call_mms" msgid="6274041545876221437">"MMS로 전화걸기"</string>
@@ -361,8 +335,6 @@
     <string name="sms_pager" msgid="7730404569637015192">"호출기로 문자 보내기"</string>
     <string name="sms_other" msgid="5131921487474531617">"기타 연락처로 문자 보내기"</string>
     <string name="sms_custom" msgid="5932736853732191825">"문자(<xliff:g id="CUSTOM">%s</xliff:g>)"</string>
-    <string name="sms_home_2" msgid="7944150531556566287">"집 2로 문자 보내기"</string>
-    <string name="sms_work_2" msgid="1652790306127907938">"직장 2로 문자 보내기"</string>
     <string name="sms_car" msgid="7444227058437359641">"카폰으로 문자 보내기"</string>
     <string name="sms_company_main" msgid="118970873419678087">"회사 기본전화로 문자 보내기"</string>
     <string name="sms_mms" msgid="4069352461380762677">"MMS로 문자 보내기"</string>
@@ -385,7 +357,6 @@
     <string name="chat_gtalk" msgid="981575737258117697">"Google 토크로 채팅"</string>
     <string name="chat_icq" msgid="8438405386153745775">"ICQ로 채팅"</string>
     <string name="chat_jabber" msgid="7561444230307829609">"Jabber로 채팅"</string>
-    <string name="chat_other" msgid="6023619161453269469">"채팅"</string>
     <string name="postal_street" msgid="8133143961580058972">"번지"</string>
     <string name="postal_pobox" msgid="4431938829180269821">"사서함"</string>
     <string name="postal_neighborhood" msgid="1450783874558956739">"인근 지역"</string>

diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index b5a5bc0..57d17c1 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml

@@ -299,34 +299,11 @@
     <string name="nicknameLabelsGroup" msgid="2891682101053358010">"Kallenavn"</string>
     <string name="organizationLabelsGroup" msgid="2478611760751832035">"Organisering"</string>
     <string name="websiteLabelsGroup" msgid="4202998982804009261">"Nettsted"</string>
-    <string name="type_home" msgid="1228039089996938949">"Privat"</string>
-    <string name="type_mobile" msgid="4202799691295960532">"Mobil"</string>
-    <string name="type_work" msgid="9046581192178244575">"Arbeid"</string>
-    <string name="type_fax_work" msgid="7056833051776335751">"Send faks (arbeid)"</string>
-    <string name="type_fax_home" msgid="5188151910627934239">"Send faks (privat)"</string>
-    <string name="type_pager" msgid="6971533430192661440">"Personsøker"</string>
-    <string name="type_other" msgid="357858743316072535">"Annen"</string>
-    <string name="type_custom" msgid="546891906059234753">"Tilpasset"</string>
     <string name="type_short_home" msgid="7770424864090605384">"H"</string>
     <string name="type_short_mobile" msgid="1655473281466676216">"M"</string>
     <string name="type_short_work" msgid="4925330752504537861">"W"</string>
     <string name="type_short_pager" msgid="2613818970827594238">"P"</string>
     <string name="type_short_other" msgid="5669407180177236769">"O"</string>
-    <string name="type_home_2" msgid="7576604544326827279">"Privat 2"</string>
-    <string name="type_work_2" msgid="4033954623350210826">"Arbeid 2"</string>
-    <string name="type_car" msgid="1882297602515019816">"Bil"</string>
-    <string name="type_company_main" msgid="1757801178953730800">"Firma (sentralbord)"</string>
-    <string name="type_mms" msgid="7575994898038669673">"MMS"</string>
-    <string name="type_radio" msgid="7376516830366758196">"Radio"</string>
-    <string name="type_assistant" msgid="4838160907811639910">"Assistent"</string>
-    <string name="type_im_aim" msgid="2227683604131341761">"AIM"</string>
-    <string name="type_im_msn" msgid="5322977067527283958">"Windows Live"</string>
-    <string name="type_im_yahoo" msgid="8093860976582856789">"Yahoo"</string>
-    <string name="type_im_skype" msgid="7847929379814316050">"Skype"</string>
-    <string name="type_im_qq" msgid="764805405209877788">"QQ"</string>
-    <string name="type_im_google_talk" msgid="4019292000925519902">"Google Talk"</string>
-    <string name="type_im_icq" msgid="7556014886862234019">"ICQ"</string>
-    <string name="type_im_jabber" msgid="5523148125631896131">"Jabber"</string>
     <string name="edit_secondary_collapse" msgid="1855127176548440583">"Andre detaljer"</string>
     <string name="dialog_primary_name" msgid="5521591005692614833">"Hovednavn"</string>
     <string name="dialog_new_contact_account" msgid="9044704073286262197">"Opprett kontakt under konto"</string>
@@ -345,10 +322,7 @@
     <string name="call_fax_work" msgid="7467763592359059243">"Anrop faks (arbeid)"</string>
     <string name="call_fax_home" msgid="8342175628887571876">"Anrop faks (privat)"</string>
     <string name="call_pager" msgid="9003902812293983281">"Ring personsøker"</string>
-    <string name="call_other" msgid="5605584621798108205">"Ring (annet)"</string>
     <string name="call_custom" msgid="7756571794763171802">"Ring <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home_2" msgid="310203419023725540">"Ring (privat 2)"</string>
-    <string name="call_work_2" msgid="4403999777434987049">"Ring (arbeid 2)"</string>
     <string name="call_car" msgid="3280537320306436445">"Ring (bil)"</string>
     <string name="call_company_main" msgid="6105120947138711257">"Ring firma (sentralbord)"</string>
     <string name="call_mms" msgid="6274041545876221437">"Ring MMS"</string>
@@ -361,8 +335,6 @@
     <string name="sms_pager" msgid="7730404569637015192">"Send SMS (personsøker)"</string>
     <string name="sms_other" msgid="5131921487474531617">"Send SMS (annet)"</string>
     <string name="sms_custom" msgid="5932736853732191825">"Send SMS (<xliff:g id="CUSTOM">%s</xliff:g>)"</string>
-    <string name="sms_home_2" msgid="7944150531556566287">"Send SMS (privat) 2"</string>
-    <string name="sms_work_2" msgid="1652790306127907938">"Send SMS (arbeid 2)"</string>
     <string name="sms_car" msgid="7444227058437359641">"Send SMS (bil)"</string>
     <string name="sms_company_main" msgid="118970873419678087">"Send SMS til firma (sentralbord)"</string>
     <string name="sms_mms" msgid="4069352461380762677">"Send MMS"</string>
@@ -385,7 +357,6 @@
     <string name="chat_gtalk" msgid="981575737258117697">"Nettprat med Google Talk"</string>
     <string name="chat_icq" msgid="8438405386153745775">"Nettprat med ICQ"</string>
     <string name="chat_jabber" msgid="7561444230307829609">"Nettprat med Jabber"</string>
-    <string name="chat_other" msgid="6023619161453269469">"Nettprat"</string>
     <string name="postal_street" msgid="8133143961580058972">"Gate"</string>
     <string name="postal_pobox" msgid="4431938829180269821">"Postboks"</string>
     <string name="postal_neighborhood" msgid="1450783874558956739">"Nabolag"</string>

diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 8a0964a..d2ca5b3 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml

@@ -299,34 +299,11 @@
     <string name="nicknameLabelsGroup" msgid="2891682101053358010">"Bijnaam"</string>
     <string name="organizationLabelsGroup" msgid="2478611760751832035">"Organisatie"</string>
     <string name="websiteLabelsGroup" msgid="4202998982804009261">"Website"</string>
-    <string name="type_home" msgid="1228039089996938949">"Thuis"</string>
-    <string name="type_mobile" msgid="4202799691295960532">"Mobiel"</string>
-    <string name="type_work" msgid="9046581192178244575">"Werk"</string>
-    <string name="type_fax_work" msgid="7056833051776335751">"Fax werk"</string>
-    <string name="type_fax_home" msgid="5188151910627934239">"Fax thuis"</string>
-    <string name="type_pager" msgid="6971533430192661440">"Pager"</string>
-    <string name="type_other" msgid="357858743316072535">"Overig"</string>
-    <string name="type_custom" msgid="546891906059234753">"Aangepast"</string>
     <string name="type_short_home" msgid="7770424864090605384">"T"</string>
     <string name="type_short_mobile" msgid="1655473281466676216">"M"</string>
     <string name="type_short_work" msgid="4925330752504537861">"W"</string>
     <string name="type_short_pager" msgid="2613818970827594238">"P"</string>
     <string name="type_short_other" msgid="5669407180177236769">"O"</string>
-    <string name="type_home_2" msgid="7576604544326827279">"Thuis 2"</string>
-    <string name="type_work_2" msgid="4033954623350210826">"Werk 2"</string>
-    <string name="type_car" msgid="1882297602515019816">"Auto"</string>
-    <string name="type_company_main" msgid="1757801178953730800">"Hoofdkantoor"</string>
-    <string name="type_mms" msgid="7575994898038669673">"MMS"</string>
-    <string name="type_radio" msgid="7376516830366758196">"Radio"</string>
-    <string name="type_assistant" msgid="4838160907811639910">"Assistent"</string>
-    <string name="type_im_aim" msgid="2227683604131341761">"AIM"</string>
-    <string name="type_im_msn" msgid="5322977067527283958">"Windows Live"</string>
-    <string name="type_im_yahoo" msgid="8093860976582856789">"Yahoo"</string>
-    <string name="type_im_skype" msgid="7847929379814316050">"Skype"</string>
-    <string name="type_im_qq" msgid="764805405209877788">"QQ"</string>
-    <string name="type_im_google_talk" msgid="4019292000925519902">"Google Talk"</string>
-    <string name="type_im_icq" msgid="7556014886862234019">"ICQ"</string>
-    <string name="type_im_jabber" msgid="5523148125631896131">"Jabber"</string>
     <string name="edit_secondary_collapse" msgid="1855127176548440583">"Secundaire gegevens"</string>
     <string name="dialog_primary_name" msgid="5521591005692614833">"Primaire naam"</string>
     <string name="dialog_new_contact_account" msgid="9044704073286262197">"Contact in account maken"</string>
@@ -345,10 +322,7 @@
     <string name="call_fax_work" msgid="7467763592359059243">"Bellen naar fax werk"</string>
     <string name="call_fax_home" msgid="8342175628887571876">"Bellen naar huisfax"</string>
     <string name="call_pager" msgid="9003902812293983281">"Bellen naar pager"</string>
-    <string name="call_other" msgid="5605584621798108205">"Bellen naar overig"</string>
     <string name="call_custom" msgid="7756571794763171802">"<xliff:g id="CUSTOM">%s</xliff:g> bellen"</string>
-    <string name="call_home_2" msgid="310203419023725540">"Bellen naar huis 2"</string>
-    <string name="call_work_2" msgid="4403999777434987049">"Bellen naar werk 2"</string>
     <string name="call_car" msgid="3280537320306436445">"Bellen naar autotelefoon"</string>
     <string name="call_company_main" msgid="6105120947138711257">"Bellen naar hoofdkantoor"</string>
     <string name="call_mms" msgid="6274041545876221437">"Bellen via MMS"</string>
@@ -361,8 +335,6 @@
     <string name="sms_pager" msgid="7730404569637015192">"Sms\'en naar pager"</string>
     <string name="sms_other" msgid="5131921487474531617">"Sms\'en naar overig"</string>
     <string name="sms_custom" msgid="5932736853732191825">"Sms\'en naar <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home_2" msgid="7944150531556566287">"Sms\'en naar huis 2"</string>
-    <string name="sms_work_2" msgid="1652790306127907938">"Sms\'en naar werk 2"</string>
     <string name="sms_car" msgid="7444227058437359641">"Sms\'en naar autotelefoon"</string>
     <string name="sms_company_main" msgid="118970873419678087">"Sms\'en naar hoofdkantoor"</string>
     <string name="sms_mms" msgid="4069352461380762677">"Sms\'en via MMS"</string>
@@ -385,7 +357,6 @@
     <string name="chat_gtalk" msgid="981575737258117697">"Chatten via Google Talk"</string>
     <string name="chat_icq" msgid="8438405386153745775">"Chatten via ICQ"</string>
     <string name="chat_jabber" msgid="7561444230307829609">"Chatten via Jabber"</string>
-    <string name="chat_other" msgid="6023619161453269469">"Chat"</string>
     <string name="postal_street" msgid="8133143961580058972">"Straat"</string>
     <string name="postal_pobox" msgid="4431938829180269821">"Postbus"</string>
     <string name="postal_neighborhood" msgid="1450783874558956739">"Wijk"</string>

diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index fcd4c63..02797d5 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml

@@ -299,34 +299,11 @@
     <string name="nicknameLabelsGroup" msgid="2891682101053358010">"Pseudonim"</string>
     <string name="organizationLabelsGroup" msgid="2478611760751832035">"Organizacja"</string>
     <string name="websiteLabelsGroup" msgid="4202998982804009261">"Adres witryny"</string>
-    <string name="type_home" msgid="1228039089996938949">"Domowy"</string>
-    <string name="type_mobile" msgid="4202799691295960532">"Komórkowy"</string>
-    <string name="type_work" msgid="9046581192178244575">"Służbowy"</string>
-    <string name="type_fax_work" msgid="7056833051776335751">"Faks służbowy"</string>
-    <string name="type_fax_home" msgid="5188151910627934239">"Faks domowy"</string>
-    <string name="type_pager" msgid="6971533430192661440">"Pager"</string>
-    <string name="type_other" msgid="357858743316072535">"Inny"</string>
-    <string name="type_custom" msgid="546891906059234753">"Niestandardowy"</string>
     <string name="type_short_home" msgid="7770424864090605384">"D"</string>
     <string name="type_short_mobile" msgid="1655473281466676216">"K"</string>
     <string name="type_short_work" msgid="4925330752504537861">"S"</string>
     <string name="type_short_pager" msgid="2613818970827594238">"P"</string>
     <string name="type_short_other" msgid="5669407180177236769">"I"</string>
-    <string name="type_home_2" msgid="7576604544326827279">"Domowy 2"</string>
-    <string name="type_work_2" msgid="4033954623350210826">"Służbowy 2"</string>
-    <string name="type_car" msgid="1882297602515019816">"Samochód"</string>
-    <string name="type_company_main" msgid="1757801178953730800">"Firmowy główny"</string>
-    <string name="type_mms" msgid="7575994898038669673">"Wiadomość MMS"</string>
-    <string name="type_radio" msgid="7376516830366758196">"Radio"</string>
-    <string name="type_assistant" msgid="4838160907811639910">"Asystent"</string>
-    <string name="type_im_aim" msgid="2227683604131341761">"AIM"</string>
-    <string name="type_im_msn" msgid="5322977067527283958">"Windows Live"</string>
-    <string name="type_im_yahoo" msgid="8093860976582856789">"Yahoo"</string>
-    <string name="type_im_skype" msgid="7847929379814316050">"Skype"</string>
-    <string name="type_im_qq" msgid="764805405209877788">"QQ"</string>
-    <string name="type_im_google_talk" msgid="4019292000925519902">"Google Talk"</string>
-    <string name="type_im_icq" msgid="7556014886862234019">"ICQ"</string>
-    <string name="type_im_jabber" msgid="5523148125631896131">"Jabber"</string>
     <string name="edit_secondary_collapse" msgid="1855127176548440583">"Dodatkowe informacje szczegółowe"</string>
     <string name="dialog_primary_name" msgid="5521591005692614833">"Nazwa główna"</string>
     <string name="dialog_new_contact_account" msgid="9044704073286262197">"Utwórz kontakt na koncie"</string>
@@ -345,10 +322,7 @@
     <string name="call_fax_work" msgid="7467763592359059243">"Telefon – faks służbowy"</string>
     <string name="call_fax_home" msgid="8342175628887571876">"Telefon – faks domowy"</string>
     <string name="call_pager" msgid="9003902812293983281">"Telefon – pager"</string>
-    <string name="call_other" msgid="5605584621798108205">"Telefon – inny"</string>
     <string name="call_custom" msgid="7756571794763171802">"Telefon – <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home_2" msgid="310203419023725540">"Telefon – domowy 2"</string>
-    <string name="call_work_2" msgid="4403999777434987049">"Telefon – służbowy 2"</string>
     <string name="call_car" msgid="3280537320306436445">"Telefon – samochód"</string>
     <string name="call_company_main" msgid="6105120947138711257">"Telefon – firmowy główny"</string>
     <string name="call_mms" msgid="6274041545876221437">"Telefon – wiadomość MMS"</string>
@@ -361,8 +335,6 @@
     <string name="sms_pager" msgid="7730404569637015192">"Tekst – pager"</string>
     <string name="sms_other" msgid="5131921487474531617">"Tekst – inny"</string>
     <string name="sms_custom" msgid="5932736853732191825">"Tekst – <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home_2" msgid="7944150531556566287">"Tekst – domowy 2"</string>
-    <string name="sms_work_2" msgid="1652790306127907938">"Tekst – służbowy 2"</string>
     <string name="sms_car" msgid="7444227058437359641">"Tekst – samochód"</string>
     <string name="sms_company_main" msgid="118970873419678087">"Tekst – firmowy główny"</string>
     <string name="sms_mms" msgid="4069352461380762677">"Tekst – wiadomość MMS"</string>
@@ -385,7 +357,6 @@
     <string name="chat_gtalk" msgid="981575737258117697">"Czat w Google Talk"</string>
     <string name="chat_icq" msgid="8438405386153745775">"Czat w ICQ"</string>
     <string name="chat_jabber" msgid="7561444230307829609">"Czat w Jabberze"</string>
-    <string name="chat_other" msgid="6023619161453269469">"Czat"</string>
     <string name="postal_street" msgid="8133143961580058972">"Ulica"</string>
     <string name="postal_pobox" msgid="4431938829180269821">"Skrytka pocztowa"</string>
     <string name="postal_neighborhood" msgid="1450783874558956739">"Okolica"</string>

diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index b25b731..5802679 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml

@@ -299,34 +299,11 @@
     <string name="nicknameLabelsGroup" msgid="2891682101053358010">"Alcunha"</string>
     <string name="organizationLabelsGroup" msgid="2478611760751832035">"Organização"</string>
     <string name="websiteLabelsGroup" msgid="4202998982804009261">"Web site"</string>
-    <string name="type_home" msgid="1228039089996938949">"Residência"</string>
-    <string name="type_mobile" msgid="4202799691295960532">"Telemóvel"</string>
-    <string name="type_work" msgid="9046581192178244575">"Emprego"</string>
-    <string name="type_fax_work" msgid="7056833051776335751">"Fax do emprego"</string>
-    <string name="type_fax_home" msgid="5188151910627934239">"Fax da residência"</string>
-    <string name="type_pager" msgid="6971533430192661440">"Pager"</string>
-    <string name="type_other" msgid="357858743316072535">"Outro"</string>
-    <string name="type_custom" msgid="546891906059234753">"Personalizado"</string>
     <string name="type_short_home" msgid="7770424864090605384">"R"</string>
     <string name="type_short_mobile" msgid="1655473281466676216">"T"</string>
     <string name="type_short_work" msgid="4925330752504537861">"E"</string>
     <string name="type_short_pager" msgid="2613818970827594238">"P"</string>
     <string name="type_short_other" msgid="5669407180177236769">"O"</string>
-    <string name="type_home_2" msgid="7576604544326827279">"Residência 2"</string>
-    <string name="type_work_2" msgid="4033954623350210826">"Emprego 2"</string>
-    <string name="type_car" msgid="1882297602515019816">"Automóvel"</string>
-    <string name="type_company_main" msgid="1757801178953730800">"Telefone principal da empresa"</string>
-    <string name="type_mms" msgid="7575994898038669673">"MMS"</string>
-    <string name="type_radio" msgid="7376516830366758196">"Rádio"</string>
-    <string name="type_assistant" msgid="4838160907811639910">"Assistente"</string>
-    <string name="type_im_aim" msgid="2227683604131341761">"AIM"</string>
-    <string name="type_im_msn" msgid="5322977067527283958">"Windows Live"</string>
-    <string name="type_im_yahoo" msgid="8093860976582856789">"Yahoo"</string>
-    <string name="type_im_skype" msgid="7847929379814316050">"Skype"</string>
-    <string name="type_im_qq" msgid="764805405209877788">"QQ"</string>
-    <string name="type_im_google_talk" msgid="4019292000925519902">"Google Talk"</string>
-    <string name="type_im_icq" msgid="7556014886862234019">"ICQ"</string>
-    <string name="type_im_jabber" msgid="5523148125631896131">"Jabber"</string>
     <string name="edit_secondary_collapse" msgid="1855127176548440583">"Detalhes secundários"</string>
     <string name="dialog_primary_name" msgid="5521591005692614833">"Nome principal"</string>
     <string name="dialog_new_contact_account" msgid="9044704073286262197">"Criar contacto subordinado à conta"</string>
@@ -345,10 +322,7 @@
     <string name="call_fax_work" msgid="7467763592359059243">"Ligar para fax do emprego"</string>
     <string name="call_fax_home" msgid="8342175628887571876">"Ligar para o fax da residência"</string>
     <string name="call_pager" msgid="9003902812293983281">"Ligar para pager"</string>
-    <string name="call_other" msgid="5605584621798108205">"Ligar para outros"</string>
     <string name="call_custom" msgid="7756571794763171802">"Ligar para <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home_2" msgid="310203419023725540">"Ligar para residência 2"</string>
-    <string name="call_work_2" msgid="4403999777434987049">"Ligar para emprego 2"</string>
     <string name="call_car" msgid="3280537320306436445">"Ligar para automóvel"</string>
     <string name="call_company_main" msgid="6105120947138711257">"Ligar para telefone principal da empresa"</string>
     <string name="call_mms" msgid="6274041545876221437">"Ligar por MMS"</string>
@@ -361,8 +335,6 @@
     <string name="sms_pager" msgid="7730404569637015192">"Enviar SMS para pager"</string>
     <string name="sms_other" msgid="5131921487474531617">"Enviar SMS para outros"</string>
     <string name="sms_custom" msgid="5932736853732191825">"Enviar SMS a <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home_2" msgid="7944150531556566287">"Enviar SMS para residência 2"</string>
-    <string name="sms_work_2" msgid="1652790306127907938">"Enviar SMS para emprego 2"</string>
     <string name="sms_car" msgid="7444227058437359641">"Enviar SMS para automóvel"</string>
     <string name="sms_company_main" msgid="118970873419678087">"Enviar SMS para telefone principal da empresa"</string>
     <string name="sms_mms" msgid="4069352461380762677">"Enviar MMS"</string>
@@ -385,7 +357,6 @@
     <string name="chat_gtalk" msgid="981575737258117697">"Chat através do Google Talk"</string>
     <string name="chat_icq" msgid="8438405386153745775">"Chat utilizando ICQ"</string>
     <string name="chat_jabber" msgid="7561444230307829609">"Chat utilizando Jabber"</string>
-    <string name="chat_other" msgid="6023619161453269469">"Chat"</string>
     <string name="postal_street" msgid="8133143961580058972">"Rua"</string>
     <string name="postal_pobox" msgid="4431938829180269821">"Apartado"</string>
     <string name="postal_neighborhood" msgid="1450783874558956739">"Vizinhança"</string>

diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index ac91be0..86423f1 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml

@@ -299,34 +299,11 @@
     <string name="nicknameLabelsGroup" msgid="2891682101053358010">"Apelido"</string>
     <string name="organizationLabelsGroup" msgid="2478611760751832035">"Organização"</string>
     <string name="websiteLabelsGroup" msgid="4202998982804009261">"Site"</string>
-    <string name="type_home" msgid="1228039089996938949">"Página inicial"</string>
-    <string name="type_mobile" msgid="4202799691295960532">"Celular"</string>
-    <string name="type_work" msgid="9046581192178244575">"Trabalho"</string>
-    <string name="type_fax_work" msgid="7056833051776335751">"Fax comercial"</string>
-    <string name="type_fax_home" msgid="5188151910627934239">"Fax residencial"</string>
-    <string name="type_pager" msgid="6971533430192661440">"Pager"</string>
-    <string name="type_other" msgid="357858743316072535">"Outros"</string>
-    <string name="type_custom" msgid="546891906059234753">"Personalizado"</string>
     <string name="type_short_home" msgid="7770424864090605384">"H"</string>
     <string name="type_short_mobile" msgid="1655473281466676216">"M"</string>
     <string name="type_short_work" msgid="4925330752504537861">"W"</string>
     <string name="type_short_pager" msgid="2613818970827594238">"P"</string>
     <string name="type_short_other" msgid="5669407180177236769">"O"</string>
-    <string name="type_home_2" msgid="7576604544326827279">"Residência 2"</string>
-    <string name="type_work_2" msgid="4033954623350210826">"Trabalho 2"</string>
-    <string name="type_car" msgid="1882297602515019816">"Carro"</string>
-    <string name="type_company_main" msgid="1757801178953730800">"Empresa (principal)"</string>
-    <string name="type_mms" msgid="7575994898038669673">"MMS"</string>
-    <string name="type_radio" msgid="7376516830366758196">"Rádio"</string>
-    <string name="type_assistant" msgid="4838160907811639910">"Assistente"</string>
-    <string name="type_im_aim" msgid="2227683604131341761">"AIM"</string>
-    <string name="type_im_msn" msgid="5322977067527283958">"Windows Live"</string>
-    <string name="type_im_yahoo" msgid="8093860976582856789">"Yahoo"</string>
-    <string name="type_im_skype" msgid="7847929379814316050">"Skype"</string>
-    <string name="type_im_qq" msgid="764805405209877788">"QQ"</string>
-    <string name="type_im_google_talk" msgid="4019292000925519902">"Google Talk"</string>
-    <string name="type_im_icq" msgid="7556014886862234019">"ICQ"</string>
-    <string name="type_im_jabber" msgid="5523148125631896131">"Jabber"</string>
     <string name="edit_secondary_collapse" msgid="1855127176548440583">"Detalhes secundários"</string>
     <string name="dialog_primary_name" msgid="5521591005692614833">"Nome principal"</string>
     <string name="dialog_new_contact_account" msgid="9044704073286262197">"Criar contato na conta"</string>
@@ -345,10 +322,7 @@
     <string name="call_fax_work" msgid="7467763592359059243">"Chamar fax comercial"</string>
     <string name="call_fax_home" msgid="8342175628887571876">"Chamar fax residencial"</string>
     <string name="call_pager" msgid="9003902812293983281">"Chamar pager"</string>
-    <string name="call_other" msgid="5605584621798108205">"Chamar outros"</string>
     <string name="call_custom" msgid="7756571794763171802">"Chamar <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home_2" msgid="310203419023725540">"Chamar residência 2"</string>
-    <string name="call_work_2" msgid="4403999777434987049">"Chamar o trabalho 2"</string>
     <string name="call_car" msgid="3280537320306436445">"Chamar carro"</string>
     <string name="call_company_main" msgid="6105120947138711257">"Chamar empresa (principal)"</string>
     <string name="call_mms" msgid="6274041545876221437">"Chamar MMS"</string>
@@ -361,8 +335,6 @@
     <string name="sms_pager" msgid="7730404569637015192">"Enviar mensagem de texto para o pager"</string>
     <string name="sms_other" msgid="5131921487474531617">"Enviar mensagem de texto para outras pessoas"</string>
     <string name="sms_custom" msgid="5932736853732191825">"Enviar mensagem de texto para <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home_2" msgid="7944150531556566287">"Texto (residencial) 2"</string>
-    <string name="sms_work_2" msgid="1652790306127907938">"Texto (comercial) 2"</string>
     <string name="sms_car" msgid="7444227058437359641">"Enviar mensagem de texto para o carro"</string>
     <string name="sms_company_main" msgid="118970873419678087">"Enviar mensagem de texto para empresa (principal)"</string>
     <string name="sms_mms" msgid="4069352461380762677">"Enviar texto MMS"</string>
@@ -385,7 +357,6 @@
     <string name="chat_gtalk" msgid="981575737258117697">"Bater papo usando o Google Talk"</string>
     <string name="chat_icq" msgid="8438405386153745775">"Bater papo usando o ICQ"</string>
     <string name="chat_jabber" msgid="7561444230307829609">"Bater papo usando o Jabber"</string>
-    <string name="chat_other" msgid="6023619161453269469">"Bate-papo"</string>
     <string name="postal_street" msgid="8133143961580058972">"Rua"</string>
     <string name="postal_pobox" msgid="4431938829180269821">"Caixa postal"</string>
     <string name="postal_neighborhood" msgid="1450783874558956739">"Vizinhança"</string>

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 2d74e72..aa5d2f8 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml

@@ -299,34 +299,11 @@
     <string name="nicknameLabelsGroup" msgid="2891682101053358010">"Псевдоним"</string>
     <string name="organizationLabelsGroup" msgid="2478611760751832035">"Организация"</string>
     <string name="websiteLabelsGroup" msgid="4202998982804009261">"Веб-сайт"</string>
-    <string name="type_home" msgid="1228039089996938949">"Дом."</string>
-    <string name="type_mobile" msgid="4202799691295960532">"Моб."</string>
-    <string name="type_work" msgid="9046581192178244575">"Раб."</string>
-    <string name="type_fax_work" msgid="7056833051776335751">"Раб. факс"</string>
-    <string name="type_fax_home" msgid="5188151910627934239">"Дом. факс"</string>
-    <string name="type_pager" msgid="6971533430192661440">"Пейджер"</string>
-    <string name="type_other" msgid="357858743316072535">"Другое"</string>
-    <string name="type_custom" msgid="546891906059234753">"Другое"</string>
     <string name="type_short_home" msgid="7770424864090605384">"Д"</string>
     <string name="type_short_mobile" msgid="1655473281466676216">"М"</string>
     <string name="type_short_work" msgid="4925330752504537861">"Р"</string>
     <string name="type_short_pager" msgid="2613818970827594238">"П"</string>
     <string name="type_short_other" msgid="5669407180177236769">"Др"</string>
-    <string name="type_home_2" msgid="7576604544326827279">"Дом. 2"</string>
-    <string name="type_work_2" msgid="4033954623350210826">"Раб. 2"</string>
-    <string name="type_car" msgid="1882297602515019816">"Автомоб."</string>
-    <string name="type_company_main" msgid="1757801178953730800">"Раб., осн."</string>
-    <string name="type_mms" msgid="7575994898038669673">"MMS"</string>
-    <string name="type_radio" msgid="7376516830366758196">"Радиотелефон"</string>
-    <string name="type_assistant" msgid="4838160907811639910">"Помощник"</string>
-    <string name="type_im_aim" msgid="2227683604131341761">"AIM"</string>
-    <string name="type_im_msn" msgid="5322977067527283958">"Windows Live"</string>
-    <string name="type_im_yahoo" msgid="8093860976582856789">"Yahoo"</string>
-    <string name="type_im_skype" msgid="7847929379814316050">"Skype"</string>
-    <string name="type_im_qq" msgid="764805405209877788">"QQ"</string>
-    <string name="type_im_google_talk" msgid="4019292000925519902">"Google Talk"</string>
-    <string name="type_im_icq" msgid="7556014886862234019">"ICQ"</string>
-    <string name="type_im_jabber" msgid="5523148125631896131">"Jabber"</string>
     <string name="edit_secondary_collapse" msgid="1855127176548440583">"Дополнительные подробности"</string>
     <string name="dialog_primary_name" msgid="5521591005692614833">"Основное имя"</string>
     <string name="dialog_new_contact_account" msgid="9044704073286262197">"Создать контакт в аккаунте"</string>
@@ -345,10 +322,7 @@
     <string name="call_fax_work" msgid="7467763592359059243">"Позвонить (раб. факс)"</string>
     <string name="call_fax_home" msgid="8342175628887571876">"Позвонить (дом. факс)"</string>
     <string name="call_pager" msgid="9003902812293983281">"Позвонить (пейджер)"</string>
-    <string name="call_other" msgid="5605584621798108205">"Позвонить (другое)"</string>
     <string name="call_custom" msgid="7756571794763171802">"Позвонить (<xliff:g id="CUSTOM">%s</xliff:g>)"</string>
-    <string name="call_home_2" msgid="310203419023725540">"Позвонить (дом. 2)"</string>
-    <string name="call_work_2" msgid="4403999777434987049">"Позвонить (раб. 2)"</string>
     <string name="call_car" msgid="3280537320306436445">"Позвонить (автомоб.)"</string>
     <string name="call_company_main" msgid="6105120947138711257">"Позвонить (раб., осн.)"</string>
     <string name="call_mms" msgid="6274041545876221437">"Позвонить (MMS)"</string>
@@ -361,8 +335,6 @@
     <string name="sms_pager" msgid="7730404569637015192">"SMS (пейджер)"</string>
     <string name="sms_other" msgid="5131921487474531617">"SMS (другое)"</string>
     <string name="sms_custom" msgid="5932736853732191825">"SMS (<xliff:g id="CUSTOM">%s</xliff:g>)"</string>
-    <string name="sms_home_2" msgid="7944150531556566287">"SMS (дом. 2)"</string>
-    <string name="sms_work_2" msgid="1652790306127907938">"SMS (раб. 2)"</string>
     <string name="sms_car" msgid="7444227058437359641">"SMS (автомоб.)"</string>
     <string name="sms_company_main" msgid="118970873419678087">"SMS (раб., осн.)"</string>
     <string name="sms_mms" msgid="4069352461380762677">"MMS"</string>
@@ -385,7 +357,6 @@
     <string name="chat_gtalk" msgid="981575737258117697">"Чат через Google Talk"</string>
     <string name="chat_icq" msgid="8438405386153745775">"Чат через ICQ"</string>
     <string name="chat_jabber" msgid="7561444230307829609">"Чат через Jabber"</string>
-    <string name="chat_other" msgid="6023619161453269469">"Чат"</string>
     <string name="postal_street" msgid="8133143961580058972">"Улица"</string>
     <string name="postal_pobox" msgid="4431938829180269821">"Почтовый ящик"</string>
     <string name="postal_neighborhood" msgid="1450783874558956739">"Окружение"</string>

diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index c9c48bf..50d9f8d 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml

@@ -299,34 +299,11 @@
     <string name="nicknameLabelsGroup" msgid="2891682101053358010">"Smeknamn"</string>
     <string name="organizationLabelsGroup" msgid="2478611760751832035">"Organisation"</string>
     <string name="websiteLabelsGroup" msgid="4202998982804009261">"Webbplats"</string>
-    <string name="type_home" msgid="1228039089996938949">"Hem"</string>
-    <string name="type_mobile" msgid="4202799691295960532">"Mobil"</string>
-    <string name="type_work" msgid="9046581192178244575">"Arbete"</string>
-    <string name="type_fax_work" msgid="7056833051776335751">"Arbetsfax"</string>
-    <string name="type_fax_home" msgid="5188151910627934239">"Hemfax"</string>
-    <string name="type_pager" msgid="6971533430192661440">"Personsökare"</string>
-    <string name="type_other" msgid="357858743316072535">"Övrigt"</string>
-    <string name="type_custom" msgid="546891906059234753">"Anpassad"</string>
     <string name="type_short_home" msgid="7770424864090605384">"H"</string>
     <string name="type_short_mobile" msgid="1655473281466676216">"M"</string>
     <string name="type_short_work" msgid="4925330752504537861">"A"</string>
     <string name="type_short_pager" msgid="2613818970827594238">"P"</string>
     <string name="type_short_other" msgid="5669407180177236769">"A"</string>
-    <string name="type_home_2" msgid="7576604544326827279">"Hem 2"</string>
-    <string name="type_work_2" msgid="4033954623350210826">"Arbete 2"</string>
-    <string name="type_car" msgid="1882297602515019816">"Bil"</string>
-    <string name="type_company_main" msgid="1757801178953730800">"Nummer till företag"</string>
-    <string name="type_mms" msgid="7575994898038669673">"MMS"</string>
-    <string name="type_radio" msgid="7376516830366758196">"Radio"</string>
-    <string name="type_assistant" msgid="4838160907811639910">"Assistent"</string>
-    <string name="type_im_aim" msgid="2227683604131341761">"AIM"</string>
-    <string name="type_im_msn" msgid="5322977067527283958">"Windows Live"</string>
-    <string name="type_im_yahoo" msgid="8093860976582856789">"Yahoo"</string>
-    <string name="type_im_skype" msgid="7847929379814316050">"Skype"</string>
-    <string name="type_im_qq" msgid="764805405209877788">"QQ"</string>
-    <string name="type_im_google_talk" msgid="4019292000925519902">"Google Talk"</string>
-    <string name="type_im_icq" msgid="7556014886862234019">"ICQ"</string>
-    <string name="type_im_jabber" msgid="5523148125631896131">"Jabber"</string>
     <string name="edit_secondary_collapse" msgid="1855127176548440583">"Sekundära detaljer"</string>
     <string name="dialog_primary_name" msgid="5521591005692614833">"Primärt namn"</string>
     <string name="dialog_new_contact_account" msgid="9044704073286262197">"Skapa kontakt under konto"</string>
@@ -345,10 +322,7 @@
     <string name="call_fax_work" msgid="7467763592359059243">"Ring – arbetsfax"</string>
     <string name="call_fax_home" msgid="8342175628887571876">"Ring upp hemfax"</string>
     <string name="call_pager" msgid="9003902812293983281">"Ring personsökare"</string>
-    <string name="call_other" msgid="5605584621798108205">"Ring – annan"</string>
     <string name="call_custom" msgid="7756571794763171802">"Ring <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home_2" msgid="310203419023725540">"Ring hem 2"</string>
-    <string name="call_work_2" msgid="4403999777434987049">"Ring arbete 2"</string>
     <string name="call_car" msgid="3280537320306436445">"Ring bilen"</string>
     <string name="call_company_main" msgid="6105120947138711257">"Ring företagets växel"</string>
     <string name="call_mms" msgid="6274041545876221437">"Samtal – MMS"</string>
@@ -361,8 +335,6 @@
     <string name="sms_pager" msgid="7730404569637015192">"SMS – personsökare"</string>
     <string name="sms_other" msgid="5131921487474531617">"SMS – annan"</string>
     <string name="sms_custom" msgid="5932736853732191825">"Skicka SMS till <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home_2" msgid="7944150531556566287">"SMS – hem 2"</string>
-    <string name="sms_work_2" msgid="1652790306127907938">"SMS – arbete 2"</string>
     <string name="sms_car" msgid="7444227058437359641">"SMS – bil"</string>
     <string name="sms_company_main" msgid="118970873419678087">"SMS – jobbväxel"</string>
     <string name="sms_mms" msgid="4069352461380762677">"Skicka MMS"</string>
@@ -385,7 +357,6 @@
     <string name="chat_gtalk" msgid="981575737258117697">"Chatta med Google Talk"</string>
     <string name="chat_icq" msgid="8438405386153745775">"Chatta med ICQ"</string>
     <string name="chat_jabber" msgid="7561444230307829609">"Chatta med Jabber"</string>
-    <string name="chat_other" msgid="6023619161453269469">"Chatt"</string>
     <string name="postal_street" msgid="8133143961580058972">"Gata"</string>
     <string name="postal_pobox" msgid="4431938829180269821">"Postbox"</string>
     <string name="postal_neighborhood" msgid="1450783874558956739">"Område"</string>

diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 1510190..c8ae19c 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml

@@ -299,34 +299,11 @@
     <string name="nicknameLabelsGroup" msgid="2891682101053358010">"Takma ad"</string>
     <string name="organizationLabelsGroup" msgid="2478611760751832035">"Kuruluş"</string>
     <string name="websiteLabelsGroup" msgid="4202998982804009261">"Web sitesi"</string>
-    <string name="type_home" msgid="1228039089996938949">"Ev"</string>
-    <string name="type_mobile" msgid="4202799691295960532">"Mobil"</string>
-    <string name="type_work" msgid="9046581192178244575">"İş"</string>
-    <string name="type_fax_work" msgid="7056833051776335751">"İş Faksı"</string>
-    <string name="type_fax_home" msgid="5188151910627934239">"Ev Faksı"</string>
-    <string name="type_pager" msgid="6971533430192661440">"Çağrı cihazı"</string>
-    <string name="type_other" msgid="357858743316072535">"Diğer"</string>
-    <string name="type_custom" msgid="546891906059234753">"Özel"</string>
     <string name="type_short_home" msgid="7770424864090605384">"E"</string>
     <string name="type_short_mobile" msgid="1655473281466676216">"M"</string>
     <string name="type_short_work" msgid="4925330752504537861">"İ"</string>
     <string name="type_short_pager" msgid="2613818970827594238">"Ç"</string>
     <string name="type_short_other" msgid="5669407180177236769">"D"</string>
-    <string name="type_home_2" msgid="7576604544326827279">"Ev 2"</string>
-    <string name="type_work_2" msgid="4033954623350210826">"İş 2"</string>
-    <string name="type_car" msgid="1882297602515019816">"Araç"</string>
-    <string name="type_company_main" msgid="1757801178953730800">"Şirket Merkezi"</string>
-    <string name="type_mms" msgid="7575994898038669673">"MMS"</string>
-    <string name="type_radio" msgid="7376516830366758196">"Telsiz"</string>
-    <string name="type_assistant" msgid="4838160907811639910">"Asistan"</string>
-    <string name="type_im_aim" msgid="2227683604131341761">"AIM"</string>
-    <string name="type_im_msn" msgid="5322977067527283958">"Windows Live"</string>
-    <string name="type_im_yahoo" msgid="8093860976582856789">"Yahoo"</string>
-    <string name="type_im_skype" msgid="7847929379814316050">"Skype"</string>
-    <string name="type_im_qq" msgid="764805405209877788">"QQ"</string>
-    <string name="type_im_google_talk" msgid="4019292000925519902">"Google Talk"</string>
-    <string name="type_im_icq" msgid="7556014886862234019">"ICQ"</string>
-    <string name="type_im_jabber" msgid="5523148125631896131">"Jabber"</string>
     <string name="edit_secondary_collapse" msgid="1855127176548440583">"İkincil ayrıntılar"</string>
     <string name="dialog_primary_name" msgid="5521591005692614833">"Ön ad"</string>
     <string name="dialog_new_contact_account" msgid="9044704073286262197">"Hesap altında kişi oluştur"</string>
@@ -345,10 +322,7 @@
     <string name="call_fax_work" msgid="7467763592359059243">"Ara (iş faksı)"</string>
     <string name="call_fax_home" msgid="8342175628887571876">"Ara (ev faksı)"</string>
     <string name="call_pager" msgid="9003902812293983281">"Çağrı cihazını ara"</string>
-    <string name="call_other" msgid="5605584621798108205">"Ara (diğer)"</string>
     <string name="call_custom" msgid="7756571794763171802">"Ara (<xliff:g id="CUSTOM">%s</xliff:g>)"</string>
-    <string name="call_home_2" msgid="310203419023725540">"Ara (ev 2)"</string>
-    <string name="call_work_2" msgid="4403999777434987049">"Ara (iş 2)"</string>
     <string name="call_car" msgid="3280537320306436445">"Ara (araç)"</string>
     <string name="call_company_main" msgid="6105120947138711257">"Ara (şirket merkezi)"</string>
     <string name="call_mms" msgid="6274041545876221437">"Ara (MMS)"</string>
@@ -361,8 +335,6 @@
     <string name="sms_pager" msgid="7730404569637015192">"Metin (çağrı cihazı)"</string>
     <string name="sms_other" msgid="5131921487474531617">"Metin (diğer)"</string>
     <string name="sms_custom" msgid="5932736853732191825">"Metin <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home_2" msgid="7944150531556566287">"Metin (ev 2)"</string>
-    <string name="sms_work_2" msgid="1652790306127907938">"Metin (iş 2)"</string>
     <string name="sms_car" msgid="7444227058437359641">"Metin (araç)"</string>
     <string name="sms_company_main" msgid="118970873419678087">"Metin (şirket merkezi)"</string>
     <string name="sms_mms" msgid="4069352461380762677">"Metin (MMS)"</string>
@@ -385,7 +357,6 @@
     <string name="chat_gtalk" msgid="981575737258117697">"Google Talk kullanarak sohbet et"</string>
     <string name="chat_icq" msgid="8438405386153745775">"ICQ kullanarak sohbet et"</string>
     <string name="chat_jabber" msgid="7561444230307829609">"Jabber kullanarak sohbet et"</string>
-    <string name="chat_other" msgid="6023619161453269469">"Sohbet"</string>
     <string name="postal_street" msgid="8133143961580058972">"Cadde"</string>
     <string name="postal_pobox" msgid="4431938829180269821">"Posta kutusu"</string>
     <string name="postal_neighborhood" msgid="1450783874558956739">"Mahalle"</string>

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 937ab21..4ee3b92 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml

@@ -299,34 +299,11 @@
     <string name="nicknameLabelsGroup" msgid="2891682101053358010">"昵称"</string>
     <string name="organizationLabelsGroup" msgid="2478611760751832035">"组织"</string>
     <string name="websiteLabelsGroup" msgid="4202998982804009261">"网站"</string>
-    <string name="type_home" msgid="1228039089996938949">"住宅"</string>
-    <string name="type_mobile" msgid="4202799691295960532">"手机"</string>
-    <string name="type_work" msgid="9046581192178244575">"单位"</string>
-    <string name="type_fax_work" msgid="7056833051776335751">"单位传真"</string>
-    <string name="type_fax_home" msgid="5188151910627934239">"住宅传真"</string>
-    <string name="type_pager" msgid="6971533430192661440">"寻呼机"</string>
-    <string name="type_other" msgid="357858743316072535">"其他"</string>
-    <string name="type_custom" msgid="546891906059234753">"自定义"</string>
     <string name="type_short_home" msgid="7770424864090605384">"H"</string>
     <string name="type_short_mobile" msgid="1655473281466676216">"M"</string>
     <string name="type_short_work" msgid="4925330752504537861">"W"</string>
     <string name="type_short_pager" msgid="2613818970827594238">"P"</string>
     <string name="type_short_other" msgid="5669407180177236769">"O"</string>
-    <string name="type_home_2" msgid="7576604544326827279">"住宅 2"</string>
-    <string name="type_work_2" msgid="4033954623350210826">"单位 2"</string>
-    <string name="type_car" msgid="1882297602515019816">"车载电话"</string>
-    <string name="type_company_main" msgid="1757801178953730800">"公司总机"</string>
-    <string name="type_mms" msgid="7575994898038669673">"彩信"</string>
-    <string name="type_radio" msgid="7376516830366758196">"无线装置"</string>
-    <string name="type_assistant" msgid="4838160907811639910">"助手"</string>
-    <string name="type_im_aim" msgid="2227683604131341761">"AIM"</string>
-    <string name="type_im_msn" msgid="5322977067527283958">"Windows Live"</string>
-    <string name="type_im_yahoo" msgid="8093860976582856789">"雅虎"</string>
-    <string name="type_im_skype" msgid="7847929379814316050">"Skype"</string>
-    <string name="type_im_qq" msgid="764805405209877788">"QQ"</string>
-    <string name="type_im_google_talk" msgid="4019292000925519902">"Google Talk"</string>
-    <string name="type_im_icq" msgid="7556014886862234019">"ICQ"</string>
-    <string name="type_im_jabber" msgid="5523148125631896131">"Jabber"</string>
     <string name="edit_secondary_collapse" msgid="1855127176548440583">"附属详情"</string>
     <string name="dialog_primary_name" msgid="5521591005692614833">"主名称"</string>
     <string name="dialog_new_contact_account" msgid="9044704073286262197">"在帐户下创建联系人"</string>
@@ -345,10 +322,7 @@
     <string name="call_fax_work" msgid="7467763592359059243">"呼叫单位传真"</string>
     <string name="call_fax_home" msgid="8342175628887571876">"呼叫住宅传真"</string>
     <string name="call_pager" msgid="9003902812293983281">"呼叫寻呼机"</string>
-    <string name="call_other" msgid="5605584621798108205">"呼叫“其他”通讯方式"</string>
     <string name="call_custom" msgid="7756571794763171802">"呼叫<xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home_2" msgid="310203419023725540">"呼叫住宅 2"</string>
-    <string name="call_work_2" msgid="4403999777434987049">"呼叫单位 2"</string>
     <string name="call_car" msgid="3280537320306436445">"呼叫车载电话"</string>
     <string name="call_company_main" msgid="6105120947138711257">"呼叫公司总机"</string>
     <string name="call_mms" msgid="6274041545876221437">"语音彩信"</string>
@@ -361,8 +335,6 @@
     <string name="sms_pager" msgid="7730404569637015192">"向寻呼机发送文字消息"</string>
     <string name="sms_other" msgid="5131921487474531617">"向其他通讯工具发送文本消息"</string>
     <string name="sms_custom" msgid="5932736853732191825">"向<xliff:g id="CUSTOM">%s</xliff:g>发送文本消息"</string>
-    <string name="sms_home_2" msgid="7944150531556566287">"向住宅 2 发送文本消息"</string>
-    <string name="sms_work_2" msgid="1652790306127907938">"向单位 2 发送文本消息"</string>
     <string name="sms_car" msgid="7444227058437359641">"向车载电话发送文本消息"</string>
     <string name="sms_company_main" msgid="118970873419678087">"向公司总机发送文本消息"</string>
     <string name="sms_mms" msgid="4069352461380762677">"文本彩信"</string>
@@ -385,7 +357,6 @@
     <string name="chat_gtalk" msgid="981575737258117697">"使用 Google Talk 聊天"</string>
     <string name="chat_icq" msgid="8438405386153745775">"使用 ICQ 聊天"</string>
     <string name="chat_jabber" msgid="7561444230307829609">"使用 Jabber 聊天"</string>
-    <string name="chat_other" msgid="6023619161453269469">"聊天"</string>
     <string name="postal_street" msgid="8133143961580058972">"街道"</string>
     <string name="postal_pobox" msgid="4431938829180269821">"信箱"</string>
     <string name="postal_neighborhood" msgid="1450783874558956739">"街区"</string>

diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 3280ba2..e0f04cf 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml

@@ -299,34 +299,11 @@
     <string name="nicknameLabelsGroup" msgid="2891682101053358010">"暱稱"</string>
     <string name="organizationLabelsGroup" msgid="2478611760751832035">"機構"</string>
     <string name="websiteLabelsGroup" msgid="4202998982804009261">"網站"</string>
-    <string name="type_home" msgid="1228039089996938949">"住家"</string>
-    <string name="type_mobile" msgid="4202799691295960532">"行動裝置"</string>
-    <string name="type_work" msgid="9046581192178244575">"公司"</string>
-    <string name="type_fax_work" msgid="7056833051776335751">"公司傳真"</string>
-    <string name="type_fax_home" msgid="5188151910627934239">"住家傳真"</string>
-    <string name="type_pager" msgid="6971533430192661440">"呼叫器"</string>
-    <string name="type_other" msgid="357858743316072535">"其他"</string>
-    <string name="type_custom" msgid="546891906059234753">"自訂"</string>
     <string name="type_short_home" msgid="7770424864090605384">"住家"</string>
     <string name="type_short_mobile" msgid="1655473281466676216">"行動"</string>
     <string name="type_short_work" msgid="4925330752504537861">"工作"</string>
     <string name="type_short_pager" msgid="2613818970827594238">"呼叫器"</string>
     <string name="type_short_other" msgid="5669407180177236769">"其他"</string>
-    <string name="type_home_2" msgid="7576604544326827279">"住家 2"</string>
-    <string name="type_work_2" msgid="4033954623350210826">"公司 2"</string>
-    <string name="type_car" msgid="1882297602515019816">"汽車電話"</string>
-    <string name="type_company_main" msgid="1757801178953730800">"公司代表號"</string>
-    <string name="type_mms" msgid="7575994898038669673">"MMS"</string>
-    <string name="type_radio" msgid="7376516830366758196">"無線電"</string>
-    <string name="type_assistant" msgid="4838160907811639910">"助理"</string>
-    <string name="type_im_aim" msgid="2227683604131341761">"AIM"</string>
-    <string name="type_im_msn" msgid="5322977067527283958">"Windows Live"</string>
-    <string name="type_im_yahoo" msgid="8093860976582856789">"Yahoo"</string>
-    <string name="type_im_skype" msgid="7847929379814316050">"Skype"</string>
-    <string name="type_im_qq" msgid="764805405209877788">"QQ"</string>
-    <string name="type_im_google_talk" msgid="4019292000925519902">"Google Talk"</string>
-    <string name="type_im_icq" msgid="7556014886862234019">"ICQ"</string>
-    <string name="type_im_jabber" msgid="5523148125631896131">"Jabber"</string>
     <string name="edit_secondary_collapse" msgid="1855127176548440583">"次要詳細資料"</string>
     <string name="dialog_primary_name" msgid="5521591005692614833">"主要名稱"</string>
     <string name="dialog_new_contact_account" msgid="9044704073286262197">"在帳戶下建立聯絡人"</string>
@@ -345,10 +322,7 @@
     <string name="call_fax_work" msgid="7467763592359059243">"去電公司傳真"</string>
     <string name="call_fax_home" msgid="8342175628887571876">"去電住家傳真"</string>
     <string name="call_pager" msgid="9003902812293983281">"去電呼叫器"</string>
-    <string name="call_other" msgid="5605584621798108205">"去電其他電話"</string>
     <string name="call_custom" msgid="7756571794763171802">"去電<xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home_2" msgid="310203419023725540">"去電住家電話 2"</string>
-    <string name="call_work_2" msgid="4403999777434987049">"去電公司電話 2"</string>
     <string name="call_car" msgid="3280537320306436445">"去電汽車電話"</string>
     <string name="call_company_main" msgid="6105120947138711257">"去電公司代表號"</string>
     <string name="call_mms" msgid="6274041545876221437">"去電 MMS"</string>
@@ -361,8 +335,6 @@
     <string name="sms_pager" msgid="7730404569637015192">"傳送簡訊至呼叫器"</string>
     <string name="sms_other" msgid="5131921487474531617">"傳送簡訊至其他裝置"</string>
     <string name="sms_custom" msgid="5932736853732191825">"傳送簡訊至<xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home_2" msgid="7944150531556566287">"傳送簡訊至住家電話 2"</string>
-    <string name="sms_work_2" msgid="1652790306127907938">"傳送簡訊至公司電話 2"</string>
     <string name="sms_car" msgid="7444227058437359641">"傳送簡訊至汽車電話"</string>
     <string name="sms_company_main" msgid="118970873419678087">"傳送簡訊至公司代表號"</string>
     <string name="sms_mms" msgid="4069352461380762677">"傳送 MMS 簡訊"</string>
@@ -385,7 +357,6 @@
     <string name="chat_gtalk" msgid="981575737258117697">"使用 Google Talk 進行即時通訊"</string>
     <string name="chat_icq" msgid="8438405386153745775">"使用 ICQ 進行即時通訊"</string>
     <string name="chat_jabber" msgid="7561444230307829609">"使用 Jabber 進行即時通訊"</string>
-    <string name="chat_other" msgid="6023619161453269469">"使用其他即時通訊進行即時通訊"</string>
     <string name="postal_street" msgid="8133143961580058972">"街道"</string>
     <string name="postal_pobox" msgid="4431938829180269821">"郵政信箱"</string>
     <string name="postal_neighborhood" msgid="1450783874558956739">"鄰"</string>
commit	e291627b8c0d0a69d77a9fd0a37cdb48349d52f6	[log] [tgz]
author	Android (Google) Code Review <android-gerrit@google.com>	Sun Sep 27 18:34:50 2009 -0400
committer	Android (Google) Code Review <android-gerrit@google.com>	Sun Sep 27 18:34:50 2009 -0400
tree	fca5f0da69eb83adf2a2148599912d3dd8c08aac
parent	6971f2ae45bbb2d89f22358e54afb9e7ccd5754d [diff]
parent	d63a9602ee06cdd276ef40309cc047c9c4b57a53 [diff]