diff --git a/po/zh_HK.po b/po/zh_HK.po
index 4c264a4..abdfd6f 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-contacts master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-29 19:19+0800\n"
-"PO-Revision-Date: 2011-08-29 19:19+0800\n"
+"POT-Creation-Date: 2011-09-04 08:37+0800\n"
+"PO-Revision-Date: 2011-09-04 08:37+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"
@@ -16,266 +16,317 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/gnome-contacts.desktop.in.in.h:1 ../src/contacts-app.vala:102
+#: ../data/gnome-contacts.desktop.in.in.h:1 ../src/contacts-app.vala:114
 #: ../src/main.vala:36
 msgid "Contacts"
 msgstr "聯絡人"
 
-#: ../src/contacts-contact-pane.vala:654
+#: ../src/contacts-app.vala:159 ../src/main.vala:28
+msgid "Show contact with this individual id"
+msgstr "顯示具有此個人 id 的聯絡人"
+
+#: ../src/contacts-app.vala:161 ../src/main.vala:30
+msgid "Show contact with this email address"
+msgstr "顯示具有這個電子郵件位址的聯絡人"
+
+#: ../src/contacts-app.vala:168
+msgid "— contact management"
+msgstr "— 聯絡人管理"
+
+#: ../src/contacts-contact-pane.vala:592 ../src/contacts-contact-pane.vala:829
+#: ../src/contacts-contact-pane.vala:1311
+msgid "Nickname"
+msgstr "網名"
+
+#: ../src/contacts-contact-pane.vala:595
+msgid "Enter nickname"
+msgstr "輸入網名"
+
+#: ../src/contacts-contact-pane.vala:601
+msgid "Alias"
+msgstr "別名"
+
+#: ../src/contacts-contact-pane.vala:604
+msgid "Enter alias"
+msgstr "輸入別名"
+
+#: ../src/contacts-contact-pane.vala:616
 msgid "Enter email address"
 msgstr "請輸入電子郵件位址"
 
-#: ../src/contacts-contact-pane.vala:665
+#: ../src/contacts-contact-pane.vala:627
 msgid "Enter phone number"
 msgstr "請輸入電話號碼"
 
-#: ../src/contacts-contact-pane.vala:678
+#: ../src/contacts-contact-pane.vala:634
+msgid "Links"
+msgstr "連結"
+
+#: ../src/contacts-contact-pane.vala:640
 msgid "Enter link"
 msgstr "輸入連結"
 
-#: ../src/contacts-contact-pane.vala:685
+#: ../src/contacts-contact-pane.vala:647
 msgid "Street"
 msgstr "街道"
 
-#: ../src/contacts-contact-pane.vala:685
+#: ../src/contacts-contact-pane.vala:647
 msgid "Extension"
 msgstr "延伸"
 
-#: ../src/contacts-contact-pane.vala:685
+#: ../src/contacts-contact-pane.vala:647
 msgid "City"
 msgstr "城市"
 
-#: ../src/contacts-contact-pane.vala:685
+#: ../src/contacts-contact-pane.vala:647
 msgid "State/Province"
 msgstr "州/省"
 
-#: ../src/contacts-contact-pane.vala:685
+#: ../src/contacts-contact-pane.vala:647
 msgid "Zip/Postal Code"
 msgstr "郵遞區號"
 
-#: ../src/contacts-contact-pane.vala:685
+#: ../src/contacts-contact-pane.vala:647
 msgid "PO box"
 msgstr "郵政信箱"
 
-#: ../src/contacts-contact-pane.vala:685
+#: ../src/contacts-contact-pane.vala:647
 msgid "Country"
 msgstr "國家"
 
-#: ../src/contacts-contact-pane.vala:745
-#: ../src/contacts-contact-pane.vala:1221
+#: ../src/contacts-contact-pane.vala:734
+#: ../src/contacts-contact-pane.vala:1328
 msgid "Chat"
 msgstr "聊天"
 
-#: ../src/contacts-contact-pane.vala:799
+#: ../src/contacts-contact-pane.vala:786
 msgid "Add detail"
 msgstr "加入詳細資料"
 
