diff --git a/po/zh_HK.po b/po/zh_HK.po
index 5c16d06..4f39411 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -7,23 +7,27 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-contacts 3.3.90\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-26 11:49+0800\n"
-"PO-Revision-Date: 2012-09-26 11:49+0800\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"contacts&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-01-12 17:23+0000\n"
+"PO-Revision-Date: 2013-02-04 20:00+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.3\n"
+"X-Generator: Poedit 1.5.4\n"
 
-#: ../data/gnome-contacts.desktop.in.in.h:1 ../src/contacts-app.vala:240
+#: ../data/gnome-contacts.desktop.in.in.h:1 ../src/contacts-app.vala:273
 #: ../src/main.vala:28
 msgid "Contacts"
 msgstr "聯絡人"
 
+#: ../data/gnome-contacts.desktop.in.in.h:2
+msgid "friends;address book;"
+msgstr "friends;address book;朋友;通訊錄;"
+
 #: ../src/app-menu.ui.h:1
 msgid "_Change Address Book..."
 msgstr "改變通訊錄(_C)…"
@@ -40,74 +44,86 @@ msgstr "求助(_H)"
 msgid "_Quit"
 msgstr "結束(_Q)"
 
-#: ../src/contacts-app.vala:79
+#: ../src/contacts-app.vala:106
 #, c-format
 msgid "No contact with id %s found"
 msgstr "顯示具有 id %s 的聯絡人"
 
-#: ../src/contacts-app.vala:80 ../src/contacts-app.vala:204
+#: ../src/contacts-app.vala:107 ../src/contacts-app.vala:231
 msgid "Contact not found"
 msgstr "找不到聯絡人"
 
-#: ../src/contacts-app.vala:89
+#: ../src/contacts-app.vala:116
 msgid "Change Address Book"
 msgstr "改變通訊錄"
 
-#: ../src/contacts-app.vala:94 ../src/contacts-setup-window.vala:152
+#: ../src/contacts-app.vala:121 ../src/contacts-setup-window.vala:152
 msgid "Select"
 msgstr "選取"
 
-#: ../src/contacts-app.vala:182
+#: ../src/contacts-app.vala:209
 msgid "translator-credits"
 msgstr ""
 "Cheng-Chia Tseng <pswo10680@gmail.com>, 2011.\n"
 "Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>, 2011."
 
-#: ../src/contacts-app.vala:183
+#: ../src/contacts-app.vala:210
 msgid "GNOME Contacts"
 msgstr "GNOME 聯絡人"
 
-#: ../src/contacts-app.vala:184
+#: ../src/contacts-app.vala:211
 msgid "About GNOME Contacts"
 msgstr "關於 GNOME 聯絡人"
 
-#: ../src/contacts-app.vala:185
+#: ../src/contacts-app.vala:212
 msgid "Contact Management Application"
 msgstr "聯絡人管理應用程式"
 
-#: ../src/contacts-app.vala:203
+#: ../src/contacts-app.vala:230
 #, c-format
 msgid "No contact with email address %s found"
 msgstr "找不到有電子郵件位址 %s 的聯絡人"
 
-#: ../src/contacts-app.vala:256
+#: ../src/contacts-app.vala:287
 msgid "New"
 msgstr "新增"
 
-#: ../src/contacts-app.vala:391
+#: ../src/contacts-app.vala:314
+msgid "Edit"
+msgstr "編輯"
+
+#: ../src/contacts-app.vala:320
+msgid "Done"
+msgstr "完成"
+
+#: ../src/contacts-app.vala:357
+msgid "Editing"
+msgstr "編輯"
+
+#: ../src/contacts-app.vala:470
 #, c-format
 msgid "Contact deleted: \"%s\""
 msgstr "聯絡人已刪除列：「%s」"
 
-#: ../src/contacts-app.vala:418
+#: ../src/contacts-app.vala:496
 msgid "Show contact with this individual id"
 msgstr "顯示具有此個人 id 的聯絡人"
 
-#: ../src/contacts-app.vala:420
+#: ../src/contacts-app.vala:498
 msgid "Show contact with this email address"
 msgstr "顯示具有這個電子郵件位址的聯絡人"
 
-#: ../src/contacts-app.vala:433
+#: ../src/contacts-app.vala:511
 #, c-format
 msgid "%s linked to %s"
 msgstr "%s 已連結到 %s"
 
-#: ../src/contacts-app.vala:435 ../src/contacts-link-dialog.vala:87
+#: ../src/contacts-app.vala:513
 #, c-format
 msgid "%s linked to the contact"
 msgstr "%s 已連結到聯絡人"
 
-#: ../src/contacts-app.vala:452
+#: ../src/contacts-app.vala:530
 msgid "— contact management"
 msgstr "— 聯絡人管理"
 
@@ -119,309 +135,302 @@ msgstr "瀏覽更多照片"
 msgid "Select Picture"
 msgstr "選擇大頭照圖片"
 
-#: ../src/contacts-avatar-dialog.vala:247 ../src/contacts-link-dialog.vala:152
+#: ../src/contacts-avatar-dialog.vala:247
+#: ../src/contacts-linked-accounts-dialog.vala:33
 msgid "Close"
 msgstr "關閉"
 
-#: ../src/contacts-contact-pane.vala:591
-msgctxt "Addresses on the Web"
-msgid "Links"
-msgstr "連結"
-
-#: ../src/contacts-contact-pane.vala:592
-msgctxt "Web address"
-msgid "Link"
-msgstr "連結"
-
-#: ../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 "電子郵件"
-
-#: ../src/contacts-contact-pane.vala:721
-#: ../src/contacts-new-contact-dialog.vala:95
-#: ../src/contacts-new-contact-dialog.vala:126
-msgid "Phone"
-msgstr "電話"
-
-#: ../src/contacts-contact-pane.vala:722 ../src/contacts-link-dialog.vala:132
-msgid "Phone number"
-msgstr "電話號碼"
-
-#: ../src/contacts-contact-pane.vala:782 ../src/contacts-contact-pane.vala:783
-msgid "Chat"
-msgstr "聊天"
-
-#: ../src/contacts-contact-pane.vala:848
+#: ../src/contacts-contact-editor.vala:331
 msgid "January"
 msgstr "一月"
 
-#: ../src/contacts-contact-pane.vala:849
+#: ../src/contacts-contact-editor.vala:332
 msgid "February"
 msgstr "二月"
 
-#: ../src/contacts-contact-pane.vala:850
+#: ../src/contacts-contact-editor.vala:333
 msgid "March"
 msgstr "三月"
 
-#: ../src/contacts-contact-pane.vala:851
+#: ../src/contacts-contact-editor.vala:334
 msgid "April"
 msgstr "四月"
 
-#: ../src/contacts-contact-pane.vala:852
+#: ../src/contacts-contact-editor.vala:335
 msgid "May"
 msgstr "五月"
 
