diff --git a/po/en_GB.po b/po/en_GB.po
index 0f10b2c..eeccaaf 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-contacts\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-22 11:26+0100\n"
-"PO-Revision-Date: 2012-09-22 11:26+0100\n"
-"Last-Translator: Bruce Cowan <bruce@bcowan.me.uk>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"contacts&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2016-05-05 07:45+0000\n"
+"PO-Revision-Date: 2016-09-06 16:39+0200\n"
+"Last-Translator: David King <amigadave@amigadave.com>\n"
 "Language-Team: British English <en@li.org>\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
@@ -18,599 +19,690 @@ msgstr ""
 "X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
 
-#: ../data/gnome-contacts.desktop.in.in.h:1 ../src/contacts-app.vala:240
-#: ../src/main.vala:28
+#: ../data/org.gnome.Contacts.appdata.xml.in.h:1
+#: ../data/org.gnome.Contacts.search-provider.ini.in.in.h:1
+#: ../src/contacts-app.vala:129
+msgid "GNOME Contacts"
+msgstr "GNOME Contacts"
+
+#: ../data/org.gnome.Contacts.appdata.xml.in.h:2
+#: ../data/org.gnome.Contacts.desktop.in.in.h:2
+msgid "A contacts manager for GNOME"
+msgstr "A contacts manager for GNOME"
+
+#: ../data/org.gnome.Contacts.appdata.xml.in.h:3
+msgid ""
+"Contacts keeps and organize your contacts information. You can create, edit, "
+"delete and link together pieces of information about your contacts. Contacts "
+"aggregates the details from all your sources providing a centralized place "
+"for managing your contacts."
+msgstr ""
+"Contacts keeps and organise your contacts information. You can create, edit, "
+"delete and link together pieces of information about your contacts. Contacts "
+"aggregates the details from all your sources providing a centralized place "
+"for managing your contacts."
+
+#: ../data/org.gnome.Contacts.appdata.xml.in.h:4
+msgid ""
+"Contacts will also integrate with online address books and automatically "
+"link contacts from different online sources."
+msgstr ""
+"Contacts will also integrate with online address books and automatically "
+"link contacts from different online sources."
+
+#: ../data/org.gnome.Contacts.desktop.in.in.h:1
 msgid "Contacts"
 msgstr "Contacts"
 
-#: ../src/app-menu.ui.h:1
-msgid "_Change Address Book..."
-msgstr "_Change Address Book…"
+#: ../data/org.gnome.Contacts.desktop.in.in.h:3
+msgid "friends;address book;"
+msgstr "friends;address book;"
 
-#: ../src/app-menu.ui.h:2
-msgid "_About Contacts"
-msgstr "_About Contacts"
+#: ../src/contacts-accounts-list.vala:48
+msgid "Online Accounts"
+msgstr "Online Accounts"
 
-#: ../src/app-menu.ui.h:3
-msgid "_Help"
-msgstr "_Help"
+#: ../src/contacts-accounts-list.vala:174 ../src/contacts-esd-setup.c:241
+msgid "Local Address Book"
+msgstr "Local Address Book"
 
-#: ../src/app-menu.ui.h:4
-msgid "_Quit"
-msgstr "_Quit"
+#: ../src/contacts-address-map.vala:80
+msgid "Install GNOME Maps to open location."
+msgstr "Install GNOME Maps to open location."
 
-#: ../src/contacts-app.vala:79
+#: ../src/contacts-app.vala:46
 #, c-format
 msgid "No contact with id %s found"
 msgstr "No contact with id %s found"
 
-#: ../src/contacts-app.vala:80 ../src/contacts-app.vala:204
+#: ../src/contacts-app.vala:47 ../src/contacts-app.vala:149
 msgid "Contact not found"
 msgstr "Contact not found"
 
-#: ../src/contacts-app.vala:89
+#: ../src/contacts-app.vala:56
 msgid "Change Address Book"
 msgstr "Change Address Book"
 
-#: ../src/contacts-app.vala:94 ../src/contacts-setup-window.vala:152
-msgid "Select"
-msgstr "Select"
+#: ../src/contacts-app.vala:61
+msgid "Change"
+msgstr "Change"
 
-#: ../src/contacts-app.vala:182
+#: ../src/contacts-app.vala:62 ../src/contacts-avatar-dialog.vala:255
+#: ../data/ui/contacts-window.ui.h:6
+msgid "Cancel"
+msgstr "Cancel"
+
+#: ../src/contacts-app.vala:71
+msgid ""
+"New contacts will be added to the selected address book.\n"
+"You are able to view and edit contacts from other address books."
+msgstr ""
+"New contacts will be added to the selected address book.\n"
+"You are able to view and edit contacts from other address books."
+
+#: ../src/contacts-app.vala:128
 msgid "translator-credits"
-msgstr "Bruce Cowan <bruce@bcowan.me.uk>"
+msgstr ""
+"Bruce Cowan <bruce@bcowan.me.uk>\n"
+"David King <amigadave@amigadave.com>"
 