-#: ../src/contacts-contact-pane.vala:805
+#: ../src/contacts-contact-pane.vala:792
 msgid "Email"
 msgstr "電子郵件"
 
-#: ../src/contacts-contact-pane.vala:812
+#: ../src/contacts-contact-pane.vala:800
 msgid "Phone number"
 msgstr "電話號碼"
 
-#: ../src/contacts-contact-pane.vala:819
+#: ../src/contacts-contact-pane.vala:808
 msgid "Postal Address"
 msgstr "郵寄地址"
 
-#: ../src/contacts-contact-pane.vala:827
+#: ../src/contacts-contact-pane.vala:818 ../src/contacts-link-dialog.vala:144
 msgid "Link"
 msgstr "連結"
 
-#: ../src/contacts-contact-pane.vala:946
+#: ../src/contacts-contact-pane.vala:939
+msgid "Browse for more pictures"
+msgstr "瀏覽更多照片"
+
+#: ../src/contacts-contact-pane.vala:1021
 msgid "Browse for more pictures..."
 msgstr "瀏覽更多照片…"
 
-#: ../src/contacts-contact-pane.vala:1164
+#: ../src/contacts-contact-pane.vala:1230
 msgid "Enter name"
 msgstr "請輸入名稱"
 
-#: ../src/contacts-contact-pane.vala:1261
+#: ../src/contacts-contact-pane.vala:1242
+msgid "Contact Name"
+msgstr "聯絡人名稱"
+
+#: ../src/contacts-contact-pane.vala:1393
 msgid "Address copied to clipboard"
 msgstr "複製位址到剪貼簿"
 
-#: ../src/contacts-contact-pane.vala:1341
+#: ../src/contacts-contact-pane.vala:1482
 #, c-format
 msgid "Unable to create new contacts: %s\n"
 msgstr "無法建立新的聯絡人：%s\n"
 
-#: ../src/contacts-contact-pane.vala:1352
+#: ../src/contacts-contact-pane.vala:1493
 msgid "Unable to find newly created contact\n"
 msgstr "找不到最近建立的聯絡人\n"
 
-#: ../src/contacts-contact-pane.vala:1432
+#: ../src/contacts-contact-pane.vala:1595
 msgid "Notes"
 msgstr "備註"
 
-#: ../src/contacts-contact-pane.vala:1463
+#: ../src/contacts-contact-pane.vala:1626
 msgid "Edit"
 msgstr "編輯"
 
-#: ../src/contacts-contact-pane.vala:1470
+#: ../src/contacts-contact-pane.vala:1633
 msgid "More"
 msgstr "更多"
 
-#: ../src/contacts-contact-pane.vala:1492
+#: ../src/contacts-contact-pane.vala:1655
 msgid "Add/Remove Linked Contacts..."
 msgstr "加入/移除已連結的聯絡人…"
 
-#: ../src/contacts-contact-pane.vala:1493
-msgid "Send..."
-msgstr "傳送…"
-
-#: ../src/contacts-contact-pane.vala:1494
+#. Utils.add_menu_item (menu,_("Send..."));
+#: ../src/contacts-contact-pane.vala:1657
 msgid "Delete"
 msgstr "刪除"
 
-#: ../src/contacts-contact.vala:360
+#: ../src/contacts-contact.vala:382
 msgid "Unknown status"
 msgstr "不明的狀態"
 
-#: ../src/contacts-contact.vala:362
+#: ../src/contacts-contact.vala:384
 msgid "Offline"
 msgstr "離線"
 
-#: ../src/contacts-contact.vala:366
+#: ../src/contacts-contact.vala:388
 msgid "Error"
 msgstr "錯誤"
 
-#: ../src/contacts-contact.vala:368
+#: ../src/contacts-contact.vala:390
 msgid "Available"
 msgstr "有空"
 
-#: ../src/contacts-contact.vala:370
+#: ../src/contacts-contact.vala:392
 msgid "Away"
 msgstr "離開"
 
-#: ../src/contacts-contact.vala:372
+#: ../src/contacts-contact.vala:394
 msgid "Extended away"
 msgstr "長期離開"
 