-#: ../src/contacts-contact-pane.vala:853
+#: ../src/contacts-contact-editor.vala:336
 msgid "June"
 msgstr "六月"
 
-#: ../src/contacts-contact-pane.vala:854
+#: ../src/contacts-contact-editor.vala:337
 msgid "July"
 msgstr "七月"
 
-#: ../src/contacts-contact-pane.vala:855
+#: ../src/contacts-contact-editor.vala:338
 msgid "August"
 msgstr "八月"
 
-#: ../src/contacts-contact-pane.vala:856
+#: ../src/contacts-contact-editor.vala:339
 msgid "September"
 msgstr "九月"
 
-#: ../src/contacts-contact-pane.vala:857
+#: ../src/contacts-contact-editor.vala:340
 msgid "October"
 msgstr "十月"
 
-#: ../src/contacts-contact-pane.vala:858
+#: ../src/contacts-contact-editor.vala:341
 msgid "November"
 msgstr "十一月"
 
-#: ../src/contacts-contact-pane.vala:859
+#: ../src/contacts-contact-editor.vala:342
 msgid "December"
 msgstr "十二月"
 
-#: ../src/contacts-contact-pane.vala:897 ../src/contacts-contact-pane.vala:898
-msgid "Birthday"
-msgstr "生日"
+#: ../src/contacts-contact-editor.vala:464
+#: ../src/contacts-contact-editor.vala:471
+#: ../src/contacts-contact-sheet.vala:169
+msgid "Website"
+msgstr "網站"
 
-#: ../src/contacts-contact-pane.vala:970 ../src/contacts-contact-pane.vala:971
+#: ../src/contacts-contact-editor.vala:490
+#: ../src/contacts-contact-editor.vala:497
+#: ../src/contacts-contact-pane.vala:395
+#: ../src/contacts-contact-sheet.vala:179
 msgid "Nickname"
 msgstr "網名"
 
-#: ../src/contacts-contact-pane.vala:1061
-#: ../src/contacts-contact-pane.vala:1062
+#: ../src/contacts-contact-editor.vala:517
+#: ../src/contacts-contact-editor.vala:524
+#: ../src/contacts-contact-pane.vala:400
+#: ../src/contacts-contact-sheet.vala:186
+msgid "Birthday"
+msgstr "生日"
+
+#: ../src/contacts-contact-editor.vala:544
+#: ../src/contacts-contact-editor.vala:551
+#: ../src/contacts-contact-sheet.vala:193
 msgid "Note"
 msgstr "備註"
 
-#: ../src/contacts-contact-pane.vala:1201
-msgid "Addresses"
-msgstr "地址"
-
-#: ../src/contacts-contact-pane.vala:1202
-#: ../src/contacts-new-contact-dialog.vala:104
-#: ../src/contacts-new-contact-dialog.vala:131
-msgid "Address"
-msgstr "地址"
-
-#: ../src/contacts-contact-pane.vala:1304
-msgid "Add to My Contacts"
-msgstr "加入我的聯絡人"
-
-#: ../src/contacts-contact-pane.vala:1314
-msgid "Unlink"
-msgstr "取消連結"
-
-#: ../src/contacts-contact-pane.vala:1346
-msgid "Add detail..."
-msgstr "加入詳細資料…"
-
-#: ../src/contacts-contact-pane.vala:1361
-#, c-format
-msgid "Select detail to add to %s"
-msgstr "選擇要加入 %s 的詳細資料"
-
-#: ../src/contacts-contact-pane.vala:1752
+#: ../src/contacts-contact-pane.vala:183
 #, c-format
 msgid "Does %s from %s belong here?"
 msgstr "來自 %2$s 的 %1$s 屬於這裏嗎？"
 
-#: ../src/contacts-contact-pane.vala:1754
+#: ../src/contacts-contact-pane.vala:185
 #, c-format
 msgid "Do these details belong to %s?"
 msgstr "這些詳細資料屬於 %s 嗎？"
 
-#: ../src/contacts-contact-pane.vala:1764
+#: ../src/contacts-contact-pane.vala:196
 msgid "Yes"
 msgstr "是"
 
-#: ../src/contacts-contact-pane.vala:1765
+#: ../src/contacts-contact-pane.vala:197
 msgid "No"
 msgstr "否"
 
-#: ../src/contacts-contact-pane.vala:1962
-msgid "Select email address"
-msgstr "選擇電子郵件位址"
+#: ../src/contacts-contact-pane.vala:349
+#| msgid "Add Detail"
+msgid "New Detail"
+msgstr "加入詳細資料"
 
-#: ../src/contacts-contact-pane.vala:2035
-msgid "Select what to call"
-msgstr "選擇要打給誰"
+#. building menu
+#: ../src/contacts-contact-pane.vala:363
+#| msgid "Personal"
+msgid "Personal email"
+msgstr "個人電子郵件"
 
-#: ../src/contacts-contact-pane.vala:2099
-msgid "Select chat account"
-msgstr "選擇聊天帳號"
+#: ../src/contacts-contact-pane.vala:368
+#| msgid "Work Fax"
+msgid "Work email"
+msgstr "工作電子郵件"
 
-#: ../src/contacts-contact-pane.vala:2179
-msgid "Add/Remove Linked Contacts..."
-msgstr "加入/移除已連結的聯絡人…"
+#: ../src/contacts-contact-pane.vala:374
+#| msgid "Mobile"
+msgid "Mobile phone"
+msgstr "流動電話"
 
-#. Utils.add_menu_item (context_menu,_("Send..."));
-#: ../src/contacts-contact-pane.vala:2183
-msgid "Delete"
-msgstr "刪除"
+#: ../src/contacts-contact-pane.vala:379
+msgid "Home phone"
+msgstr "家用電話"
 
-#: ../src/contacts-contact.vala:686
+#: ../src/contacts-contact-pane.vala:384
+msgid "Work phone"
+msgstr "工作電話"
+
+#: ../src/contacts-contact-pane.vala:390
+msgid "Link"
+msgstr "連結"
+
+#: ../src/contacts-contact-pane.vala:406
+#| msgid "Address"
+msgid "Home address"
+msgstr "住址"
+
+#: ../src/contacts-contact-pane.vala:411
+#| msgid "Address"
+msgid "Work address"
+msgstr "工作地址"
+
+#: ../src/contacts-contact-pane.vala:417
+#| msgid "Note"
+msgid "Notes"
+msgstr "筆記"
+
+#: ../src/contacts-contact-pane.vala:434
+#| msgid "Online Accounts"
+msgid "Linked Accounts"
+msgstr "連結的帳號"
+
+#: ../src/contacts-contact-pane.vala:446
+#| msgid "Create Contact"
+msgid "Remove Contact"
+msgstr "移除聯絡人"
+
+#: ../src/contacts-contact.vala:710
 msgid "Street"
 msgstr "街道"
 
-#: ../src/contacts-contact.vala:686
+#: ../src/contacts-contact.vala:710
 msgid "Extension"
 msgstr "延伸"
 