-#: ../src/contacts-app.vala:183
-msgid "GNOME Contacts"
-msgstr "GNOME Contacts"
-
-#: ../src/contacts-app.vala:184
+#: ../src/contacts-app.vala:130
 msgid "About GNOME Contacts"
 msgstr "About GNOME Contacts"
 
-#: ../src/contacts-app.vala:185
+#: ../src/contacts-app.vala:131
 msgid "Contact Management Application"
 msgstr "Contact Management Application"
 
-#: ../src/contacts-app.vala:203
+#: ../src/contacts-app.vala:148
 #, c-format
 msgid "No contact with email address %s found"
 msgstr "No contact with e-mail address %s found"
 
-#: ../src/contacts-app.vala:256
-msgid "New"
-msgstr "New"
-
-#: ../src/contacts-app.vala:391
-#, c-format
-msgid "Contact deleted: \"%s\""
-msgstr "Contact deleted: \"%s\""
-
-#: ../src/contacts-app.vala:418
+#: ../src/contacts-app.vala:320
 msgid "Show contact with this individual id"
 msgstr "Show contact with this individual id"
 
-#: ../src/contacts-app.vala:420
+#: ../src/contacts-app.vala:322
 msgid "Show contact with this email address"
 msgstr "Show contact with this e-mail address"
 
-#: ../src/contacts-app.vala:433
-#, c-format
-msgid "%s linked to %s"
-msgstr "%s linked to %s"
-
-#: ../src/contacts-app.vala:435 ../src/contacts-link-dialog.vala:87
-#, c-format
-msgid "%s linked to the contact"
-msgstr "%s linked to the contact"
-
-#: ../src/contacts-app.vala:452
+#: ../src/contacts-app.vala:331
 msgid "— contact management"
 msgstr "— contact management"
 
-#: ../src/contacts-avatar-dialog.vala:197
+#: ../src/contacts-avatar-dialog.vala:200
 msgid "Browse for more pictures"
 msgstr "Browse for more pictures"
 
-#: ../src/contacts-avatar-dialog.vala:244
+#: ../src/contacts-avatar-dialog.vala:203
+msgid "_Cancel"
+msgstr "_Cancel"
+
+#: ../src/contacts-avatar-dialog.vala:204
+msgid "_Open"
+msgstr "_Open"
+
+#: ../src/contacts-avatar-dialog.vala:249
 msgid "Select Picture"
 msgstr "Select Picture"
 
-#: ../src/contacts-avatar-dialog.vala:247 ../src/contacts-link-dialog.vala:152
-msgid "Close"
-msgstr "Close"
+#: ../src/contacts-avatar-dialog.vala:253 ../src/contacts-window.vala:198
+#: ../src/contacts-window.vala:224
+msgid "Select"
+msgstr "Select"
 
-#: ../src/contacts-contact-pane.vala:591
-msgctxt "Addresses on the Web"
-msgid "Links"
-msgstr "Links"
+#: ../src/contacts-avatar-dialog.vala:281 ../src/contacts-window.vala:315
+msgid "New Contact"
+msgstr "New Contact"
 
-#: ../src/contacts-contact-pane.vala:592
-msgctxt "Web address"
-msgid "Link"
-msgstr "Link"
+#: ../src/contacts-contact-editor.vala:28
+msgid "Street"
+msgstr "Street"
 
-#: ../src/contacts-contact-pane.vala:679 ../src/contacts-contact-pane.vala:680
-#: ../src/contacts-link-dialog.vala:116
-#: ../src/contacts-new-contact-dialog.vala:86
-#: ../src/contacts-new-contact-dialog.vala:121
-msgid "Email"
-msgstr "E-mail"
+#: ../src/contacts-contact-editor.vala:28
+msgid "Extension"
+msgstr "Extension"
 
-#: ../src/contacts-contact-pane.vala:721
-#: ../src/contacts-new-contact-dialog.vala:95
-#: ../src/contacts-new-contact-dialog.vala:126
-msgid "Phone"
-msgstr "Phone"
+#: ../src/contacts-contact-editor.vala:28
+msgid "City"
+msgstr "City"
 
-#: ../src/contacts-contact-pane.vala:722 ../src/contacts-link-dialog.vala:132
-msgid "Phone number"
-msgstr "Phone number"
+#: ../src/contacts-contact-editor.vala:28
+msgid "State/Province"
+msgstr "County"
 
-#: ../src/contacts-contact-pane.vala:782 ../src/contacts-contact-pane.vala:783
-msgid "Chat"
-msgstr "Chat"
+#: ../src/contacts-contact-editor.vala:28
+msgid "Zip/Postal Code"
+msgstr "Postcode"
 
