[empathy] Updated Japanese translation.

[Takayuki Kusano <kusano src gnome org>]

commit 238feae615e7bf327f89dd5d67f2d5579c4d56f6
Author: Takayuki KUSANO <AE5T-KSN asahi-net or jp>
Date:   Mon Sep 6 23:25:40 2010 +0900

    Updated Japanese translation.

 po/ja.po |  622 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 313 insertions(+), 309 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index 1aa0eeb..c5673ce 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,16 +5,21 @@
 # Kentaro Kazuhama <kazken3 gmail com>, 2009.
 # GLSJPN_Etsuko <etsuko murozono ptiglobal net>, 2009.
 # (Contributed to Moblin by Intel GLS)
+# Takayuki KUSANO <AE5T-KSN asahi-net or jp>
 #
 # GLOSSARIES:
 #  contact list: 仲é??ã?ªã?¹ã??
+#  contact:      仲é??
+#  away:         �席
+#  log(s) in:    �����
+#  log(s) out:   ã?µã?¤ã?³ã?¢ã?¦ã??
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=empathy&component=general\n"
-"POT-Creation-Date: 2010-08-30 11:03+0000\n"
-"PO-Revision-Date: 2010-08-30 20:08+0900\n"
+"POT-Creation-Date: 2010-09-06 13:43+0000\n"
+"PO-Revision-Date: 2010-09-06 23:24+0900\n"
 "Last-Translator: GLSJPN_Etsuko <etsuko murozono ptiglobal net>\n"
 "Language-Team: Japanese <gnome-translation gnome gr jp>\n"
 "MIME-Version: 1.0\n"
@@ -24,14 +29,13 @@ msgstr ""
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr ""
+msgstr "Googleã??ã?¼ã?¯ã??Facebookã??MSN ã??ä»?ã?®å¤?ã??ã?®ã??ã?£ã??ã??ã?µã?¼ã??ã?¹ã?§ã??ã?£ã??ã??"
 
 #: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
 #: ../data/empathy.desktop.in.in.h:3
-#, fuzzy
 msgid "Empathy Internet Messaging"
 msgstr "Empathy ã?¤ã?³ã?¹ã?¿ã?³ã??ã?»ã?¡ã??ã?»ã?³ã?¸ã?£ã?¼"
 
@@ -55,11 +59,10 @@ msgid "Chat window theme"
 msgstr "ä¼?話ã?¦ã?£ã?³ã??ã?¦ã?®ã??ã?¼ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-#, fuzzy
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
-"ã?¹ã??ã?«ã??ã??ã?§ã??ã?¯ã??ã??è¨?èª?ã??ã?³ã?³ã??ã?§å?ºå??ã?£ã?¦æ??å®?ã??ã?¾ã?? (ä¾?: en, fr, nl)ã??"
+"ã?¹ã??ã?«ã??ã??ã?§ã??ã?¯ã??ã??è¨?èª?ã??ã?³ã?³ã??ã?§å?ºå??ã?£ã?¦æ??å®?ã??ã?¾ã?? (ä¾?: \"en, fr, nl\")ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
 msgid "Compact contact list"
@@ -70,7 +73,6 @@ msgid "Connection managers should be used"
 msgstr "æ?¥ç¶?ã??ã??ã?¼ã?¸ã?£ã??å?©ç?¨ã??ã??ã??ã?©ã??ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-#, fuzzy
 msgid "Contact list sort criterion"
 msgstr "仲é??ã?ªã?¹ã??ã??並ã?³æ?¿ã??ã??é??ã?®æ?¡ä»¶"
 
@@ -125,9 +127,8 @@ msgid "Empathy has migrated butterfly logs"
 msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-#, fuzzy
 msgid "Empathy should auto-away when idle"
-msgstr "èµ·å??æ??ã?«è?ªå??æ?¥ç¶?ã??ã??ã??ã?©ã??ã??"
+msgstr "ã?¢ã?¤ã??ã?«æ??ã?«è?ªå??ç??ã?«é?¢å¸­ã??ã??ã??ã?©ã??ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy should auto-connect on startup"
@@ -170,15 +171,14 @@ msgid "Open new chats in separate windows"
 msgstr "æ?°ã??ã??ä¼?話æ¯?ã?«ã?¦ã?£ã?³ã??ã?¦ã??é??ã??ã??ã?©ã??ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-#, fuzzy
 msgid "Path of the Adium theme to use"
-msgstr "使ç?¨ã??ã??adiumã??ã?¼ã??ã?®ã??ã?¹"
+msgstr "使ç?¨ã??ã?? Adium ã??ã?¼ã??ã?®ã??ã?¹"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-#, fuzzy
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr ""
-"ä¼?話ã?§ä½¿ç?¨ã??ã??ã??ã?¼ã??ã??adiumã?®å ´å??ã?«ä½¿ç?¨ã??ã??adiumã??ã?¼ã??ã?®ã??ã?¹ã??æ??å®?ã??ã?¾ã??ã??"
+"ä¼?話ã?§ä½¿ç?¨ã??ã??ã??ã?¼ã??ã?? Adium ã?®å ´å??ã?«ä½¿ç?¨ã??ã?? Adium ã??ã?¼ã??ã?®ã??ã?¹ã??æ??å®?ã??ã?¾"
+"ã??ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Play a sound for incoming messages"
@@ -209,21 +209,17 @@ msgid "Play a sound when we log out"
 msgstr "ã?µã?¤ã?³ã?¢ã?¦ã??ã??ã??ã??ã?µã?¦ã?³ã??ã??æ¼?å¥?ã??ã??ã??ã?©ã??ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-#, fuzzy
 msgid "Pop up notifications if the chat isn't focused"
 msgstr ""
-"ã??ã?£ã??ã??ã?»ã?¦ã?£ã?³ã??ã?¦ã?«ã??ã?©ã?¼ã?«ã?¹ã??å½?ã??ã?£ã?¦ã??ã?ªã??ã?¦ã??ã??ã??ã??ã?¢ã??ã??é??ç?¥ã??ã??ã??ã?©"
-"ã??ã??"
+"ã??ã?£ã??ã??ã?»ã?¦ã?£ã?³ã??ã?¦ã?«ã??ã?©ã?¼ã?«ã?¹ã??å½?ã??ã?£ã?¦ã??ã?ªã??å ´å??ã?«ã??ã??ã??ã?¢ã??ã??é??ç?¥ã??ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-#, fuzzy
 msgid "Pop up notifications when a contact logs in"
-msgstr "ã?µã?¤ã?³ã?¤ã?³ã??ã??é??ã?®ã??ã??ã??ã?¢ã??ã??é??ç?¥"
+msgstr "仲é??ã??ã?µã?¤ã?³ã?¤ã?³ã??ã??é??ã?«ã??ã??ã??ã?¢ã??ã??é??ç?¥"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-#, fuzzy
 msgid "Pop up notifications when a contact logs out"
-msgstr "ã?µã?¤ã?³ã?¢ã?¦ã??ã??ã??é??ã?®ã??ã??ã??ã?¢ã??ã??é??ç?¥"
+msgstr "仲é??ã??ã?µã?¤ã?³ã?¢ã?¦ã??ã??ã??é??ã?«ã??ã??ã??ã?¢ã??ã??é??ç?¥"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Show avatars"
@@ -242,9 +238,8 @@ msgid "Show offline contacts"
 msgstr "ã?ªã??ã?©ã?¤ã?³ã?ªä»²é??ã??表示ã??ã??ã??ã?©ã??ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-#, fuzzy
 msgid "Show protocols"