-#: ../src/contacts-contact.vala:686
+#: ../src/contacts-contact.vala:710
 msgid "City"
 msgstr "城市"
 
-#: ../src/contacts-contact.vala:686
+#: ../src/contacts-contact.vala:710
 msgid "State/Province"
 msgstr "州/省"
 
-#: ../src/contacts-contact.vala:686
+#: ../src/contacts-contact.vala:710
 msgid "Zip/Postal Code"
 msgstr "郵遞區號"
 
-#: ../src/contacts-contact.vala:686
+#: ../src/contacts-contact.vala:710
 msgid "PO box"
 msgstr "郵政信箱"
 
-#: ../src/contacts-contact.vala:686
+#: ../src/contacts-contact.vala:710
 msgid "Country"
 msgstr "國家"
 
-#: ../src/contacts-contact.vala:742
+#: ../src/contacts-contact.vala:766
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../src/contacts-contact.vala:743
+#: ../src/contacts-contact.vala:767
 msgid "Ovi Chat"
 msgstr "Ovi Chat"
 
-#: ../src/contacts-contact.vala:744 ../src/contacts-contact.vala:1026
+#: ../src/contacts-contact.vala:768 ../src/contacts-contact.vala:1052
 msgid "Facebook"
 msgstr "Facebook"
 
-#: ../src/contacts-contact.vala:745
+#: ../src/contacts-contact.vala:769
 msgid "Livejournal"
 msgstr "Livejournal"
 
-#: ../src/contacts-contact.vala:746
+#: ../src/contacts-contact.vala:770
 msgid "AOL Instant Messenger"
 msgstr "AOL 即時通訊"
 
-#: ../src/contacts-contact.vala:747
+#: ../src/contacts-contact.vala:771
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../src/contacts-contact.vala:748
+#: ../src/contacts-contact.vala:772
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: ../src/contacts-contact.vala:749
+#: ../src/contacts-contact.vala:773
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../src/contacts-contact.vala:750
+#: ../src/contacts-contact.vala:774
 msgid "IRC"
 msgstr "IRC"
 
-#: ../src/contacts-contact.vala:751
+#: ../src/contacts-contact.vala:775
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/contacts-contact.vala:752
+#: ../src/contacts-contact.vala:776
 msgid "Local network"
 msgstr "區域網絡"
 
-#: ../src/contacts-contact.vala:753
+#: ../src/contacts-contact.vala:777
 msgid "Windows Live Messenger"
 msgstr "Windows Live Messenger"
 
-#: ../src/contacts-contact.vala:754
+#: ../src/contacts-contact.vala:778
 msgid "MySpace"
 msgstr "MySpace"
 
-#: ../src/contacts-contact.vala:755
+#: ../src/contacts-contact.vala:779
 msgid "MXit"
 msgstr "MXit"
 
-#: ../src/contacts-contact.vala:756
+#: ../src/contacts-contact.vala:780
 msgid "Napster"
 msgstr "Napster"
 
-#: ../src/contacts-contact.vala:757
+#: ../src/contacts-contact.vala:781
 msgid "Tencent QQ"
 msgstr "Tencent QQ"
 
-#: ../src/contacts-contact.vala:758
+#: ../src/contacts-contact.vala:782
 msgid "IBM Lotus Sametime"
 msgstr "IBM Lotus Sametime"
 
-#: ../src/contacts-contact.vala:759
+#: ../src/contacts-contact.vala:783
 msgid "SILC"
 msgstr "SILC"
 
-#: ../src/contacts-contact.vala:760
+#: ../src/contacts-contact.vala:784
 msgid "sip"
 msgstr "sip"
 
-#: ../src/contacts-contact.vala:761
+#: ../src/contacts-contact.vala:785
 msgid "Skype"
 msgstr "Skype"
 
-#: ../src/contacts-contact.vala:762
+#: ../src/contacts-contact.vala:786
 msgid "Telephony"
 msgstr "Telephony"
 
-#: ../src/contacts-contact.vala:763
+#: ../src/contacts-contact.vala:787
 msgid "Trepia"
 msgstr "Trepia"
 
-#: ../src/contacts-contact.vala:764 ../src/contacts-contact.vala:765
+#: ../src/contacts-contact.vala:788 ../src/contacts-contact.vala:789
 msgid "Yahoo! Messenger"
 msgstr "Yahoo! 即時通"
 
-#: ../src/contacts-contact.vala:766
+#: ../src/contacts-contact.vala:790
 msgid "Zephyr"
 msgstr "Zephyr"
 
-#: ../src/contacts-contact.vala:1029
+#: ../src/contacts-contact.vala:1055
 msgid "Twitter"
 msgstr "Twitter"
 
-#: ../src/contacts-contact.vala:1032
+#: ../src/contacts-contact.vala:1058
 msgid "Google Profile"
 msgstr "Google 個人資料"
 
-#: ../src/contacts-contact.vala:1096
+#: ../src/contacts-contact.vala:1122
 msgid "Unexpected internal error: created contact was not found"
 msgstr "未預期的內部錯誤：找不到建立的聯絡人"
 
-#: ../src/contacts-contact.vala:1234
+#: ../src/contacts-contact.vala:1260
 msgid "Google Circles"
 msgstr "Google 社交圈"
 
-#: ../src/contacts-contact.vala:1236
+#: ../src/contacts-contact.vala:1262
 msgid "Google Other Contact"
 msgstr "Google 其他聯絡人"
 
@@ -437,35 +446,19 @@ msgstr "Google"
 msgid "Local Contact"
 msgstr "本地端聯絡人"
 
-#: ../src/contacts-link-dialog.vala:73
-msgctxt "contacts link action"
-msgid "Link"
-msgstr "連結"
-
-#: ../src/contacts-link-dialog.vala:84
-msgid "Undo"
-msgstr "復原"
-
-#: ../src/contacts-link-dialog.vala:148
-msgid "Link Contact"
-msgstr "連結聯絡人"
-
-#: ../src/contacts-link-dialog.vala:154 ../src/contacts-setup-window.vala:137
-msgid "Cancel"
-msgstr "取消"
-
-#: ../src/contacts-link-dialog.vala:154
-msgid "Link"
-msgstr "連結"
-
-#: ../src/contacts-link-dialog.vala:182
+#: ../src/contacts-linked-accounts-dialog.vala:28
 #, c-format
-msgid "Link contacts to %s"
-msgstr "連結聯絡人到 %s"
+#| msgid "Online Accounts"
+msgid "%s - Linked Accounts"
+msgstr "%s - 連結的帳號"
 
-#: ../src/contacts-link-dialog.vala:184
-msgid "Select contact to link to"
-msgstr "選擇要連結的聯絡人"
+#: ../src/contacts-linked-accounts-dialog.vala:52
+msgid "You can manually link contacts from the contacts list"
+msgstr "你可以從聯絡人清單手動連結聯絡人"
+
+#: ../src/contacts-linked-accounts-dialog.vala:98
+msgid "Remove"
+msgstr "移除"
 
 #: ../src/contacts-new-contact-dialog.vala:35
 msgid "New contact"