-#: ../src/contacts-contact-pane.vala:848
+#: ../src/contacts-contact-editor.vala:28
+msgid "PO box"
+msgstr "PO box"
+
+#: ../src/contacts-contact-editor.vala:28
+msgid "Country"
+msgstr "Country"
+
+#: ../src/contacts-contact-editor.vala:293
+msgid "Add email"
+msgstr "Add e-mail"
+
+#: ../src/contacts-contact-editor.vala:295
+msgid "Add number"
+msgstr "Add number"
+
+#: ../src/contacts-contact-editor.vala:299
+#: ../src/contacts-contact-editor.vala:330
+#: ../src/contacts-contact-editor.vala:365
+#: ../src/contacts-contact-editor.vala:428
+#: ../src/contacts-contact-editor.vala:478
+msgid "Delete field"
+msgstr "Delete field"
+
+#: ../src/contacts-contact-editor.vala:400
 msgid "January"
 msgstr "January"
 
-#: ../src/contacts-contact-pane.vala:849
+#: ../src/contacts-contact-editor.vala:401
 msgid "February"
 msgstr "February"
 
-#: ../src/contacts-contact-pane.vala:850
+#: ../src/contacts-contact-editor.vala:402
 msgid "March"
 msgstr "March"
 
-#: ../src/contacts-contact-pane.vala:851
+#: ../src/contacts-contact-editor.vala:403
 msgid "April"
 msgstr "April"
 
-#: ../src/contacts-contact-pane.vala:852
+#: ../src/contacts-contact-editor.vala:404
 msgid "May"
 msgstr "May"
 
-#: ../src/contacts-contact-pane.vala:853
+#: ../src/contacts-contact-editor.vala:405
 msgid "June"
 msgstr "June"
 
-#: ../src/contacts-contact-pane.vala:854
+#: ../src/contacts-contact-editor.vala:406
 msgid "July"
 msgstr "July"
 
-#: ../src/contacts-contact-pane.vala:855
+#: ../src/contacts-contact-editor.vala:407
 msgid "August"
 msgstr "August"
 
-#: ../src/contacts-contact-pane.vala:856
+#: ../src/contacts-contact-editor.vala:408
 msgid "September"
 msgstr "September"
 
-#: ../src/contacts-contact-pane.vala:857
+#: ../src/contacts-contact-editor.vala:409
 msgid "October"
 msgstr "October"
 
-#: ../src/contacts-contact-pane.vala:858
+#: ../src/contacts-contact-editor.vala:410
 msgid "November"
 msgstr "November"
 
-#: ../src/contacts-contact-pane.vala:859
+#: ../src/contacts-contact-editor.vala:411
 msgid "December"
 msgstr "December"
 
-#: ../src/contacts-contact-pane.vala:897 ../src/contacts-contact-pane.vala:898
-msgid "Birthday"
-msgstr "Birthday"
+#: ../src/contacts-contact-editor.vala:561
+#: ../src/contacts-contact-editor.vala:568
+#: ../src/contacts-contact-sheet.vala:190 ../data/ui/app-menu.ui.h:10
+msgid "Website"
+msgstr "Website"
 
-#: ../src/contacts-contact-pane.vala:970 ../src/contacts-contact-pane.vala:971
+#: ../src/contacts-contact-editor.vala:587
+#: ../src/contacts-contact-editor.vala:594
+#: ../src/contacts-contact-sheet.vala:196 ../data/ui/app-menu.ui.h:11
 msgid "Nickname"
 msgstr "Nickname"
 
-#: ../src/contacts-contact-pane.vala:1061
-#: ../src/contacts-contact-pane.vala:1062
+#: ../src/contacts-contact-editor.vala:620
+#: ../src/contacts-contact-editor.vala:627
+#: ../src/contacts-contact-sheet.vala:203 ../data/ui/app-menu.ui.h:12
+msgid "Birthday"
+msgstr "Birthday"
+
+#: ../src/contacts-contact-editor.vala:642
+#: ../src/contacts-contact-editor.vala:649
+#: ../src/contacts-contact-sheet.vala:210
 msgid "Note"
 msgstr "Note"
 
-#: ../src/contacts-contact-pane.vala:1201
-msgid "Addresses"
-msgstr "Addresses"
+#: ../src/contacts-contact-editor.vala:795
+msgid "New Detail"
+msgstr "New Detail"
 
-#: ../src/contacts-contact-pane.vala:1202
-#: ../src/contacts-new-contact-dialog.vala:104
-#: ../src/contacts-new-contact-dialog.vala:131
-msgid "Address"
-msgstr "Address"
+#: ../src/contacts-contact-editor.vala:801
+#: ../src/contacts-linked-accounts-dialog.vala:36
+msgid "Linked Accounts"
+msgstr "Linked Accounts"
 
-#: ../src/contacts-contact-pane.vala:1304
-msgid "Add to My Contacts"
-msgstr "Add to My Contacts"
+#: ../src/contacts-contact-editor.vala:804
+msgid "Remove Contact"
+msgstr "Remove Contact"
 
-#: ../src/contacts-contact-pane.vala:1314
-msgid "Unlink"
-msgstr "Unlink"
+#: ../src/contacts-contact-editor.vala:862
+#: ../src/contacts-contact-editor.vala:1062
+msgid "Add name"
+msgstr "Add name"
 
