Updated Japanese translation

1 files changed, 407 insertions, 347 deletions

diff --git a/po/ja.po b/po/ja.po
index 36a11b6..b951050 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,593 +6,483 @@
 # Noriko Mizumoto <noriko@fedoraproject.org>, 2012.
 # Jiro Matsuzawa <jmatsuzawa@gnome.org>, 2013, 2014.
 # Ikuya Awashiro <ikuya@fruitsbasket.info>, 2014.
+# Zhou Fang <houshuu@live.jp>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-contacts master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-contacts&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-04-10 19:46+0000\n"
-"PO-Revision-Date: 2014-03-30 16:46+0900\n"
-"Last-Translator: Ikuya Awashiro <ikuya@fruitsbasket.info>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"contacts&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2015-02-16 16:55+0000\n"
+"PO-Revision-Date: 2014-05-31 21:36+0900\n"
+"Last-Translator: Zhou Fang <houshuu@live.jp>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
 "Language: ja\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.6.5\n"
 
-#: ../data/gnome-contacts.appdata.xml.in.h:1
-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."
+# TODO: Need to review and rewrite
+#: ../data/org.gnome.Contacts.appdata.xml.in.h:1
+#, fuzzy
+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 ""
+"連絡先はあなたの連絡先情報を保存して管理する。あなたの連絡先を作成、編集、削"
+"除と一緒にリンクすることができる。連絡先はすべてあなたの詳しい情報を統合し、"
+"集中的にあなたの連絡先を管理する。"
 
-#: ../data/gnome-contacts.appdata.xml.in.h:2
-msgid "Contacts will also integrate with online address books and automatically link contacts from different online sources."
+# TODO: Need to review and rewrite
+#: ../data/org.gnome.Contacts.appdata.xml.in.h:2
+#, fuzzy
+msgid ""
+"Contacts will also integrate with online address books and automatically "
+"link contacts from different online sources."
 msgstr ""
+"連絡先はオンラインアドレス帳と統合して、自動的に別のオンライン情報源から連絡"
+"先をリンクすることもできます。"
 
-#: ../data/gnome-contacts.desktop.in.in.h:1 ../src/main.vala:28
+#: ../data/org.gnome.Contacts.desktop.in.in.h:1 ../src/main.vala:28
 msgid "Contacts"
 msgstr "連絡先"
 
-#: ../data/gnome-contacts.desktop.in.in.h:2
+#: ../data/org.gnome.Contacts.desktop.in.in.h:2
 msgid "A contacts manager for GNOME"
 msgstr "GNOME の連絡先管理ツール"
 
-#: ../data/gnome-contacts.desktop.in.in.h:3
+#: ../data/org.gnome.Contacts.desktop.in.in.h:3
 msgid "friends;address book;"
 msgstr "friends;address book;友達;アドレス帳;contacts;"
 
-#: ../src/app-menu.ui.h:1
-msgid "_Change Address Book..."
-msgstr "アドレス帳を変更...(_C)"
-
-#: ../src/app-menu.ui.h:2
-msgid "_Help"
-msgstr "ヘルプ(_H)"
-
-#: ../src/app-menu.ui.h:3
-msgid "_About"
-msgstr "このアプリケーションについて(_A)"
-
-#: ../src/app-menu.ui.h:4
-msgid "_Quit"
-msgstr "終了(_Q)"
-
-#: ../src/app-menu.ui.h:5
-msgid "Personal email"
-msgstr "個人のメール"
-
-#: ../src/app-menu.ui.h:6
-msgid "Work email"
-msgstr "職場のメール"
-
-#: ../src/app-menu.ui.h:7
-msgid "Mobile phone"
-msgstr "携帯電話"
-
-#: ../src/app-menu.ui.h:8
-msgid "Home phone"
-msgstr "自宅の電話"
-
-#: ../src/app-menu.ui.h:9
-msgid "Work phone"
-msgstr "職場の電話"
-
-#: ../src/app-menu.ui.h:10 ../src/contacts-contact-editor.vala:505
-#: ../src/contacts-contact-editor.vala:512
-#: ../src/contacts-contact-sheet.vala:190
-msgid "Website"
-msgstr "ウェブサイト"
-
-#: ../src/app-menu.ui.h:11 ../src/contacts-contact-editor.vala:531
-#: ../src/contacts-contact-editor.vala:538
-#: ../src/contacts-contact-sheet.vala:196
-msgid "Nickname"
-msgstr "ニックネーム"
-
-#: ../src/app-menu.ui.h:12 ../src/contacts-contact-editor.vala:564
-#: ../src/contacts-contact-editor.vala:571
-#: ../src/contacts-contact-sheet.vala:203
-msgid "Birthday"
-msgstr "誕生日"
-
-#: ../src/app-menu.ui.h:13
-msgid "Home address"
-msgstr "自宅の住所"
-
-#: ../src/app-menu.ui.h:14
-msgid "Work address"
-msgstr "職場の住所"
-
-#: ../src/app-menu.ui.h:15
-msgid "Notes"
-msgstr "メモ"
+#: ../data/org.gnome.Contacts.search-provider.ini.in.in.h:1
+#: ../src/contacts-app.vala:129
+msgid "GNOME Contacts"
+msgstr "GNOME Contacts"
 
 #: ../src/contacts-accounts-list.vala:48
 msgid "Online Accounts"
 msgstr "オンラインアカウント"
 