-msgstr "ã??ã?­ã??ã?³ã?«"
+msgstr "ã??ã?­ã??ã?³ã?«ã??表示"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Spell checking languages"
@@ -283,62 +278,52 @@ msgid "Use theme for chat rooms"
 msgstr "ä¼?話ã?¦ã?£ã?³ã??ã?¦ã?«ã??ã?¼ã??ã??é?©ç?¨ã??ã??ã??ã?©ã??ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-#, fuzzy
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Empathyã??仲é??ã?«å ´æ??ã??å?¬é??ã??ã??ã??ã?©ã??ã??ã??設å®?ã??ã?¾ã??ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-#, fuzzy
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Empathyã??GPSã?§å ´æ??ã??æ?¨æ¸¬ã??ã??ã??ã?©ã??ã??ã??設å®?ã??ã?¾ã??ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-#, fuzzy
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Empathyã??ã?»ã?«ã?©ã?¼ã??ã??ã??ã?¯ã?¼ã?¯ã?§å ´æ??ã??æ?¨æ¸¬ã??ã??ã??ã?©ã??ã??ã??設å®?ã??ã?¾ã??ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-#, fuzzy
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Empathyã??ã??ã??ã??ã?¯ã?¼ã?¯ã?§å ´æ??ã??æ?¨æ¸¬ã??ã??ã??ã?©ã??ã??ã??設å®?ã??ã?¾ã??ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-#, fuzzy
 msgid "Whether Empathy has asked about importing accounts from other programs."
 msgstr ""
-"ä»?ã?®ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³ (Pidgin ç­?) ã?§ä½¿ã?£ã?¦ã??ã??ã?¢ã?«ã?¦ã?³ã??æ??å ±ã?®å??ã??è¾¼ã?¿ã??å??ã??å??"
-"ã??ã??ã??ã??ã?¤ã?¢ã?­ã?°ã??表示ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
+"Empathy ã??ä»?ã?®ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³ã??ã??ã?¢ã?«ã?¦ã?³ã??æ??å ±ã??å??ã??è¾¼ã?¿ã??ã?®ã??å??ã??å??ã??ã??ã??"
+"ã??ã?©ã??ã??ã?§ã??ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-#, fuzzy
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr ""
 "Empathy ã??èµ·å??ã??ã??ã??è?ªå??ç??ã?«è?ªå??ã?®ã?¢ã?«ã?¦ã?³ã??ã?«ã?µã?¤ã?³ã?¤ã?³ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-#, fuzzy
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
-msgstr ""
-"Empathy ã??èµ·å??ã??ã??ã??è?ªå??ç??ã?«è?ªå??ã?®ã?¢ã?«ã?¦ã?³ã??ã?«ã?µã?¤ã?³ã?¤ã?³ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
+msgstr "ã?¢ã?¤ã??ã?«ç?¶æ??ã?«ã?ªã?£ã??ã??ã??Empathy ã??è?ªå??ç??ã?«é?¢å¸­ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-#, fuzzy
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "Empathyã??ã??ã?©ã?¤ã??ã?·ã?¼ã?®ç??ç?±ã?§å ´æ??ã?®ç²¾åº¦ã??ä¸?ã??ã??ã??ã?©ã??ã??ã??設å®?ã??ã?¾ã??ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-#, fuzzy
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
-"仲é??ã?ªã?¹ã??ã?®ã?¢ã??ã?¿ã?¼ã??ã??ã?£ã??ã??ã?»ã?¦ã?£ã?³ã??ã?¦ã?®ã?¢ã?¤ã?³ã?³ã?¨ã??ã?¦å?©ç?¨ã??ã??ã??ã?©ã??ã??ã?§"
-"ã??ã??"
+"Empathy ã??仲é??ã?®ã?¢ã??ã?¿ã?¼ã??ã??ã?£ã??ã??ã?»ã?¦ã?£ã?³ã??ã?¦ã?®ã?¢ã?¤ã?³ã?³ã?¨ã??ã?¦å?©ç?¨ã??ã??ã??ã?©ã??"
+"ã??ã?§ã??ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid ""
@@ -346,66 +331,55 @@ msgid ""
 msgstr "Web Inspectorã?®ã??ã??ã?ªWebKit developer toolsã??æ??å?¹ã?«ã??ã??ã??ã?©ã??ã??ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-#, fuzzy
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
-msgstr "æ?¥ç¶?ã??ã??ã?¼ã?¸ã?£ã??è?ªå??ç??ã?«å??æ?­/å??æ?¥ç¶?ã??å?©ç?¨ã??ã?¹ã??ã??ã?©ã??ã??ã??設å®?ã??ã?¾ã??ã??"
+msgstr ""
+"è?ªå??ç??ã?«å??æ?­/å??æ?¥ç¶?ã??ã??ã?®ã?«æ?¥ç¶?ã??ã??ã?¼ã?¸ã?£ã??å?©ç?¨ã??ã?¹ã??ã??ã?©ã??ã??ã??設å®?ã??ã?¾ã??ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-#, fuzzy
 msgid ""
 "Whether to check words typed against the languages you want to check with."
-msgstr ""
-"æ??å®?ã??ã??è¨?èª?ã?®ã?¹ã??ã?«ã?»ã??ã?§ã??ã?«ã?§å?¥å??ã??ã??å??èª?ã??ã??ã?§ã??ã?¯ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
+msgstr "æ??å®?ã??ã??è¨?èª?ã?§å?¥å??ã??ã??å??èª?ã??ã??ã?§ã??ã?¯ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-#, fuzzy
 msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "ä¼?話ã?¦ã?£ã?³ã??ã?¦ã?«å?¥å??ã??ã??ã?¹ã??ã?¤ã?ªã?¼ã??ã?¢ã?¤ã?³ã?³ã?«å¤?æ??ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
+msgstr "ä¼?話中ã?®ã?¹ã??ã?¤ã?ªã?¼ã??ã?°ã?©ã??ã?£ã?«ã?«ã?ªç?»å??ã?«å¤?æ??ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-#, fuzzy
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr ""
-"仲é??ã??ã?µã?¤ã?³ã?¤ã?³ã??ã??ã??ã?¨ã??é??ç?¥ã??ã??ã??ã??ã?«ã?µã?¦ã?³ã??ã??æ¼?å¥?ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
+"仲é??ã??ã?µã?¤ã?³ã?¤ã?³ã??ã??ã??ã?¨ã??é??ç?¥ã??ã??ã??ã??ã?«ã?µã?¦ã?³ã??ã??å??ç??ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-#, fuzzy
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr ""
-"仲é??ã??ã?µã?¤ã?³ã?¢ã?¦ã??ã??ã??ã??ã?¨ã??é??ç?¥ã??ã??ã??ã??ã?«ã?µã?¦ã?³ã??ã??æ¼?å¥?ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
+"仲é??ã??ã?µã?¤ã?³ã?¢ã?¦ã??ã??ã??ã??ã?¨ã??é??ç?¥ã??ã??ã??ã??ã?«ã?µã?¦ã?³ã??ã??å??ç??ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-#, fuzzy
 msgid "Whether to play a sound to notify of events."
-msgstr "ã?¤ã??ã?³ã??ã??ç?ºç??ã??ã??ã??ã?µã?¦ã?³ã??ã??æ¼?å¥?ã??ã?¦é??ç?¥ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
+msgstr "ã?¤ã??ã?³ã??ã??ç?ºç??ã??ã??ã??ã?µã?¦ã?³ã??ã??å??ç??ã??ã?¦é??ç?¥ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
-#, fuzzy
 msgid "Whether to play a sound to notify of incoming messages."
-msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??å??ã??å??ã?£ã??ã??ã?µã?¦ã?³ã??ã??æ¼?å¥?ã??ã?¦é??ç?¥ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
+msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??å??ã??å??ã?£ã??ã??ã?µã?¦ã?³ã??ã??å??ç??ã??ã?¦é??ç?¥ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-#, fuzzy
 msgid "Whether to play a sound to notify of new conversations."
-msgstr "æ?°ã??ã??ä¼?話ã??é??å§?ã??ã??ã??ã?µã?¦ã?³ã??ã??æ¼?å¥?ã??ã?¦é??ç?¥ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
+msgstr "æ?°ã??ã??ä¼?話ã??é??å§?ã??ã??ã??ã?µã?¦ã?³ã??ã??å??ç??ã??ã?¦é??ç?¥ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-#, fuzzy
 msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ã??ã??ã??ã?µã?¦ã?³ã??ã??æ¼?å¥?ã??ã?¦é??ç?¥ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
+msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ã??ã??ã??ã?µã?¦ã?³ã??ã??å??ç??ã??ã?¦é??ç?¥ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-#, fuzzy
 msgid "Whether to play a sound when logging into a network."
-msgstr "ã?¢ã?«ã?¦ã?³ã??ã?«ã?µã?¤ã?³ã?¤ã?³ã??ã??ã??ã?µã?¦ã?³ã??ã??æ¼?å¥?ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
+msgstr "ã??ã??ã??ã?¯ã?¼ã?¯ã?«ã?µã?¤ã?³ã?¤ã?³ã??ã??ã??ã?µã?¦ã?³ã??ã??å??ç??ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-#, fuzzy
 msgid "Whether to play a sound when logging out of a network."
-msgstr "ã?¢ã?«ã?¦ã?³ã??ã??ã??ã?µã?¤ã?³ã?¢ã?¦ã??ã??ã??ã??ã?µã?¦ã?³ã??ã??æ¼?å¥?ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
+msgstr "ã??ã??ã??ã?¯ã?¼ã?¯ã??ã??ã?µã?¤ã?³ã?¢ã?¦ã??ã??ã??ã??ã?µã?¦ã?³ã??ã??å??ç??ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 #, fuzzy
@@ -414,18 +388,14 @@ msgstr ""
 "ç?¶æ??ã??é?¢å¸­ä¸­ã?¾ã??ã?¯å¤?å¿?ã?«ã?ªã?£ã??ã??ã?µã?¦ã?³ã??ã?®æ¼?å¥?ã?«ã??ã??é??ç?¥ã??è¡?ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-#, fuzzy
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr ""
-"仲é??ã??ã?ªã??ã?©ã?¤ã?³ã?«ã?ªã?£ã??é??ã?«ã??ã??ã??ã?¢ã??ã??ã?§é??ç?¥ã??表示ã??ã??ã??ã?©ã??ã??ã??設å®?ã??ã?¾"
-"ã??ã??"
+"仲é??ã??ã?ªã??ã?©ã?¤ã?³ã?«ã?ªã?£ã??é??ã?«ã??ã??ã??ã?¢ã??ã??ã?§ã?®é??ç?¥ã??表示ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-#, fuzzy
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr ""
-"仲é??ã??ã?ªã?³ã?©ã?¤ã?³ã?«ã?ªã?£ã??é??ã?«ã??ã??ã??ã?¢ã??ã??ã?§é??ç?¥ã??表示ã??ã??ã??ã?©ã??ã??ã??設å®?ã??ã?¾"
-"ã??ã??"
+"仲é??ã??ã?ªã?³ã?©ã?¤ã?³ã?«ã?ªã?£ã??é??ã?«ã??ã??ã??ã?¢ã??ã??ã?§ã?®é??ç?¥ã??表示ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 #, fuzzy
@@ -643,32 +613,27 @@ msgstr "証æ??æ?¸ã?«é?¢é?£ã??ã??ã?¨ã?©ã?¼ã?§ã??"
 
 #: ../libempathy/empathy-utils.c:352
 msgid "Encryption is not available"
-msgstr ""
+msgstr "æ??å?·ã??å?©ç?¨ã?§ã??ã?¾ã??ã??"
 
 #: ../libempathy/empathy-utils.c:354
-#, fuzzy
 msgid "Certificate is invalid"
-msgstr "証æ??æ?¸ã?¯å?©ç?¨ã?§ã??ã?¾ã??ã??"
+msgstr "証æ??æ?¸ã??æ­£ã??ã??ã??ã??ã?¾ã??ã??"
 
 #: ../libempathy/empathy-utils.c:356
-#, fuzzy
 msgid "Connection has been refused"
-msgstr "æ?¥ç¶?ã??ã??ã?¼ã?¸ã?£ã??å?©ç?¨ã??ã??ã??ã?©ã??ã??"
+msgstr "æ?¥ç¶?ã??æ??å?¦ã??ã??ã?¾ã??ã??"
 
 #: ../libempathy/empathy-utils.c:358
-#, fuzzy
 msgid "Connection can't be established"
-msgstr "æ?¥ç¶?ã??ã??ã?¼ã?¸ã?£ã??å?©ç?¨ã??ã??ã??ã?©ã??ã??"
+msgstr "æ?¥ç¶?ã??確ç«?ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
 #: ../libempathy/empathy-utils.c:360
-#, fuzzy
 msgid "Connection has been lost"
-msgstr "æ?¥ç¶?ã??ã??ã?¼ã?¸ã?£ã??å?©ç?¨ã??ã??ã??ã?©ã??ã??"
+msgstr "æ?¥ç¶?ã??失ã??ã??ã?¾ã??ã??"
 
 #: ../libempathy/empathy-utils.c:362
-#, fuzzy
 msgid "This resource is already connected to the server"
-msgstr "ã??ã??ã?«ã??ã?£ã?¦ã??ã?µã?¼ã??ã?¼ã??ã??ã?¢ã?«ã?¦ã?³ã??ã??å??é?¤ã??ã??ã??ã??ã?¨ã?¯ã??ã??ã?¾ã??ã??ã??"
+msgstr "ã??ã?®ã?ªã?½ã?¼ã?¹ã?¯æ?¢ã?«ã?µã?¼ã??ã?«æ?¥ç¶?æ¸?ã?¿ã?§ã??"
 
 #: ../libempathy/empathy-utils.c:364
 msgid ""
@@ -684,9 +649,8 @@ msgid "Server is currently too busy to handle the connection"
 msgstr ""
 
 #: ../libempathy/empathy-utils.c:371
-#, fuzzy
 msgid "Certificate has been revoked"
-msgstr "証æ??æ?¸ã??ã??ã??ã?¾ã??ã??"
+msgstr "証æ??æ?¸ã??ç?¡å?¹å??ã??ã??ã?¾ã??ã??"
 
 #: ../libempathy/empathy-utils.c:373
 msgid ""
@@ -755,70 +719,96 @@ msgstr "���"
 msgid "All"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-account-widget.c:549