-#: ../src/contacts-contact-pane.vala:1346
-msgid "Add detail..."
-msgstr "Add detail…"
-
-#: ../src/contacts-contact-pane.vala:1361
-#, c-format
-msgid "Select detail to add to %s"
-msgstr "Select detail to add to %s"
-
-#: ../src/contacts-contact-pane.vala:1752
+#: ../src/contacts-contact-pane.vala:137
 #, c-format
 msgid "Does %s from %s belong here?"
 msgstr "Does %s from %s belong here?"
 
-#: ../src/contacts-contact-pane.vala:1754
+#: ../src/contacts-contact-pane.vala:139
 #, c-format
 msgid "Do these details belong to %s?"
 msgstr "Do these details belong to %s?"
 
-#: ../src/contacts-contact-pane.vala:1764
+#: ../src/contacts-contact-pane.vala:151
 msgid "Yes"
 msgstr "Yes"
 
-#: ../src/contacts-contact-pane.vala:1765
+#: ../src/contacts-contact-pane.vala:152
 msgid "No"
 msgstr "No"
 
-#: ../src/contacts-contact-pane.vala:1962
-msgid "Select email address"
-msgstr "Select e-mail address"
+#: ../src/contacts-contact-pane.vala:323
+msgid "Select a contact"
+msgstr "Select a contact"
 
-#: ../src/contacts-contact-pane.vala:2035
-msgid "Select what to call"
-msgstr "Select what to call"
+#: ../src/contacts-contact-pane.vala:455
+msgid "You need to enter some data"
+msgstr "You need to enter some data"
 
-#: ../src/contacts-contact-pane.vala:2099
-msgid "Select chat account"
-msgstr "Select chat account"
+#: ../src/contacts-contact-pane.vala:467
+msgid "No primary addressbook configured"
+msgstr "No primary addressbook configured"
 
-#: ../src/contacts-contact-pane.vala:2179
-msgid "Add/Remove Linked Contacts..."
-msgstr "Add/Remove Linked Contacts…"
+#: ../src/contacts-contact-pane.vala:486
+#, c-format
+msgid "Unable to create new contacts: %s"
+msgstr "Unable to create new contacts: %s"
 
-#. Utils.add_menu_item (context_menu,_("Send..."));
-#: ../src/contacts-contact-pane.vala:2183
-msgid "Delete"
-msgstr "Delete"
+#: ../src/contacts-contact-pane.vala:497
+msgid "Unable to find newly created contact"
+msgstr "Unable to find newly created contact"
 
-#: ../src/contacts-contact.vala:686
-msgid "Street"
-msgstr "Street"
+#: ../src/contacts-contact-frame.vala:40
+msgid "Change avatar"
+msgstr "Change avatar"
 
-#: ../src/contacts-contact.vala:686
-msgid "Extension"
-msgstr "Extension"
-
-#: ../src/contacts-contact.vala:686
-msgid "City"
-msgstr "City"
-
-#: ../src/contacts-contact.vala:686
-msgid "State/Province"
-msgstr "County"
-
-#: ../src/contacts-contact.vala:686
-msgid "Zip/Postal Code"
-msgstr "Postcode"
-
-#: ../src/contacts-contact.vala:686
-msgid "PO box"
-msgstr "PO box"
-
-#: ../src/contacts-contact.vala:686
-msgid "Country"
-msgstr "Country"
-
-#: ../src/contacts-contact.vala:742
+#: ../src/contacts-contact.vala:741
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../src/contacts-contact.vala:743
+#: ../src/contacts-contact.vala:742
 msgid "Ovi Chat"
 msgstr "Ovi Chat"
 
-#: ../src/contacts-contact.vala:744 ../src/contacts-contact.vala:1026
+#: ../src/contacts-contact.vala:743
 msgid "Facebook"
 msgstr "Facebook"
 
-#: ../src/contacts-contact.vala:745
+#: ../src/contacts-contact.vala:744
 msgid "Livejournal"
 msgstr "Livejournal"
 
-#: ../src/contacts-contact.vala:746
+#: ../src/contacts-contact.vala:745
 msgid "AOL Instant Messenger"
 msgstr "AOL Instant Messenger"
 
-#: ../src/contacts-contact.vala:747
+#: ../src/contacts-contact.vala:746
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../src/contacts-contact.vala:748
+#: ../src/contacts-contact.vala:747
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: ../src/contacts-contact.vala:749
+#: ../src/contacts-contact.vala:748
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../src/contacts-contact.vala:750
+#: ../src/contacts-contact.vala:749
 msgid "IRC"
 msgstr "IRC"
 
-#: ../src/contacts-contact.vala:751
+#: ../src/contacts-contact.vala:750
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/contacts-contact.vala:752
+#: ../src/contacts-contact.vala:751
 msgid "Local network"
 msgstr "Local network"
 
-#: ../src/contacts-contact.vala:753
+#: ../src/contacts-contact.vala:752
 msgid "Windows Live Messenger"
 msgstr "Windows Live Messenger"
 