-#: ../src/contacts-accounts-list.vala:180 ../src/contacts-esd-setup.c:118
+#: ../src/contacts-accounts-list.vala:174 ../src/contacts-esd-setup.c:233
 msgid "Local Address Book"
 msgstr "ローカルのアドレス帳"
 
-#: ../src/contacts-app.vala:100
+#: ../src/contacts-address-map.vala:80
+msgid "Install GNOME Maps to open location."
+msgstr ""
+
+#: ../src/contacts-app.vala:46
 #, c-format
 msgid "No contact with id %s found"
 msgstr "ID %s に該当する連絡先はありません。"
 
-#: ../src/contacts-app.vala:101 ../src/contacts-app.vala:200
+#: ../src/contacts-app.vala:47 ../src/contacts-app.vala:149
 msgid "Contact not found"
 msgstr "連絡先が見つかりません"
 
-#: ../src/contacts-app.vala:110
+#: ../src/contacts-app.vala:56
 msgid "Change Address Book"
 msgstr "アドレス帳を変更"
 
-#: ../src/contacts-app.vala:115
+#: ../src/contacts-app.vala:61
 msgid "Change"
-msgstr ""
+msgstr "変更"
 
-#: ../src/contacts-app.vala:116 ../src/contacts-setup-window.vala:41
+#: ../src/contacts-app.vala:62 ../src/contacts-avatar-dialog.vala:255
+#: ../data/ui/contacts-window.ui.h:5
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: ../src/contacts-app.vala:125
+#: ../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 ""
+"新規に作成する連絡先は、選択したアドレス帳に追加されます。\n"
+"他のアドレス帳に登録された連絡先を参照・編集することもできます。"
 
-#: ../src/contacts-app.vala:179
+#: ../src/contacts-app.vala:128
 msgid "translator-credits"
 msgstr ""
 "Hajime Taira <htaira@redhat.com>\n"
 "Mako N <mako@pasero.net>\n"
 "松澤 二郎 <jmatsuzawa@gnome.org>"
 
-#: ../src/contacts-app.vala:180
-msgid "GNOME Contacts"
-msgstr "GNOME Contacts"
-
-#: ../src/contacts-app.vala:181
+#: ../src/contacts-app.vala:130
 msgid "About GNOME Contacts"
 msgstr "このアプリケーションについて"
 
-#: ../src/contacts-app.vala:182
+#: ../src/contacts-app.vala:131
 msgid "Contact Management Application"
 msgstr "連絡先管理アプリケーション"
 
-#: ../src/contacts-app.vala:199
+#: ../src/contacts-app.vala:148
 #, c-format
 msgid "No contact with email address %s found"
 msgstr "メールアドレス %s に該当する連絡先はありません"
 
-#: ../src/contacts-app.vala:256 ../src/contacts-window.vala:85
-msgid "Select"
-msgstr "選択"
-
-#: ../src/contacts-app.vala:258
-#, c-format
-msgid "%d Selected"
-msgid_plural "%d Selected"
-msgstr[0] "%d 件選択"
-
-#: ../src/contacts-app.vala:287
-#, c-format
-msgid "Editing %s"
-msgstr "%s の編集"
-
-#: ../src/contacts-app.vala:413
-#, c-format
-msgid "%d contacts linked"
-msgid_plural "%d contacts linked"
-msgstr[0] "連絡先を %d 件リンクしました"
-
-#: ../src/contacts-app.vala:417 ../src/contacts-app.vala:449
-#: ../src/contacts-app.vala:490 ../src/contacts-app.vala:535
-msgid "_Undo"
-msgstr "戻す(_U)"
-
-#: ../src/contacts-app.vala:445
-#, c-format
-msgid "%d contact deleted"
-msgid_plural "%d contacts deleted"
-msgstr[0] "連絡先を %d 件削除しました"
-
-#: ../src/contacts-app.vala:487
-#, c-format
-msgid "Contact deleted: \"%s\""
-msgstr "連絡先を削除しました: \"%s\""
-
-#: ../src/contacts-app.vala:515
+#: ../src/contacts-app.vala:318
 msgid "Show contact with this individual id"
 msgstr "この個別IDで連絡先を表示"
 