-#: ../src/contacts-contact.vala:374
+#: ../src/contacts-contact.vala:396
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../src/contacts-contact.vala:376
+#: ../src/contacts-contact.vala:398
 msgid "Hidden"
 msgstr "隱藏"
 
-#: ../src/contacts-contact.vala:567
+#: ../src/contacts-contact.vala:600
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../src/contacts-contact.vala:568
+#: ../src/contacts-contact.vala:601
 msgid "Ovi Chat"
 msgstr "Ovi Chat"
 
-#: ../src/contacts-contact.vala:569 ../src/contacts-contact.vala:841
+#: ../src/contacts-contact.vala:602 ../src/contacts-contact.vala:874
 msgid "Facebook"
 msgstr "Facebook"
 
-#: ../src/contacts-contact.vala:570
+#: ../src/contacts-contact.vala:603
 msgid "Livejournal"
 msgstr "Livejournal"
 
-#: ../src/contacts-contact.vala:571
+#: ../src/contacts-contact.vala:604
 msgid "AOL Instant Messenger"
 msgstr "AOL 即時通訊"
 
-#: ../src/contacts-contact.vala:572
+#: ../src/contacts-contact.vala:605
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../src/contacts-contact.vala:573
+#: ../src/contacts-contact.vala:606
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: ../src/contacts-contact.vala:574
+#: ../src/contacts-contact.vala:607
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../src/contacts-contact.vala:575
+#: ../src/contacts-contact.vala:608
 msgid "IRC"
 msgstr "IRC"
 
-#: ../src/contacts-contact.vala:576
+#: ../src/contacts-contact.vala:609
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/contacts-contact.vala:577
+#: ../src/contacts-contact.vala:610
 msgid "Local network"
 msgstr "區域網絡"
 
-#: ../src/contacts-contact.vala:578
+#: ../src/contacts-contact.vala:611
 msgid "Windows Live Messenger"
 msgstr "Windows Live Messenger"
 
-#: ../src/contacts-contact.vala:579
+#: ../src/contacts-contact.vala:612
 msgid "MySpace"
 msgstr "MySpace"
 
-#: ../src/contacts-contact.vala:580
+#: ../src/contacts-contact.vala:613
 msgid "MXit"
 msgstr "MXit"
 
-#: ../src/contacts-contact.vala:581
+#: ../src/contacts-contact.vala:614
 msgid "Napster"
 msgstr "Napster"
 
-#: ../src/contacts-contact.vala:582
+#: ../src/contacts-contact.vala:615
 msgid "Tencent QQ"
 msgstr "Tencent QQ"
 
-#: ../src/contacts-contact.vala:583
+#: ../src/contacts-contact.vala:616
 msgid "IBM Lotus Sametime"
 msgstr "IBM Lotus Sametime"
 
-#: ../src/contacts-contact.vala:584
+#: ../src/contacts-contact.vala:617
 msgid "SILC"
 msgstr "SILC"
 
-#: ../src/contacts-contact.vala:585
+#: ../src/contacts-contact.vala:618
 msgid "sip"
 msgstr "sip"
 
-#: ../src/contacts-contact.vala:586
+#: ../src/contacts-contact.vala:619
 msgid "Skype"
 msgstr "Skype"
 
-#: ../src/contacts-contact.vala:587
+#: ../src/contacts-contact.vala:620
 msgid "Telephony"
 msgstr "Telephony"
 
-#: ../src/contacts-contact.vala:588
+#: ../src/contacts-contact.vala:621
 msgid "Trepia"
 msgstr "Trepia"
 
-#: ../src/contacts-contact.vala:589 ../src/contacts-contact.vala:590
+#: ../src/contacts-contact.vala:622 ../src/contacts-contact.vala:623
 msgid "Yahoo! Messenger"
 msgstr "Yahoo! 即時通"
 
-#: ../src/contacts-contact.vala:591
+#: ../src/contacts-contact.vala:624
 msgid "Zephyr"
 msgstr "Zephyr"
 
-#: ../src/contacts-contact.vala:844
+#: ../src/contacts-contact.vala:877
 msgid "Twitter"
 msgstr "Twitter"
 