-#: ../src/contacts-contact.vala:754
+#: ../src/contacts-contact.vala:753
 msgid "MySpace"
 msgstr "MySpace"
 
-#: ../src/contacts-contact.vala:755
+#: ../src/contacts-contact.vala:754
 msgid "MXit"
 msgstr "MXit"
 
-#: ../src/contacts-contact.vala:756
+#: ../src/contacts-contact.vala:755
 msgid "Napster"
 msgstr "Napster"
 
-#: ../src/contacts-contact.vala:757
+#: ../src/contacts-contact.vala:756
 msgid "Tencent QQ"
 msgstr "Tencent QQ"
 
-#: ../src/contacts-contact.vala:758
+#: ../src/contacts-contact.vala:757
 msgid "IBM Lotus Sametime"
 msgstr "IBM Lotus Sametime"
 
-#: ../src/contacts-contact.vala:759
+#: ../src/contacts-contact.vala:758
 msgid "SILC"
 msgstr "SILC"
 
-#: ../src/contacts-contact.vala:760
+#: ../src/contacts-contact.vala:759
 msgid "sip"
 msgstr "sip"
 
-#: ../src/contacts-contact.vala:761
+#: ../src/contacts-contact.vala:760
 msgid "Skype"
 msgstr "Skype"
 
-#: ../src/contacts-contact.vala:762
+#: ../src/contacts-contact.vala:761
 msgid "Telephony"
 msgstr "Telephony"
 
-#: ../src/contacts-contact.vala:763
+#: ../src/contacts-contact.vala:762
 msgid "Trepia"
 msgstr "Trepia"
 
-#: ../src/contacts-contact.vala:764 ../src/contacts-contact.vala:765
+#: ../src/contacts-contact.vala:763 ../src/contacts-contact.vala:764
 msgid "Yahoo! Messenger"
 msgstr "Yahoo! Messenger"
 
-#: ../src/contacts-contact.vala:766
+#: ../src/contacts-contact.vala:765
 msgid "Zephyr"
 msgstr "Zephyr"
 
-#: ../src/contacts-contact.vala:1029
-msgid "Twitter"
-msgstr "Twitter"
-
-#: ../src/contacts-contact.vala:1032
-msgid "Google Profile"
-msgstr "Google Profile"
-
-#: ../src/contacts-contact.vala:1096
+#: ../src/contacts-contact.vala:1070
 msgid "Unexpected internal error: created contact was not found"
 msgstr "Unexpected internal error: created contact was not found"
 
-#: ../src/contacts-contact.vala:1234
+#: ../src/contacts-contact.vala:1255
 msgid "Google Circles"
 msgstr "Google Circles"
 
-#: ../src/contacts-contact.vala:1236
-msgid "Google Other Contact"
-msgstr "Google Other Contact"
-
-#: ../src/contacts-esd-setup.c:114
-msgid "Local Address Book"
-msgstr "Local Address Book"
-
-#: ../src/contacts-esd-setup.c:117 ../src/contacts-esd-setup.c:145
+#: ../src/contacts-contact.vala:1257 ../src/contacts-esd-setup.c:244
+#: ../src/contacts-esd-setup.c:272
 msgid "Google"
 msgstr "Google"
 
-#: ../src/contacts-esd-setup.c:142
+#: ../src/contacts-esd-setup.c:269
 msgid "Local Contact"
 msgstr "Local Contact"
 
-#: ../src/contacts-link-dialog.vala:73
-msgctxt "contacts link action"
-msgid "Link"
-msgstr "Link"
-
-#: ../src/contacts-link-dialog.vala:84
-msgid "Undo"
-msgstr "Undo"
-
-#: ../src/contacts-link-dialog.vala:148
-msgid "Link Contact"
-msgstr "Link Contact"
-
-#: ../src/contacts-link-dialog.vala:154 ../src/contacts-setup-window.vala:137
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../src/contacts-link-dialog.vala:154
-msgid "Link"
-msgstr "Link"
-
-#: ../src/contacts-link-dialog.vala:182
+#: ../src/contacts-linked-accounts-dialog.vala:35
 #, c-format
-msgid "Link contacts to %s"
-msgstr "Link contacts to %s"
+msgid "%s"
+msgstr "%s"
 
-#: ../src/contacts-link-dialog.vala:184
-msgid "Select contact to link to"
-msgstr "Select contact to link to"
+#: ../src/contacts-linked-accounts-dialog.vala:60
+msgid "You can link contacts by selecting them from the contacts list"
+msgstr "You can link contacts by selecting them from the contacts list"
 
-#: ../src/contacts-new-contact-dialog.vala:35
-msgid "New contact"
-msgstr "New contact"
+#: ../src/contacts-linked-accounts-dialog.vala:104
+msgid "Unlink"
+msgstr "Unlink"
 