-#: ../src/contacts-app.vala:517
+#: ../src/contacts-app.vala:320
 msgid "Show contact with this email address"
 msgstr "このメールアドレスで連絡先を表示"
 
-#: ../src/contacts-app.vala:531
-#, c-format
-msgid "%s linked to %s"
-msgstr "%s を %s にリンク"
-
-#: ../src/contacts-app.vala:533
-#, c-format
-msgid "%s linked to the contact"
-msgstr "%s をこの連絡先にリンク"
-
-#: ../src/contacts-app.vala:550
+#: ../src/contacts-app.vala:329
 msgid "— contact management"
 msgstr "— 連絡先の管理"
 
-#: ../src/contacts-avatar-dialog.vala:197
+#: ../src/contacts-avatar-dialog.vala:200
 msgid "Browse for more pictures"
 msgstr "もっと写真を見る"
 
-#: ../src/contacts-avatar-dialog.vala:200
-#: ../src/contacts-new-contact-dialog.vala:50
+#: ../src/contacts-avatar-dialog.vala:203
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
 
-#: ../src/contacts-avatar-dialog.vala:201
+#: ../src/contacts-avatar-dialog.vala:204
 msgid "_Open"
 msgstr "開く(_O)"
 
-#: ../src/contacts-avatar-dialog.vala:246
+#: ../src/contacts-avatar-dialog.vala:249
 msgid "Select Picture"
 msgstr "写真を選択"
 
-#: ../src/contacts-contact-editor.vala:262
+#: ../src/contacts-avatar-dialog.vala:253 ../src/contacts-window.vala:198
+#: ../src/contacts-window.vala:224
+msgid "Select"
+msgstr "選択"
+
+#: ../src/contacts-avatar-dialog.vala:281 ../src/contacts-window.vala:315
+#, fuzzy
+#| msgid "New contact"
+msgid "New Contact"
+msgstr "新しい連絡先"
+
+#: ../src/contacts-contact-editor.vala:28
+msgid "Street"
+msgstr "町丁名"
+
+#: ../src/contacts-contact-editor.vala:28
+msgid "Extension"
+msgstr "番地"
+
+#: ../src/contacts-contact-editor.vala:28
+msgid "City"
+msgstr "市(区町村)"
+
+#: ../src/contacts-contact-editor.vala:28
+msgid "State/Province"
+msgstr "県(州)"
+
+#: ../src/contacts-contact-editor.vala:28
+msgid "Zip/Postal Code"
+msgstr "郵便番号"
+
+#: ../src/contacts-contact-editor.vala:28
+msgid "PO box"
+msgstr "私書箱"
+
+#: ../src/contacts-contact-editor.vala:28
+msgid "Country"
+msgstr "国"
+
+#: ../src/contacts-contact-editor.vala:293
+#, fuzzy
+#| msgid "Add Detail"
+msgid "Add email"
+msgstr "詳細を追加"
+
 #: ../src/contacts-contact-editor.vala:295
-#: ../src/contacts-contact-editor.vala:332
-#: ../src/contacts-contact-editor.vala:391
-#: ../src/contacts-contact-editor.vala:421
+#, fuzzy
+#| msgid "Phone number"
+msgid "Add number"
+msgstr "電話番号"
+
+#: ../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
 #, fuzzy
 #| msgid "Delete"
 msgid "Delete field"
 msgstr "削除"
 
-#: ../src/contacts-contact-editor.vala:367
+#: ../src/contacts-contact-editor.vala:400
 msgid "January"
 msgstr "1月"
 
-#: ../src/contacts-contact-editor.vala:368
+#: ../src/contacts-contact-editor.vala:401
 msgid "February"
 msgstr "2月"
 
-#: ../src/contacts-contact-editor.vala:369
+#: ../src/contacts-contact-editor.vala:402
 msgid "March"
 msgstr "3月"
 
-#: ../src/contacts-contact-editor.vala:370
+#: ../src/contacts-contact-editor.vala:403
 msgid "April"
 msgstr "4月"
 