-#: ../src/contacts-contact.vala:871
+#: ../src/contacts-contact.vala:904
 msgid "Unexpected internal error: created contact was not found"
 msgstr "未預期的內部錯誤：找不到建立的聯絡人"
 
-#: ../src/contacts-contact.vala:892
+#: ../src/contacts-contact.vala:925
 msgid "Local Contact"
 msgstr "本地端聯絡人"
 
-#: ../src/contacts-contact.vala:895
+#: ../src/contacts-contact.vala:928
 msgid "Google"
 msgstr "Google"
 
-#: ../src/contacts-list-pane.vala:147
+#: ../src/contacts-link-dialog.vala:81
+msgid "Link Contact"
+msgstr "連結聯絡人"
+
+#: ../src/contacts-link-dialog.vala:95
+#, c-format
+msgid "Select contacts to link to %s"
+msgstr "選取要連結到 %s 的聯絡人"
+
+#: ../src/contacts-link-dialog.vala:160
+msgid "Currently linked:"
+msgstr "目前已連結的："
+
+#: ../src/contacts-list-pane.vala:149
 msgid ""
 "Connect to an account,\n"
 "import or add contacts"
@@ -283,7 +334,7 @@ msgstr ""
 "連接到一個帳號，\n"
 "匯入或加入聯絡人"
 
-#: ../src/contacts-list-pane.vala:153
+#: ../src/contacts-list-pane.vala:155
 msgid "Online Accounts"
 msgstr "網上帳號"
 
@@ -359,10 +410,9 @@ msgstr "電報"
 msgid "TTY"
 msgstr "TTY"
 
-#: ../src/main.vala:28
-msgid "Show contact with this individual id"
-msgstr "顯示具有此個人 id 的聯絡人"
+#: ../src/contacts-view.vala:284
+msgid "New contact"
+msgstr "新增聯絡人"
 
-#: ../src/main.vala:30
-msgid "Show contact with this email address"
-msgstr "顯示具有這個電子郵件位址的聯絡人"
+#~ msgid "Send..."
+#~ msgstr "傳送…"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 690e622..7f44bab 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-contacts master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-29 19:19+0800\n"
-"PO-Revision-Date: 2011-08-28 21:24+0800\n"
+"POT-Creation-Date: 2011-09-04 08:37+0800\n"
+"PO-Revision-Date: 2011-09-03 22:10+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"
@@ -16,266 +16,317 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/gnome-contacts.desktop.in.in.h:1 ../src/contacts-app.vala:102
+#: ../data/gnome-contacts.desktop.in.in.h:1 ../src/contacts-app.vala:114
 #: ../src/main.vala:36
 msgid "Contacts"
 msgstr "連絡人"
 
-#: ../src/contacts-contact-pane.vala:654
+#: ../src/contacts-app.vala:159 ../src/main.vala:28
+msgid "Show contact with this individual id"
+msgstr "顯示具有此個人 id 的連絡人"
+
+#: ../src/contacts-app.vala:161 ../src/main.vala:30
+msgid "Show contact with this email address"
+msgstr "顯示具有這個電子郵件位址的連絡人"
+
+#: ../src/contacts-app.vala:168
+msgid "— contact management"
+msgstr "— 連絡人管理"
+
+#: ../src/contacts-contact-pane.vala:592 ../src/contacts-contact-pane.vala:829
+#: ../src/contacts-contact-pane.vala:1311
+msgid "Nickname"
+msgstr "暱稱"
+
+#: ../src/contacts-contact-pane.vala:595
+msgid "Enter nickname"
+msgstr "輸入暱稱"
+
+#: ../src/contacts-contact-pane.vala:601
+msgid "Alias"
+msgstr "別名"
+
+#: ../src/contacts-contact-pane.vala:604
+msgid "Enter alias"
+msgstr "輸入別名"
+
+#: ../src/contacts-contact-pane.vala:616
 msgid "Enter email address"
 msgstr "請輸入電子郵件位址"
 
-#: ../src/contacts-contact-pane.vala:665
+#: ../src/contacts-contact-pane.vala:627
 msgid "Enter phone number"
 msgstr "請輸入電話號碼"
 