-#: ../src/contacts-new-contact-dialog.vala:41
-msgid "Create Contact"
-msgstr "Create Contact"
-
-#: ../src/contacts-new-contact-dialog.vala:67
-msgid ""
-"Add or \n"
-"select a picture"
-msgstr ""
-"Add or \n"
-"select a picture"
-
-#: ../src/contacts-new-contact-dialog.vala:78
-msgid "Contact Name"
-msgstr "Contact Name"
-
-#: ../src/contacts-new-contact-dialog.vala:113
-msgid "Add Detail"
-msgstr "Add Detail"
-
-#: ../src/contacts-new-contact-dialog.vala:212
-msgid "You must specify a contact name"
-msgstr "You must specify a contact name"
-
-#: ../src/contacts-new-contact-dialog.vala:320
-msgid "No primary addressbook configured\n"
-msgstr "No primary addressbook configured\n"
-
-#: ../src/contacts-new-contact-dialog.vala:341
-#, c-format
-msgid "Unable to create new contacts: %s\n"
-msgstr "Unable to create new contacts: %s\n"
-
-#: ../src/contacts-new-contact-dialog.vala:352
-msgid "Unable to find newly created contact\n"
-msgstr "Unable to find newly created contact\n"
-
-#: ../src/contacts-setup-window.vala:36
-msgid ""
-"Welcome to Contacts! Please select where you want to keep your address book:"
-msgstr ""
-"Welcome to Contacts! Please select where you want to keep your address book:"
-
-#: ../src/contacts-setup-window.vala:81
-msgid "Online Account Settings"
-msgstr "Online Account Settings"
-
-#: ../src/contacts-setup-window.vala:86
-msgid "Setup an online account or use a local address book"
-msgstr "Setup an online account or use a local address book"
-
-#: ../src/contacts-setup-window.vala:89
-msgid "Online Accounts"
-msgstr "Online Accounts"
-
-#: ../src/contacts-setup-window.vala:92
-msgid "Use Local Address Book"
-msgstr "Use Local Address Book"
-
-#: ../src/contacts-setup-window.vala:125 ../src/contacts-setup-window.vala:146
-msgid "Contacts Setup"
-msgstr "Contacts Setup"
-
-#: ../src/contacts-types.vala:113 ../src/contacts-types.vala:133
-#: ../src/contacts-types.vala:234 ../src/contacts-types.vala:324
+#. Refers to the type of the detail, could be Home, Work or Other for email, and the same
+#. * for phone numbers, addresses, etc.
+#: ../src/contacts-types.vala:115 ../src/contacts-types.vala:127
+#: ../src/contacts-types.vala:228 ../src/contacts-types.vala:342
 msgid "Other"
 msgstr "Other"
 
-#: ../src/contacts-types.vala:121
-msgid "Custom..."
-msgstr "Custom…"
-
 #. List most specific first, always in upper case
-#: ../src/contacts-types.vala:289 ../src/contacts-types.vala:320
+#: ../src/contacts-types.vala:283 ../src/contacts-types.vala:307
+#: ../src/contacts-types.vala:338
 msgid "Home"
 msgstr "Home"
 
-#: ../src/contacts-types.vala:290 ../src/contacts-types.vala:315
+#: ../src/contacts-types.vala:284 ../src/contacts-types.vala:308
+#: ../src/contacts-types.vala:333
 msgid "Work"
 msgstr "Work"
 
 #. List most specific first, always in upper case
-#: ../src/contacts-types.vala:314
+#: ../src/contacts-types.vala:306
+msgid "Personal"
+msgstr "Personal"
+
+#. List most specific first, always in upper case
+#: ../src/contacts-types.vala:332
 msgid "Assistant"
 msgstr "Assistant"
 
-#: ../src/contacts-types.vala:316
+#: ../src/contacts-types.vala:334
 msgid "Work Fax"
 msgstr "Work Fax"
 
-#: ../src/contacts-types.vala:317
+#: ../src/contacts-types.vala:335
 msgid "Callback"
 msgstr "Callback"
 
-#: ../src/contacts-types.vala:318
+#: ../src/contacts-types.vala:336
 msgid "Car"
 msgstr "Car"
 
-#: ../src/contacts-types.vala:319
+#: ../src/contacts-types.vala:337
 msgid "Company"
 msgstr "Company"
 
-#: ../src/contacts-types.vala:321
+#: ../src/contacts-types.vala:339
 msgid "Home Fax"
 msgstr "Home Fax"
 
-#: ../src/contacts-types.vala:322
+#: ../src/contacts-types.vala:340
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../src/contacts-types.vala:323
+#: ../src/contacts-types.vala:341
 msgid "Mobile"
 msgstr "Mobile"
 
-#: ../src/contacts-types.vala:325
+#: ../src/contacts-types.vala:343
 msgid "Fax"
 msgstr "Fax"
 
-#: ../src/contacts-types.vala:326
+#: ../src/contacts-types.vala:344
 msgid "Pager"
 msgstr "Pager"
 
-#: ../src/contacts-types.vala:327
+#: ../src/contacts-types.vala:345
 msgid "Radio"
 msgstr "Radio"
 