-#: ../src/contacts-contact-editor.vala:371
+#: ../src/contacts-contact-editor.vala:404
 msgid "May"
 msgstr "5月"
 
-#: ../src/contacts-contact-editor.vala:372
+#: ../src/contacts-contact-editor.vala:405
 msgid "June"
 msgstr "6月"
 
-#: ../src/contacts-contact-editor.vala:373
+#: ../src/contacts-contact-editor.vala:406
 msgid "July"
 msgstr "7月"
 
-#: ../src/contacts-contact-editor.vala:374
+#: ../src/contacts-contact-editor.vala:407
 msgid "August"
 msgstr "8月"
 
-#: ../src/contacts-contact-editor.vala:375
+#: ../src/contacts-contact-editor.vala:408
 msgid "September"
 msgstr "9月"
 
-#: ../src/contacts-contact-editor.vala:376
+#: ../src/contacts-contact-editor.vala:409
 msgid "October"
 msgstr "10月"
 
-#: ../src/contacts-contact-editor.vala:377
+#: ../src/contacts-contact-editor.vala:410
 msgid "November"
 msgstr "11月"
 
-#: ../src/contacts-contact-editor.vala:378
+#: ../src/contacts-contact-editor.vala:411
 msgid "December"
 msgstr "12月"
 
-#: ../src/contacts-contact-editor.vala:586
-#: ../src/contacts-contact-editor.vala:593
+#: ../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 "ウェブサイト"
+
+#: ../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 "ニックネーム"
+
+#: ../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 "誕生日"
+
+#: ../src/contacts-contact-editor.vala:642
+#: ../src/contacts-contact-editor.vala:649
 #: ../src/contacts-contact-sheet.vala:210
 msgid "Note"
 msgstr "メモ"
 
-#: ../src/contacts-contact-pane.vala:143
+#: ../src/contacts-contact-editor.vala:795
+msgid "New Detail"
+msgstr "詳細を追加"
+
+#: ../src/contacts-contact-editor.vala:801
+#: ../src/contacts-linked-accounts-dialog.vala:36
+msgid "Linked Accounts"
+msgstr "リンク済みアカウント"
+
+#: ../src/contacts-contact-editor.vala:804
+msgid "Remove Contact"
+msgstr "連絡先を削除"
+
+#: ../src/contacts-contact-editor.vala:862
+#: ../src/contacts-contact-editor.vala:1062
+#, fuzzy
+#| msgid "New contact"
+msgid "Add name"
+msgstr "新しい連絡先"
+
+#: ../src/contacts-contact-pane.vala:137
 #, c-format
 msgid "Does %s from %s belong here?"
 msgstr "%s (%s) が属するのはここですか?"
 
-#: ../src/contacts-contact-pane.vala:145
+#: ../src/contacts-contact-pane.vala:139
 #, c-format
 msgid "Do these details belong to %s?"
 msgstr "これらの詳細情報は %s に関するものですか?"
 
-#: ../src/contacts-contact-pane.vala:157
+#: ../src/contacts-contact-pane.vala:151
 msgid "Yes"
 msgstr "はい"
 
-#: ../src/contacts-contact-pane.vala:158
+#: ../src/contacts-contact-pane.vala:152
 msgid "No"
 msgstr "いいえ"
 
-#: ../src/contacts-contact-pane.vala:307
-msgid "New Detail"
-msgstr "詳細を追加"
-
-#: ../src/contacts-contact-pane.vala:313
-#: ../src/contacts-linked-accounts-dialog.vala:36
-msgid "Linked Accounts"
-msgstr "リンク済みアカウント"
-
-#: ../src/contacts-contact-pane.vala:317
-msgid "Remove Contact"
-msgstr "連絡先を削除"
-
-#: ../src/contacts-contact-pane.vala:413
+#: ../src/contacts-contact-pane.vala:323
 msgid "Select a contact"
 msgstr "連絡先を選択してください"
 
-#: ../src/contacts-contact-frame.vala:40
-msgid "Change avatar"
+#: ../src/contacts-contact-pane.vala:455
+msgid "You need to enter some data"
 msgstr ""
 
-#: ../src/contacts-contact.vala:674
-msgid "Street"
-msgstr "町丁名"
-
-#: ../src/contacts-contact.vala:674
-msgid "Extension"
-msgstr "番地"
-
-#: ../src/contacts-contact.vala:674
-msgid "City"
-msgstr "市(区町村)"
-
-#: ../src/contacts-contact.vala:674
-msgid "State/Province"
-msgstr "県(州)"
+#: ../src/contacts-contact-pane.vala:467
+#, fuzzy
+#| msgid "No primary addressbook configured\n"
+msgid "No primary addressbook configured"
+msgstr "使用するアドレス帳が設定されていません\n"
 