-#: ../src/contacts-contact-pane.vala:678
+#: ../src/contacts-contact-pane.vala:634
+msgid "Links"
+msgstr "連結"
+
+#: ../src/contacts-contact-pane.vala:640
 msgid "Enter link"
 msgstr "輸入連結"
 
-#: ../src/contacts-contact-pane.vala:685
+#: ../src/contacts-contact-pane.vala:647
 msgid "Street"
 msgstr "街道"
 
-#: ../src/contacts-contact-pane.vala:685
+#: ../src/contacts-contact-pane.vala:647
 msgid "Extension"
 msgstr "延伸"
 
-#: ../src/contacts-contact-pane.vala:685
+#: ../src/contacts-contact-pane.vala:647
 msgid "City"
 msgstr "城市"
 
-#: ../src/contacts-contact-pane.vala:685
+#: ../src/contacts-contact-pane.vala:647
 msgid "State/Province"
 msgstr "州/省"
 
-#: ../src/contacts-contact-pane.vala:685
+#: ../src/contacts-contact-pane.vala:647
 msgid "Zip/Postal Code"
 msgstr "郵遞區號"
 
-#: ../src/contacts-contact-pane.vala:685
+#: ../src/contacts-contact-pane.vala:647
 msgid "PO box"
 msgstr "郵政信箱"
 
-#: ../src/contacts-contact-pane.vala:685
+#: ../src/contacts-contact-pane.vala:647
 msgid "Country"
 msgstr "國家"
 
-#: ../src/contacts-contact-pane.vala:745
-#: ../src/contacts-contact-pane.vala:1221
+#: ../src/contacts-contact-pane.vala:734
+#: ../src/contacts-contact-pane.vala:1328
 msgid "Chat"
 msgstr "聊天"
 
-#: ../src/contacts-contact-pane.vala:799
+#: ../src/contacts-contact-pane.vala:786
 msgid "Add detail"
 msgstr "加入詳細資料"
 
-#: ../src/contacts-contact-pane.vala:805
+#: ../src/contacts-contact-pane.vala:792
 msgid "Email"
 msgstr "電子郵件"
 
-#: ../src/contacts-contact-pane.vala:812
+#: ../src/contacts-contact-pane.vala:800
 msgid "Phone number"
 msgstr "電話號碼"
 
-#: ../src/contacts-contact-pane.vala:819
+#: ../src/contacts-contact-pane.vala:808
 msgid "Postal Address"
 msgstr "郵寄地址"
 
-#: ../src/contacts-contact-pane.vala:827
+#: ../src/contacts-contact-pane.vala:818 ../src/contacts-link-dialog.vala:144
 msgid "Link"
 msgstr "連結"
 
-#: ../src/contacts-contact-pane.vala:946
+#: ../src/contacts-contact-pane.vala:939
+msgid "Browse for more pictures"
+msgstr "瀏覽更多照片"
+
+#: ../src/contacts-contact-pane.vala:1021
 msgid "Browse for more pictures..."
 msgstr "瀏覽更多照片…"
 
-#: ../src/contacts-contact-pane.vala:1164
+#: ../src/contacts-contact-pane.vala:1230
 msgid "Enter name"
 msgstr "請輸入名稱"
 
-#: ../src/contacts-contact-pane.vala:1261
+#: ../src/contacts-contact-pane.vala:1242
+msgid "Contact Name"
+msgstr "連絡人名稱"
+
+#: ../src/contacts-contact-pane.vala:1393
 msgid "Address copied to clipboard"
 msgstr "複製位址到剪貼簿"
 
-#: ../src/contacts-contact-pane.vala:1341
+#: ../src/contacts-contact-pane.vala:1482
 #, c-format
 msgid "Unable to create new contacts: %s\n"
 msgstr "無法建立新的連絡人：%s\n"
 
-#: ../src/contacts-contact-pane.vala:1352
+#: ../src/contacts-contact-pane.vala:1493
 msgid "Unable to find newly created contact\n"
 msgstr "找不到最近建立的連絡人\n"
 