-#: ../src/contacts-types.vala:328
+#: ../src/contacts-types.vala:346
 msgid "Telex"
 msgstr "Telex"
 
 #. To translators: TTY is Teletypewriter
-#: ../src/contacts-types.vala:330
+#: ../src/contacts-types.vala:348
 msgid "TTY"
 msgstr "TTY"
 
-#: ../src/contacts-view.vala:271
+#: ../src/contacts-view.vala:194
+msgid "No results matched search"
+msgstr "No results matched search"
+
+#: ../src/contacts-view.vala:298
 msgid "Suggestions"
 msgstr "Suggestions"
 
-#: ../src/contacts-view.vala:296
+#: ../src/contacts-view.vala:323
 msgid "Other Contacts"
 msgstr "Other Contacts"
 
+#: ../src/contacts-window.vala:200
+#, c-format
+msgid "%d Selected"
+msgid_plural "%d Selected"
+msgstr[0] "%d Selected"
+msgstr[1] "%d Selected"
+
+#: ../src/contacts-window.vala:233 ../data/ui/contacts-window.ui.h:3
+msgid "All Contacts"
+msgstr "All Contacts"
+
+#: ../src/contacts-window.vala:250
+#, c-format
+msgid "Editing %s"
+msgstr "Editing %s"
+
+#: ../src/contacts-window.vala:265 ../data/ui/contacts-window.ui.h:8
+msgid "Done"
+msgstr "Done"
+
+#: ../src/contacts-window.vala:320
+msgid "Add"
+msgstr "Add"
+
+#: ../src/contacts-window.vala:411
+#, c-format
+msgid "%d contacts linked"
+msgid_plural "%d contacts linked"
+msgstr[0] "%d contacts linked"
+msgstr[1] "%d contacts linked"
+
+#: ../src/contacts-window.vala:415 ../src/contacts-window.vala:447
+#: ../src/contacts-window.vala:489 ../src/contacts-window.vala:525
+msgid "_Undo"
+msgstr "_Undo"
+
+#: ../src/contacts-window.vala:443
+#, c-format
+msgid "%d contact deleted"
+msgid_plural "%d contacts deleted"
+msgstr[0] "%d contact deleted"
+msgstr[1] "%d contacts deleted"
+
+#: ../src/contacts-window.vala:486
+#, c-format
+msgid "Contact deleted: \"%s\""
+msgstr "Contact deleted: “%s”"
+
+#: ../src/contacts-window.vala:521
+#, c-format
+msgid "%s linked to %s"
+msgstr "%s linked to %s"
+
+#: ../src/contacts-window.vala:523
+#, c-format
+msgid "%s linked to the contact"
+msgstr "%s linked to the contact"
+
+#: ../data/ui/app-menu.ui.h:1
+msgid "_Change Address Book..."
+msgstr "_Change Address Book…"
+
+#: ../data/ui/app-menu.ui.h:2
+msgid "_Help"
+msgstr "_Help"
+
+#: ../data/ui/app-menu.ui.h:3
+msgid "_About"
+msgstr "_About"
+
+#: ../data/ui/app-menu.ui.h:4
+msgid "_Quit"
+msgstr "_Quit"
+
+#: ../data/ui/app-menu.ui.h:5
+msgid "Home email"
+msgstr "Home e-mail"
+
+#: ../data/ui/app-menu.ui.h:6
+msgid "Work email"
+msgstr "Work e-mail"
+
+#: ../data/ui/app-menu.ui.h:7
+msgid "Mobile phone"
+msgstr "Mobile phone"
+
+#: ../data/ui/app-menu.ui.h:8
+msgid "Home phone"
+msgstr "Home phone"
+
+#: ../data/ui/app-menu.ui.h:9
+msgid "Work phone"
+msgstr "Work phone"
+
+#: ../data/ui/app-menu.ui.h:13
+msgid "Home address"
+msgstr "Home address"
+
+#: ../data/ui/app-menu.ui.h:14
+msgid "Work address"
+msgstr "Work address"
+
+#: ../data/ui/app-menu.ui.h:15
+msgid "Notes"
+msgstr "Notes"
+
+#: ../data/ui/contacts-list-pane.ui.h:1
+msgid "Type to search"
+msgstr "Type to search"
+
+#. Link refers to the verb, from linking contacts together
+#: ../data/ui/contacts-list-pane.ui.h:3
+msgid "Link"
+msgstr "Link"
+
+#: ../data/ui/contacts-list-pane.ui.h:4
+msgid "Delete"
+msgstr "Delete"
+
+#: ../data/ui/contacts-window.ui.h:1
+msgid "Loading"
+msgstr "Loading"
+
+#: ../data/ui/contacts-window.ui.h:2
+msgid ""
+"New contacts will be added to the selected address book. You are able to "
+"view and edit contacts from other address books."
+msgstr ""
+"New contacts will be added to the selected address book. You are able to "
+"view and edit contacts from other address books."
+
+#: ../data/ui/contacts-window.ui.h:4
+msgid "Add contact"
+msgstr "Add contact"
+
+#: ../data/ui/contacts-window.ui.h:5
+msgid "Selection mode"
+msgstr "Selection mode"
+
+#: ../data/ui/contacts-window.ui.h:7
+msgid "Edit"
+msgstr "Edit"
+
+#: ../data/ui/contacts-window.ui.h:9
+msgid "Select Address Book"
+msgstr "Select Address Book"
+
+#: ../data/ui/contacts-window.ui.h:10
+msgid "Cancel setup"
+msgstr "Cancel setup"
+
+#: ../data/ui/contacts-window.ui.h:11
+msgid "Setup complete"
+msgstr "Setup complete"
+
 #: ../src/org.gnome.Contacts.gschema.xml.in.h:1
 msgid "First-time setup done."
 msgstr "First-time setup done."