-#: ../src/contacts-contact.vala:674
-msgid "Zip/Postal Code"
-msgstr "郵便番号"
+#: ../src/contacts-contact-pane.vala:486
+#, fuzzy, c-format
+#| msgid "Unable to create new contacts: %s\n"
+msgid "Unable to create new contacts: %s"
+msgstr "新しい連絡先を作ることができません: %s\n"
 
-#: ../src/contacts-contact.vala:674
-msgid "PO box"
-msgstr "私書箱"
+#: ../src/contacts-contact-pane.vala:497
+#, fuzzy
+#| msgid "Unable to find newly created contact\n"
+msgid "Unable to find newly created contact"
+msgstr "新しく作成した連絡先を見つけることができません。\n"
 
-#: ../src/contacts-contact.vala:674
-msgid "Country"
-msgstr "国"
+#: ../src/contacts-contact-frame.vala:40
+msgid "Change avatar"
+msgstr "アバターを変更する"
 
-#: ../src/contacts-contact.vala:730
+#: ../src/contacts-contact.vala:763
 msgid "Google Talk"
 msgstr "Google トーク"
 
-#: ../src/contacts-contact.vala:731
+#: ../src/contacts-contact.vala:764
 msgid "Ovi Chat"
 msgstr "Ovi Chat"
 
-#: ../src/contacts-contact.vala:732 ../src/contacts-contact.vala:1016
+#: ../src/contacts-contact.vala:765
 msgid "Facebook"
 msgstr "Facebook"
 
-#: ../src/contacts-contact.vala:733
+#: ../src/contacts-contact.vala:766
 msgid "Livejournal"
 msgstr "Livejournal"
 
-#: ../src/contacts-contact.vala:734
+#: ../src/contacts-contact.vala:767
 msgid "AOL Instant Messenger"
 msgstr "AOL インスタントメッセンジャー"
 
-#: ../src/contacts-contact.vala:735
+#: ../src/contacts-contact.vala:768
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../src/contacts-contact.vala:736
+#: ../src/contacts-contact.vala:769
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: ../src/contacts-contact.vala:737
+#: ../src/contacts-contact.vala:770
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../src/contacts-contact.vala:738
+#: ../src/contacts-contact.vala:771
 msgid "IRC"
 msgstr "IRC"
 
-#: ../src/contacts-contact.vala:739
+#: ../src/contacts-contact.vala:772
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/contacts-contact.vala:740
+#: ../src/contacts-contact.vala:773
 msgid "Local network"
 msgstr "ローカルネットワーク"
 
-#: ../src/contacts-contact.vala:741
+#: ../src/contacts-contact.vala:774
 msgid "Windows Live Messenger"
 msgstr "Windows Live メッセンジャー"
 
-#: ../src/contacts-contact.vala:742
+#: ../src/contacts-contact.vala:775
 msgid "MySpace"
 msgstr "MySpace"
 
-#: ../src/contacts-contact.vala:743
+#: ../src/contacts-contact.vala:776
 msgid "MXit"
 msgstr "MXit"
 
-#: ../src/contacts-contact.vala:744
+#: ../src/contacts-contact.vala:777
 msgid "Napster"
 msgstr "Napster"
 
-#: ../src/contacts-contact.vala:745
+#: ../src/contacts-contact.vala:778
 msgid "Tencent QQ"
 msgstr "Tencent QQ"
 
-#: ../src/contacts-contact.vala:746
+#: ../src/contacts-contact.vala:779
 msgid "IBM Lotus Sametime"
 msgstr "IBM Lotus Sametime"
 
-#: ../src/contacts-contact.vala:747
+#: ../src/contacts-contact.vala:780
 msgid "SILC"
 msgstr "SILC"
 
-#: ../src/contacts-contact.vala:748
+#: ../src/contacts-contact.vala:781
 msgid "sip"
 msgstr "sip"
 
-#: ../src/contacts-contact.vala:749
+#: ../src/contacts-contact.vala:782
 msgid "Skype"
 msgstr "Skype"
 
-#: ../src/contacts-contact.vala:750
+#: ../src/contacts-contact.vala:783
 msgid "Telephony"
 msgstr "テレフォニー"
 
-#: ../src/contacts-contact.vala:751
+#: ../src/contacts-contact.vala:784
 msgid "Trepia"
 msgstr "Trepia"
 