@@ -487,6 +480,21 @@ msgstr ""
 msgid "Contact Name"
 msgstr "聯絡人名稱"
 
+#: ../src/contacts-new-contact-dialog.vala:86
+#: ../src/contacts-new-contact-dialog.vala:121
+msgid "Email"
+msgstr "電子郵件"
+
+#: ../src/contacts-new-contact-dialog.vala:95
+#: ../src/contacts-new-contact-dialog.vala:126
+msgid "Phone"
+msgstr "電話"
+
+#: ../src/contacts-new-contact-dialog.vala:104
+#: ../src/contacts-new-contact-dialog.vala:131
+msgid "Address"
+msgstr "地址"
+
 #: ../src/contacts-new-contact-dialog.vala:113
 msgid "Add Detail"
 msgstr "加入詳細資料"
@@ -533,75 +541,81 @@ msgstr "使用本地通訊錄"
 msgid "Contacts Setup"
 msgstr "聯絡人設定"
 
-#: ../src/contacts-types.vala:113 ../src/contacts-types.vala:133
-#: ../src/contacts-types.vala:234 ../src/contacts-types.vala:324
+#: ../src/contacts-setup-window.vala:137
+msgid "Cancel"
+msgstr "取消"
+
+#: ../src/contacts-types.vala:113 ../src/contacts-types.vala:125
+#: ../src/contacts-types.vala:226 ../src/contacts-types.vala:339
 msgid "Other"
 msgstr "其他"
 
-#: ../src/contacts-types.vala:121
-msgid "Custom..."
-msgstr "自選…"
-
 #. List most specific first, always in upper case
-#: ../src/contacts-types.vala:289 ../src/contacts-types.vala:320
+#: ../src/contacts-types.vala:281 ../src/contacts-types.vala:335
 msgid "Home"
 msgstr "住家"
 
-#: ../src/contacts-types.vala:290 ../src/contacts-types.vala:315
+#: ../src/contacts-types.vala:282 ../src/contacts-types.vala:305
+#: ../src/contacts-types.vala:330
 msgid "Work"
 msgstr "工作"
 
 #. List most specific first, always in upper case
-#: ../src/contacts-types.vala:314
+#: ../src/contacts-types.vala:304
+msgid "Personal"
+msgstr "個人"
+
+#. List most specific first, always in upper case
+#: ../src/contacts-types.vala:329
 msgid "Assistant"
 msgstr "助理"
 
-#: ../src/contacts-types.vala:316
+#: ../src/contacts-types.vala:331
 msgid "Work Fax"
 msgstr "商務傅真"
 
-#: ../src/contacts-types.vala:317
+#: ../src/contacts-types.vala:332
 msgid "Callback"
 msgstr "回電"
 
-#: ../src/contacts-types.vala:318
+#: ../src/contacts-types.vala:333
 msgid "Car"
 msgstr "汽車電話"
 
-#: ../src/contacts-types.vala:319
+#: ../src/contacts-types.vala:334
 msgid "Company"
 msgstr "公司"
 
-#: ../src/contacts-types.vala:321
+#: ../src/contacts-types.vala:336
 msgid "Home Fax"
 msgstr "家用傳真"
 
-#: ../src/contacts-types.vala:322
+#: ../src/contacts-types.vala:337
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../src/contacts-types.vala:323
+#: ../src/contacts-types.vala:338
 msgid "Mobile"
 msgstr "流動電話"
 
-#: ../src/contacts-types.vala:325
+#: ../src/contacts-types.vala:340
 msgid "Fax"
 msgstr "傳真"
 
-#: ../src/contacts-types.vala:326
+#: ../src/contacts-types.vala:341
 msgid "Pager"
 msgstr "傳呼機"
 
-#: ../src/contacts-types.vala:327
+#: ../src/contacts-types.vala:342
 msgid "Radio"
 msgstr "無線電電話"
 
-#: ../src/contacts-types.vala:328
+#: ../src/contacts-types.vala:343
 msgid "Telex"
 msgstr "電報"
 
 #. To translators: TTY is Teletypewriter
-#: ../src/contacts-types.vala:330
+#: ../src/contacts-types.vala:345
 msgid "TTY"
 msgstr "TTY"
 
@@ -621,6 +635,69 @@ msgstr "首次設定完成。"
 msgid "Set to true when the user ran the first-time setup wizard."
 msgstr "當使用者執行完首次設定精靈後設定為「true」。"
 
+#~ msgctxt "Addresses on the Web"
+#~ msgid "Links"
+#~ msgstr "連結"
+
+#~ msgctxt "Web address"
+#~ msgid "Link"
+#~ msgstr "連結"
+
+#~ msgid "Phone number"
+#~ msgstr "電話號碼"
+
+#~ msgid "Chat"
+#~ msgstr "聊天"
+
+#~ msgid "Addresses"
+#~ msgstr "地址"
+
+#~ msgid "Add to My Contacts"
+#~ msgstr "加入我的連絡人"
+
+#~ msgid "Unlink"
+#~ msgstr "取消連結"
+
+#~ msgid "Add detail..."
+#~ msgstr "加入詳細資料…"
+
+#~ msgid "Select detail to add to %s"
+#~ msgstr "選擇要加入 %s 的詳細資料"
+
+#~ msgid "Select email address"
+#~ msgstr "選擇電子郵件位址"
+
+#~ msgid "Select what to call"
+#~ msgstr "選擇要打給誰"
+
+#~ msgid "Select chat account"
+#~ msgstr "選擇聊天帳號"
+
+#~ msgid "Add/Remove Linked Contacts..."
+#~ msgstr "加入/移除已連結的連絡人…"
+
+#~ msgid "Delete"
+#~ msgstr "刪除"
+
+#~ msgctxt "contacts link action"
+#~ msgid "Link"
+#~ msgstr "連結"
+
+#~ msgid "Undo"
+#~ msgstr "復原"
+
+#~ msgid "Link Contact"
+#~ msgstr "連結連絡人"
+
+#~ msgid "Link contacts to %s"
+#~ msgstr "連結連絡人到 %s"
+
+#~ msgid "Select contact to link to"
+#~ msgstr "選擇要連結的連絡人"
+
+#~ msgid "Custom..."
+#~ msgstr "自訂…"
+
 #~ msgid "<span weight='bold'>Link contacts to %s</span>"
 #~ msgstr "<span weight='bold'>連結連絡人到 %s</span>"
 
@@ -648,9 +725,6 @@ msgstr "當使用者執行完首次設定精靈後設定為「true」。"
 #~ msgid "Hidden"
 #~ msgstr "隱藏"
 