@@ -619,6 +711,115 @@ msgstr "First-time setup done."
 msgid "Set to true when the user ran the first-time setup wizard."
 msgstr "Set to true when the user ran the first-time setup wizard."
 
+#: ../src/org.gnome.Contacts.gschema.xml.in.h:3
+msgid "View subset"
+msgstr "View subset"
+
+#: ../src/org.gnome.Contacts.gschema.xml.in.h:4
+msgid "View contacts subset"
+msgstr "View contacts subset"
+
+#~ msgid "_About Contacts"
+#~ msgstr "_About Contacts"
+
+#~ msgid "New"
+#~ msgstr "New"
+
+#~ msgid "Close"
+#~ msgstr "Close"
+
+#~ msgctxt "Addresses on the Web"
+#~ msgid "Links"
+#~ msgstr "Links"
+
+#~ msgctxt "Web address"
+#~ msgid "Link"
+#~ msgstr "Link"
+
+#~ msgid "Email"
+#~ msgstr "E-mail"
+
+#~ msgid "Phone"
+#~ msgstr "Phone"
+
+#~ msgid "Chat"
+#~ msgstr "Chat"
+
+#~ msgid "Addresses"
+#~ msgstr "Addresses"
+
+#~ msgid "Add to My Contacts"
+#~ msgstr "Add to My Contacts"
+
+#~ msgid "Add detail..."
+#~ msgstr "Add detail…"
+
+#~ msgid "Select detail to add to %s"
+#~ msgstr "Select detail to add to %s"
+
+#~ msgid "Select email address"
+#~ msgstr "Select e-mail address"
+
+#~ msgid "Select what to call"
+#~ msgstr "Select what to call"
+
+#~ msgid "Add/Remove Linked Contacts..."
+#~ msgstr "Add/Remove Linked Contacts…"
+
+#~ msgid "Twitter"
+#~ msgstr "Twitter"
+
+#~ msgid "Google Profile"
+#~ msgstr "Google Profile"
+
+#~ msgid "Google Other Contact"
+#~ msgstr "Google Other Contact"
+
+#~ msgctxt "contacts link action"
+#~ msgid "Link"
+#~ msgstr "Link"
+
+#~ msgid "Link Contact"
+#~ msgstr "Link Contact"
+
+#~ msgid "Link contacts to %s"
+#~ msgstr "Link contacts to %s"
+
+#~ msgid ""
+#~ "Add or \n"
+#~ "select a picture"
+#~ msgstr ""
+#~ "Add or \n"
+#~ "select a picture"
+
+#~ msgid "Contact Name"
+#~ msgstr "Contact Name"
+
+#~ msgid "You must specify a contact name"
+#~ msgstr "You must specify a contact name"
+
+#~ msgid ""
+#~ "Welcome to Contacts! Please select where you want to keep your address "
+#~ "book:"
+#~ msgstr ""
+#~ "Welcome to Contacts! Please select where you want to keep your address "
+#~ "book:"
+
+#~ msgid "Online Account Settings"
+#~ msgstr "Online Account Settings"
+
+#~ msgid "Setup an online account or use a local address book"
+#~ msgstr "Setup an online account or use a local address book"
+
+#~ msgid "Use Local Address Book"
+#~ msgstr "Use Local Address Book"
+
+#~ msgid "Contacts Setup"
+#~ msgstr "Contacts Setup"
+
+#~ msgid "Custom..."
+#~ msgstr "Custom…"
+
 #~ msgid "Unknown status"
 #~ msgstr "Unknown status"
 
@@ -643,9 +844,6 @@ msgstr "Set to true when the user ran the first-time setup wizard."
 #~ msgid "Hidden"
 #~ msgstr "Hidden"
 
-#~ msgid "Personal"
-#~ msgstr "Personal"
-
 #~ msgid "<span weight='bold'>Link contacts to %s</span>"
 #~ msgstr "<span weight='bold'>Link contacts to %s</span>"
 
@@ -682,9 +880,6 @@ msgstr "Set to true when the user ran the first-time setup wizard."
 #~ msgid "Manager"
 #~ msgstr "Manager"
 
-#~ msgid "Edit"
-#~ msgstr "Edit"
-
 #~ msgid "More"
 #~ msgstr "More"