-#: ../src/contacts-contact.vala:752 ../src/contacts-contact.vala:753
+#: ../src/contacts-contact.vala:785 ../src/contacts-contact.vala:786
 msgid "Yahoo! Messenger"
 msgstr "Yahoo! メッセンジャー"
 
-#: ../src/contacts-contact.vala:754
+#: ../src/contacts-contact.vala:787
 msgid "Zephyr"
 msgstr "Zephyr"
 
-#: ../src/contacts-contact.vala:1019
-msgid "Twitter"
-msgstr "Twitter"
-
-#: ../src/contacts-contact.vala:1022
-msgid "Google Profile"
-msgstr "Google プロフィール"
-
-#: ../src/contacts-contact.vala:1086
+#: ../src/contacts-contact.vala:1087
 msgid "Unexpected internal error: created contact was not found"
 msgstr "予期しない内部エラー: 新しく作成した連絡先が見つかりませんでした"
 
-#: ../src/contacts-contact.vala:1260
+#: ../src/contacts-contact.vala:1272
 msgid "Google Circles"
 msgstr "Google サークル"
 
-#: ../src/contacts-contact.vala:1262
-msgid "Google Other Contact"
-msgstr "Google のその他の連絡先"
-
-#: ../src/contacts-esd-setup.c:121 ../src/contacts-esd-setup.c:149
+#: ../src/contacts-contact.vala:1274 ../src/contacts-esd-setup.c:236
+#: ../src/contacts-esd-setup.c:264
 msgid "Google"
 msgstr "Google"
 
-#: ../src/contacts-esd-setup.c:146
+#: ../src/contacts-esd-setup.c:261
 msgid "Local Contact"
 msgstr "ローカルの連絡先"
 
 #: ../src/contacts-linked-accounts-dialog.vala:35
 #, c-format
 msgid "%s"
-msgstr ""
+msgstr "%s"
 
-#: ../src/contacts-linked-accounts-dialog.vala:59
-msgid "You can manually link contacts from the contacts list"
+#: ../src/contacts-linked-accounts-dialog.vala:60
+#, fuzzy
+#| msgid "You can manually link contacts from the contacts list"
+msgid "You can link contacts by selecting them from the contacts list"
 msgstr "連絡先リストから手動で連絡先をリンクできます"
 
-#: ../src/contacts-linked-accounts-dialog.vala:105
+#: ../src/contacts-linked-accounts-dialog.vala:104
 msgid "Unlink"
 msgstr "リンク解除"
 
-#: ../src/contacts-list-pane.vala:84
-msgid "Type to search"
-msgstr "検索ワードを入力"
-
-#. To translators: Link refers to the verb, from linking contacts together
-#: ../src/contacts-list-pane.vala:126
-msgid "Link"
-msgstr "リンク"
-
-#: ../src/contacts-list-pane.vala:129
-msgid "Delete"
-msgstr "削除"
-
-#: ../src/contacts-new-contact-dialog.vala:45
-#, fuzzy
-#| msgid "New contact"
-msgid "New Contact"
-msgstr "新しい連絡先"
-
-#: ../src/contacts-new-contact-dialog.vala:51
-msgid "Create Contact"
-msgstr "連絡先を作成"
-
-#: ../src/contacts-new-contact-dialog.vala:77
-msgid ""
-"Add or \n"
-"select a picture"
-msgstr ""
-"写真を追加\n"
-"または選択"
-
-#: ../src/contacts-new-contact-dialog.vala:88
-msgid "Contact Name"
-msgstr "連絡先名"
-
-#: ../src/contacts-new-contact-dialog.vala:96
-#: ../src/contacts-new-contact-dialog.vala:132
-msgid "Email"
-msgstr "メール"
-
-#: ../src/contacts-new-contact-dialog.vala:105
-#: ../src/contacts-new-contact-dialog.vala:137
-msgid "Phone"
-msgstr "電話"
-
-#: ../src/contacts-new-contact-dialog.vala:114
-#: ../src/contacts-new-contact-dialog.vala:142
-msgid "Address"
-msgstr "住所"
-
-#: ../src/contacts-new-contact-dialog.vala:124
-msgid "Add Detail"
-msgstr "詳細を追加"
-
-#: ../src/contacts-new-contact-dialog.vala:227
-msgid "You must specify a contact name"
-msgstr "連絡先名を指定する必要があります"
-
-#: ../src/contacts-new-contact-dialog.vala:337
-msgid "No primary addressbook configured\n"
-msgstr "使用するアドレス帳が設定されていません\n"
-
-#: ../src/contacts-new-contact-dialog.vala:358
-#, c-format
-msgid "Unable to create new contacts: %s\n"
-msgstr "新しい連絡先を作ることができません: %s\n"
-
-#: ../src/contacts-new-contact-dialog.vala:369
-msgid "Unable to find newly created contact\n"
-msgstr "新しく作成した連絡先を見つけることができません。\n"
-
-#: ../src/contacts-setup-window.vala:38
-msgid "Contacts Setup"
-msgstr "連絡先の設定"
-
-#: ../src/contacts-setup-window.vala:55 ../src/contacts-window.ui.h:5
-msgid "Done"
-msgstr "完了"
-
-#: ../src/contacts-setup-window.vala:71
-msgid "Please select your primary contacts account"
-msgstr "使用する連絡先アカウントを選択してください"
-
 #. 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