-#~ msgid "Personal"
-#~ msgstr "個人"
-
 #~ msgid "Add..."
 #~ msgstr "加入…"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index a7b8300..b16d05b 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,23 +7,27 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-contacts 3.3.90\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-26 11:49+0800\n"
-"PO-Revision-Date: 2012-09-26 11:29+0800\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"contacts&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-01-12 17:23+0000\n"
+"PO-Revision-Date: 2013-02-04 15:49+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (Taiwan) <chinese-l10n@googlegroups.com>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.3\n"
+"X-Generator: Poedit 1.5.4\n"
 
-#: ../data/gnome-contacts.desktop.in.in.h:1 ../src/contacts-app.vala:240
+#: ../data/gnome-contacts.desktop.in.in.h:1 ../src/contacts-app.vala:273
 #: ../src/main.vala:28
 msgid "Contacts"
 msgstr "連絡人"
 
+#: ../data/gnome-contacts.desktop.in.in.h:2
+msgid "friends;address book;"
+msgstr "friends;address book;朋友;通訊錄;"
+
 #: ../src/app-menu.ui.h:1
 msgid "_Change Address Book..."
 msgstr "改變通訊錄(_C)…"
@@ -40,74 +44,86 @@ msgstr "求助(_H)"
 msgid "_Quit"
 msgstr "結束(_Q)"
 
-#: ../src/contacts-app.vala:79
+#: ../src/contacts-app.vala:106
 #, c-format
 msgid "No contact with id %s found"
 msgstr "顯示具有 id %s 的連絡人"
 
-#: ../src/contacts-app.vala:80 ../src/contacts-app.vala:204
+#: ../src/contacts-app.vala:107 ../src/contacts-app.vala:231
 msgid "Contact not found"
 msgstr "找不到連絡人"
 
-#: ../src/contacts-app.vala:89
+#: ../src/contacts-app.vala:116
 msgid "Change Address Book"
 msgstr "改變通訊錄"
 
-#: ../src/contacts-app.vala:94 ../src/contacts-setup-window.vala:152
+#: ../src/contacts-app.vala:121 ../src/contacts-setup-window.vala:152
 msgid "Select"
 msgstr "選取"
 
-#: ../src/contacts-app.vala:182
+#: ../src/contacts-app.vala:209
 msgid "translator-credits"
 msgstr ""
 "Cheng-Chia Tseng <pswo10680@gmail.com>, 2011.\n"
 "Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>, 2011."
 
-#: ../src/contacts-app.vala:183
+#: ../src/contacts-app.vala:210
 msgid "GNOME Contacts"
 msgstr "GNOME 連絡人"
 
-#: ../src/contacts-app.vala:184
+#: ../src/contacts-app.vala:211
 msgid "About GNOME Contacts"
 msgstr "關於 GNOME 連絡人"
 
-#: ../src/contacts-app.vala:185
+#: ../src/contacts-app.vala:212
 msgid "Contact Management Application"
 msgstr "連絡人管理應用程式"
 
-#: ../src/contacts-app.vala:203
+#: ../src/contacts-app.vala:230
 #, c-format
 msgid "No contact with email address %s found"
 msgstr "找不到有電子郵件位址 %s 的連絡人"
 
-#: ../src/contacts-app.vala:256
+#: ../src/contacts-app.vala:287
 msgid "New"
 msgstr "新增"
 
-#: ../src/contacts-app.vala:391
+#: ../src/contacts-app.vala:314
+msgid "Edit"
+msgstr "編輯"
+
+#: ../src/contacts-app.vala:320
+msgid "Done"
+msgstr "完成"
+
+#: ../src/contacts-app.vala:357
+msgid "Editing"
+msgstr "編輯"
+
+#: ../src/contacts-app.vala:470
 #, c-format
 msgid "Contact deleted: \"%s\""
 msgstr "連絡人已刪除列：「%s」"
 
-#: ../src/contacts-app.vala:418
+#: ../src/contacts-app.vala:496
 msgid "Show contact with this individual id"
 msgstr "顯示具有此個人 id 的連絡人"
 
-#: ../src/contacts-app.vala:420
+#: ../src/contacts-app.vala:498
 msgid "Show contact with this email address"
 msgstr "顯示具有這個電子郵件位址的連絡人"
 
-#: ../src/contacts-app.vala:433
+#: ../src/contacts-app.vala:511
 #, c-format
 msgid "%s linked to %s"
 msgstr "%s 已連結到 %s"
 
-#: ../src/contacts-app.vala:435 ../src/contacts-link-dialog.vala:87
+#: ../src/contacts-app.vala:513
 #, c-format
 msgid "%s linked to the contact"
 msgstr "%s 已連結到連絡人"
 
-#: ../src/contacts-app.vala:452
+#: ../src/contacts-app.vala:530
 msgid "— contact management"
 msgstr "— 連絡人管理"
 
@@ -119,309 +135,302 @@ msgstr "瀏覽更多照片"
 msgid "Select Picture"
 msgstr "選擇大頭照圖片"
 
-#: ../src/contacts-avatar-dialog.vala:247 ../src/contacts-link-dialog.vala:152
+#: ../src/contacts-avatar-dialog.vala:247
+#: ../src/contacts-linked-accounts-dialog.vala:33
 msgid "Close"
 msgstr "關閉"
 
-#: ../src/contacts-contact-pane.vala:591
-msgctxt "Addresses on the Web"
-msgid "Links"
-msgstr "連結"
-
-#: ../src/contacts-contact-pane.vala:592
-msgctxt "Web address"
-msgid "Link"
-msgstr "連結"
-
-#: ../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 "電子郵件"
-
-#: ../src/contacts-contact-pane.vala:721
-#: ../src/contacts-new-contact-dialog.vala:95
-#: ../src/contacts-new-contact-dialog.vala:126
-msgid "Phone"
-msgstr "電話"
-
-#: ../src/contacts-contact-pane.vala:722 ../src/contacts-link-dialog.vala:132
-msgid "Phone number"
-msgstr "電話號碼"
-
-#: ../src/contacts-contact-pane.vala:782 ../src/contacts-contact-pane.vala:783
-msgid "Chat"
-msgstr "聊天"
-
-#: ../src/contacts-contact-pane.vala:848
+#: ../src/contacts-contact-editor.vala:331
 msgid "January"
 msgstr "一月"
 
-#: ../src/contacts-contact-pane.vala:849
+#: ../src/contacts-contact-editor.vala:332
 msgid "February"
 msgstr "二月"
 
-#: ../src/contacts-contact-pane.vala:850
+#: ../src/contacts-contact-editor.vala:333
 msgid "March"
 msgstr "三月"
 
-#: ../src/contacts-contact-pane.vala:851
+#: ../src/contacts-contact-editor.vala:334
 msgid "April"
 msgstr "四月"
 
-#: ../src/contacts-contact-pane.vala:852
+#: ../src/contacts-contact-editor.vala:335
 msgid "May"
 msgstr "五月"
 