-#: ../libempathy-gtk/empathy-account-widget.c:606
+#: ../libempathy-gtk/empathy-account-widget.c:514
+#: ../libempathy-gtk/empathy-log-window.c:646
+#: ../src/empathy-import-widget.c:312
+msgid "Account"
+msgstr "ã?¢ã?«ã?¦ã?³ã??"
+
+#: ../libempathy-gtk/empathy-account-widget.c:515
+#, fuzzy
+msgid "Password"
+msgstr "ã??ã?¹ã?¯ã?¼ã??:"
+
+#: ../libempathy-gtk/empathy-account-widget.c:516
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
+msgid "Server"
+msgstr "ã?µã?¼ã??"
+
+#: ../libempathy-gtk/empathy-account-widget.c:517
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
+msgid "Port"
+msgstr "ã??ã?¼ã??ç?ªå?·"
+
+#: ../libempathy-gtk/empathy-account-widget.c:589
+#: ../libempathy-gtk/empathy-account-widget.c:646
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1145
-#, fuzzy
+#: ../libempathy-gtk/empathy-account-widget.c:1192
 msgid "Username:"
-msgstr "ã?¦ã?¼ã?¶å??(_U):"
+msgstr "ã?¦ã?¼ã?¶å??:"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1522
+msgid "A_pply"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget.c:1488
+#: ../libempathy-gtk/empathy-account-widget.c:1552
 msgid "L_og in"
 msgstr "����(_O)"
 
 #. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1556
+#: ../libempathy-gtk/empathy-account-widget.c:1618
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1397
+#: ../libempathy-gtk/empathy-individual-widget.c:1401
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid "Account:"
 msgstr "ã?¢ã?«ã?¦ã?³ã??:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1567
-msgid "Enabled"
+#: ../libempathy-gtk/empathy-account-widget.c:1629
+#, fuzzy
+msgid "_Enabled"
 msgstr "�����"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1632
-#, fuzzy
+#: ../libempathy-gtk/empathy-account-widget.c:1694
 msgid "This account already exists on the server"
-msgstr "ã??ã??ã?«ã??ã?£ã?¦ã??ã?µã?¼ã??ã?¼ã??ã??ã?¢ã?«ã?¦ã?³ã??ã??å??é?¤ã??ã??ã??ã??ã?¨ã?¯ã??ã??ã?¾ã??ã??ã??"
+msgstr "ã??ã?®ã?¢ã?«ã?¦ã?³ã??ã?¯ã??ã?§ã?«ã?µã?¼ã??ã?«å­?å?¨ã??ã?¾ã??"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1635
-#, fuzzy
+#: ../libempathy-gtk/empathy-account-widget.c:1697
 msgid "Create a new account on the server"
-msgstr "ã?¢ã?«ã?¦ã?³ã??ã??ä½?ã??ï¼?_C)"
+msgstr "ã?µã?¼ã??ã?§æ?°ã??ã??ã?¢ã?«ã?¦ã?³ã??ã??ä½?ã??"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1790
+msgid "Ca_ncel"
+msgstr ""
 
 #. To translators: The first parameter is the login id and the
-#. * second one is the server. The resulting string will be something
-#. * like: "MyUserName on chat.freenode.net".
+#. * second one is the network. The resulting string will be something
+#. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2004
+#: ../libempathy-gtk/empathy-account-widget.c:2078
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%2$s ã?«ã??ã?? %1$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2030
+#: ../libempathy-gtk/empathy-account-widget.c:2104
 #, c-format
 msgid "%s Account"
 msgstr "%s ã?¢ã?«ã?¦ã?³ã??"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2034
+#: ../libempathy-gtk/empathy-account-widget.c:2108
 msgid "New account"
 msgstr "æ?°ã??ã??ã?¢ã?«ã?¦ã?³ã??"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-#, fuzzy
 msgid "<b>Example:</b> MyScreenName"
-msgstr "<span size=\"small\"><b>ä¾?:</b> MyScreenName</span>"
+msgstr "<b>ä¾?:</b> MyScreenName"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
@@ -834,11 +824,11 @@ msgstr "詳細"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "Pass_word:"
 msgstr "ã??ã?¹ã?¯ã?¼ã??(_W):"
 
@@ -875,12 +865,11 @@ msgstr "ã?µã?¼ã??(_S):"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-#, fuzzy
 msgid "<b>Example:</b> username"
-msgstr "<span size=\"small\"><b>ä¾?:</b> username</span>"
+msgstr "<b>ä¾?:</b> username"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "Login I_D:"
 msgstr "ã?­ã?°ã?¤ã?³å??(_D):"
@@ -894,58 +883,55 @@ msgid "What is your GroupWise password?"
 msgstr "GroupWiseã?®ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
-#, fuzzy
 msgid "<b>Example:</b> 123456789"
-msgstr "<span size=\"small\"><b>ä¾?:</b> 123456789</span>"
+msgstr "<b>ä¾?:</b> 123456789"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#, fuzzy
+msgid "Ch_aracter set:"
+msgstr "æ??å­?é??å??:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
 msgid "ICQ _UIN:"
 msgstr "ICQ UIN(_U):"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
 msgid "What is your ICQ UIN?"
 msgstr "ICQ UINã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
 msgid "What is your ICQ password?"
 msgstr "ICQã?®ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-#, fuzzy
-msgid "_Character set:"
-msgstr "æ??å­?é??å??(_C):"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.c:183
 #: ../libempathy-gtk/empathy-account-widget-sip.c:216
-#, fuzzy
 msgid "Auto"
-msgstr "æ??å ±(_A)"
+msgstr "è?ªå??"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.c:186
 msgid "UDP"
-msgstr ""
+msgstr "UDP"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.c:189
 msgid "TCP"
-msgstr ""
+msgstr "TCP"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.c:192
 msgid "TLS"
-msgstr ""
+msgstr "TLS"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
 #: ../libempathy-gtk/empathy-account-widget-sip.c:221
-#, fuzzy
 msgid "Register"
-msgstr "西欧"
+msgstr "Register"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
 #: ../libempathy-gtk/empathy-account-widget-sip.c:226
 msgid "Options"
-msgstr ""
+msgstr "Options"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.c:229
 #, fuzzy
@@ -953,7 +939,6 @@ msgid "None"
 msgstr "ã??ã??ã??"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#, fuzzy
 msgid "Character set:"
 msgstr "æ??å­?é??å??:"
 
@@ -1004,20 +989,31 @@ msgstr "<span size=\"small\"><b>ä¾?:</b> user gmail com</span>"
 msgid "<b>Example:</b> user jabber org"
 msgstr "<span size=\"small\"><b>ä¾?:</b> user jabber org</span>"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+#, fuzzy
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "TLS/SSL ã??使ã?£ã?¦æ??å?·å??ã??ã??(_E)"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+#, fuzzy
+msgid "I_gnore SSL certificate errors"
+msgstr "SSL ã?®è¨¼æ??æ?¸ã?«é?¢é?£ã??ã??ã?¨ã?©ã?¼ã?¯ç?¡è¦?ã??ã??(_I)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 msgid "Override server settings"
 msgstr "ã?µã?¼ã??ã?®è¨­å®?ã??ä¸?æ?¸ã??ã??ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Pri_ority:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+#, fuzzy