-#: ../src/contacts-contact-pane.vala:1432
+#: ../src/contacts-contact-pane.vala:1595
 msgid "Notes"
 msgstr "備註"
 
-#: ../src/contacts-contact-pane.vala:1463
+#: ../src/contacts-contact-pane.vala:1626
 msgid "Edit"
 msgstr "編輯"
 
-#: ../src/contacts-contact-pane.vala:1470
+#: ../src/contacts-contact-pane.vala:1633
 msgid "More"
 msgstr "更多"
 
-#: ../src/contacts-contact-pane.vala:1492
+#: ../src/contacts-contact-pane.vala:1655
 msgid "Add/Remove Linked Contacts..."
 msgstr "加入/移除已連結的連絡人…"
 
-#: ../src/contacts-contact-pane.vala:1493
-msgid "Send..."
-msgstr "傳送…"
-
-#: ../src/contacts-contact-pane.vala:1494
+#. Utils.add_menu_item (menu,_("Send..."));
+#: ../src/contacts-contact-pane.vala:1657
 msgid "Delete"
 msgstr "刪除"
 
-#: ../src/contacts-contact.vala:360
+#: ../src/contacts-contact.vala:382
 msgid "Unknown status"
 msgstr "不明的狀態"
 
-#: ../src/contacts-contact.vala:362
+#: ../src/contacts-contact.vala:384
 msgid "Offline"
 msgstr "離線"
 
-#: ../src/contacts-contact.vala:366
+#: ../src/contacts-contact.vala:388
 msgid "Error"
 msgstr "錯誤"
 
-#: ../src/contacts-contact.vala:368
+#: ../src/contacts-contact.vala:390
 msgid "Available"
 msgstr "有空"
 
-#: ../src/contacts-contact.vala:370
+#: ../src/contacts-contact.vala:392
 msgid "Away"
 msgstr "離開"
 
-#: ../src/contacts-contact.vala:372
+#: ../src/contacts-contact.vala:394
 msgid "Extended away"
 msgstr "長期離開"
 
-#: ../src/contacts-contact.vala:374
+#: ../src/contacts-contact.vala:396
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../src/contacts-contact.vala:376
+#: ../src/contacts-contact.vala:398
 msgid "Hidden"
 msgstr "隱藏"
 
-#: ../src/contacts-contact.vala:567
+#: ../src/contacts-contact.vala:600
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../src/contacts-contact.vala:568
+#: ../src/contacts-contact.vala:601
 msgid "Ovi Chat"
 msgstr "Ovi Chat"
 
-#: ../src/contacts-contact.vala:569 ../src/contacts-contact.vala:841
+#: ../src/contacts-contact.vala:602 ../src/contacts-contact.vala:874
 msgid "Facebook"
 msgstr "Facebook"
 
-#: ../src/contacts-contact.vala:570
+#: ../src/contacts-contact.vala:603
 msgid "Livejournal"
 msgstr "Livejournal"
 
-#: ../src/contacts-contact.vala:571
+#: ../src/contacts-contact.vala:604
 msgid "AOL Instant Messenger"
 msgstr "AOL 即時通訊"
 
-#: ../src/contacts-contact.vala:572
+#: ../src/contacts-contact.vala:605
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../src/contacts-contact.vala:573
+#: ../src/contacts-contact.vala:606
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: ../src/contacts-contact.vala:574
+#: ../src/contacts-contact.vala:607
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../src/contacts-contact.vala:575
+#: ../src/contacts-contact.vala:608
 msgid "IRC"
 msgstr "IRC"
 
-#: ../src/contacts-contact.vala:576
+#: ../src/contacts-contact.vala:609
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/contacts-contact.vala:577
+#: ../src/contacts-contact.vala:610
 msgid "Local network"
 msgstr "區域網路"
 
-#: ../src/contacts-contact.vala:578
+#: ../src/contacts-contact.vala:611
 msgid "Windows Live Messenger"
 msgstr "Windows Live Messenger"
 
-#: ../src/contacts-contact.vala:579
+#: ../src/contacts-contact.vala:612
 msgid "MySpace"
 msgstr "MySpace"
 