-#: ../src/contacts-contact-pane.vala:853
+#: ../src/contacts-contact-editor.vala:336
 msgid "June"
 msgstr "六月"
 
-#: ../src/contacts-contact-pane.vala:854
+#: ../src/contacts-contact-editor.vala:337
 msgid "July"
 msgstr "七月"
 
-#: ../src/contacts-contact-pane.vala:855
+#: ../src/contacts-contact-editor.vala:338
 msgid "August"
 msgstr "八月"
 
-#: ../src/contacts-contact-pane.vala:856
+#: ../src/contacts-contact-editor.vala:339
 msgid "September"
 msgstr "九月"
 
-#: ../src/contacts-contact-pane.vala:857
+#: ../src/contacts-contact-editor.vala:340
 msgid "October"
 msgstr "十月"
 
-#: ../src/contacts-contact-pane.vala:858
+#: ../src/contacts-contact-editor.vala:341
 msgid "November"
 msgstr "十一月"
 
-#: ../src/contacts-contact-pane.vala:859
+#: ../src/contacts-contact-editor.vala:342
 msgid "December"
 msgstr "十二月"
 
-#: ../src/contacts-contact-pane.vala:897 ../src/contacts-contact-pane.vala:898
-msgid "Birthday"
-msgstr "生日"
+#: ../src/contacts-contact-editor.vala:464
+#: ../src/contacts-contact-editor.vala:471
+#: ../src/contacts-contact-sheet.vala:169
+msgid "Website"
+msgstr "網站"
 
-#: ../src/contacts-contact-pane.vala:970 ../src/contacts-contact-pane.vala:971
+#: ../src/contacts-contact-editor.vala:490
+#: ../src/contacts-contact-editor.vala:497
+#: ../src/contacts-contact-pane.vala:395
+#: ../src/contacts-contact-sheet.vala:179
 msgid "Nickname"
 msgstr "暱稱"
 
-#: ../src/contacts-contact-pane.vala:1061
-#: ../src/contacts-contact-pane.vala:1062
+#: ../src/contacts-contact-editor.vala:517
+#: ../src/contacts-contact-editor.vala:524
+#: ../src/contacts-contact-pane.vala:400
+#: ../src/contacts-contact-sheet.vala:186
+msgid "Birthday"
+msgstr "生日"
+
+#: ../src/contacts-contact-editor.vala:544
+#: ../src/contacts-contact-editor.vala:551
+#: ../src/contacts-contact-sheet.vala:193
 msgid "Note"
 msgstr "備註"
 
-#: ../src/contacts-contact-pane.vala:1201
-msgid "Addresses"
-msgstr "地址"
-
-#: ../src/contacts-contact-pane.vala:1202
-#: ../src/contacts-new-contact-dialog.vala:104
-#: ../src/contacts-new-contact-dialog.vala:131
-msgid "Address"
-msgstr "地址"
-
-#: ../src/contacts-contact-pane.vala:1304
-msgid "Add to My Contacts"
-msgstr "加入我的連絡人"
-
-#: ../src/contacts-contact-pane.vala:1314
-msgid "Unlink"
-msgstr "取消連結"
-
-#: ../src/contacts-contact-pane.vala:1346
-msgid "Add detail..."
-msgstr "加入詳細資料…"
-
-#: ../src/contacts-contact-pane.vala:1361
-#, c-format
-msgid "Select detail to add to %s"
-msgstr "選擇要加入 %s 的詳細資料"
-
-#: ../src/contacts-contact-pane.vala:1752
+#: ../src/contacts-contact-pane.vala:183
 #, c-format
 msgid "Does %s from %s belong here?"
 msgstr "來自 %2$s 的 %1$s 屬於這裡嗎？"
 
-#: ../src/contacts-contact-pane.vala:1754
+#: ../src/contacts-contact-pane.vala:185
 #, c-format
 msgid "Do these details belong to %s?"
 msgstr "這些詳細資料屬於 %s 嗎？"
 
-#: ../src/contacts-contact-pane.vala:1764
+#: ../src/contacts-contact-pane.vala:196
 msgid "Yes"
 msgstr "是"
 
-#: ../src/contacts-contact-pane.vala:1765
+#: ../src/contacts-contact-pane.vala:197
 msgid "No"
 msgstr "否"
 
-#: ../src/contacts-contact-pane.vala:1962
-msgid "Select email address"
-msgstr "選擇電子郵件位址"
+#: ../src/contacts-contact-pane.vala:349
+#| msgid "Add Detail"
+msgid "New Detail"
+msgstr "加入詳細資料"
 
-#: ../src/contacts-contact-pane.vala:2035
-msgid "Select what to call"
-msgstr "選擇要打給誰"
+#. building menu
+#: ../src/contacts-contact-pane.vala:363
+#| msgid "Personal"
+msgid "Personal email"
+msgstr "個人電子郵件"
 
-#: ../src/contacts-contact-pane.vala:2099
-msgid "Select chat account"
-msgstr "選擇聊天帳號"
+#: ../src/contacts-contact-pane.vala:368
+#| msgid "Work Fax"
+msgid "Work email"
+msgstr "工作電子郵件"
 
-#: ../src/contacts-contact-pane.vala:2179
-msgid "Add/Remove Linked Contacts..."
-msgstr "加入/移除已連結的連絡人…"
+#: ../src/contacts-contact-pane.vala:374
+#| msgid "Mobile"
+msgid "Mobile phone"
+msgstr "行動電話"
 
-#. Utils.add_menu_item (context_menu,_("Send..."));
-#: ../src/contacts-contact-pane.vala:2183
-msgid "Delete"
-msgstr "刪除"
+#: ../src/contacts-contact-pane.vala:379
+msgid "Home phone"
+msgstr "住家電話"
 
-#: ../src/contacts-contact.vala:686
+#: ../src/contacts-contact-pane.vala:384
+msgid "Work phone"
+msgstr "工作電話"
+
+#: ../src/contacts-contact-pane.vala:390
+msgid "Link"
+msgstr "連結"
+
+#: ../src/contacts-contact-pane.vala:406
+#| msgid "Address"
+msgid "Home address"
+msgstr "住家地址"
+
+#: ../src/contacts-contact-pane.vala:411
+#| msgid "Address"
+msgid "Work address"
+msgstr "工作地址"
+
+#: ../src/contacts-contact-pane.vala:417
+#| msgid "Note"
+msgid "Notes"
+msgstr "筆記"
+
+#: ../src/contacts-contact-pane.vala:434
+#| msgid "Online Accounts"
+msgid "Linked Accounts"
+msgstr "連結的帳號"
+
+#: ../src/contacts-contact-pane.vala:446
+#| msgid "Create Contact"
+msgid "Remove Contact"
+msgstr "移除連絡人"
+
+#: ../src/contacts-contact.vala:710
 msgid "Street"
 msgstr "街道"
 
-#: ../src/contacts-contact.vala:686
+#: ../src/contacts-contact.vala:710
 msgid "Extension"
 msgstr "延伸"
 