+msgid "Priori_ty:"
 msgstr "å?ªå??度(_O):"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "Reso_urce:"
 msgstr "����(_U):"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1025,52 +1021,44 @@ msgid ""
 "Facebook username if you don't have one."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
 msgid "Use old SS_L"
 msgstr "å?¤ã?? SSL ã??使ã??(_L)"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
 #, fuzzy
 msgid "What is your Facebook password?"
 msgstr "Yahoo!ã?®ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
 #, fuzzy
 msgid "What is your Facebook username?"
 msgstr "Windows Liveã?®ã?¦ã?¼ã?¶å??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
 msgid "What is your Google ID?"
 msgstr "Google IDã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
 msgid "What is your Google password?"
 msgstr "Googleã?®ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 msgid "What is your Jabber ID?"
 msgstr "Jabber IDã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 msgid "What is your Jabber password?"
 msgstr "Jabberã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
 msgid "What is your desired Jabber ID?"
 msgstr "å¸?æ??ã??ã??Jabber IDã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
 msgid "What is your desired Jabber password?"
 msgstr "å¸?æ??ã??ã??Jabberã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "_Encryption required (TLS/SSL)"
-msgstr "TLS/SSL ã??使ã?£ã?¦æ??å?·å??ã??ã??(_E)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "_Ignore SSL certificate errors"
-msgstr "SSL ã?®è¨¼æ??æ?¸ã?«é?¢é?£ã??ã??ã?¨ã?©ã?¼ã?¯ç?¡è¦?ã??ã??(_I)"
-
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
 #, fuzzy
 msgid "<b>Example:</b> user hotmail com"
@@ -1087,25 +1075,26 @@ msgstr "Windows Liveã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
 #, fuzzy
-msgid "_E-mail address:"
-msgstr "E-���(_E):"
+msgid "E-_mail address:"
+msgstr "E-ã?¡ã?¼ã?«ã?¢ã??ã?¬ã?¹:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#, fuzzy
+msgid "Nic_kname:"
+msgstr "ã??ã? å??:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
 msgid "_First Name:"
 msgstr "å??å??(_F):"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "Jabber ID(_J):"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
 msgid "_Last Name:"
 msgstr "å??å­?(_L):"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Nickname:"
-msgstr "ã??ã? å??(_N):"
-
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
 msgid "_Published Name:"
 msgstr "�称(_P):"
@@ -1190,27 +1179,27 @@ msgstr "ã?¦ã?¼ã?¶å??(_U):"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
 #, fuzzy
+msgid "I_gnore conference and chat room invitations"
+msgstr "ä¼?è­°ã?¨ã??ã?£ã??ã??é?¨å±?ã?¸ã?®å?§èª?ã??ç?¡è¦?ã??ã??(_I)"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#, fuzzy
 msgid "Use _Yahoo! Japan"
 msgstr "Yahoo Japan ã?«æ?¥ç¶?ã??ã??(_J)"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "What is your Yahoo! ID?"
 msgstr "Yahoo! IDã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
 msgid "What is your Yahoo! password?"
 msgstr "Yahoo!ã?®ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
 #, fuzzy
 msgid "Yahoo! I_D:"
 msgstr "Yahoo ã?® ID(_D):"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-#, fuzzy
-msgid "_Ignore conference and chat room invitations"
-msgstr "ä¼?è­°ã?¨ã??ã?£ã??ã??é?¨å±?ã?¸ã?®å?§èª?ã??ç?¡è¦?ã??ã??(_I)"
-
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "_Room List locale:"
 msgstr "é?¨å±?ã?®ä¸?覧ã??ã??ã??å ´æ??(_R):"
@@ -1245,145 +1234,145 @@ msgstr "å?¨ã?¦ã?®ã??ã?¡ã?¤ã?«"
 msgid "Click to enlarge"
 msgstr "ã?¯ã?ªã??ã?¯ã??ã??ã?¨å¤§ã??ã??ã?ªã??ã?¾ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:639
+#: ../libempathy-gtk/empathy-chat.c:642
 #, fuzzy
 msgid "Failed to open private chat"
 msgstr "ã??ã?®ä¼?話ã?«å??æ?¥ç¶?ã?§ã??ã?¾ã??ã??ã?§ã??ã??ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:679
+#: ../libempathy-gtk/empathy-chat.c:682
 msgid "Topic not supported on this conversation"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:685
+#: ../libempathy-gtk/empathy-chat.c:688
 msgid "You are not allowed to change the topic"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:819
+#: ../libempathy-gtk/empathy-chat.c:822
 msgid "/clear: clear all messages from the current conversation"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:822
+#: ../libempathy-gtk/empathy-chat.c:825
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:825
+#: ../libempathy-gtk/empathy-chat.c:828
 msgid "/join <chat room ID>: join a new chat room"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:828
+#: ../libempathy-gtk/empathy-chat.c:831
 msgid "/j <chat room ID>: join a new chat room"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:833
+#: ../libempathy-gtk/empathy-chat.c:836
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:836
+#: ../libempathy-gtk/empathy-chat.c:839
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:840
+#: ../libempathy-gtk/empathy-chat.c:843
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:843
+#: ../libempathy-gtk/empathy-chat.c:846
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:846
+#: ../libempathy-gtk/empathy-chat.c:849
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:851
+#: ../libempathy-gtk/empathy-chat.c:854
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:861
+#: ../libempathy-gtk/empathy-chat.c:864
 #, fuzzy, c-format
 msgid "Usage: %s"
 msgstr ""
 "\n"
 "ã?¡ã??ã?»ã?¼ã?¸: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:890
+#: ../libempathy-gtk/empathy-chat.c:893
 #, fuzzy
 msgid "Unknown command"
 msgstr "å??å? ä¸?æ??ã?§ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:1011
+#: ../libempathy-gtk/empathy-chat.c:1014
 msgid "Unknown command; see /help for the available commands"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1149
+#: ../libempathy-gtk/empathy-chat.c:1152
 msgid "offline"
 msgstr "ã?ªã??ã?©ã?¤ã?³"
 
-#: ../libempathy-gtk/empathy-chat.c:1152
+#: ../libempathy-gtk/empathy-chat.c:1155
 msgid "invalid contact"
 msgstr "ç?¡å?¹ã?ªä»²é??ã?§ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1158
 msgid "permission denied"
 msgstr "権é??ã??ã??ã??ã?¾ã??ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:1158
+#: ../libempathy-gtk/empathy-chat.c:1161
 msgid "too long message"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??é?·ã??ã??ã?¾ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:1161
+#: ../libempathy-gtk/empathy-chat.c:1164
 msgid "not implemented"
 msgstr "æ?ªå®?è£?ã?§ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:1165
+#: ../libempathy-gtk/empathy-chat.c:1168
 msgid "unknown"
 msgstr "å??å? ä¸?æ??ã?§ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:1169
+#: ../libempathy-gtk/empathy-chat.c:1172
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "'%s' ã?¨ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ã??ã??é??ã?«ã?¨ã?©ã?¼: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1279 ../src/empathy-chat-window.c:691
+#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:691
 msgid "Topic:"
 msgstr "ã??ã??ã??ã?¯:"
 
-#: ../libempathy-gtk/empathy-chat.c:1291
+#: ../libempathy-gtk/empathy-chat.c:1294
 #, c-format
 msgid "Topic set to: %s"
 msgstr "æ?°ã??ã??ã??ã??ã??ã?¯: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1293
+#: ../libempathy-gtk/empathy-chat.c:1296
 msgid "No topic defined"
 msgstr "ã??ã??ã??ã?¯ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:1772
+#: ../libempathy-gtk/empathy-chat.c:1775
 msgid "(No Suggestions)"
 msgstr "(æ??æ¡?ã?ªã??)"
 
-#: ../libempathy-gtk/empathy-chat.c:1826
+#: ../libempathy-gtk/empathy-chat.c:1829
 msgid "Insert Smiley"
 msgstr "ã?¹ã??ã?¤ã?ªã?¼ã?®æ?¿å?¥"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1844