-#: ../src/contacts-contact.vala:580
+#: ../src/contacts-contact.vala:613
 msgid "MXit"
 msgstr "MXit"
 
-#: ../src/contacts-contact.vala:581
+#: ../src/contacts-contact.vala:614
 msgid "Napster"
 msgstr "Napster"
 
-#: ../src/contacts-contact.vala:582
+#: ../src/contacts-contact.vala:615
 msgid "Tencent QQ"
 msgstr "Tencent QQ"
 
-#: ../src/contacts-contact.vala:583
+#: ../src/contacts-contact.vala:616
 msgid "IBM Lotus Sametime"
 msgstr "IBM Lotus Sametime"
 
-#: ../src/contacts-contact.vala:584
+#: ../src/contacts-contact.vala:617
 msgid "SILC"
 msgstr "SILC"
 
-#: ../src/contacts-contact.vala:585
+#: ../src/contacts-contact.vala:618
 msgid "sip"
 msgstr "sip"
 
-#: ../src/contacts-contact.vala:586
+#: ../src/contacts-contact.vala:619
 msgid "Skype"
 msgstr "Skype"
 
-#: ../src/contacts-contact.vala:587
+#: ../src/contacts-contact.vala:620
 msgid "Telephony"
 msgstr "Telephony"
 
-#: ../src/contacts-contact.vala:588
+#: ../src/contacts-contact.vala:621
 msgid "Trepia"
 msgstr "Trepia"
 
-#: ../src/contacts-contact.vala:589 ../src/contacts-contact.vala:590
+#: ../src/contacts-contact.vala:622 ../src/contacts-contact.vala:623
 msgid "Yahoo! Messenger"
 msgstr "Yahoo! 即時通"
 
-#: ../src/contacts-contact.vala:591
+#: ../src/contacts-contact.vala:624
 msgid "Zephyr"
 msgstr "Zephyr"
 
-#: ../src/contacts-contact.vala:844
+#: ../src/contacts-contact.vala:877
 msgid "Twitter"
 msgstr "Twitter"
 
-#: ../src/contacts-contact.vala:871
+#: ../src/contacts-contact.vala:904
 msgid "Unexpected internal error: created contact was not found"
 msgstr "未預期的內部錯誤：找不到建立的連絡人"
 
-#: ../src/contacts-contact.vala:892
+#: ../src/contacts-contact.vala:925
 msgid "Local Contact"
 msgstr "本地端連絡人"
 
-#: ../src/contacts-contact.vala:895
+#: ../src/contacts-contact.vala:928
 msgid "Google"
 msgstr "Google"
 
-#: ../src/contacts-list-pane.vala:147
+#: ../src/contacts-link-dialog.vala:81
+msgid "Link Contact"
+msgstr "連結連絡人"
+
+#: ../src/contacts-link-dialog.vala:95
+#, c-format
+msgid "Select contacts to link to %s"
+msgstr "選取要連結到 %s 的連絡人"
+
+#: ../src/contacts-link-dialog.vala:160
+msgid "Currently linked:"
+msgstr "目前已連結的："
+
+#: ../src/contacts-list-pane.vala:149
 msgid ""
 "Connect to an account,\n"
 "import or add contacts"
@@ -283,7 +334,7 @@ msgstr ""
 "連接到一個帳號，\n"
 "匯入或加入連絡人"
 
-#: ../src/contacts-list-pane.vala:153
+#: ../src/contacts-list-pane.vala:155
 msgid "Online Accounts"
 msgstr "線上帳號"
 
@@ -359,10 +410,9 @@ msgstr "電報"
 msgid "TTY"
 msgstr "TTY"
 
-#: ../src/main.vala:28
-msgid "Show contact with this individual id"
-msgstr "顯示具有此個人 id 的連絡人"
+#: ../src/contacts-view.vala:284
+msgid "New contact"
+msgstr "新增連絡人"
 
-#: ../src/main.vala:30
-msgid "Show contact with this email address"
-msgstr "顯示具有這個電子郵件位址的連絡人"
+#~ msgid "Send..."
+#~ msgstr "傳送…"