-#: ../src/contacts-contact.vala:686
+#: ../src/contacts-contact.vala:710
 msgid "City"
 msgstr "城市"
 
-#: ../src/contacts-contact.vala:686
+#: ../src/contacts-contact.vala:710
 msgid "State/Province"
 msgstr "州/省"
 
-#: ../src/contacts-contact.vala:686
+#: ../src/contacts-contact.vala:710
 msgid "Zip/Postal Code"
 msgstr "郵遞區號"
 
-#: ../src/contacts-contact.vala:686
+#: ../src/contacts-contact.vala:710
 msgid "PO box"
 msgstr "郵政信箱"
 
-#: ../src/contacts-contact.vala:686
+#: ../src/contacts-contact.vala:710
 msgid "Country"
 msgstr "國家"
 
-#: ../src/contacts-contact.vala:742
+#: ../src/contacts-contact.vala:766
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../src/contacts-contact.vala:743
+#: ../src/contacts-contact.vala:767
 msgid "Ovi Chat"
 msgstr "Ovi Chat"
 
-#: ../src/contacts-contact.vala:744 ../src/contacts-contact.vala:1026
+#: ../src/contacts-contact.vala:768 ../src/contacts-contact.vala:1052
 msgid "Facebook"
 msgstr "Facebook"
 
-#: ../src/contacts-contact.vala:745
+#: ../src/contacts-contact.vala:769
 msgid "Livejournal"
 msgstr "Livejournal"
 
-#: ../src/contacts-contact.vala:746
+#: ../src/contacts-contact.vala:770
 msgid "AOL Instant Messenger"
 msgstr "AOL 即時通訊"
 
-#: ../src/contacts-contact.vala:747
+#: ../src/contacts-contact.vala:771
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../src/contacts-contact.vala:748
+#: ../src/contacts-contact.vala:772
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: ../src/contacts-contact.vala:749
+#: ../src/contacts-contact.vala:773
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../src/contacts-contact.vala:750
+#: ../src/contacts-contact.vala:774
 msgid "IRC"
 msgstr "IRC"
 
-#: ../src/contacts-contact.vala:751
+#: ../src/contacts-contact.vala:775
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/contacts-contact.vala:752
+#: ../src/contacts-contact.vala:776
 msgid "Local network"
 msgstr "區域網路"
 
-#: ../src/contacts-contact.vala:753
+#: ../src/contacts-contact.vala:777
 msgid "Windows Live Messenger"
 msgstr "Windows Live Messenger"
 
-#: ../src/contacts-contact.vala:754
+#: ../src/contacts-contact.vala:778
 msgid "MySpace"
 msgstr "MySpace"
 
-#: ../src/contacts-contact.vala:755
+#: ../src/contacts-contact.vala:779
 msgid "MXit"
 msgstr "MXit"
 
-#: ../src/contacts-contact.vala:756
+#: ../src/contacts-contact.vala:780
 msgid "Napster"
 msgstr "Napster"
 
-#: ../src/contacts-contact.vala:757
+#: ../src/contacts-contact.vala:781
 msgid "Tencent QQ"
 msgstr "Tencent QQ"
 
-#: ../src/contacts-contact.vala:758
+#: ../src/contacts-contact.vala:782
 msgid "IBM Lotus Sametime"
 msgstr "IBM Lotus Sametime"
 
-#: ../src/contacts-contact.vala:759
+#: ../src/contacts-contact.vala:783
 msgid "SILC"
 msgstr "SILC"
 
-#: ../src/contacts-contact.vala:760
+#: ../src/contacts-contact.vala:784
 msgid "sip"
 msgstr "sip"
 
-#: ../src/contacts-contact.vala:761
+#: ../src/contacts-contact.vala:785
 msgid "Skype"
 msgstr "Skype"
 
-#: ../src/contacts-contact.vala:762
+#: ../src/contacts-contact.vala:786
 msgid "Telephony"
 msgstr "Telephony"
 
-#: ../src/contacts-contact.vala:763
+#: ../src/contacts-contact.vala:787
 msgid "Trepia"
 msgstr "Trepia"
 
-#: ../src/contacts-contact.vala:764 ../src/contacts-contact.vala:765
+#: ../src/contacts-contact.vala:788 ../src/contacts-contact.vala:789
 msgid "Yahoo! Messenger"
 msgstr "Yahoo! 即時通"
 
-#: ../src/contacts-contact.vala:766
+#: ../src/contacts-contact.vala:790
 msgid "Zephyr"
 msgstr "Zephyr"
 
-#: ../src/contacts-contact.vala:1029
+#: ../src/contacts-contact.vala:1055
 msgid "Twitter"
 msgstr "Twitter"
 
-#: ../src/contacts-contact.vala:1032
+#: ../src/contacts-contact.vala:1058
 msgid "Google Profile"
 msgstr "Google 個人資料"
 
-#: ../src/contacts-contact.vala:1096
+#: ../src/contacts-contact.vala:1122
 msgid "Unexpected internal error: created contact was not found"
 msgstr "未預期的內部錯誤：找不到建立的連絡人"
 
-#: ../src/contacts-contact.vala:1234
+#: ../src/contacts-contact.vala:1260
 msgid "Google Circles"
 msgstr "Google 社交圈"
 
-#: ../src/contacts-contact.vala:1236
+#: ../src/contacts-contact.vala:1262
 msgid "Google Other Contact"
 msgstr "Google 其他連絡人"
 
@@ -437,35 +446,19 @@ msgstr "Google"
 msgid "Local Contact"
 msgstr "本地端連絡人"
 
-#: ../src/contacts-link-dialog.vala:73
-msgctxt "contacts link action"
-msgid "Link"
-msgstr "連結"
-
-#: ../src/contacts-link-dialog.vala:84
-msgid "Undo"
-msgstr "復原"
-
-#: ../src/contacts-link-dialog.vala:148
-msgid "Link Contact"
-msgstr "連結連絡人"
-
-#: ../src/contacts-link-dialog.vala:154 ../src/contacts-setup-window.vala:137
-msgid "Cancel"
-msgstr "取消"
-
-#: ../src/contacts-link-dialog.vala:154
-msgid "Link"
-msgstr "連結"
-
-#: ../src/contacts-link-dialog.vala:182
+#: ../src/contacts-linked-accounts-dialog.vala:28
 #, c-format
-msgid "Link contacts to %s"
-msgstr "連結連絡人到 %s"
+#| msgid "Online Accounts"
+msgid "%s - Linked Accounts"
+msgstr "%s - 連結的帳號"
 
-#: ../src/contacts-link-dialog.vala:184
-msgid "Select contact to link to"
-msgstr "選擇要連結的連絡人"
+#: ../src/contacts-linked-accounts-dialog.vala:52
+msgid "You can manually link contacts from the contacts list"
+msgstr "您可以從連絡人清單手動連結連絡人"
+
+#: ../src/contacts-linked-accounts-dialog.vala:98
+msgid "Remove"
+msgstr "移除"
 
 #: ../src/contacts-new-contact-dialog.vala:35
 msgid "New contact"