+#: ../libempathy-gtk/empathy-chat.c:1847
 #: ../libempathy-gtk/empathy-ui-utils.c:1801
 msgid "_Send"
 msgstr "é??ä¿¡(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1878
+#: ../libempathy-gtk/empathy-chat.c:1881
 msgid "_Spelling Suggestions"
 msgstr "ã?¹ã??ã?«ã?®æ??æ¡?(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1955
+#: ../libempathy-gtk/empathy-chat.c:1958
 msgid "Failed to retrieve recent logs"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:2061
+#: ../libempathy-gtk/empathy-chat.c:2064
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s ã?¯å??æ?­ã??ã??ã?¾ã??ã??"
@@ -1391,12 +1380,12 @@ msgstr "%s ã?¯å??æ?­ã??ã??ã?¾ã??ã??"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2068
+#: ../libempathy-gtk/empathy-chat.c:2071
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s ã?¯ %2$s ã?«kickã??ã??ã?¾ã??ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:2071
+#: ../libempathy-gtk/empathy-chat.c:2074
 #, c-format
 msgid "%s was kicked"
 msgstr "%s ã?¯kickã??ã??ã?¾ã??ã??"
@@ -1404,17 +1393,17 @@ msgstr "%s ã?¯kickã??ã??ã?¾ã??ã??"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2079
+#: ../libempathy-gtk/empathy-chat.c:2082
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s ã?? %2$s ã?«BANã??ã??ã?¾ã??ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:2082
+#: ../libempathy-gtk/empathy-chat.c:2085
 #, c-format
 msgid "%s was banned"
 msgstr "%s ã?¯BANã??ã??ã?¾ã??ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:2086
+#: ../libempathy-gtk/empathy-chat.c:2089
 #, c-format
 msgid "%s has left the room"
 msgstr "%s ã??ã??ã??é?¨å±?ã??ã??é??室ã??ã?¾ã??ã??"
@@ -1424,46 +1413,46 @@ msgstr "%s ã??ã??ã??é?¨å±?ã??ã??é??室ã??ã?¾ã??ã??"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2095
+#: ../libempathy-gtk/empathy-chat.c:2098
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2120
+#: ../libempathy-gtk/empathy-chat.c:2123
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s ã??ã??ã??é?¨å±?ã?«å?¥å®¤ã??ã?¾ã??ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:2145
+#: ../libempathy-gtk/empathy-chat.c:2148
 #, fuzzy, c-format
 msgid "%s is now known as %s"
 msgstr "%s ã??ã??ã?¯ã?ªã?³ã?©ã?¤ã?³ã?§ã??ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:2284 ../src/empathy-call-window.c:1922
+#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1922
 msgid "Disconnected"
 msgstr "ä¸?é??"
 
-#: ../libempathy-gtk/empathy-chat.c:2922
+#: ../libempathy-gtk/empathy-chat.c:2934
 msgid "Wrong password; please try again:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:2923
+#: ../libempathy-gtk/empathy-chat.c:2935
 msgid "Retry"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:2928
+#: ../libempathy-gtk/empathy-chat.c:2940
 msgid "This room is protected by a password:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:2929
+#: ../libempathy-gtk/empathy-chat.c:2941
 msgid "Join"
 msgstr "å?¥å®¤ã??ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:3069
+#: ../libempathy-gtk/empathy-chat.c:3081
 msgid "Connected"
 msgstr "�����"
 
-#: ../libempathy-gtk/empathy-chat.c:3122
+#: ../libempathy-gtk/empathy-chat.c:3134
 #: ../libempathy-gtk/empathy-log-window.c:653
 msgid "Conversation"
 msgstr "�話"
@@ -1487,7 +1476,7 @@ msgid "%A %B %d %Y"
 msgstr "%Yå¹´%B%eæ?¥ %A"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:243
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:249
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:248
 msgid "Edit Contact Information"
 msgstr "仲é??æ??å ±ã?®ç·¨é??"
 
@@ -1509,108 +1498,101 @@ msgid "Subscription Request"
 msgstr "ç?»é?²ã?®ã?ªã?¯ã?¨ã?¹ã??"
 
 #: ../libempathy-gtk/empathy-contact-list-view.c:2004
-#: ../libempathy-gtk/empathy-individual-view.c:2218
+#: ../libempathy-gtk/empathy-individual-view.c:2232
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "æ?¬å½?ã?« '%s' ã?¨ã??ã??ã?°ã?«ã?¼ã??ã??å??é?¤ã??ã?¾ã??ã??ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-list-view.c:2006
-#: ../libempathy-gtk/empathy-individual-view.c:2221
+#: ../libempathy-gtk/empathy-individual-view.c:2235
 msgid "Removing group"
 msgstr "ã?°ã?«ã?¼ã??ã?®å??é?¤"
 
 #. Remove
 #: ../libempathy-gtk/empathy-contact-list-view.c:2055
 #: ../libempathy-gtk/empathy-contact-list-view.c:2132
-#: ../libempathy-gtk/empathy-individual-view.c:2275
-#: ../libempathy-gtk/empathy-individual-view.c:2360
+#: ../libempathy-gtk/empathy-individual-view.c:2289
+#: ../libempathy-gtk/empathy-individual-view.c:2387
 #: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Remove"
 msgstr "å??é?¤(_R)"
 
 #: ../libempathy-gtk/empathy-contact-list-view.c:2085
-#: ../libempathy-gtk/empathy-individual-view.c:2306
+#: ../libempathy-gtk/empathy-individual-view.c:2320
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "æ?¬å½?ã?« '%s' ã?¨ã??ã??仲é??ã??å??é?¤ã??ã?¾ã??ã??ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-list-view.c:2087
-#: ../libempathy-gtk/empathy-individual-view.c:2308
+#: ../libempathy-gtk/empathy-individual-view.c:2322
 msgid "Removing contact"
 msgstr "仲é??ã?®å??é?¤"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:203
-#: ../libempathy-gtk/empathy-individual-menu.c:364
 #: ../src/empathy-main-window.ui.h:13
 #, fuzzy
 msgid "_Add Contactâ?¦"
 msgstr "仲é??ã?®è¿½å? (_A)..."
 
 #: ../libempathy-gtk/empathy-contact-menu.c:230
-#: ../libempathy-gtk/empathy-individual-menu.c:467
+#: ../libempathy-gtk/empathy-individual-menu.c:514
 #: ../src/empathy-main-window.ui.h:14
 msgid "_Chat"
 msgstr "�話(_C)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:260
-#: ../libempathy-gtk/empathy-individual-menu.c:508
+#: ../libempathy-gtk/empathy-individual-menu.c:557
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "�声��話(_A)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:290
-#: ../libempathy-gtk/empathy-individual-menu.c:550
+#: ../libempathy-gtk/empathy-individual-menu.c:599
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "æ? å??ã?§ä¼?話(_V)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:330
-#: ../libempathy-gtk/empathy-individual-menu.c:608
+#: ../libempathy-gtk/empathy-individual-menu.c:642
 #: ../src/empathy-main-window.ui.h:25
 msgid "_Previous Conversations"
 msgstr "�話�履歴(_P)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:352
-#: ../libempathy-gtk/empathy-individual-menu.c:649
-#, fuzzy
+#: ../libempathy-gtk/empathy-individual-menu.c:683
 msgid "Send File"
 msgstr "ã??ã?¡ã?¤ã?«ã?®é??ä¿¡"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:375