@@ -669,38 +559,172 @@ msgstr "テレックス"
 msgid "TTY"
 msgstr "テレタイプライター"
 
-#: ../src/contacts-view.vala:193
+#: ../src/contacts-view.vala:194
 msgid "No results matched search"
 msgstr "一致するものがありません"
 
-#: ../src/contacts-view.vala:297
+#: ../src/contacts-view.vala:298
 msgid "Suggestions"
 msgstr "提案"
 
-#: ../src/contacts-view.vala:322
+#: ../src/contacts-view.vala:323
 msgid "Other Contacts"
 msgstr "その他の連絡先"
 
-#: ../src/contacts-window.ui.h:1 ../src/contacts-window.vala:92
+#: ../src/contacts-window.vala:200
+#, c-format
+msgid "%d Selected"
+msgid_plural "%d Selected"
+msgstr[0] "%d 件選択"
+
+#: ../src/contacts-window.vala:233 ../data/ui/contacts-window.ui.h:2
 msgid "All Contacts"
 msgstr "すべての連絡先"
 
-#: ../src/contacts-window.ui.h:2
+#: ../src/contacts-window.vala:250
+#, c-format
+msgid "Editing %s"
+msgstr "%s の編集"
+
+#: ../src/contacts-window.vala:265 ../data/ui/contacts-window.ui.h:7
+msgid "Done"
+msgstr "完了"
+
+#: ../src/contacts-window.vala:320
+#, fuzzy
+#| msgid "Address"
+msgid "Add"
+msgstr "住所"
+
+#: ../src/contacts-window.vala:411
+#, c-format
+msgid "%d contacts linked"
+msgid_plural "%d contacts linked"
+msgstr[0] "連絡先を %d 件リンクしました"
+
+#: ../src/contacts-window.vala:415 ../src/contacts-window.vala:447
+#: ../src/contacts-window.vala:489 ../src/contacts-window.vala:525
+msgid "_Undo"
+msgstr "戻す(_U)"
+
+#: ../src/contacts-window.vala:443
+#, c-format
+msgid "%d contact deleted"
+msgid_plural "%d contacts deleted"
+msgstr[0] "連絡先を %d 件削除しました"
+
+#: ../src/contacts-window.vala:486
+#, c-format
+msgid "Contact deleted: \"%s\""
+msgstr "連絡先を削除しました: \"%s\""
+
+#: ../src/contacts-window.vala:521
+#, c-format
+msgid "%s linked to %s"
+msgstr "%s を %s にリンク"
+
+#: ../src/contacts-window.vala:523
+#, c-format
+msgid "%s linked to the contact"
+msgstr "%s をこの連絡先にリンク"
+
+#: ../data/ui/app-menu.ui.h:1
+msgid "_Change Address Book..."
+msgstr "アドレス帳を変更...(_C)"
+
+#: ../data/ui/app-menu.ui.h:2
+msgid "_Help"
+msgstr "ヘルプ(_H)"
+
+#: ../data/ui/app-menu.ui.h:3
+msgid "_About"
+msgstr "このアプリケーションについて(_A)"
+
+#: ../data/ui/app-menu.ui.h:4
+msgid "_Quit"
+msgstr "終了(_Q)"
+
+#: ../data/ui/app-menu.ui.h:5
+msgid "Personal email"
+msgstr "個人のメール"
+
+#: ../data/ui/app-menu.ui.h:6
+msgid "Work email"
+msgstr "職場のメール"
+
+#: ../data/ui/app-menu.ui.h:7
+msgid "Mobile phone"
+msgstr "携帯電話"
+
+#: ../data/ui/app-menu.ui.h:8
+msgid "Home phone"
+msgstr "自宅の電話"
+
+#: ../data/ui/app-menu.ui.h:9
+msgid "Work phone"
+msgstr "職場の電話"
+
+#: ../data/ui/app-menu.ui.h:13
+msgid "Home address"
+msgstr "自宅の住所"
+
+#: ../data/ui/app-menu.ui.h:14
+msgid "Work address"
+msgstr "職場の住所"
+
+#: ../data/ui/app-menu.ui.h:15
+msgid "Notes"
+msgstr "メモ"
+
+#: ../data/ui/contacts-list-pane.ui.h:1
+msgid "Type to search"
+msgstr "検索ワードを入力"
+
+#. Link refers to the verb, from linking contacts together
+#: ../data/ui/contacts-list-pane.ui.h:3
+msgid "Link"
+msgstr "リンク"
+
+#: ../data/ui/contacts-list-pane.ui.h:4
+msgid "Delete"
+msgstr "削除"
+
+#: ../data/ui/contacts-window.ui.h:1
+msgid "Loading"
+msgstr "ロード中"
+
+#: ../data/ui/contacts-window.ui.h:3
 #, fuzzy
 #| msgid "New contact"
 msgid "Add contact"
 msgstr "新しい連絡先"
 