@@ -487,6 +480,21 @@ msgstr ""
 msgid "Contact Name"
 msgstr "連絡人名稱"
 
+#: ../src/contacts-new-contact-dialog.vala:86
+#: ../src/contacts-new-contact-dialog.vala:121
+msgid "Email"
+msgstr "電子郵件"
+
+#: ../src/contacts-new-contact-dialog.vala:95
+#: ../src/contacts-new-contact-dialog.vala:126
+msgid "Phone"
+msgstr "電話"
+
+#: ../src/contacts-new-contact-dialog.vala:104
+#: ../src/contacts-new-contact-dialog.vala:131
+msgid "Address"
+msgstr "地址"
+
 #: ../src/contacts-new-contact-dialog.vala:113
 msgid "Add Detail"
 msgstr "加入詳細資料"
@@ -533,75 +541,81 @@ msgstr "使用本地通訊錄"
 msgid "Contacts Setup"
 msgstr "連絡人設定"
 
-#: ../src/contacts-types.vala:113 ../src/contacts-types.vala:133
-#: ../src/contacts-types.vala:234 ../src/contacts-types.vala:324
+#: ../src/contacts-setup-window.vala:137
+msgid "Cancel"
+msgstr "取消"
+
+#: ../src/contacts-types.vala:113 ../src/contacts-types.vala:125
+#: ../src/contacts-types.vala:226 ../src/contacts-types.vala:339
 msgid "Other"
 msgstr "其他"
 
-#: ../src/contacts-types.vala:121
-msgid "Custom..."
-msgstr "自訂…"
-
 #. List most specific first, always in upper case
-#: ../src/contacts-types.vala:289 ../src/contacts-types.vala:320
+#: ../src/contacts-types.vala:281 ../src/contacts-types.vala:335
 msgid "Home"
 msgstr "住家"
 
-#: ../src/contacts-types.vala:290 ../src/contacts-types.vala:315
+#: ../src/contacts-types.vala:282 ../src/contacts-types.vala:305
+#: ../src/contacts-types.vala:330
 msgid "Work"
 msgstr "工作"
 
 #. List most specific first, always in upper case
-#: ../src/contacts-types.vala:314
+#: ../src/contacts-types.vala:304
+msgid "Personal"
+msgstr "個人"
+
+#. List most specific first, always in upper case
+#: ../src/contacts-types.vala:329
 msgid "Assistant"
 msgstr "助理"
 
-#: ../src/contacts-types.vala:316
+#: ../src/contacts-types.vala:331
 msgid "Work Fax"
 msgstr "商務傅真"
 
-#: ../src/contacts-types.vala:317
+#: ../src/contacts-types.vala:332
 msgid "Callback"
 msgstr "回電"
 
-#: ../src/contacts-types.vala:318
+#: ../src/contacts-types.vala:333
 msgid "Car"
 msgstr "汽車電話"
 
-#: ../src/contacts-types.vala:319
+#: ../src/contacts-types.vala:334
 msgid "Company"
 msgstr "公司"
 
-#: ../src/contacts-types.vala:321
+#: ../src/contacts-types.vala:336
 msgid "Home Fax"
 msgstr "住家傳真"
 
-#: ../src/contacts-types.vala:322
+#: ../src/contacts-types.vala:337
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../src/contacts-types.vala:323
+#: ../src/contacts-types.vala:338
 msgid "Mobile"
 msgstr "行動電話"
 
-#: ../src/contacts-types.vala:325
+#: ../src/contacts-types.vala:340
 msgid "Fax"
 msgstr "傳真"
 
-#: ../src/contacts-types.vala:326
+#: ../src/contacts-types.vala:341
 msgid "Pager"
 msgstr "呼叫器"
 
-#: ../src/contacts-types.vala:327
+#: ../src/contacts-types.vala:342
 msgid "Radio"
 msgstr "無線電電話"
 
-#: ../src/contacts-types.vala:328
+#: ../src/contacts-types.vala:343
 msgid "Telex"
 msgstr "電報"
 
 #. To translators: TTY is Teletypewriter
-#: ../src/contacts-types.vala:330
+#: ../src/contacts-types.vala:345
 msgid "TTY"
 msgstr "TTY"
 
@@ -621,6 +635,69 @@ msgstr "首次設定完成。"
 msgid "Set to true when the user ran the first-time setup wizard."
 msgstr "當使用者執行完首次設定精靈後設定為「true」。"
 
+#~ msgctxt "Addresses on the Web"
+#~ msgid "Links"
+#~ msgstr "連結"
+
+#~ msgctxt "Web address"
+#~ msgid "Link"
+#~ msgstr "連結"
+
+#~ msgid "Phone number"
+#~ msgstr "電話號碼"
+
+#~ msgid "Chat"
+#~ msgstr "聊天"
+
+#~ msgid "Addresses"
+#~ msgstr "地址"
+
+#~ msgid "Add to My Contacts"
+#~ msgstr "加入我的連絡人"
+
+#~ msgid "Unlink"
+#~ msgstr "取消連結"
+
+#~ msgid "Add detail..."
+#~ msgstr "加入詳細資料…"
+
+#~ msgid "Select detail to add to %s"
+#~ msgstr "選擇要加入 %s 的詳細資料"
+
+#~ msgid "Select email address"
+#~ msgstr "選擇電子郵件位址"
+
+#~ msgid "Select what to call"
+#~ msgstr "選擇要打給誰"
+
+#~ msgid "Select chat account"
+#~ msgstr "選擇聊天帳號"
+
+#~ msgid "Add/Remove Linked Contacts..."
+#~ msgstr "加入/移除已連結的連絡人…"
+
+#~ msgid "Delete"
+#~ msgstr "刪除"
+
+#~ msgctxt "contacts link action"
+#~ msgid "Link"
+#~ msgstr "連結"
+
+#~ msgid "Undo"
+#~ msgstr "復原"
+
+#~ msgid "Link Contact"
+#~ msgstr "連結連絡人"
+
+#~ msgid "Link contacts to %s"
+#~ msgstr "連結連絡人到 %s"
+
+#~ msgid "Select contact to link to"
+#~ msgstr "選擇要連結的連絡人"
+
+#~ msgid "Custom..."
+#~ msgstr "自訂…"
+
 #~ msgid "<span weight='bold'>Link contacts to %s</span>"
 #~ msgstr "<span weight='bold'>連結連絡人到 %s</span>"
 
@@ -648,9 +725,6 @@ msgstr "當使用者執行完首次設定精靈後設定為「true」。"
 #~ msgid "Hidden"
 #~ msgstr "隱藏"
 
-#~ msgid "Personal"
-#~ msgstr "個人"
-
 #~ msgid "Add..."
 #~ msgstr "加入…"