-#: ../libempathy-gtk/empathy-individual-menu.c:691
-#, fuzzy
+#: ../libempathy-gtk/empathy-individual-menu.c:725
 msgid "Share My Desktop"
 msgstr "ã??ã?¹ã?¯ã??ã??ã??ã??å?±æ??ã??ã??"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:415
 #: ../libempathy-gtk/empathy-contact-widget.c:1541
-#: ../libempathy-gtk/empathy-individual-menu.c:725
-#: ../libempathy-gtk/empathy-individual-widget.c:1288
-#, fuzzy
+#: ../libempathy-gtk/empathy-individual-menu.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:1292
 msgid "Favorite"
-msgstr "ã??æ°?ã?«å?¥ã??ã?«è¿½å? (_F)"
+msgstr "ã??æ°?ã?«å?¥ã??"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:444
-#: ../libempathy-gtk/empathy-individual-menu.c:752
+#: ../libempathy-gtk/empathy-individual-menu.c:786
 msgid "Infor_mation"
 msgstr "æ??å ±(_M)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:490
-#, fuzzy
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "ç·¨é??(_E)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:544
-#: ../libempathy-gtk/empathy-individual-menu.c:945
+#: ../libempathy-gtk/empathy-individual-menu.c:970
 #: ../src/empathy-chat-window.c:903
-#, fuzzy
 msgid "Inviting you to this room"
 msgstr "ã??ã?®é?¨å±?ã?«æ??å¾?ã??ã?¾ã??"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:575
-#: ../libempathy-gtk/empathy-individual-menu.c:992
-#, fuzzy
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
 msgid "_Invite to Chat Room"
 msgstr "ã??ã?£ã??ã??é?¨å±?ã?«æ??å¾?ã??ã??(_I)"
 
@@ -1620,25 +1602,23 @@ msgstr "é?£çµ¡å??ã?®é?¸æ??"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:217
 #: ../libempathy-gtk/empathy-individual-widget.c:148
-#, fuzzy
 msgid "Full name:"
 msgstr "æ°?å??:"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:218
 #: ../libempathy-gtk/empathy-individual-widget.c:149
 msgid "Phone number:"
-msgstr ""
+msgstr "�話��:"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:219
 #: ../libempathy-gtk/empathy-individual-widget.c:150
 msgid "E-mail address:"
-msgstr ""
+msgstr "E-ã?¡ã?¼ã?«ã?¢ã??ã?¬ã?¹:"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:220
 #: ../libempathy-gtk/empathy-individual-widget.c:151
-#, fuzzy
 msgid "Website:"
-msgstr "ã??ã?¼ã? ã??ã?¼ã?¸:"
+msgstr "ã?¦ã?§ã??ã?µã?¤ã??:"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:221
 #: ../libempathy-gtk/empathy-individual-widget.c:152
@@ -1646,152 +1626,152 @@ msgid "Birthday:"
 msgstr "èª?ç??æ?¥:"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:579
-#: ../libempathy-gtk/empathy-individual-widget.c:451
+#: ../libempathy-gtk/empathy-individual-widget.c:454
 msgid "Country ISO Code:"
 msgstr "ISOã?«ã??ã??å?½ã?³ã?¼ã??:"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:581
-#: ../libempathy-gtk/empathy-individual-widget.c:453
+#: ../libempathy-gtk/empathy-individual-widget.c:456
 msgid "Country:"
 msgstr "å?½:"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:583
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-individual-widget.c:458
 msgid "State:"
 msgstr "����:"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:585
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-individual-widget.c:460
 msgid "City:"
 msgstr "���"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:587
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-individual-widget.c:462
 msgid "Area:"
 msgstr "å?°å??:"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:589
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-individual-widget.c:464
 msgid "Postal Code:"
 msgstr "�便���"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:591
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-individual-widget.c:466
 msgid "Street:"
 msgstr "é??ã??:"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:593
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-individual-widget.c:468
 msgid "Building:"
 msgstr "ã??ã?«ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:595
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-individual-widget.c:470
 msgid "Floor:"
 msgstr "é??ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:597
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-individual-widget.c:472
 msgid "Room:"
 msgstr "����:"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:599
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-individual-widget.c:474
 msgid "Text:"
 msgstr "ã??ã?­ã?¹ã??:"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:601
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-individual-widget.c:476
 msgid "Description:"
 msgstr "説æ??:"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:603
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-individual-widget.c:478
 msgid "URI:"
 msgstr "URIï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:605
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-individual-widget.c:480
 msgid "Accuracy Level:"
 msgstr "精度ã?®ã?¬ã??ã?«:"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-individual-widget.c:482
 msgid "Error:"
 msgstr "���:"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:609
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-individual-widget.c:484
 msgid "Vertical Error (meters):"
 msgstr "å??ç?´èª¤å·® (ã?¡ã?¼ã??ã?«):"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:611
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-individual-widget.c:486
 msgid "Horizontal Error (meters):"
 msgstr "水平誤差 (ã?¡ã?¼ã??ã?«):"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:613
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-individual-widget.c:488
 msgid "Speed:"
 msgstr "é??度:"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:615
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-individual-widget.c:490
 msgid "Bearing:"
 msgstr "��:"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:617
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-individual-widget.c:492
 msgid "Climb Speed:"
 msgstr "ä¸?æ??é??度:"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:619
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-individual-widget.c:494
 msgid "Last Updated on:"
 msgstr "æ??å¾?ã?®ã?¢ã??ã??ã??ã?¼ã??ã?¯ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:621
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-individual-widget.c:496
 msgid "Longitude:"
 msgstr "�度:"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:623
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-individual-widget.c:498
 msgid "Latitude:"
 msgstr "緯度:"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:625
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-individual-widget.c:500
 msgid "Altitude:"
 msgstr "�度:"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:688
 #: ../libempathy-gtk/empathy-contact-widget.c:705
-#: ../libempathy-gtk/empathy-individual-widget.c:578
-#: ../libempathy-gtk/empathy-individual-widget.c:595
+#: ../libempathy-gtk/empathy-individual-widget.c:582
+#: ../libempathy-gtk/empathy-individual-widget.c:599
 #: ../src/empathy-preferences.ui.h:12
 msgid "Location"
 msgstr "å ´æ??"
 
 #. translators: format is "Location, $date"
 #: ../libempathy-gtk/empathy-contact-widget.c:707
-#: ../libempathy-gtk/empathy-individual-widget.c:597
+#: ../libempathy-gtk/empathy-individual-widget.c:601
 #, fuzzy, c-format
 msgid "%s, %s"
 msgstr "%s / %s"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:759
-#: ../libempathy-gtk/empathy-individual-widget.c:646
+#: ../libempathy-gtk/empathy-individual-widget.c:650
 msgid "%B %e, %Y at %R UTC"
 msgstr "%R UTCã??ã?«ã??%B %e, %Y"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:842
-#: ../libempathy-gtk/empathy-individual-widget.c:837
+#: ../libempathy-gtk/empathy-individual-widget.c:841
 msgid "Save Avatar"
 msgstr "ã?¢ã??ã?¿ã?¼ã?®ä¿?å­?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:898
-#: ../libempathy-gtk/empathy-individual-widget.c:895
+#: ../libempathy-gtk/empathy-individual-widget.c:899
 msgid "Unable to save avatar"
 msgstr "ã?¢ã??ã?¿ã?¼ã??ä¿?å­?ã?§ã??ã?¾ã??ã??"
 