-#: ../src/contacts-window.ui.h:3
+#: ../data/ui/contacts-window.ui.h:4
 #, fuzzy
 #| msgid "Select"
 msgid "Selection mode"
 msgstr "選択"
 
-#: ../src/contacts-window.ui.h:4
+#: ../data/ui/contacts-window.ui.h:6
 msgid "Edit"
 msgstr "編集"
 
+#: ../data/ui/contacts-window.ui.h:8
+#, fuzzy
+#| msgid "Local Address Book"
+msgid "Select Address Book"
+msgstr "ローカルのアドレス帳"
+
+#: ../data/ui/contacts-window.ui.h:9
+#, fuzzy
+#| msgid "Cancel"
+msgid "Cancel setup"
+msgstr "キャンセル"
+
+#: ../data/ui/contacts-window.ui.h:10
+msgid "Setup complete"
+msgstr "セットアップ完了"
+
 #: ../src/org.gnome.Contacts.gschema.xml.in.h:1
 msgid "First-time setup done."
 msgstr "初期設定を完了しました。"
@@ -717,6 +741,43 @@ msgstr "表示するサブセット"
 msgid "View contacts subset"
 msgstr "表示する連絡先のサブセットを設定します。"
 
+#~ msgid "Twitter"
+#~ msgstr "Twitter"
+
+#~ msgid "Google Profile"
+#~ msgstr "Google プロフィール"
+
+#~ msgid "Google Other Contact"
+#~ msgstr "Google のその他の連絡先"
+
+#~ msgid "Create Contact"
+#~ msgstr "連絡先を作成"
+
+#~ msgid ""
+#~ "Add or \n"
+#~ "select a picture"
+#~ msgstr ""
+#~ "写真を追加\n"
+#~ "または選択"
+
+#~ msgid "Contact Name"
+#~ msgstr "連絡先名"
+
+#~ msgid "Email"
+#~ msgstr "メール"
+
+#~ msgid "Phone"
+#~ msgstr "電話"
+
+#~ msgid "You must specify a contact name"
+#~ msgstr "連絡先名を指定する必要があります"
+
+#~ msgid "Contacts Setup"
+#~ msgstr "連絡先の設定"
+
+#~ msgid "Please select your primary contacts account"
+#~ msgstr "使用する連絡先アカウントを選択してください"
+
 #~ msgid "Primary Contacts Account"
 #~ msgstr "使用する連絡先アカウント"
 
@@ -743,9 +804,6 @@ msgstr "表示する連絡先のサブセットを設定します。"
 #~ msgid "Link"
 #~ msgstr "リンク"
 
-#~ msgid "Phone number"
-#~ msgstr "電話番号"
-
 #~ msgid "Chat"
 #~ msgstr "チャット"
 
@@ -780,7 +838,9 @@ msgstr "表示する連絡先のサブセットを設定します。"
 #~ msgid "Link contacts to %s"
 #~ msgstr "連絡先を %s にリンクする"
 
-#~ msgid "Welcome to Contacts! Please select where you want to keep your address book:"
+#~ msgid ""
+#~ "Welcome to Contacts! Please select where you want to keep your address "
+#~ "book:"
 #~ msgstr "ようこそ! アドレス帳の保存先を選択してください。"
 
 #~ msgid "Online Account Settings"