@@ -1801,7 +1781,7 @@ msgstr "<b>å ´æ??</b> ã?§ (date)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1223
+#: ../libempathy-gtk/empathy-individual-widget.c:1227
 msgid "Alias:"
 msgstr "ã??ã? å??:"
 
@@ -1821,7 +1801,7 @@ msgstr "仲é??ã?®è©³ç´°"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1427
+#: ../libempathy-gtk/empathy-individual-widget.c:1431
 msgid "Identifier:"
 msgstr "ã?¹ã?¯ã?ªã?¼ã?³å??:"
 
@@ -1856,6 +1836,7 @@ msgid "_Add Group"
 msgstr "ã?°ã?«ã?¼ã??ã?®è¿½å? (_A)"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:397
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:554
 msgid "Select"
 msgstr "é?¸æ??"
 
@@ -1864,40 +1845,35 @@ msgstr "é?¸æ??"
 msgid "Group"
 msgstr "ã?°ã?«ã?¼ã??"
 
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:253
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr ""
-
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:143
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:282
 #, fuzzy
 msgid "Linked Contacts"
 msgstr "ã?ªã??ã?©ã?¤ã?³ã?®ä»²é??ã??表示(_O)"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:348
+#: ../libempathy-gtk/empathy-individual-linker.c:354
 #, fuzzy
 msgid "Select contacts to link"
 msgstr "é?£çµ¡å??ã?®é?¸æ??"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:421
+#: ../libempathy-gtk/empathy-individual-linker.c:428
 #, fuzzy
 msgid "New contact preview"
 msgstr "æ?°ã??ã??仲é??"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:465
+#: ../libempathy-gtk/empathy-individual-linker.c:472
 msgid "Contacts selected in the list on the left will be linked together."
 msgstr ""
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo jabber org) and the second is one
 #. * of the user's account IDs (e.g. me hotmail com).
-#: ../libempathy-gtk/empathy-individual-menu.c:112
+#: ../libempathy-gtk/empathy-individual-menu.c:132
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:803
+#: ../libempathy-gtk/empathy-individual-menu.c:837
 #, fuzzy
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
@@ -1905,12 +1881,13 @@ msgstr "ç·¨é??(_E)"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:835
+#: ../libempathy-gtk/empathy-individual-menu.c:863
+#, fuzzy
 msgctxt "Link individual (contextual menu)"
-msgid "_Linkâ?¦"
-msgstr ""
+msgid "_Link Contactsâ?¦"
+msgstr "ã?ªã??ã?©ã?¤ã?³ã?®ä»²é??ã??表示(_O)"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1565
+#: ../libempathy-gtk/empathy-individual-widget.c:1569
 #, c-format
 msgid "Meta-contact containing %u contact"
 msgid_plural "Meta-contact containing %u contacts"
@@ -1921,18 +1898,19 @@ msgstr[0] ""
 msgid "<b>Location</b> at (date)"
 msgstr "<b>å ´æ??</b> ã?§ (date)\t"
 
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328
+msgid "New Network"
+msgstr "æ?°ã??ã??ã??ã??ã??ã?¯ã?¼ã?¯"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:495
+#, fuzzy
+msgid "Choose an IRC network"
+msgstr "é?¸æ??ã??ã?? IRC ã??ã??ã??ã?¯ã?¼ã?¯ã??ç·¨é??ã??ã?¾ã??"
+
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:280
 msgid "new server"
 msgstr "æ?°ã??ã??ã?µã?¼ã??"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
-msgid "Server"
-msgstr "ã?µã?¼ã??"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
-msgid "Port"
-msgstr "ã??ã?¼ã??ç?ªå?·"
-
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:535
 msgid "SSL"
 msgstr "SSL"
@@ -1940,24 +1918,46 @@ msgstr "SSL"
 #. Translators: this is the title of the linking dialogue (reached by
 #. * right-clicking on a contact and selecting "Linkâ?¦"). "Link" in this title
 #. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:95
+#: ../libempathy-gtk/empathy-linking-dialog.c:115
 #, fuzzy
 msgid "Link Contacts"
 msgstr "ã?ªã??ã?©ã?¤ã?³ã?®ä»²é??ã??表示(_O)"
 
+#: ../libempathy-gtk/empathy-linking-dialog.c:120
+#, fuzzy
+msgctxt "Unlink individual (button)"
+msgid "_Unlinkâ?¦"
+msgstr "å??å? ã??ã??(_J)"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:121
+msgid ""
+"Completely split the displayed meta-contact into the contacts it contains."
+msgstr ""
+
 #. Add button
 #. Translators: this is an action button in the linking dialogue. "Link" is
 #. * used here as a verb meaning "to connect two contacts to form a
 #. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:108
+#: ../libempathy-gtk/empathy-linking-dialog.c:136
 #, fuzzy
 msgid "_Link"
 msgstr "ã?ªã?³ã?¯ã??é??ã??(_O)"
 
-#: ../libempathy-gtk/empathy-log-window.c:646
-#: ../src/empathy-import-widget.c:312
-msgid "Account"
-msgstr "ã?¢ã?«ã?¦ã?³ã??"
+#: ../libempathy-gtk/empathy-linking-dialog.c:182
+#, c-format
+msgid "Unlink meta-contact '%s'?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:185
+msgid ""
+"Are you sure you want to unlink this meta-contact? This will completely "
+"split the meta-contact into the contacts it contains."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:190
+msgctxt "Unlink individual (button)"
+msgid "_Unlink"
+msgstr ""
 
 #: ../libempathy-gtk/empathy-log-window.c:663
 msgid "Date"
@@ -3873,6 +3873,16 @@ msgstr "ã?¢ã?«ã?¦ã?³ã??ã?®å??ã??è¾¼ã?¿"
 msgid "Empathy Debugger"
 msgstr "Empathy"
 
+#~ msgid "_Character set:"
+#~ msgstr "æ??å­?é??å??(_C):"
+
+#, fuzzy
+#~ msgid "_E-mail address:"
+#~ msgstr "E-���(_E):"
+
+#~ msgid "_Nickname:"
+#~ msgstr "ã??ã? å??(_N):"
+
 #~ msgid "Send and receive messages"
 #~ msgstr "ã?¤ã?³ã?¹ã?¿ã?³ã??ã?»ã?¡ã??ã?»ã?¼ã?¸ã??é??å??ä¿¡ã??ã?¾ã??"
 
@@ -3897,9 +3907,6 @@ msgstr "Empathy"
 #~ msgid "Hidden"
 #~ msgstr "é? ã??ã??"
 
-#~ msgid "New Network"
-#~ msgstr "æ?°ã??ã??ã??ã??ã??ã?¯ã?¼ã?¯"
-
 #~ msgid "Unsupported command"
 #~ msgstr "ã?µã??ã?¼ã??ã??ã??ã?¦ã??ã?ªã??ã?³ã??ã?³ã??ã?§ã??"
 
@@ -4058,9 +4065,6 @@ msgstr "Empathy"
 #~ msgid "<b>Servers</b>"
 #~ msgstr "<b>ã?µã?¼ã??</b>"
 
-#~ msgid "Edit the selected IRC network"
-#~ msgstr "é?¸æ??ã??ã?? IRC ã??ã??ã??ã?¯ã?¼ã?¯ã??ç·¨é??ã??ã?¾ã??"
-
 #~ msgid "Remove the selected IRC network"
 #~ msgstr "é?¸æ??ã??ã?? IRC ã??ã??ã??ã?¯ã?¼ã?¯ã??å??é?¤ã??ã?¾ã??"