[empathy] Updated Japanese translation (from gnome-2-28 branch)

From: Takayuki Kusano <kusano src gnome org>
To: commits-list gnome org
Cc:
Subject: [empathy] Updated Japanese translation (from gnome-2-28 branch)
Date: Mon, 30 Aug 2010 11:17:34 +0000 (UTC)
commit 6d4a28c88bc0a70af8f0fe97943199b010d9870e
Author: GLSJPN_Etsuko <etsuko murozono ptiglobal net>
Date:   Mon Aug 30 20:16:44 2010 +0900

    Updated Japanese translation (from gnome-2-28 branch)

 po/ja.po | 3060 ++++++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 2101 insertions(+), 959 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index 3d588e8..1aa0eeb 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,19 +1,21 @@
 # empathy ja.po.
-# Copyright (C) 2007-2009 Free Software Foundation, Inc.
+# Copyright (C) 2007-2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the empathy package.
 # Takeshi AIHANA <takeshi aihana gmail com>, 2007-2009.
 # Kentaro Kazuhama <kazken3 gmail com>, 2009.
+# GLSJPN_Etsuko <etsuko murozono ptiglobal net>, 2009.
+# (Contributed to Moblin by Intel GLS)
 #
 # GLOSSARIES:
 #  contact list: ä»²é??ã?ªã?¹ã??
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy gnome-2-28\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
-"product=empathy&component=General\n"
-"POT-Creation-Date: 2009-09-27 12:33+0900\n"
-"PO-Revision-Date: 2009-09-27 12:40+0900\n"
-"Last-Translator: Kentaro Kazuhama <kazken3 gmail com>\n"
+"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"
+"Last-Translator: GLSJPN_Etsuko <etsuko murozono ptiglobal net>\n"
 "Language-Team: Japanese <gnome-translation gnome gr jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,507 +23,691 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr ""
+
+#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
-#: ../data/empathy.desktop.in.in.h:2
-msgid "Empathy IM Client"
+#: ../data/empathy.desktop.in.in.h:3
+#, fuzzy
+msgid "Empathy Internet Messaging"
 msgstr "Empathy ã?¤ã?³ã?¹ã?¿ã?³ã??ã?»ã?¡ã??ã?»ã?³ã?¸ã?£ã?¼"
 
-#: ../data/empathy.desktop.in.in.h:3
+#: ../data/empathy.desktop.in.in.h:4
 msgid "IM Client"
 msgstr "ã?¤ã?³ã?¹ã?¿ã?³ã??ã?»ã?¡ã??ã?»ã?³ã?¸ã?£ã?¼ ã?¯ã?©ã?¤ã?¢ã?³ã??"
 
-#: ../data/empathy.desktop.in.in.h:4
-msgid "Send and receive messages"
-msgstr "ã?¤ã?³ã?¹ã?¿ã?³ã??ã?»ã?¡ã??ã?»ã?¼ã?¸ã??é??å??ä¿¡ã??ã?¾ã??"
-
-#: ../data/empathy.schemas.in.h:1
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Always open a separate chat window for new chats."
 msgstr "æ?°ã??ã??ä»²é??ã?¨ä¼?è©±ã??ã??åº¦ã?«å?¥ã?®ã?¦ã?£ã?³ã??ã?¦ã??é??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/empathy.schemas.in.h:2
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
 "ã?°ã?«ã?¼ã??ã?»ã??ã?£ã??ã??ã?§ã??ã? å??ã??è£?å®?ã??ã??é??ã?«ã??ã??ã? å??ã?®å¾?ã??ã?«è¿½å? ã??ã?¹ã??æ??å?ã?§ã??ã??"
 
-#: ../data/empathy.schemas.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
 msgid "Chat window theme"
 msgstr "ä¼?è©±ã?¦ã?£ã?³ã??ã?¦ã?®ã??ã?¼ã??"
 
-#: ../data/empathy.schemas.in.h:4
+#: ../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)."
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "ã?¹ã??ã?«ã??ã??ã?§ã??ã?¯ã??ã??è¨?èª?ã??ã?³ã?³ã??ã?§å?ºå??ã?£ã?¦æ??å®?ã??ã?¾ã?? (ä¾?: en, fr, nl)ã??"
 
-#: ../data/empathy.schemas.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
 msgid "Compact contact list"
 msgstr "ä»²é??ã?ªã?¹ã??ã??å°?ã??ã??ã??ã??ã??ã?©ã??ã??"
 
-#: ../data/empathy.schemas.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid "Connection managers should be used"
 msgstr "æ?¥ç¶?ã??ã??ã?¼ã?¸ã?£ã??å?©ç?¨ã??ã??ã??ã?©ã??ã??"
 
-#: ../data/empathy.schemas.in.h:7
-msgid "Contact list sort criterium"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#, fuzzy
+msgid "Contact list sort criterion"
 msgstr "ä»²é??ã?ªã?¹ã??ã??ä¸¦ã?³æ?¿ã??ã??é??ã?®æ?¡ä»¶"
 
-#: ../data/empathy.schemas.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Default directory to select an avatar image from"
 msgstr "ã?¢ã??ã?¿ã?¼ã?®ç?»å??ã??æ ¼ç´?ã??ã??ã??ã??ã??ã?©ã?«ã??ã?®ã??ã?©ã?«ã??"
 
-#: ../data/empathy.schemas.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid "Disable popup notifications when away"
 msgstr "é?¢å¸ä¸ã?«ã?ªã?£ã?¦ã??ã??ã??ã??ã?¢ã??ã??é??ç?¥ã??ã?ªã??ã??ã?©ã??ã??"
 
-#: ../data/empathy.schemas.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Disable sounds when away"
 msgstr "é?¢å¸ä¸ã?«ã?ªã?£ã??ã??ã?µã?¦ã?³ã??ã?®æ¼?å¥?ã??ç?¡å?¹ã?«ã??ã??ã??ã?©ã??ã??"
 
-#: ../data/empathy.schemas.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+msgid "Display incoming events in the status area"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Empathy can publish the user's location"
 msgstr "Empathyã?§ã?¦ã?¼ã?¶ã?®å ´æ??ã?®å?¬é??ã??å?¯è?½ã?«ã??ã??"
 
-#: ../data/empathy.schemas.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathyã?§å ´æ??ã?®æ?¨æ¸¬ã?«GPSã??å?©ç?¨ã??ã??ã??ã?¨ã??å?¯è?½ã?«ã??ã??"
 
-#: ../data/empathy.schemas.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathyã?§å ´æ??ã?®æ?¨æ¸¬ã?«ã?»ã?«ã?©ã?¼ã??ã??ã??ã?¯ã?¼ã?¯ã??å?©ç?¨ã??ã??ã??ã?¨ã??å?¯è?½ã?«ã??ã??"
 
-#: ../data/empathy.schemas.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathyã?§å ´æ??ã?®æ?¨æ¸¬ã?«ã??ã??ã??ã?¯ã?¼ã?¯ã??å?©ç?¨ã??ã??ã??ã?¨ã??å?¯è?½ã?«ã??ã??"
 
-#: ../data/empathy.schemas.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Empathy default download folder"
 msgstr "Empathy ã??ä½¿ã??ã??ã??ã?©ã?«ã??ã?®ã??ã?¦ã?³ã?ã?¼ã??ã?»ã??ã?©ã?«ã??"
 
-#: ../data/empathy.schemas.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid "Empathy has asked about importing accounts"
 msgstr "ã?¢ã?«ã?¦ã?³ã??ã?®å??ã??è¾¼ã?¿ã??å??ã??å??ã??ã??ã??ã??ã?©ã??ã??"
 
-#: ../data/empathy.schemas.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+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 "èµ·å??æ??ã?«è?ªå??æ?¥ç¶?ã??ã??ã??ã?©ã??ã??"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy should auto-connect on startup"
 msgstr "èµ·å??æ??ã?«è?ªå??æ?¥ç¶?ã??ã??ã??ã?©ã??ã??"
 
-#: ../data/empathy.schemas.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathyã?¯å ´æ??ã?®ç²¾åº¦ã??ä¸?ã??ã??ã??ã?©ã??ã??"
 
-#: ../data/empathy.schemas.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "ä»²é??ã?ªã?¹ã??ã?®ã?¢ã??ã?¿ã?¼ã??ã??ã?£ã??ã??ã?»ã?¦ã?£ã?³ã??ã?¦ã?®ã?¢ã?¤ã?³ã?³ã?«ã??ã??ã??ã?©ã??ã??"
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Enable WebKit Developer Tools"
 msgstr "WebKit Developer Toolsã??æ??å?¹ã?«ã??ã??"
 
-#: ../data/empathy.schemas.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Enable popup notifications for new messages"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??å??ä¿¡ã??ã??ã??ã??ã??ã??ã?¢ã??ã??ã?§é??ç?¥ã??ã??ã??ã?©ã??ã??"
 
-#: ../data/empathy.schemas.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Enable spell checker"
 msgstr "ã?¹ã??ã?«ã??ã??ã?§ã??ã?¯ã??ã??ã??ã?©ã??ã??"
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Hide main window"
 msgstr "ã?¡ã?¤ã?³ã?»ã?¦ã?£ã?³ã??ã?¦ã??é? ã??ã??ã?©ã??ã??"
 
-#: ../data/empathy.schemas.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Hide the main window."
 msgstr "ã?¡ã?¤ã?³ã?»ã?¦ã?£ã?³ã??ã?¦ã??é? ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/empathy.schemas.in.h:25
-msgid "MC 4 accounts have been imported"
-msgstr "MC 4 ã?¢ã?«ã?¦ã?³ã??ã?®ã?¤ã?³ã??ã?¼ã??"
-
-#: ../data/empathy.schemas.in.h:26
-msgid "MC 4 accounts have been imported."
-msgstr "MC 4 ã?¢ã?«ã?¦ã?³ã??ã??ã?¤ã?³ã??ã?¼ã??æ¸?ã?¿ã??ã?©ã??ã??ã??"
-
-#: ../data/empathy.schemas.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Nick completed character"
 msgstr "ã??ã? å??ã??è£?å®?ã??ã??æ??å?"
 
-#: ../data/empathy.schemas.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Open new chats in separate windows"
 msgstr "æ?°ã??ã??ä¼?è©±æ¯?ã?«ã?¦ã?£ã?³ã??ã?¦ã??é??ã??ã??ã?©ã??ã??"
 
-#: ../data/empathy.schemas.in.h:29
-msgid "Path of the adium theme to use"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#, fuzzy
+msgid "Path of the Adium theme to use"
 msgstr "ä½¿ç?¨ã??ã??adiumã??ã?¼ã??ã?®ã??ã?¹"
 
-#: ../data/empathy.schemas.in.h:30
-msgid "Path of the adium theme to use if the theme used for chat is 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ã??ã?¼ã??ã?®ã??ã?¹ã??æ??å®?ã??ã?¾ã??ã??"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Play a sound for incoming messages"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??å??ä¿¡ã??ã??ã??ã?µã?¦ã?³ã??ã??æ¼?å¥?ã??ã??ã??ã?©ã??ã??"
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Play a sound for new conversations"
 msgstr "ã??ã?£ã??ã??ã?§æ?°ã??ã??ä¼?è©±ã??ã??ã??ã??ã?µã?¦ã?³ã??ã??æ¼?å¥?ã??ã??ã??ã?©ã??ã??"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Play a sound for outgoing messages"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ã??ã??ã??ã?µã?¦ã?³ã??ã??æ¼?å¥?ã??ã??ã??ã?©ã??ã??"
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Play a sound when a contact logs in"
 msgstr "ä»²é??ã??ã?µã?¤ã?³ã?¤ã?³ã??ã??ã??ã?µã?¦ã?³ã??ã??æ¼?å¥?ã??ã??ã??ã?©ã??ã??"
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Play a sound when a contact logs out"
 msgstr "ä»²é??ã??ã?µã?¤ã?³ã?¢ã?¦ã??ã??ã??ã??ã?µã?¦ã?³ã??ã??æ¼?å¥?ã??ã??ã??ã?©ã??ã??"
 
-#: ../data/empathy.schemas.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Play a sound when we log in"
 msgstr "ã?µã?¤ã?³ã?¤ã?³ã??ã??ã??ã?µã?¦ã?³ã??ã??æ¼?å¥?ã??ã??ã??ã?©ã??ã??"
 
-#: ../data/empathy.schemas.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound when we log out"
 msgstr "ã?µã?¤ã?³ã?¢ã?¦ã??ã??ã??ã??ã?µã?¦ã?³ã??ã??æ¼?å¥?ã??ã??ã??ã?©ã??ã??"
 
-#: ../data/empathy.schemas.in.h:38
-msgid "Popup notifications if the chat isn't focused"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#, fuzzy
+msgid "Pop up notifications if the chat isn't focused"
 msgstr ""
 "ã??ã?£ã??ã??ã?»ã?¦ã?£ã?³ã??ã?¦ã?«ã??ã?©ã?¼ã?«ã?¹ã??å½?ã??ã?£ã?¦ã??ã?ªã??ã?¦ã??ã??ã??ã??ã?¢ã??ã??é??ç?¥ã??ã??ã??ã?©"
 "ã??ã??"
 
-#: ../data/empathy.schemas.in.h:39
-msgid "Popup notifications when a contact sign in"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#, fuzzy
+msgid "Pop up notifications when a contact logs in"
 msgstr "ã?µã?¤ã?³ã?¤ã?³ã??ã??é??ã?®ã??ã??ã??ã?¢ã??ã??é??ç?¥"
 
-#: ../data/empathy.schemas.in.h:40
-msgid "Popup notifications when a contact sign out"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#, fuzzy
+msgid "Pop up notifications when a contact logs out"
 msgstr "ã?µã?¤ã?³ã?¢ã?¦ã??ã??ã??é??ã?®ã??ã??ã??ã?¢ã??ã??é??ç?¥"
 
-#: ../data/empathy.schemas.in.h:41
-msgid "Salut account is created"
-msgstr "Salut ã?®ã?¢ã?«ã?¦ã?³ã??ã??ç??æ??ã??ã??ã??ã?©ã??ã??"
-
-#: ../data/empathy.schemas.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Show avatars"
 msgstr "ã?¢ã??ã?¿ã?¼ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??"
 
-#: ../data/empathy.schemas.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Show contact list in rooms"
 msgstr "é?¨å±?ã?«ä»²é??ã?®ä¸?è¦§ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??"
 
-#: ../data/empathy.schemas.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Show hint about closing the main window"
 msgstr "ã?¡ã?¤ã?³ã?»ã?¦ã?£ã?³ã??ã?¦ã??é??ã??ã??é??ã?®ã??ã?³ã??ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??"
 
-#: ../data/empathy.schemas.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Show offline contacts"
 msgstr "ã?ªã??ã?©ã?¤ã?³ã?ªä»²é??ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??"
 
-#: ../data/empathy.schemas.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#, fuzzy
+msgid "Show protocols"
+msgstr "ã??ã?ã??ã?³ã?«"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Spell checking languages"
 msgstr "ã?¹ã??ã?«ã??ã??ã?§ã??ã?¯ã??ã??è¨?èª?"
 
-#: ../data/empathy.schemas.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "The default folder to save file transfers in."
 msgstr "è»¢é??ã??ã??ã??ã?¡ã?¤ã?«ã??ä¿?å?ã??ã??ã??ã??ã?©ã?«ã??ã?®ã??ã?©ã?«ã??ã?§ã??ã??"
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "The last directory that an avatar image was chosen from."
 msgstr "æ??å¾?ã?«ã?¢ã??ã?¿ã?¼ã??é?¸æ??ã??ã??æ??ã?«ä½¿ç?¨ã??ã??ã??ã?©ã?«ã??ã?§ã??ã??"
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+msgid "The position for the chat window side pane"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "ä¼?è©±ã?¦ã?£ã?³ã??ã?¦ã?§ä½¿ç?¨ã??ã??ã??ã?¼ã??ã?§ã??ã??"
 
-#: ../data/empathy.schemas.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Use graphical smileys"
 msgstr "ã?¹ã??ã?¤ã?ªã?¼ã?»ã?¢ã?¤ã?³ã?³ã??ä½¿ã??ã??ã?©ã??ã??"
 
-#: ../data/empathy.schemas.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Use notification sounds"
 msgstr "ç?¶æ??ã??ã?µã?¦ã?³ã??ã?®æ¼?å¥?ã?§é??ç?¥ã??ã??ã??ã?©ã??ã??"
 
-#: ../data/empathy.schemas.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Use theme for chat rooms"
 msgstr "ä¼?è©±ã?¦ã?£ã?³ã??ã?¦ã?«ã??ã?¼ã??ã??é?©ç?¨ã??ã??ã??ã?©ã??ã??"
 
-#: ../data/empathy.schemas.in.h:53
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "Web Inspectorã?®ã??ã??ã?ªWebKit developer toolsã??æ??å?¹ã?«ã??ã??ã??ã?©ã??ã??ã??"
-
-#: ../data/empathy.schemas.in.h:54
-msgid "Whether or not Empathy can publish the user's location to his contacts."
+#: ../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/empathy.schemas.in.h:55
-msgid "Whether or not Empathy can use the GPS to guess the location."
+#: ../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/empathy.schemas.in.h:56
-msgid ""
-"Whether or not Empathy can use the cellular network to guess the location."
+#: ../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/empathy.schemas.in.h:57
-msgid "Whether or not Empathy can use the network to guess the location."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#, fuzzy
+msgid "Whether Empathy can use the network to guess the location."
 msgstr "Empathyã??ã??ã??ã??ã?¯ã?¼ã?¯ã?§å ´æ??ã??æ?¨æ¸¬ã??ã??ã??ã?©ã??ã??ã??è¨å®?ã??ã?¾ã??ã??"
 
-#: ../data/empathy.schemas.in.h:58
-msgid ""
-"Whether or not Empathy has asked about importing accounts from other "
-"programs."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#, fuzzy
+msgid "Whether Empathy has asked about importing accounts from other programs."
 msgstr ""
 "ä»?ã?®ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³ (Pidgin ç?) ã?§ä½¿ã?£ã?¦ã??ã??ã?¢ã?«ã?¦ã?³ã??æ??å ±ã?®å??ã??è¾¼ã?¿ã??å??ã??å??"
 "ã??ã??ã??ã??ã?¤ã?¢ã?ã?°ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/empathy.schemas.in.h:59
+#: ../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 or not Empathy should automatically log in to your accounts on "
-"startup."
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
 "Empathy ã??èµ·å??ã??ã??ã??è?ªå??ç??ã?«è?ªå??ã?®ã?¢ã?«ã?¦ã?³ã??ã?«ã?µã?¤ã?³ã?¤ã?³ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/empathy.schemas.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#, fuzzy
 msgid ""
-"Whether or not Empathy should reduce the location's accuracy for privacy "
-"reasons."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "Empathyã??ã??ã?©ã?¤ã??ã?·ã?¼ã?®ç??ç?±ã?§å ´æ??ã?®ç²¾åº¦ã??ä¸?ã??ã??ã??ã?©ã??ã??ã??è¨å®?ã??ã?¾ã??ã??"
 
-#: ../data/empathy.schemas.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#, fuzzy
 msgid ""
-"Whether or not Empathy should use the avatar of the contact as the chat "
-"window icon."
+"Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
 "ä»²é??ã?ªã?¹ã??ã?®ã?¢ã??ã?¿ã?¼ã??ã??ã?£ã??ã??ã?»ã?¦ã?£ã?³ã??ã?¦ã?®ã?¢ã?¤ã?³ã?³ã?¨ã??ã?¦å?©ç?¨ã??ã??ã??ã?©ã??ã??ã?§"
 "ã??ã??"
 
-#: ../data/empathy.schemas.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid ""
-"Whether or not connectivity managers should be used to automatically "
-"disconnect/reconnect."
-msgstr "æ?¥ç¶?ã??ã??ã?¼ã?¸ã?£ã??è?ªå??ç??ã?«å??æ?/å??æ?¥ç¶?ã??å?©ç?¨ã??ã?¹ã??ã??ã?©ã??ã??ã??è¨å®?ã??ã?¾ã??ã??"
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "Web Inspectorã?®ã??ã??ã?ªWebKit developer toolsã??æ??å?¹ã?«ã??ã??ã??ã?©ã??ã??ã??"
 
-#: ../data/empathy.schemas.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#, fuzzy
 msgid ""
-"Whether or not the Salut account has been created on the first Empathy run."
-msgstr "Empathy ã??å??ã??ã?¦èµ·å??ã??ã??æ??ã?« Salut ã?¢ã?«ã?¦ã?³ã??ã??ç??æ??ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr "æ?¥ç¶?ã??ã??ã?¼ã?¸ã?£ã??è?ªå??ç??ã?«å??æ?/å??æ?¥ç¶?ã??å?©ç?¨ã??ã?¹ã??ã??ã?©ã??ã??ã??è¨å®?ã??ã?¾ã??ã??"
 
-#: ../data/empathy.schemas.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#, fuzzy
 msgid ""
-"Whether or not to check words typed against the languages you want to check "
-"with."
+"Whether to check words typed against the languages you want to check with."
 msgstr ""
 "æ??å®?ã??ã??è¨?èª?ã?®ã?¹ã??ã?«ã?»ã??ã?§ã??ã?«ã?§å?¥å??ã??ã??å??èª?ã??ã??ã?§ã??ã?¯ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/empathy.schemas.in.h:65
-msgid ""
-"Whether or not to convert smileys into graphical images in conversations."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#, fuzzy
+msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "ä¼?è©±ã?¦ã?£ã?³ã??ã?¦ã?«å?¥å??ã??ã??ã?¹ã??ã?¤ã?ªã?¼ã??ã?¢ã?¤ã?³ã?³ã?«å¤?æ??ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/empathy.schemas.in.h:66
-msgid ""
-"Whether or not to play a sound to notify for contacts logging in the network."
+#: ../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/empathy.schemas.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#, fuzzy
 msgid ""
-"Whether or not to play a sound to notify for contacts logging off the "
-"network."
+"Whether to play a sound to notify of contacts logging out of the network."
 msgstr ""
 "ä»²é??ã??ã?µã?¤ã?³ã?¢ã?¦ã??ã??ã??ã??ã?¨ã??é??ç?¥ã??ã??ã??ã??ã?«ã?µã?¦ã?³ã??ã??æ¼?å¥?ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/empathy.schemas.in.h:68
-msgid "Whether or not to play a sound to notify for events."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#, fuzzy
+msgid "Whether to play a sound to notify of events."
 msgstr "ã?¤ã??ã?³ã??ã??ç?ºç??ã??ã??ã??ã?µã?¦ã?³ã??ã??æ¼?å¥?ã??ã?¦é??ç?¥ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/empathy.schemas.in.h:69
-msgid "Whether or not to play a sound to notify for incoming messages."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#, fuzzy
+msgid "Whether to play a sound to notify of incoming messages."
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??å??ã??å??ã?£ã??ã??ã?µã?¦ã?³ã??ã??æ¼?å¥?ã??ã?¦é??ç?¥ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/empathy.schemas.in.h:70
-msgid "Whether or not to play a sound to notify for new conversations."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#, fuzzy
+msgid "Whether to play a sound to notify of new conversations."
 msgstr "æ?°ã??ã??ä¼?è©±ã??é??å§?ã??ã??ã??ã?µã?¦ã?³ã??ã??æ¼?å¥?ã??ã?¦é??ç?¥ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/empathy.schemas.in.h:71
-msgid "Whether or not to play a sound to notify for outgoing messages."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#, fuzzy
+msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ã??ã??ã??ã?µã?¦ã?³ã??ã??æ¼?å¥?ã??ã?¦é??ç?¥ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/empathy.schemas.in.h:72
-msgid "Whether or not to play a sound when logging in a network."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#, fuzzy
+msgid "Whether to play a sound when logging into a network."
 msgstr "ã?¢ã?«ã?¦ã?³ã??ã?«ã?µã?¤ã?³ã?¤ã?³ã??ã??ã??ã?µã?¦ã?³ã??ã??æ¼?å¥?ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/empathy.schemas.in.h:73
-msgid "Whether or not to play a sound when logging off a network."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#, fuzzy
+msgid "Whether to play a sound when logging out of a network."
 msgstr "ã?¢ã?«ã?¦ã?³ã??ã??ã??ã?µã?¤ã?³ã?¢ã?¦ã??ã??ã??ã??ã?µã?¦ã?³ã??ã??æ¼?å¥?ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/empathy.schemas.in.h:74
-msgid "Whether or not to play sound notifications when away or busy."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#, fuzzy
+msgid "Whether to play sound notifications when away or busy."
 msgstr ""
 "ç?¶æ??ã??é?¢å¸ä¸ã?¾ã??ã?¯å¤?å¿?ã?«ã?ªã?£ã??ã??ã?µã?¦ã?³ã??ã?®æ¼?å¥?ã?«ã??ã??é??ç?¥ã??è¡?ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/empathy.schemas.in.h:75
-msgid ""
-"Whether or not to show a popup notification when a contact goes offline."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#, fuzzy
+msgid "Whether to show a popup notification when a contact goes offline."
 msgstr ""
 "ä»²é??ã??ã?ªã??ã?©ã?¤ã?³ã?«ã?ªã?£ã??é??ã?«ã??ã??ã??ã?¢ã??ã??ã?§é??ç?¥ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??ã??è¨å®?ã??ã?¾"
 "ã??ã??"
 
-#: ../data/empathy.schemas.in.h:76
-msgid "Whether or not to show a popup notification when a contact goes online."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#, fuzzy
+msgid "Whether to show a popup notification when a contact goes online."
 msgstr ""
 "ä»²é??ã??ã?ªã?³ã?©ã?¤ã?³ã?«ã?ªã?£ã??é??ã?«ã??ã??ã??ã?¢ã??ã??ã?§é??ç?¥ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??ã??è¨å®?ã??ã?¾"
 "ã??ã??"
 
-#: ../data/empathy.schemas.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#, fuzzy
 msgid ""
-"Whether or not to show a popup notification when receiving a new message "
-"even if the chat is already opened, but not focused."
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
 msgstr ""
 "ã??ã?£ã??ã??ã?»ã?¦ã?£ã?³ã??ã?¦ã??é??ã??ã?¦ã??ã?¦ã??ã??ã?©ã?¼ã?«ã?¹ã??å½?ã??ã?£ã?¦ã??ã?ªã??ã??ã?°ã??æ?°ã??ã??ã?¡ã??"
 "ã?»ã?¼ã?¸ã??å??ä¿¡ã??ã??åº¦ã?«ã??ã??ã??ã?¢ã??ã??é??ç?¥ã??è¡?ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/empathy.schemas.in.h:78
-msgid ""
-"Whether or not to show a popup notification when receiving a new message."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#, fuzzy
+msgid "Whether to show a popup notification when receiving a new message."
 msgstr "æ?°ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã??å??ä¿¡ã??ã??åº¦ã?«ã??ã??ã??ã?¢ã??ã??é??ç?¥ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/empathy.schemas.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#, fuzzy
 msgid ""
-"Whether or not to show avatars for contacts in the contact list and chat "
-"windows."
+"Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "ä»²é??ã?ªã?¹ã??ã?¨ä¼?è©±ã?¦ã?£ã?³ã??ã?¦ã?®ä¸ã?«ä»²é??ã?®ã?¢ã??ã?¿ã?¼ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/empathy.schemas.in.h:80
-msgid "Whether or not to show contacts that are offline in the contact list."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#, fuzzy
+msgid "Whether to show contacts that are offline in the contact list."
 msgstr "ä»²é??ã?ªã?¹ã??ã?®ä¸ã?§ã?ªã??ã?©ã?¤ã?³ã?®ä»²é??ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/empathy.schemas.in.h:81
-msgid "Whether or not to show popup notifications when away or busy."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#, fuzzy
+msgid "Whether to show popup notifications when away or busy."
 msgstr "ç?¶æ??ã??é?¢å¸ä¸ã?«ã?ªã?£ã?¦ã??ã??ã??ã??ã?¢ã??ã??é??ç?¥ã??è¡¨ç¤ºã??ã?ªã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/empathy.schemas.in.h:82
-msgid "Whether or not to show the contact list in chat rooms."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#, fuzzy
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "ä»²é??ã?ªã?¹ã??ã?¨ä¼?è©±ã?¦ã?£ã?³ã??ã?¦ã?®ä¸ã?«ä»²é??ã?®ã?¢ã??ã?¿ã?¼ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#, fuzzy
+msgid "Whether to show the contact list in chat rooms."
 msgstr "ä¼?è©±é?¨å±?ã?§ä»²é??ã?ªã?¹ã??ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??ã??è¨å®?ã??ã?¾ã??ã??"
 
-#: ../data/empathy.schemas.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#, fuzzy
+msgid "Whether to show the contact list in compact mode."
+msgstr "ä»²é??ã?ªã?¹ã??ã??å°?ã??ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#, fuzzy
 msgid ""
-"Whether or not to show the message dialog about closing the main window with "
-"the 'x' button in the title bar."
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
 msgstr ""
 "ã?¿ã?¤ã??ã?«ã??ã?¼ã?«ã??ã?? 'x' ã??ã?¿ã?³ã??ã?¯ã?ªã??ã?¯ã??ã?¦ã?¡ã?¤ã?³ã?¦ã?£ã?³ã??ã?¦ã??é??ã??ã??ã??ã?¡ã??ã?»ã?¼"
 "ã?¸ã?»ã??ã?¤ã?¢ã?ã?°ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/empathy.schemas.in.h:84
-msgid "Whether to show the contact list in compact mode or not."
-msgstr "ä»²é??ã?ªã?¹ã??ã??å°?ã??ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
-
-#: ../data/empathy.schemas.in.h:85
-msgid "Whether to use the theme for chat rooms or not."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#, fuzzy
+msgid "Whether to use the theme for chat rooms."
 msgstr "ä¼?è©±ã?¦ã?£ã?³ã??ã?¦ã?«ã??ã?¼ã??ã??é?©ç?¨ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/empathy.schemas.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#, fuzzy
 msgid ""
-"Which criterium to use when sorting the contact list. Default is to use sort "
-"by the contact's name with the value \"name\". A value of \"state\" will "
-"sort the contact list by state."
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's name with the value \"name\". A value of \"state\" will sort "
+"the contact list by state."
 msgstr ""
-"ä»²é??ã?ªã?¹ã??ã?®ä¸ã?§ä»²é??ã??ä¸¦ã?³æ?¿ã??ã??é??ã?«ä½¿ç?¨ã??ã??æ?¡ä»¶ã?§ã??ã??ã??ã??ã?©ã?«ã??ã?¯ä»²é??ã?®å??å?? "
-"(\"name\") ã?§ã??ã??ä»?ã?«ä½¿ç?¨å?¯è?½ã?ªå?¤: \"state\" (ä»²é??ã?®ç?¶æ??)"
+"ä»²é??ã?ªã?¹ã??ã?®ä¸ã?§ä»²é??ã??ä¸¦ã?³æ?¿ã??ã??é??ã?«ä½¿ç?¨ã??ã??æ?¡ä»¶ã??é?¸æ??ã??ã?¾ã??ã??ã??ã??ã?©ã?«ã??ã?¯ä»²"
+"é??ã?®å??å?? (\"name\") ã?§ã??ã??\"state\" ã?¨ã??ã??å?¤ã?¯ã??ä»²é??ã?®ç?¶æ??ã?§ä»²é??ã?ªã?¹ã??ã??ä¸¦ã?³"
+"æ?¿ã??ã?¾ã??ã??"
 
-#: ../libempathy/empathy-account.c:1158
-msgid "Can't set an empty display name"
-msgstr "ç©ºã?®è¡¨ç¤ºå??ã?¯è¨å®?ã?§ã??ã?¾ã??ã??"
+#: ../data/empathy-accounts.desktop.in.in.h:1
+msgid "Manage Messaging and VoIP accounts"
+msgstr ""
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:2
+#: ../src/empathy-accounts-dialog.c:2151
+msgid "Messaging and VoIP Accounts"
+msgstr ""
 
-#: ../libempathy/empathy-ft-handler.c:839
+#: ../libempathy/empathy-ft-handler.c:851
 msgid "The hash of the received file and the sent one do not match"
 msgstr "å??ä¿¡æ¸?ã?¿ã??ã?¡ã?¤ã?«ã?¨é??ä¿¡ã??ã??ã??ã??ã?¡ã?¤ã?«ã?®ã??ã??ã?·ã?¥ã??ä¸?è?´ã??ã?¾ã??ã??"
 
-#: ../libempathy/empathy-ft-handler.c:1099
+#: ../libempathy/empathy-ft-handler.c:1111
 msgid "File transfer not supported by remote contact"
 msgstr "ã?ªã?¢ã?¼ã??å?´ã?®ç?¸æ??ã?¯ã??ã?¡ã?¤ã?«è»¢é??ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??ã??"
 
-#: ../libempathy/empathy-ft-handler.c:1157
+#: ../libempathy/empathy-ft-handler.c:1169
 msgid "The selected file is not a regular file"
 msgstr "é?¸æ??ã??ã??ã??ã?¡ã?¤ã?«ã?¯ä¸?è?¬ç??ã?ªã??ã?¡ã?¤ã?«ã?§ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../libempathy/empathy-ft-handler.c:1166
+#: ../libempathy/empathy-ft-handler.c:1178
 msgid "The selected file is empty"
 msgstr "é?¸æ??ã??ã??ã??ã??ã?¡ã?¤ã?«ã?¯ç©ºã?§ã??"
 
-#: ../libempathy/empathy-tp-contact-list.c:844 ../src/empathy.c:285
-msgid "People nearby"
-msgstr "ã??ã??è¿?ã??ã?«ã??ã??äººé??"
-
-#: ../libempathy/empathy-tp-file.c:280
+#: ../libempathy/empathy-tp-file.c:283
 msgid "Socket type not supported"
 msgstr "ã?µã??ã?¼ã??ã??ã??ã?¦ã??ã?ªã??ã?½ã?±ã??ã??ã?¿ã?¤ã??ã?§ã??"
 
-#: ../libempathy/empathy-tp-file.c:399
+#: ../libempathy/empathy-tp-file.c:402
 msgid "No reason was specified"
 msgstr "å??å? ã??ç?¹å®?ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../libempathy/empathy-tp-file.c:402
+#: ../libempathy/empathy-tp-file.c:405
 msgid "The change in state was requested"
 msgstr "ç?¶æ??ã?®å¤?æ?´ã??è¦?æ±?ã??ã??ã?¾ã??ã??"
 
-#: ../libempathy/empathy-tp-file.c:405
+#: ../libempathy/empathy-tp-file.c:408
 msgid "You canceled the file transfer"
 msgstr "ã??ã?¡ã?¤ã?«è»¢é??ã??ã?ã?£ã?³ã?»ã?«ã??ã?¾ã??ã??"
 
-#: ../libempathy/empathy-tp-file.c:408
+#: ../libempathy/empathy-tp-file.c:411
 msgid "The other participant canceled the file transfer"
 msgstr "ä»?ã?®ä»²é??ã??ã??ã?¡ã?¤ã?«è»¢é??ã??ã?ã?£ã?³ã?»ã?«ã??ã?¾ã??ã??"
 
-#: ../libempathy/empathy-tp-file.c:411
+#: ../libempathy/empathy-tp-file.c:414
 msgid "Error while trying to transfer the file"
 msgstr "ã??ã?¡ã?¤ã?«ã?®è»¢é??ä¸ã?«ã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??"
 
-#: ../libempathy/empathy-tp-file.c:414
+#: ../libempathy/empathy-tp-file.c:417
 msgid "The other participant is unable to transfer the file"
 msgstr "ä»?ã?®ä»²é??ã??ã??ã?¡ã?¤ã?«è»¢é??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../libempathy/empathy-tp-file.c:417
+#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:320
 msgid "Unknown reason"
 msgstr "å??å? ä¸?æ??ã?§ã??"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:242
 msgid "Available"
 msgstr "å?¨å¸ä¸"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:244
 msgid "Busy"
 msgstr "å??ã??è¾¼ã?¿ä¸"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:247
 msgid "Away"
 msgstr "é?¢å¸ä¸"
 
-#: ../libempathy/empathy-utils.c:242
-msgid "Hidden"
-msgstr "é? ã??ã??"
+#: ../libempathy/empathy-utils.c:249
+#, fuzzy
+msgid "Invisible"
+msgstr "æ??å¾?ã??ã??"
 
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:251
 msgid "Offline"
 msgstr "ã?ªã??ã?©ã?¤ã?³"
 
-#: ../libempathy/empathy-utils.c:380 ../src/empathy-import-mc4-accounts.c:104
+#: ../libempathy/empathy-utils.c:253 ../src/empathy-call-window.c:1883
+#: ../src/empathy-call-window.c:1884 ../src/empathy-call-window.c:1885
+#: ../src/empathy-call-window.c:1886 ../src/empathy-call-window.ui.h:18
+#, fuzzy
+msgid "Unknown"
+msgstr "ä¸?æ??"
+
+#: ../libempathy/empathy-utils.c:292
+#, fuzzy
+msgid "No reason specified"
+msgstr "å??å? ã??ç?¹å®?ã??ã??ã?¦ã??ã?¾ã??ã??"
+
+#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:350
+#, fuzzy
+msgid "Status is set to offline"
+msgstr "%s ã??ã??ã?¯ã?ªã??ã?©ã?¤ã?³ã?§ã??ã??"
+
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:330
+msgid "Network error"
+msgstr "ã??ã??ã??ã?¯ã?¼ã?¯ã?®ã?¨ã?©ã?¼ã?§ã??"
+
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:332
+msgid "Authentication failed"
+msgstr "èª?è¨¼ã?«å¤±æ??ã??ã?¾ã??ã??"
+
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
+msgid "Encryption error"
+msgstr "æ??å?·å??ã?®ã?¨ã?©ã?¼ã?§ã??"
+
+#: ../libempathy/empathy-utils.c:302
+msgid "Name in use"
+msgstr "ä½¿ç?¨ä¸ã?®å??å??"
+
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+msgid "Certificate not provided"
+msgstr "è¨¼æ??æ?¸ã??ã??ã??ã?¾ã??ã??"
+
+#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+msgid "Certificate untrusted"
+msgstr "ä¿¡ç?¨ã?®ã?ªã??è¨¼æ??æ?¸ã?§ã??"
+
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+msgid "Certificate expired"
+msgstr "è¨¼æ??æ?¸ã?®æ??å?¹æ??é??ã??å??ã??ã?¦ã??ã?¾ã??"
+
+#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
+msgid "Certificate not activated"
+msgstr "è¨¼æ??æ?¸ã?¯å?©ç?¨ã?§ã??ã?¾ã??ã??"
+
+#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
+msgid "Certificate hostname mismatch"
+msgstr "è¨¼æ??æ?¸ã?®ã??ã?¹ã??å??ã??ä¸?è?´ã??ã?¾ã??ã??"
+
+#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
+msgid "Certificate fingerprint mismatch"
+msgstr "è¨¼æ??æ?¸ã?®æ??ç´?ã??ä¸?è?´ã??ã?¾ã??ã??"
+
+#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
+msgid "Certificate self-signed"
+msgstr "è¨¼æ??æ?¸è?ªèº«ã?®ç½²å??ã?§ã??"
+
+#: ../libempathy/empathy-utils.c:318
+msgid "Certificate error"
+msgstr "è¨¼æ??æ?¸ã?«é?¢é?£ã??ã??ã?¨ã?©ã?¼ã?§ã??"
+
+#: ../libempathy/empathy-utils.c:352
+msgid "Encryption is not available"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:354
+#, fuzzy
+msgid "Certificate is invalid"
+msgstr "è¨¼æ??æ?¸ã?¯å?©ç?¨ã?§ã??ã?¾ã??ã??"
+
+#: ../libempathy/empathy-utils.c:356
+#, fuzzy
+msgid "Connection has been refused"
+msgstr "æ?¥ç¶?ã??ã??ã?¼ã?¸ã?£ã??å?©ç?¨ã??ã??ã??ã?©ã??ã??"
+
+#: ../libempathy/empathy-utils.c:358
+#, fuzzy
+msgid "Connection can't be established"
+msgstr "æ?¥ç¶?ã??ã??ã?¼ã?¸ã?£ã??å?©ç?¨ã??ã??ã??ã?©ã??ã??"
+
+#: ../libempathy/empathy-utils.c:360
+#, fuzzy
+msgid "Connection has been lost"
+msgstr "æ?¥ç¶?ã??ã??ã?¼ã?¸ã?£ã??å?©ç?¨ã??ã??ã??ã?©ã??ã??"
+
+#: ../libempathy/empathy-utils.c:362
+#, fuzzy
+msgid "This resource is already connected to the server"
+msgstr "ã??ã??ã?«ã??ã?£ã?¦ã??ã?µã?¼ã??ã?¼ã??ã??ã?¢ã?«ã?¦ã?³ã??ã??å??é?¤ã??ã??ã??ã??ã?¨ã?¯ã??ã??ã?¾ã??ã??ã??"
+
+#: ../libempathy/empathy-utils.c:364
+msgid ""
+"Connection has been replaced by a new connection using the same resource"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:367
+msgid "The account already exists on the server"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:369
+msgid "Server is currently too busy to handle the connection"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:371
+#, fuzzy
+msgid "Certificate has been revoked"
+msgstr "è¨¼æ??æ?¸ã??ã??ã??ã?¾ã??ã??"
+
+#: ../libempathy/empathy-utils.c:373
+msgid ""
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:376
+msgid ""
+"The length of the server certificate, or the depth of the server certificate "
+"chain, exceed the limits imposed by the cryptography library"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:540
 msgid "People Nearby"
 msgstr "ã??ã??è¿?ã??ã?«ã??ã??äººé??"
 
-#: ../libempathy/empathy-utils.c:385
+#: ../libempathy/empathy-utils.c:545
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:386
+#: ../libempathy/empathy-utils.c:546
 msgid "Facebook Chat"
 msgstr "Facebook Chat"
 
@@ -565,22 +751,73 @@ msgstr[0] "%d ã?¶æ??å??"
 msgid "in the future"
 msgstr "æ?ªæ?¥ã?«"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:424
+#: ../libempathy-gtk/empathy-account-chooser.c:463
 msgid "All"
 msgstr "å?¨ã?¦"
 
-#: ../libempathy-gtk/empathy-account-widget.c:430
-#: ../libempathy-gtk/empathy-account-widget.c:486
+#: ../libempathy-gtk/empathy-account-widget.c:549
+#: ../libempathy-gtk/empathy-account-widget.c:606
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1264
+#: ../libempathy-gtk/empathy-account-widget.c:1145
+#, fuzzy
+msgid "Username:"
+msgstr "ã?¦ã?¼ã?¶å??(_U):"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1488
+msgid "L_og in"
+msgstr "ã?ã?°ã?¤ã?³(_O)"
+
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-account-widget.c:1556
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1397
+#: ../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"
 msgstr "ã?µã?¤ã?³ã?¤ã?³"
 
+#: ../libempathy-gtk/empathy-account-widget.c:1632
+#, fuzzy
+msgid "This account already exists on the server"
+msgstr "ã??ã??ã?«ã??ã?£ã?¦ã??ã?µã?¼ã??ã?¼ã??ã??ã?¢ã?«ã?¦ã?³ã??ã??å??é?¤ã??ã??ã??ã??ã?¨ã?¯ã??ã??ã?¾ã??ã??ã??"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1635
+#, fuzzy
+msgid "Create a new account on the server"
+msgstr "ã?¢ã?«ã?¦ã?³ã??ã??ä½?ã??ï¼?_C)"
+
+#. 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".
+#. * 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
+#, 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
+#, c-format
+msgid "%s Account"
+msgstr "%s ã?¢ã?«ã?¦ã?³ã??"
+
+#: ../libempathy-gtk/empathy-account-widget.c:2034
+msgid "New account"
+msgstr "æ?°ã??ã??ã?¢ã?«ã?¦ã?³ã??"
+
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> MyScreenName</span>"
+#, fuzzy
+msgid "<b>Example:</b> MyScreenName"
 msgstr "<span size=\"small\"><b>ä¾?:</b> MyScreenName</span>"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
@@ -600,7 +837,7 @@ msgstr "è©³ç´°"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
 msgid "Pass_word:"
 msgstr "ã??ã?¹ã?¯ã?¼ã??(_W):"
@@ -620,7 +857,7 @@ msgstr "AIMã?®ã?¹ã?¯ã?ªã?¼ã?³ã??ã?¼ã? ã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "_Port:"
@@ -629,7 +866,7 @@ msgstr "ã??ã?¼ã??ç?ªå?·(_P):"
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
 #: ../src/empathy-new-chatroom-dialog.ui.h:9
@@ -638,7 +875,8 @@ msgstr "ã?µã?¼ã??(_S):"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> username</span>"
+#, fuzzy
+msgid "<b>Example:</b> username"
 msgstr "<span size=\"small\"><b>ä¾?:</b> username</span>"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
@@ -656,7 +894,8 @@ msgid "What is your GroupWise password?"
 msgstr "GroupWiseã?®ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> 123456789</span>"
+#, fuzzy
+msgid "<b>Example:</b> 123456789"
 msgstr "<span size=\"small\"><b>ä¾?:</b> 123456789</span>"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
@@ -673,15 +912,49 @@ msgstr "ICQã?®ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Charset:"
+#, fuzzy
+msgid "_Character set:"
 msgstr "æ??å?é??å??(_C):"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:244
-msgid "New Network"
-msgstr "æ?°ã??ã??ã??ã??ã??ã?¯ã?¼ã?¯"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:183
+#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+#, fuzzy
+msgid "Auto"
+msgstr "æ??å ±(_A)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:186
+msgid "UDP"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:189
+msgid "TCP"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:192
+msgid "TLS"
+msgstr ""
+
+#. 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 "è¥¿æ¬§"
+
+#. 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 ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:229
+#, fuzzy
+msgid "None"
+msgstr "ã??ã??ã??"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "Charset:"
+#, fuzzy
+msgid "Character set:"
 msgstr "æ??å?é??å??:"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
@@ -712,12 +985,23 @@ msgstr "æ°?å??:"
 msgid "Servers"
 msgstr "ã?µã?¼ã??"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#, fuzzy
+msgid "What is your IRC nickname?"
+msgstr "AIMã?®ã?¹ã?¯ã?ªã?¼ã?³ã??ã?¼ã? ã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+msgid "Which IRC network?"
+msgstr ""
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> user gmail com</span>"
+#, fuzzy
+msgid "<b>Example:</b> user gmail com"
 msgstr "<span size=\"small\"><b>ä¾?:</b> user gmail com</span>"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<span size=\"small\"><b>Example:</b> user jabber org</span>"
+#, fuzzy
+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:5
@@ -732,56 +1016,78 @@ msgstr "å?ªå??åº¦(_O):"
 msgid "Reso_urce:"
 msgstr "ã?ªã?½ã?¼ã?¹(_U):"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+#. 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
+msgid ""
+"This is your username, not your normal Facebook login.\n"
+"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
+"Use <a href=\"http://www.facebook.com/username/\";>this page</a> to choose a "
+"Facebook username if you don't have one."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
 msgid "Use old SS_L"
 msgstr "å?¤ã?? SSL ã??ä½¿ã??(_L)"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#, fuzzy
+msgid "What is your Facebook password?"
+msgstr "Yahoo!ã?®ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#, fuzzy
+msgid "What is your Facebook username?"
+msgstr "Windows Liveã?®ã?¦ã?¼ã?¶å??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
 msgid "What is your Google ID?"
 msgstr "Google IDã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
 msgid "What is your Google password?"
 msgstr "Googleã?®ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
 msgid "What is your Jabber ID?"
 msgstr "Jabber IDã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
 msgid "What is your Jabber password?"
 msgstr "Jabberã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 msgid "What is your desired Jabber ID?"
 msgstr "å¸?æ??ã??ã??Jabber IDã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 msgid "What is your desired Jabber password?"
 msgstr "å¸?æ??ã??ã??Jabberã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../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:17
+#: ../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
-msgid "<span size=\"small\"><b>Example:</b> user hotmail com</span>"
+#, fuzzy
+msgid "<b>Example:</b> user hotmail com"
 msgstr "<span size=\"small\"><b>ä¾?:</b> user hotmail com</span>"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-msgid "What is your Windows Live password?"
+#, fuzzy
+msgid "What is your Windows Live ID?"
 msgstr "Windows Liveã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-msgid "What is your Windows Live user name?"
-msgstr "Windows Liveã?®ã?¦ã?¼ã?¶å??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
+msgid "What is your Windows Live password?"
+msgstr "Windows Liveã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_Email:"
+#, fuzzy
+msgid "_E-mail address:"
 msgstr "E-ã?¡ã?¼ã?«(_E):"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
@@ -805,36 +1111,86 @@ msgid "_Published Name:"
 msgstr "å?¬ç§°(_P):"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> user my sip server</span>"
+#, fuzzy
+msgid "<b>Example:</b> user my sip server"
 msgstr "<span size=\"small\"><b>ä¾?:</b> user my sip server</span>"
 
-#. look up the DNS SRV record at the service's domain for the host name of a STUN server.
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
+#, fuzzy
+msgid "Authentication username:"
+msgstr "èª?è¨¼ã?«å¤±æ??ã??ã?¾ã??ã??"
+
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover STUN"
+#, fuzzy
+msgid "Discover Binding"
 msgstr "STUN ã?µã?¼ã??ã?®æ¤?ç´¢"
 
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+msgid "Discover the STUN server automatically"
+msgstr ""
+
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+msgid "Interval (seconds)"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+msgid "Keep-Alive Options"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+msgid "Loose Routing"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+msgid "Mechanism:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+msgid "Miscellaneous Options"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+msgid "NAT Traversal Options"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#, fuzzy
+msgid "Port:"
+msgstr "ã??ã?¼ã??ç?ªå?·(_P):"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+msgid "Proxy Options"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
 msgid "STUN Server:"
 msgstr "STUN ã?µã?¼ã??:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "STUN port:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#, fuzzy
+msgid "Server:"
+msgstr "ã?µã?¼ã??(_S):"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#, fuzzy
+msgid "Transport:"
 msgstr "STUN ã?µã?¼ã??ã?®ã??ã?¼ã??:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "What is your SIP account password?"
 msgstr "SIPã?¢ã?«ã?¦ã?³ã??ã?®ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
 msgid "What is your SIP login ID?"
 msgstr "SIPã?®ã?ã?°ã?¤ã?³IDã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 msgid "_Username:"
 msgstr "ã?¦ã?¼ã?¶å??(_U):"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
-msgid "Use _Yahoo Japan"
+#, fuzzy
+msgid "Use _Yahoo! Japan"
 msgstr "Yahoo Japan ã?«æ?¥ç¶?ã??ã??(_J)"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
@@ -846,111 +1202,188 @@ msgid "What is your Yahoo! password?"
 msgstr "Yahoo!ã?®ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "Yahoo I_D:"
+#, fuzzy
+msgid "Yahoo! I_D:"
 msgstr "Yahoo ã?® ID(_D):"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "_Ignore conference and chatroom invitations"
+#, 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):"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
-#: ../libempathy-gtk/empathy-avatar-chooser.c:525
+#: ../libempathy-gtk/empathy-avatar-chooser.c:443
+#: ../libempathy-gtk/empathy-avatar-chooser.c:519
 msgid "Couldn't convert image"
 msgstr "ç?»å??ã??å¤?æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:450
-msgid "None of the accepted image formats is supported on your system"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:444
+#, fuzzy
+msgid "None of the accepted image formats are supported on your system"
 msgstr "ã??ä½¿ã??ã?®ã?·ã?¹ã??ã? ã?§ã?µã??ã?¼ã??ã??ã??ã?¦ã??ã??å½¢å¼?ã?®ç?»å??ã?§ã?¯ã??ã??ã?¾ã??ã??ã?§ã??ã??ã??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:935
 msgid "Select Your Avatar Image"
 msgstr "ã?¢ã??ã?¿ã?¼ã?«ä½¿ç?¨ã??ã??ç?»å??ã?®é?¸æ??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:936
+#: ../libempathy-gtk/empathy-avatar-chooser.c:938
 msgid "No Image"
 msgstr "ç?»å??ã?ªã??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:998
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
 msgid "Images"
 msgstr "ç?»å??ã??ã?¡ã?¤ã?«"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
 msgid "All Files"
 msgstr "å?¨ã?¦ã?®ã??ã?¡ã?¤ã?«"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:324
+#: ../libempathy-gtk/empathy-avatar-image.c:323
 msgid "Click to enlarge"
 msgstr "ã?¯ã?ªã??ã?¯ã??ã??ã?¨å¤§ã??ã??ã?ªã??ã?¾ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:186
-msgid "Failed to reconnect this chat"
+#: ../libempathy-gtk/empathy-chat.c:639
+#, fuzzy
+msgid "Failed to open private chat"
 msgstr "ã??ã?®ä¼?è©±ã?«å??æ?¥ç¶?ã?§ã??ã?¾ã??ã??ã?§ã??ã??ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:403
-msgid "Unsupported command"
-msgstr "ã?µã??ã?¼ã??ã??ã??ã?¦ã??ã?ªã??ã?³ã??ã?³ã??ã?§ã??"
+#: ../libempathy-gtk/empathy-chat.c:679
+msgid "Topic not supported on this conversation"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:685
+msgid "You are not allowed to change the topic"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:819
+msgid "/clear: clear all messages from the current conversation"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:822
+msgid "/topic <topic>: set the topic of the current conversation"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:825
+msgid "/join <chat room ID>: join a new chat room"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:828
+msgid "/j <chat room ID>: join a new chat room"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:833
+msgid "/query <contact ID> [<message>]: open a private chat"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:836
+msgid "/msg <contact ID> <message>: open a private chat"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:840
+msgid "/nick <nickname>: change your nickname on the current server"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:843
+msgid "/me <message>: send an ACTION message to the current conversation"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:846
+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
+msgid ""
+"/help [<command>]: show all supported commands. If <command> is defined, "
+"show its usage."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:861
+#, fuzzy, c-format
+msgid "Usage: %s"
+msgstr ""
+"\n"
+"ã?¡ã??ã?»ã?¼ã?¸: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:890
+#, fuzzy
+msgid "Unknown command"
+msgstr "å??å? ä¸?æ??ã?§ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:535
+#: ../libempathy-gtk/empathy-chat.c:1011
+msgid "Unknown command; see /help for the available commands"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1149
 msgid "offline"
 msgstr "ã?ªã??ã?©ã?¤ã?³"
 
-#: ../libempathy-gtk/empathy-chat.c:538
+#: ../libempathy-gtk/empathy-chat.c:1152
 msgid "invalid contact"
 msgstr "ç?¡å?¹ã?ªä»²é??ã?§ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:541
+#: ../libempathy-gtk/empathy-chat.c:1155
 msgid "permission denied"
 msgstr "æ¨©é??ã??ã??ã??ã?¾ã??ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:544
+#: ../libempathy-gtk/empathy-chat.c:1158
 msgid "too long message"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??é?·ã??ã??ã?¾ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:547
+#: ../libempathy-gtk/empathy-chat.c:1161
 msgid "not implemented"
 msgstr "æ?ªå®?è£?ã?§ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:550
+#: ../libempathy-gtk/empathy-chat.c:1165
 msgid "unknown"
 msgstr "å??å? ä¸?æ??ã?§ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:554
+#: ../libempathy-gtk/empathy-chat.c:1169
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "'%s' ã?¨ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ã??ã??é??ã?«ã?¨ã?©ã?¼: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:584
+#: ../libempathy-gtk/empathy-chat.c:1279 ../src/empathy-chat-window.c:691
+msgid "Topic:"
+msgstr "ã??ã??ã??ã?¯:"
+
+#: ../libempathy-gtk/empathy-chat.c:1291
 #, c-format
 msgid "Topic set to: %s"
 msgstr "æ?°ã??ã??ã??ã??ã??ã?¯: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:586
+#: ../libempathy-gtk/empathy-chat.c:1293
 msgid "No topic defined"
 msgstr "ã??ã??ã??ã?¯ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:956
+#: ../libempathy-gtk/empathy-chat.c:1772
 msgid "(No Suggestions)"
 msgstr "(æ??æ¡?ã?ªã??)"
 
-#: ../libempathy-gtk/empathy-chat.c:1010
+#: ../libempathy-gtk/empathy-chat.c:1826
 msgid "Insert Smiley"
 msgstr "ã?¹ã??ã?¤ã?ªã?¼ã?®æ?¿å?¥"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1028
-#: ../libempathy-gtk/empathy-ui-utils.c:1492
+#: ../libempathy-gtk/empathy-chat.c:1844
+#: ../libempathy-gtk/empathy-ui-utils.c:1801
 msgid "_Send"
 msgstr "é??ä¿¡(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1062
+#: ../libempathy-gtk/empathy-chat.c:1878
 msgid "_Spelling Suggestions"
 msgstr "ã?¹ã??ã?«ã?®æ??æ¡?(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1177
+#: ../libempathy-gtk/empathy-chat.c:1955
+msgid "Failed to retrieve recent logs"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:2061
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s ã?¯å??æ?ã??ã??ã?¾ã??ã??"
@@ -958,12 +1391,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:1184
+#: ../libempathy-gtk/empathy-chat.c:2068
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s ã?¯ %2$s ã?«kickã??ã??ã?¾ã??ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:1187
+#: ../libempathy-gtk/empathy-chat.c:2071
 #, c-format
 msgid "%s was kicked"
 msgstr "%s ã?¯kickã??ã??ã?¾ã??ã??"
@@ -971,17 +1404,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:1195
+#: ../libempathy-gtk/empathy-chat.c:2079
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s ã?? %2$s ã?«BANã??ã??ã?¾ã??ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:1198
+#: ../libempathy-gtk/empathy-chat.c:2082
 #, c-format
 msgid "%s was banned"
 msgstr "%s ã?¯BANã??ã??ã?¾ã??ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:1202
+#: ../libempathy-gtk/empathy-chat.c:2086
 #, c-format
 msgid "%s has left the room"
 msgstr "%s ã??ã??ã??é?¨å±?ã??ã??é??å®¤ã??ã?¾ã??ã??"
@@ -991,61 +1424,79 @@ msgstr "%s ã??ã??ã??é?¨å±?ã??ã??é??å®¤ã??ã?¾ã??ã??"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:1211
+#: ../libempathy-gtk/empathy-chat.c:2095
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:1234
+#: ../libempathy-gtk/empathy-chat.c:2120
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s ã??ã??ã??é?¨å±?ã?«å?¥å®¤ã??ã?¾ã??ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:1367 ../src/empathy-call-window.c:1295
+#: ../libempathy-gtk/empathy-chat.c:2145
+#, fuzzy, c-format
+msgid "%s is now known as %s"
+msgstr "%s ã??ã??ã?¯ã?ªã?³ã?©ã?¤ã?³ã?§ã??ã??"
+
+#: ../libempathy-gtk/empathy-chat.c:2284 ../src/empathy-call-window.c:1922
 msgid "Disconnected"
 msgstr "ä¸?é??"
 
-#: ../libempathy-gtk/empathy-chat.c:1803
+#: ../libempathy-gtk/empathy-chat.c:2922
+msgid "Wrong password; please try again:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:2923
+msgid "Retry"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:2928
+msgid "This room is protected by a password:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:2929
+msgid "Join"
+msgstr "å?¥å®¤ã??ã??"
+
+#: ../libempathy-gtk/empathy-chat.c:3069
 msgid "Connected"
 msgstr "ã?ªã?³ã?©ã?¤ã?³"
 
-#: ../libempathy-gtk/empathy-chat.c:1853
-#: ../libempathy-gtk/empathy-log-window.c:502
+#: ../libempathy-gtk/empathy-chat.c:3122
+#: ../libempathy-gtk/empathy-log-window.c:653
 msgid "Conversation"
 msgstr "ä¼?è©±"
 
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:477
-msgid "Topic:"
-msgstr "ã??ã??ã??ã?¯:"
-
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:316
-#: ../libempathy-gtk/empathy-theme-adium.c:276
+#: ../libempathy-gtk/empathy-chat-text-view.c:324
+#: ../libempathy-gtk/empathy-theme-adium.c:791
 msgid "_Copy Link Address"
 msgstr "ã?ªã?³ã?¯å??ã?®ã?³ã??ã?¼(_C)"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:323
-#: ../libempathy-gtk/empathy-theme-adium.c:284
+#: ../libempathy-gtk/empathy-chat-text-view.c:331
+#: ../libempathy-gtk/empathy-theme-adium.c:798
 msgid "_Open Link"
 msgstr "ã?ªã?³ã?¯ã??é??ã??(_O)"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:421
+#: ../libempathy-gtk/empathy-chat-text-view.c:424
 msgid "%A %B %d %Y"
 msgstr "%Yå¹´%B%eæ?¥ %A"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:177
-#: ../libempathy-gtk/empathy-contact-dialogs.c:236
+#: ../libempathy-gtk/empathy-contact-dialogs.c:243
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:249
 msgid "Edit Contact Information"
 msgstr "ä»²é??æ??å ±ã?®ç·¨é??"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:287
+#: ../libempathy-gtk/empathy-contact-dialogs.c:295
 msgid "Personal Information"
 msgstr "å??äººã?®æ??å ±"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:392
+#: ../libempathy-gtk/empathy-contact-dialogs.c:401
+#: ../libempathy-gtk/empathy-individual-dialogs.c:112
 msgid "New Contact"
 msgstr "æ?°ã??ã??ä»²é??"
 
@@ -1057,270 +1508,342 @@ msgstr "ã??ã?¨ã?§æ±ºã??ã??(_L)"
 msgid "Subscription Request"
 msgstr "ç?»é?²ã?®ã?ªã?¯ã?¨ã?¹ã??"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1414
+#: ../libempathy-gtk/empathy-contact-list-view.c:2004
+#: ../libempathy-gtk/empathy-individual-view.c:2218
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "æ?¬å½?ã?« '%s' ã?¨ã??ã??ã?°ã?«ã?¼ã??ã??å??é?¤ã??ã?¾ã??ã??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1416
+#: ../libempathy-gtk/empathy-contact-list-view.c:2006
+#: ../libempathy-gtk/empathy-individual-view.c:2221
 msgid "Removing group"
 msgstr "ã?°ã?«ã?¼ã??ã?®å??é?¤"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1463
-#: ../libempathy-gtk/empathy-contact-list-view.c:1540
+#: ../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
+#: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Remove"
 msgstr "å??é?¤(_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1493
+#: ../libempathy-gtk/empathy-contact-list-view.c:2085
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "æ?¬å½?ã?« '%s' ã?¨ã??ã??ä»²é??ã??å??é?¤ã??ã?¾ã??ã??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1495
+#: ../libempathy-gtk/empathy-contact-list-view.c:2087
+#: ../libempathy-gtk/empathy-individual-view.c:2308
 msgid "Removing contact"
 msgstr "ä»²é??ã?®å??é?¤"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:195
-#: ../src/empathy-main-window.ui.h:11
-msgid "_Add Contact..."
+#: ../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:222
-#: ../src/empathy-main-window.ui.h:12
+#: ../libempathy-gtk/empathy-contact-menu.c:230
+#: ../libempathy-gtk/empathy-individual-menu.c:467
+#: ../src/empathy-main-window.ui.h:14
 msgid "_Chat"
 msgstr "ä¼?è©±(_C)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:253
+#: ../libempathy-gtk/empathy-contact-menu.c:260
+#: ../libempathy-gtk/empathy-individual-menu.c:508
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "é?³å£°ã?§ä¼?è©±(_A)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:285
+#: ../libempathy-gtk/empathy-contact-menu.c:290
+#: ../libempathy-gtk/empathy-individual-menu.c:550
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "æ? å??ã?§ä¼?è©±(_V)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:324
-msgid "_View Previous Conversations"
-msgstr "ä¼?è©±ã?®å±¥æ´(_V)"
+#: ../libempathy-gtk/empathy-contact-menu.c:330
+#: ../libempathy-gtk/empathy-individual-menu.c:608
+#: ../src/empathy-main-window.ui.h:25
+msgid "_Previous Conversations"
+msgstr "ä¼?è©±ã?®å±¥æ´(_P)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:346
-msgid "Send file"
+#: ../libempathy-gtk/empathy-contact-menu.c:352
+#: ../libempathy-gtk/empathy-individual-menu.c:649
+#, fuzzy
+msgid "Send File"
 msgstr "ã??ã?¡ã?¤ã?«ã?®é??ä¿¡"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:369
-msgid "Share my desktop"
+#: ../libempathy-gtk/empathy-contact-menu.c:375
+#: ../libempathy-gtk/empathy-individual-menu.c:691
+#, fuzzy
+msgid "Share My Desktop"
 msgstr "ã??ã?¹ã?¯ã??ã??ã??ã??å?±æ??ã??ã??"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:397
+#: ../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
+msgid "Favorite"
+msgstr "ã??æ°?ã?«å?¥ã??ã?«è¿½å? (_F)"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:444
+#: ../libempathy-gtk/empathy-individual-menu.c:752
 msgid "Infor_mation"
 msgstr "æ??å ±(_M)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:441
-#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16
+#: ../libempathy-gtk/empathy-contact-menu.c:490
+#, fuzzy
+msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "ç·¨é??(_E)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:501
-msgid "Inviting to this room"
+#: ../libempathy-gtk/empathy-contact-menu.c:544
+#: ../libempathy-gtk/empathy-individual-menu.c:945
+#: ../src/empathy-chat-window.c:903
+#, fuzzy
+msgid "Inviting you to this room"
 msgstr "ã??ã?®é?¨å±?ã?«æ??å¾?ã??ã?¾ã??"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:532
-msgid "_Invite to chatroom"
+#: ../libempathy-gtk/empathy-contact-menu.c:575
+#: ../libempathy-gtk/empathy-individual-menu.c:992
+#, fuzzy
+msgid "_Invite to Chat Room"
 msgstr "ã??ã?£ã??ã??é?¨å±?ã?«æ??å¾?ã??ã??(_I)"
 
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "é?£çµ¡å??ã?®é?¸æ??"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:447
-msgid "Save Avatar"
-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:503
-msgid "Unable to save avatar"
-msgstr "ã?¢ã??ã?¿ã?¼ã??ä¿?å?ã?§ã??ã?¾ã??ã??"
+#: ../libempathy-gtk/empathy-contact-widget.c:218
+#: ../libempathy-gtk/empathy-individual-widget.c:149
+msgid "Phone number:"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1000
-msgid "Select"
-msgstr "é?¸æ??"
+#: ../libempathy-gtk/empathy-contact-widget.c:219
+#: ../libempathy-gtk/empathy-individual-widget.c:150
+msgid "E-mail address:"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1009
-#: ../src/empathy-main-window.c:1019
-msgid "Group"
-msgstr "ã?°ã?«ã?¼ã??"
+#: ../libempathy-gtk/empathy-contact-widget.c:220
+#: ../libempathy-gtk/empathy-individual-widget.c:151
+#, fuzzy
+msgid "Website:"
+msgstr "ã??ã?¼ã? ã??ã?¼ã?¸:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1260
+#: ../libempathy-gtk/empathy-contact-widget.c:221
+#: ../libempathy-gtk/empathy-individual-widget.c:152
+msgid "Birthday:"
+msgstr "èª?ç??æ?¥:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:579
+#: ../libempathy-gtk/empathy-individual-widget.c:451
 msgid "Country ISO Code:"
 msgstr "ISOã?«ã??ã??å?½ã?³ã?¼ã??:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1262
+#: ../libempathy-gtk/empathy-contact-widget.c:581
+#: ../libempathy-gtk/empathy-individual-widget.c:453
 msgid "Country:"
 msgstr "å?½:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1264
+#: ../libempathy-gtk/empathy-contact-widget.c:583
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "State:"
 msgstr "é?£é?¦ã?»å·?:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1266
+#: ../libempathy-gtk/empathy-contact-widget.c:585
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "City:"
 msgstr "é?½å¸?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1268
+#: ../libempathy-gtk/empathy-contact-widget.c:587
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "Area:"
 msgstr "å?°å??:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1270
+#: ../libempathy-gtk/empathy-contact-widget.c:589
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "Postal Code:"
 msgstr "é?µä¾¿ç?ªå?·ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1272
+#: ../libempathy-gtk/empathy-contact-widget.c:591
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Street:"
 msgstr "é??ã??:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1274
+#: ../libempathy-gtk/empathy-contact-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Building:"
 msgstr "ã??ã?«ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1276
+#: ../libempathy-gtk/empathy-contact-widget.c:595
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Floor:"
 msgstr "é??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1278
+#: ../libempathy-gtk/empathy-contact-widget.c:597
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Room:"
 msgstr "é?¨å±?ç?ªå?·:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1280
+#: ../libempathy-gtk/empathy-contact-widget.c:599
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Text:"
 msgstr "ã??ã?ã?¹ã??:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1282
+#: ../libempathy-gtk/empathy-contact-widget.c:601
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Description:"
 msgstr "èª¬æ??:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1284
+#: ../libempathy-gtk/empathy-contact-widget.c:603
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "URI:"
 msgstr "URIï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1286
+#: ../libempathy-gtk/empathy-contact-widget.c:605
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Accuracy Level:"
 msgstr "ç²¾åº¦ã?®ã?¬ã??ã?«:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1288
+#: ../libempathy-gtk/empathy-contact-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Error:"
 msgstr "ã?¨ã?©ã?¼:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1290
+#: ../libempathy-gtk/empathy-contact-widget.c:609
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Vertical Error (meters):"
 msgstr "å??ç?´èª¤å·® (ã?¡ã?¼ã??ã?«):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1292
+#: ../libempathy-gtk/empathy-contact-widget.c:611
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Horizontal Error (meters):"
 msgstr "æ°´å¹³èª¤å·® (ã?¡ã?¼ã??ã?«):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1294
+#: ../libempathy-gtk/empathy-contact-widget.c:613
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Speed:"
 msgstr "é??åº¦:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1296
+#: ../libempathy-gtk/empathy-contact-widget.c:615
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Bearing:"
 msgstr "æ?¹ä½?:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1298
+#: ../libempathy-gtk/empathy-contact-widget.c:617
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Climb Speed:"
 msgstr "ä¸?æ??é??åº¦:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1300
+#: ../libempathy-gtk/empathy-contact-widget.c:619
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Last Updated on:"
 msgstr "æ??å¾?ã?®ã?¢ã??ã??ã??ã?¼ã??ã?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1302
+#: ../libempathy-gtk/empathy-contact-widget.c:621
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Longitude:"
 msgstr "çµ?åº¦:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1304
+#: ../libempathy-gtk/empathy-contact-widget.c:623
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Latitude:"
 msgstr "ç·¯åº¦:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1306
+#: ../libempathy-gtk/empathy-contact-widget.c:625
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Altitude:"
 msgstr "é«?åº¦:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1353
-msgid "<b>Location</b>"
-msgstr "<b>å ´æ??</b>"
+#: ../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
+#: ../src/empathy-preferences.ui.h:12
+msgid "Location"
+msgstr "å ´æ??"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1366
-msgid "<b>Location</b>, "
-msgstr "<b>å ´æ??</b>, "
+#. translators: format is "Location, $date"
+#: ../libempathy-gtk/empathy-contact-widget.c:707
+#: ../libempathy-gtk/empathy-individual-widget.c:597
+#, fuzzy, c-format
+msgid "%s, %s"
+msgstr "%s / %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1416
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:646
 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
+msgid "Save Avatar"
+msgstr "ã?¢ã??ã?¿ã?¼ã?®ä¿?å?"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:898
+#: ../libempathy-gtk/empathy-individual-widget.c:895
+msgid "Unable to save avatar"
+msgstr "ã?¢ã??ã?¿ã?¼ã??ä¿?å?ã?§ã??ã?¾ã??ã??"
+
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1
 msgid "<b>Location</b> at (date)\t"
 msgstr "<b>å ´æ??</b> ã?§ (date)\t"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "ã?¢ã?«ã?¦ã?³ã??:"
-
+#. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1223
 msgid "Alias:"
 msgstr "ã??ã? å??:"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Birthday:"
-msgstr "èª?ç??æ?¥:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
 msgid "Client Information"
 msgstr "ã?¯ã?©ã?¤ã?¢ã?³ã??æ??å ±"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
 msgid "Client:"
 msgstr "ã?¯ã?©ã?¤ã?¢ã?³ã??:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:1002
-msgid "Contact"
-msgstr "ä»²é??"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Contact Details"
 msgstr "ä»²é??ã?®è©³ç´°"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-msgid "Email:"
-msgstr "E-ã?¡ã?¼ã?«:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
-msgid "Fullname:"
-msgstr "æ°?å??:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
-msgid "Groups"
-msgstr "ã?°ã?«ã?¼ã??"
-
 #. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+#: ../libempathy-gtk/empathy-individual-widget.c:1427
 msgid "Identifier:"
 msgstr "ã?¹ã?¯ã?ªã?¼ã?³å??:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
-msgid "Information requested..."
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#, fuzzy
+msgid "Information requestedâ?¦"
 msgstr "æ??å ±ã?®å??å¾?ä¸..."
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Version:"
+msgstr "ã??ã?¼ã?¸ã?§ã?³:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:332
+msgid "Groups"
+msgstr "ã?°ã?«ã?¼ã??"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:344
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -1328,157 +1851,275 @@ msgstr ""
 "ã??ã?®ä»²é??ã??ç?»é?²ã??ã??ã?°ã?«ã?¼ã??ã??é?¸æ??ã??ã?¦ä¸?ã??ã?? (ï¼?ã?¤ä»¥ä¸?ã?®ã?°ã?«ã?¼ã??ã??é?¸æ??ã??ã??ã??ã??"
 "ã??ã??ã??ã?¯å?¨ã??é?¸æ??ã??ã?ªã??ã?¦ã??æ§?ã??ã?¾ã??ã??)"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
-msgid "Version:"
-msgstr "ã??ã?¼ã?¸ã?§ã?³:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
-msgid "Web site:"
-msgstr "ã??ã?¼ã? ã??ã?¼ã?¸:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
+#: ../libempathy-gtk/empathy-groups-widget.c:363
 msgid "_Add Group"
 msgstr "ã?°ã?«ã?¼ã??ã?®è¿½å? (_A)"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:281
+#: ../libempathy-gtk/empathy-groups-widget.c:397
+msgid "Select"
+msgstr "é?¸æ??"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-main-window.c:1247
+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
+#, fuzzy
+msgid "Linked Contacts"
+msgstr "ã?ªã??ã?©ã?¤ã?³ã?®ä»²é??ã??è¡¨ç¤º(_O)"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:348
+#, fuzzy
+msgid "Select contacts to link"
+msgstr "é?£çµ¡å??ã?®é?¸æ??"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:421
+#, fuzzy
+msgid "New contact preview"
+msgstr "æ?°ã??ã??ä»²é??"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:465
+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
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr " (%s)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:803
+#, fuzzy
+msgctxt "Edit individual (contextual menu)"
+msgid "_Edit"
+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
+msgctxt "Link individual (contextual menu)"
+msgid "_Linkâ?¦"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1565
+#, c-format
+msgid "Meta-contact containing %u contact"
+msgid_plural "Meta-contact containing %u contacts"
+msgstr[0] ""
+
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
+#, fuzzy
+msgid "<b>Location</b> at (date)"
+msgstr "<b>å ´æ??</b> ã?§ (date)\t"
+
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
 msgid "new server"
 msgstr "æ?°ã??ã??ã?µã?¼ã??"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:508
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "ã?µã?¼ã??"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:523
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "ã??ã?¼ã??ç?ªå?·"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:536
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:495
-#: ../src/empathy-import-widget.c:302
+#. 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
+#, fuzzy
+msgid "Link Contacts"
+msgstr "ã?ªã??ã?©ã?¤ã?³ã?®ä»²é??ã??è¡¨ç¤º(_O)"
+
+#. 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
+#, fuzzy
+msgid "_Link"
+msgstr "ã?ªã?³ã?¯ã??é??ã??(_O)"
+
+#: ../libempathy-gtk/empathy-log-window.c:646
+#: ../src/empathy-import-widget.c:312
 msgid "Account"
 msgstr "ã?¢ã?«ã?¦ã?³ã??"
 
-#: ../libempathy-gtk/empathy-log-window.c:512
+#: ../libempathy-gtk/empathy-log-window.c:663
 msgid "Date"
 msgstr "æ?¥ä»?"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:1
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
 msgid "Conversations"
 msgstr "ä¼?è©±"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
+msgid "Find Next"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#, fuzzy
+msgid "Find Previous"
+msgstr "å??ã?®ã?¿ã??ã?¸(_P)"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
 msgid "Previous Conversations"
 msgstr "ä¼?è©±ã?®å±¥æ´"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.ui.h:7
 msgid "Search"
 msgstr "æ¤?ç´¢"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#. Searching *for* something
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "_For:"
 msgstr "æ¤?ç´¢ã??ã??æ??å?(_F):"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
-msgid "C_all"
-msgstr "å?¼ã?³å?ºã??(_A)"
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
+msgid "Contact ID:"
+msgstr "ä»²é??ã?® ID:"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
+#. add chat button
+#: ../libempathy-gtk/empathy-new-message-dialog.c:145
 msgid "C_hat"
 msgstr "ã??ã?£ã??ã??(_H)"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
-msgid "Contact ID:"
-msgstr "ä»²é??ã?® ID:"
-
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-message-dialog.c:155
 msgid "New Conversation"
 msgstr "æ?°ã??ã??ä¼?è©±"
 
+#. add video toggle
+#: ../libempathy-gtk/empathy-new-call-dialog.c:205
+#, fuzzy
+msgid "Send _Video"
+msgstr "æ? å??ã?®é??ä¿¡"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:213
+msgid "C_all"
+msgstr "å?¼ã?³å?ºã??(_A)"
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+#, fuzzy
+msgid "New Call"
+msgstr "ç?ºä¿¡"
+
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:176
-#: ../libempathy-gtk/empathy-presence-chooser.c:212
-msgid "Custom Message..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:168
+#: ../libempathy-gtk/empathy-presence-chooser.c:204
+#, fuzzy
+msgid "Custom Messageâ?¦"
 msgstr "ç?¬è?ªã?®ã?¡ã??ã?»ã?¼ã?¸..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:229
-#: ../libempathy-gtk/empathy-presence-chooser.c:231
-msgid "Edit Custom Messages..."
-msgstr "ç?¬è?ªã?®ã?¡ã??ã?»ã?¼ã?¸ã??ç·¨é??..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:221
+#: ../libempathy-gtk/empathy-presence-chooser.c:223
+#, fuzzy
+msgid "Edit Custom Messagesâ?¦"
+msgstr "ç?¬è?ªã?®ã?¡ã??ã?»ã?¼ã?¸ã??ç·¨é??"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:330
+#: ../libempathy-gtk/empathy-presence-chooser.c:346
 msgid "Click to remove this status as a favorite"
 msgstr "ã??æ°?ã?«å?¥ã??ã?®ç?¶æ??ã??ã??è§£é?¤ã??ã??ã?«ã?¯ã?¯ã?ªã??ã?¯ã??ã?¾ã??"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:339
+#: ../libempathy-gtk/empathy-presence-chooser.c:355
 msgid "Click to make this status a favorite"
 msgstr "ã??ã?®ç?¶æ??ã??ã??æ°?ã?«å?¥ã??ã?«ã??ã??ã?«ã?¯ã?¯ã?ªã??ã?¯ã??ã?¾ã??"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:373
+#: ../libempathy-gtk/empathy-presence-chooser.c:389
 msgid "Set status"
 msgstr "ç?¶æ??ã??è¨å®?"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:794
+#: ../libempathy-gtk/empathy-presence-chooser.c:939
 msgid "Set your presence and current status"
 msgstr "å?¨å¸ä¸ã?«ã??ç?¾å?¨ã?®ç?¶æ??ã??è¨å®?ã??ã??"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1043
-msgid "Custom messages..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:1124
+#, fuzzy
+msgid "Custom messagesâ?¦"
 msgstr "ç?¬è?ªã?®ã?¡ã??ã?»ã?¼ã?¸..."
 
-#: ../libempathy-gtk/empathy-sound.c:51
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+#, fuzzy
+msgid "Find:"
+msgstr "ã??ã?³ã??ã?£ã?¼èª?"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Match case"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+msgid "Phrase not found"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-sound.c:50
 msgid "Received an instant message"
 msgstr "ã?¤ã?³ã?¹ã?¿ã?³ã??ã?»ã?¡ã??ã?»ã?¼ã?¸ã??å??ä¿¡ã??ã??"
 
-#: ../libempathy-gtk/empathy-sound.c:53
+#: ../libempathy-gtk/empathy-sound.c:52
 msgid "Sent an instant message"
 msgstr "ã?¤ã?³ã?¹ã?¿ã?³ã??ã?»ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ã??ã??"
 
-#: ../libempathy-gtk/empathy-sound.c:55
+#: ../libempathy-gtk/empathy-sound.c:54
 msgid "Incoming chat request"
 msgstr "ã??ã?£ã??ã??å??å? ã?®è¦?æ±?ã??ã??ã??"
 
-#: ../libempathy-gtk/empathy-sound.c:57
+#: ../libempathy-gtk/empathy-sound.c:56
 msgid "Contact connected"
 msgstr "ä»²é??ã??ã?µã?¤ã?³ã?¤ã?³ã??ã??"
 
-#: ../libempathy-gtk/empathy-sound.c:59
+#: ../libempathy-gtk/empathy-sound.c:58
 msgid "Contact disconnected"
 msgstr "ä»²é??ã??ã?µã?¤ã?³ã?¢ã?¦ã??ã??ã??"
 
-#: ../libempathy-gtk/empathy-sound.c:61
+#: ../libempathy-gtk/empathy-sound.c:60
 msgid "Connected to server"
 msgstr "ã?µã?¼ã??ã?«æ?¥ç¶?ã??ã??"
 
-#: ../libempathy-gtk/empathy-sound.c:63
+#: ../libempathy-gtk/empathy-sound.c:62
 msgid "Disconnected from server"
 msgstr "ã?µã?¼ã??ã?®æ?¥ç¶?ã??æ?ã??ã??"
 
-#: ../libempathy-gtk/empathy-sound.c:65
+#: ../libempathy-gtk/empathy-sound.c:64
 msgid "Incoming voice call"
 msgstr "é?³å£°ã?§å?¼ã?³ã??ã??ã??ã??ã??"
 
-#: ../libempathy-gtk/empathy-sound.c:67
+#: ../libempathy-gtk/empathy-sound.c:66
 msgid "Outgoing voice call"
 msgstr "é?³å£°ã?§å?¼ã?³ã??ã??ã??"
 
-#: ../libempathy-gtk/empathy-sound.c:69
+#: ../libempathy-gtk/empathy-sound.c:68
 msgid "Voice call ended"
 msgstr "é?³å£°ã?®ä¼?è©±ã??çµ?äº?ã??ã??"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
 msgid "Enter Custom Message"
 msgstr "ç?¬è?ªã?®ã?¡ã??ã?»ã?¼ã?¸ã??å?¥å??"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
 msgid "Edit Custom Messages"
 msgstr "ç?¬è?ªã?®ã?¡ã??ã?»ã?¼ã?¸ã??ç·¨é??"
 
@@ -1506,17 +2147,94 @@ msgstr "ã?¯ã?ªã?¼ã?³"
 msgid "Blue"
 msgstr "ã??ã?«ã?¼"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1394
+#: ../libempathy-gtk/empathy-tls-dialog.c:150
+msgid "The identity provided by the chat server cannot be verified.\n"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:156
+msgid "The certrificate is not signed by a Certification Authority"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:160
+#, fuzzy
+msgid "The certificate has expired"
+msgstr "è¨¼æ??æ?¸ã?®æ??å?¹æ??é??ã??å??ã??ã?¦ã??ã?¾ã??"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:163
+#, fuzzy
+msgid "The certificate hasn't yet been activated"
+msgstr "è¨¼æ??æ?¸ã?¯å?©ç?¨ã?§ã??ã?¾ã??ã??"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:166
+msgid "The certificate does not have the expected fingerprint"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:169
+msgid "The hostname verified by the certificate doesn't match the server name"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:173
+#, fuzzy
+msgid "The certificate is self-signed"
+msgstr "è¨¼æ??æ?¸è?ªèº«ã?®ç½²å??ã?§ã??"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:176
+msgid "The certificate has been revoked by the issuing Certification Authority"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:180
+msgid "The certificate is cryptographically weak"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:183
+msgid "The certificate length exceeds verifiable limits"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:187
+#, fuzzy
+msgid "The certificate is malformed"
+msgstr "è¨¼æ??æ?¸ã?®æ??å?¹æ??é??ã??å??ã??ã?¦ã??ã?¾ã??"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:205
+#, fuzzy, c-format
+msgid "Expected hostname: %s"
+msgstr "è¨¼æ??æ?¸ã?®ã??ã?¹ã??å??ã??ä¸?è?´ã??ã?¾ã??ã??"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:208
+#, fuzzy, c-format
+msgid "Certificate hostname: %s"
+msgstr "è¨¼æ??æ?¸ã?®ã??ã?¹ã??å??ã??ä¸?è?´ã??ã?¾ã??ã??"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:263
+#, fuzzy
+msgid "Continue"
+msgstr "ã?³ã?³ã??ã?ã?¹ã??"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:269
+msgid "This connection is untrusted. Would you like to continue anyway?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:286
+msgid "Remember this choice for future connections"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:294
+#, fuzzy
+msgid "Certificate Details"
+msgstr "è¨¼æ??æ?¸ã?®æ??å?¹æ??é??ã??å??ã??ã?¦ã??ã?¾ã??"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1698
 msgid "Unable to open URI"
 msgstr "URI ã??é??ã??ã?¾ã??ã??"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1484
+#: ../libempathy-gtk/empathy-ui-utils.c:1793
 msgid "Select a file"
 msgstr "ã??ã?¡ã?¤ã?«ã?®é?¸æ??"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1544
-msgid "Select a destination"
-msgstr "ä¿?å?å??ã?®é?¸æ??"
+#: ../libempathy-gtk/empathy-ui-utils.c:1862
+#, fuzzy, c-format
+msgid "Incoming file from %s"
+msgstr "%s ã??ã??ã??ã??ã?®å?¼ã?³å?ºã??ã?§ã??"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
@@ -1685,75 +2403,38 @@ msgstr "è¥¿æ¬§"
 msgid "Vietnamese"
 msgstr "ã??ã??ã??ã? èª?"
 
-#.
-#. * vim: sw=2 ts=8 cindent noai bs=2
-#.
-#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:1
-msgid ""
-"The contact to display in the applet. Empty means no contact is displayed."
-msgstr "ã?¢ã??ã?¬ã??ã??ã?®ä¸ã?«è¡¨ç¤ºã??ã??ä»²é??ã?ªã?¹ã??"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:2
-msgid "The contact's avatar token. Empty means contact has no avatar."
-msgstr "ä»²é??ã?ªã?¹ã??ã?®ã?¢ã??ã?¿ã?¼"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:1
-msgid "Megaphone"
-msgstr "ã?¡ã?¬ã??ã?³"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:522
-msgid "Talk!"
-msgstr "ä»²é??ã?¨è©±ã??ã??ã??ã?¾ã??ã??ã??ï¼?"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:1
-#: ../nothere/data/GNOME_NotHere_Applet.xml.h:1
-msgid "_About"
-msgstr "æ??å ±(_A)"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:2
-msgid "_Information"
-msgstr "æ??å ±(_I)"
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
+#, fuzzy
+msgid "The selected contact cannot receive files."
+msgstr "é?¸æ??ã??ã??ä»²é??ã?¯ã??ã?¡ã?¤ã?«ã??å??ä¿¡ã?§ã??ã?¾ã??ã??ã??"
 
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.ui.h:23
-msgid "_Preferences"
-msgstr "è¨å®?(_P)"
-
-#: ../megaphone/src/megaphone-applet.c:166
-msgid "Please configure a contact."
-msgstr "é?£çµ¡å??ã??è¨å®?ã??ã?¦ä¸?ã??ã??"
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
+#, fuzzy
+msgid "The selected contact is offline."
+msgstr "é?¸æ??ã??ã??ä»²é??ã?¯ã?ªã??ã?©ã?¤ã?³ã?§ã??ã??"
 
-#: ../megaphone/src/megaphone-applet.c:256
-msgid "Select contact..."
-msgstr "é?£çµ¡å??ã?®é?¸æ??..."
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+msgid "No error message"
+msgstr "ã?¨ã?©ã?¼ã?¡ã??ã?»ã?¼ã?¸ã?ªã??"
 
-#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:1
-msgid "Presence"
-msgstr "å?¨å¸"
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+msgid "Instant Message (Empathy)"
+msgstr "ã?¤ã?³ã?¹ã?¿ã?³ã?? ã?¡ã??ã?»ã?¼ã?¸ (Empathy)"
 
-#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:2
-#: ../nothere/src/nothere-applet.c:105
-msgid "Set your own presence"
-msgstr "ã??ã?ªã??ã?®å?¨å¸æ??å ±ã??ã?»ã??ã??ã??ã?¾ã??"
-
-#: ../src/empathy.c:742
+#: ../src/empathy.c:414
 msgid "Don't connect on startup"
 msgstr "èµ·å??ã??ã??ã??è?ªå??ç??ã?«ã?µã?¤ã?³ã?¤ã?³ã??ã?ªã??"
 
-#: ../src/empathy.c:746
-msgid "Don't show the contact list on startup"
+#: ../src/empathy.c:418
+#, fuzzy
+msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "èµ·å??æ??ã?«ä»²é??ã?ªã?¹ã??ã??è¡¨ç¤ºã??ã?ªã??"
 
-#: ../src/empathy.c:750
-msgid "Show the accounts dialog"
-msgstr "ã?¢ã?«ã?¦ã?³ã??ã?»ã??ã?¤ã?¢ã?ã?°ã??è¡¨ç¤ºã??ã??"
-
-#: ../src/empathy.c:762
+#: ../src/empathy.c:435
 msgid "- Empathy IM Client"
 msgstr "- Empathy ã?¤ã?³ã?¹ã?¿ã?³ã??ã?»ã?¡ã??ã?»ã?³ã?¸ã?£ã?¼"
 
-#: ../src/empathy-about-dialog.c:83
+#: ../src/empathy-about-dialog.c:85
 msgid ""
 "Empathy is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU General Public License as published by the Free Software "
@@ -1764,7 +2445,7 @@ msgstr ""
 "è¡?å?©ç?¨è¨±è«¾å¥?ç´?æ?¸ã?®ç¬¬äº?ç??ã??ã??ã??ã??ã?¯ã??ã??ä»¥é??ã?®ç??ã??å®?ã??ã??æ?¡é ?ã?®ä¸?ã?§æ?¬ã??ã?ã?°ã?©ã? "
 "ã??å??é ?å¸?ã?¾ã??ã?¯å¤?æ?´ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??"
 
-#: ../src/empathy-about-dialog.c:87
+#: ../src/empathy-about-dialog.c:89
 msgid ""
 "Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1775,7 +2456,7 @@ msgstr ""
 "é?©å??æ?§ã?«ã?¤ã??ã?¦ã?®æ??é»?ã?®ä¿?è¨¼ã??å?«ã??ã?¦ã??ã??ã??ã?ªã??ä¿?è¨¼ã??è¡?ã?ªã??ã?¾ã??ã??ã??è©³ç´°ã?«ã?¤ã??ã?¦"
 "ã?¯ GNU ä¸?è?¬å?¬è¡?å?©ç?¨è¨±è«¾å¥?ç´?æ?¸ã??ã??è¦§ä¸?ã??ã??ã??"
 
-#: ../src/empathy-about-dialog.c:91
+#: ../src/empathy-about-dialog.c:93
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
@@ -1785,38 +2466,45 @@ msgstr ""
 "ã??ã?¯ã??ã?§ã??ã??ã??ã??ã?§ã?ªã??å ´å??ã?¯ã??Free Software Foundation, Inc., 51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-130159 USA ã?¾ã?§æ??ç´?ã??æ?¸ã??ã?¦ä¸?ã??ã??ã??"
 
-#: ../src/empathy-about-dialog.c:119
+#: ../src/empathy-about-dialog.c:121
 msgid "An Instant Messaging client for GNOME"
 msgstr "GNOME å??ã??ã?®ã?¤ã?³ã?¹ã?¿ã?³ã??ã?»ã?¡ã??ã?»ã?³ã?¸ã?£ã?¼ã?»ã?¯ã?©ã?¤ã?¢ã?³ã??ã?§ã??ã??"
 
-#: ../src/empathy-about-dialog.c:125
+#: ../src/empathy-about-dialog.c:127
 msgid "translator-credits"
 msgstr ""
 "ç?¸è?± æ¯? <takeshi aihana gmail com>\n"
-"Kentaro Kazuhama <kazken3 gmail com>"
-
-#: ../src/empathy-account-assistant.c:118
-msgid "There has been an error while importing the accounts."
+"Kentaro Kazuhama <kazken3 gmail com>\n"
+"GLSJPN_Etsuko <etsuko murozono ptiglobal net>\n"
+"(Contributed to Moblin by Intel GLS)\n"
+"æ?¥æ?¬GNOMEã?¦ã?¼ã?¶ä¼? <http://www.gnome.gr.jp/>"
+
+#: ../src/empathy-account-assistant.c:167
+#, fuzzy
+msgid "There was an error while importing the accounts."
 msgstr "ã?¢ã?«ã?¦ã?³ã??ã?®ã?¤ã?³ã??ã?¼ã??ä¸ã?«ã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??ã??"
 
-#: ../src/empathy-account-assistant.c:121
-msgid "There has been an error while parsing the account details."
+#: ../src/empathy-account-assistant.c:170
+#, fuzzy
+msgid "There was an error while parsing the account details."
 msgstr "ã?¢ã?«ã?¦ã?³ã??ã?®è©³ç´°ã??è§£æ??ä¸ã?«ã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??ã??"
 
-#: ../src/empathy-account-assistant.c:124
-msgid "There has been an error while creating the account."
+#: ../src/empathy-account-assistant.c:173
+#, fuzzy
+msgid "There was an error while creating the account."
 msgstr "ã?¢ã?«ã?¦ã?³ã??ã?®ä½?æ??ä¸ã?«ã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??ã??"
 
-#: ../src/empathy-account-assistant.c:126
-msgid "There has been an error."
+#: ../src/empathy-account-assistant.c:175
+#, fuzzy
+msgid "There was an error."
 msgstr "ã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??ã??"
 
-#: ../src/empathy-account-assistant.c:141
-#, c-format
-msgid "The error message was: <span style=\"italic\">%s</span>"
-msgstr "ã?¨ã?©ã?¼ã?¡ã??ã?»ã?¼ã?¸: <span style=\"italic\">%s</span>"
+#: ../src/empathy-account-assistant.c:179
+#, fuzzy, c-format
+msgid "The error message was: %s"
+msgstr "ã?¨ã?©ã?¼ã?¡ã??ã?»ã?¼ã?¸ã?ªã??"
 
-#: ../src/empathy-account-assistant.c:149
+#: ../src/empathy-account-assistant.c:183
 msgid ""
 "You can either go back and try to enter your accounts' details again or quit "
 "this assistant and add accounts later from the Edit menu."
@@ -1824,47 +2512,46 @@ msgstr ""
 "æ?»ã?£ã?¦ã?¢ã?«ã?¦ã?³ã??ã?®è©³ç´°ã??ç·¨é??ã??ã??ã??ã??ã??ã?®ã?¢ã?·ã?¹ã?¿ã?³ã??ã??çµ?äº?ã??ã?¦ç·¨é??ã?¡ã??ã?¥ã?¼ã??"
 "ã??ã?¢ã?«ã?¦ã?³ã??ã??å¾?ã?§è¿½å? ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??"
 
-#: ../src/empathy-account-assistant.c:184
+#: ../src/empathy-account-assistant.c:220
+#: ../src/empathy-account-assistant.c:1310
 msgid "An error occurred"
 msgstr "ã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??"
 
-#. Create account
 #. To translator: %s is the protocol name
 #. Create account
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../src/empathy-account-assistant.c:321
-#: ../src/empathy-accounts-dialog.c:1400
+#: ../src/empathy-account-assistant.c:412 ../src/empathy-accounts-dialog.c:614
 #, c-format
 msgid "New %s account"
 msgstr "æ?°ã??ã?? %s ã??ã??ã?®ã?¢ã?«ã?¦ã?³ã??"
 
-#: ../src/empathy-account-assistant.c:393
+#: ../src/empathy-account-assistant.c:509
 msgid "What kind of chat account do you have?"
 msgstr "ã?©ã?®ç¨®é¡?ã?®ã?¢ã?«ã?¦ã?³ã??ã??ã??ã??ã?¾ã??ã???"
 
-#: ../src/empathy-account-assistant.c:399
+#: ../src/empathy-account-assistant.c:515
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "è¨å®?ã??ã??ã??ä»?ã?®ã?¢ã?«ã?¦ã?³ã??ã?¯ã??ã??ã?¾ã??ã???"
 
-#: ../src/empathy-account-assistant.c:405
+#: ../src/empathy-account-assistant.c:521
 msgid "Enter your account details"
 msgstr "ã?¢ã?«ã?¦ã?³ã??ã?®è©³ç´°ã??å?¥å??"
 
-#: ../src/empathy-account-assistant.c:410
+#: ../src/empathy-account-assistant.c:526
 msgid "What kind of chat account do you want to create?"
 msgstr "ç??æ??ã??ã??ã??ã?¢ã?«ã?¦ã?³ã??ã?®ç¨®é¡?ã?¯?"
 
-#: ../src/empathy-account-assistant.c:416
+#: ../src/empathy-account-assistant.c:532
 msgid "Do you want to create other chat accounts?"
 msgstr "ä»?ã?®ã?¢ã?«ã?¦ã?³ã??ã??ç??æ??ã??ã?¾ã??ã???"
 
-#: ../src/empathy-account-assistant.c:423
+#: ../src/empathy-account-assistant.c:539
 msgid "Enter the details for the new account"
 msgstr "æ?°ã??ã??ã?¢ã?«ã?¦ã?³ã??ã?®è©³ç´°ã??å?¥å??"
 
-#: ../src/empathy-account-assistant.c:509
+#: ../src/empathy-account-assistant.c:654
 msgid ""
 "With Empathy you can chat with people online nearby and with friends and "
 "colleagues who use Google Talk, AIM, Windows Live and many other chat "
@@ -1874,77 +2561,129 @@ msgstr ""
 "Empathyã?§è¿?ã??ã?®äººã??å??é??ã??å??å??ã?¨Google Talkã??AIMã??Windows Liveã??ä»?ã?®ã??ã?ã?°ã?©ã? "
 "ã?§ä¼?è©±ã??ã?§ã??ã?¾ã??ã??ã??ã?¤ã?¯ã??ã?¦ã?§ã??ã?«ã?¡ã?©ã?§ã??é?³å£°ã??æ? å??ã?§ä¼?è©±ã??ã?§ã??ã?¾ã??ã??"
 
-#: ../src/empathy-account-assistant.c:526
+#: ../src/empathy-account-assistant.c:671
 msgid "Do you have an account you've been using with another chat program?"
 msgstr "ä»?ã?®ä¼?è©±ç?¨ã??ã?ã?°ã?©ã? ã?§å?©ç?¨ã??ã?¦ã??ã??ã?¢ã?«ã?¦ã?³ã??ã?¯ã??ã??ã?¾ã??ã???"
 
-#: ../src/empathy-account-assistant.c:549
+#: ../src/empathy-account-assistant.c:694
 msgid "Yes, import my account details from "
 msgstr "ã?¯ã??ã??ã?¢ã?«ã?¦ã?³ã??ã?®è©³ç´°ã??ã?¤ã?³ã??ã?¼ã??ã??ã?¾ã?? "
 
-#: ../src/empathy-account-assistant.c:570
+#: ../src/empathy-account-assistant.c:715
 msgid "Yes, I'll enter my account details now"
 msgstr "ã?¯ã??ã??ä»?ã?¢ã?«ã?¦ã?³ã??ã?®è©³ç´°ã??å?¥å??ã??ã?¾ã??"
 
-#: ../src/empathy-account-assistant.c:592
+#: ../src/empathy-account-assistant.c:737
 msgid "No, I want a new account"
 msgstr "ã??ã??ã??ã??æ?°ã??ã??ã?¢ã?«ã?¦ã?³ã??ã??ä½?æ??ã??ã?¾ã??"
 
-#: ../src/empathy-account-assistant.c:602
+#: ../src/empathy-account-assistant.c:747
 msgid "No, I just want to see people online nearby for now"
 msgstr "ã??ã??ã??ã??ä»?è¿?ã??ã?§ã?ªã?³ã?©ã?¤ã?³ã?®äººã??è¦?ã??ã??ã? ã??ã?§ã??"
 
-#: ../src/empathy-account-assistant.c:623
+#: ../src/empathy-account-assistant.c:768
 msgid "Select the accounts you want to import:"
 msgstr "ã?¤ã?³ã??ã?¼ã??ã??ã??ã??ã?¢ã?«ã?¦ã?³ã??ã??é?¸æ??ã??ã?¾ã??:"
 
-#: ../src/empathy-account-assistant.c:710
-#: ../src/empathy-new-chatroom-dialog.c:496
-#: ../src/empathy-new-chatroom-dialog.c:497
+#: ../src/empathy-account-assistant.c:852
+#: ../src/empathy-new-chatroom-dialog.c:609
+#: ../src/empathy-new-chatroom-dialog.c:610
 msgid "Yes"
 msgstr "ã?¯ã??"
 
-#: ../src/empathy-account-assistant.c:717
+#: ../src/empathy-account-assistant.c:859
 msgid "No, that's all for now"
 msgstr "ã??ã??ã??ã??ä»?ã?¯ã??ã??ã?§å??å??ã?§ã??"
 
-#: ../src/empathy-account-assistant.c:910
+#: ../src/empathy-account-assistant.c:1124
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct. You can easily change these details later or "
+"disable this feature by using the 'Accounts' dialog"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:1130
+#: ../src/empathy-account-assistant.c:1186
+#, fuzzy
+msgid "Edit->Accounts"
+msgstr "ã?¢ã?«ã?¦ã?³ã??ã?®ç·¨é??(_E)"
+
+#: ../src/empathy-account-assistant.c:1146
+#, fuzzy
+msgid "I don't want to enable this feature for now"
+msgstr "ã??ã??ã??ã??ä»?è¿?ã??ã?§ã?ªã?³ã?©ã?¤ã?³ã?®äººã??è¦?ã??ã??ã? ã??ã?§ã??"
+
+#: ../src/empathy-account-assistant.c:1182
+msgid ""
+"You won't be able to chat with people connected to your local network, as "
+"telepathy-salut is not installed. If you want to enable this feature, please "
+"install the telepathy-salut package and create a People Nearby account from "
+"the Accounts dialog"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:1188
+msgid "telepathy-salut not installed"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:1234
+msgid "Messaging and VoIP Accounts Assistant"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:1268
 msgid "Welcome to Empathy"
 msgstr "ã??ã??ã??ã??Empathyã?¸"
 
-#: ../src/empathy-account-assistant.c:919
+#: ../src/empathy-account-assistant.c:1277
 msgid "Import your existing accounts"
 msgstr "å?å?¨ã??ã??ã?¢ã?«ã?¦ã?³ã??ã??ã?¤ã?³ã??ã?¼ã??ã??ã?¾ã??"
 
+#: ../src/empathy-account-assistant.c:1295
+msgid "Please enter personal details"
+msgstr ""
+
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:63
-#, c-format
-msgid "There are unsaved modification regarding your %s account."
+#: ../src/empathy-accounts-dialog.c:65
+#, fuzzy, c-format
+msgid "There are unsaved modifications to your %s account."
 msgstr "%s ã?¢ã?«ã?¦ã?³ã??ã?®ç·¨é??ã??ä¿?å?ã??ã??ã?¦ã??ã?¾ã??ã??ã??"
 
-#. 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".
-#. * You should reverse the order of these arguments if the
-#. * server should come before the login id in your locale.
-#: ../src/empathy-accounts-dialog.c:236
-#, c-format
-msgid "%1$s on %2$s"
-msgstr "%2$s ã?«ã??ã?? %1$s"
+#. The primary text of the dialog shown to the user when he is about to lose
+#. * an unsaved new account
+#: ../src/empathy-accounts-dialog.c:69
+msgid "Your new account has not been saved yet."
+msgstr ""
 
-#. To translators: The parameter is the protocol name. The resulting
-#. * string will be something like: "Jabber Account"
-#: ../src/empathy-accounts-dialog.c:248
-#, c-format
-msgid "%s Account"
-msgstr "%s ã?¢ã?«ã?¦ã?³ã??"
+#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:808
+#, fuzzy
+msgid "Connectingâ?¦"
+msgstr "æ?¥ç¶?ä¸..."
 
-#: ../src/empathy-accounts-dialog.c:252
-msgid "New account"
-msgstr "æ?°ã??ã??ã?¢ã?«ã?¦ã?³ã??"
+#: ../src/empathy-accounts-dialog.c:322
+#, fuzzy, c-format
+msgid "Offline â?? %s"
+msgstr "ã?ªã??ã?©ã?¤ã?³"
+
+#: ../src/empathy-accounts-dialog.c:334
+#, fuzzy, c-format
+msgid "Disconnected â?? %s"
+msgstr "ä¸?é??"
+
+#: ../src/empathy-accounts-dialog.c:345
+msgid "Offline â?? No Network Connection"
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:352
+#, fuzzy
+msgid "Unknown Status"
+msgstr "å??å? ä¸?æ??ã?§ã??"
+
+#: ../src/empathy-accounts-dialog.c:364
+msgid "Offline â?? Account Disabled"
+msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:502
+#: ../src/empathy-accounts-dialog.c:805
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -1952,30 +2691,16 @@ msgstr ""
 "å¤?æ?´ã??ç ´æ£?ã??ã?¦æ?°ã??ã??ã?¢ã?«ã?¦ã?³ã??ã??ç??æ??ã??ã??ã??ã?¨ã??ã?¦ã??ã?¾ã??ã??\n"
 "æ?¬å½?ã?«ç¶?ç¶?ã??ã?¾ã??ã???"
 
-#: ../src/empathy-accounts-dialog.c:787
+#: ../src/empathy-accounts-dialog.c:1152
 #, c-format
-msgid ""
-"You are about to remove your %s account!\n"
-"Are you sure you want to proceed?"
-msgstr ""
-"%s ã?¨ã??ã??ã?¢ã?«ã?¦ã?³ã??ã??å??é?¤ã??ã??ã??ã?¨ã??ã?¦ã??ã?¾ã??ï¼?\n"
-"æ?¬å½?ã?«å??é?¤ã??ã?¦ã??ã??ã??ã??ã??ã?§ã??ã??ï¼?"
+msgid "Do you want to remove %s from your computer?"
+msgstr "ã?³ã?³ã??ã?¥ã?¼ã?¿ã?¼ã??ã?? %s ã??å??é?¤ã??ã?¾ã??ã??ï¼?"
 
-#: ../src/empathy-accounts-dialog.c:792
-msgid ""
-"Any associated conversations and chat rooms will NOT be removed if you "
-"decide to proceed.\n"
-"\n"
-"Should you decide to add the account back at a later time, they will still "
-"be available."
-msgstr ""
-"ã??ã??ã?§ã?¢ã?«ã?¦ã?³ã??ã?®å??é?¤ã??ç¶?è¡?ã??ã?¦ã??ã??å®?é??ã?«ã??ã?®ã?¢ã?«ã?¦ã?³ã??ã?«é?¢é?£ã??ã??ä¼?è©±ã??é?¨å±?"
-"ã?¯å??é?¤ã??ã??ã?¾ã??ã??ã??\n"
-"\n"
-"ã??ã?®ç??ç?±ã?¯ã??ã??ã?¨ã?§ã?¢ã?«ã?¦ã?³ã??ã??è¿½å? ã??ç?´ã??ã??æ??ã?«å??å?©ç?¨ã?§ã??ã??ã??ã??ã?«ã??ã??ã??ã??ã?§"
-"ã??ã??"
+#: ../src/empathy-accounts-dialog.c:1156
+msgid "This will not remove your account on the server."
+msgstr "ã??ã??ã?«ã??ã?£ã?¦ã??ã?µã?¼ã??ã?¼ã??ã??ã?¢ã?«ã?¦ã?³ã??ã??å??é?¤ã??ã??ã??ã??ã?¨ã?¯ã??ã??ã?¾ã??ã??ã??"
 
-#: ../src/empathy-accounts-dialog.c:980
+#: ../src/empathy-accounts-dialog.c:1394
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -1983,7 +2708,7 @@ msgstr ""
 "å¤?æ?´ã??ç ´æ£?ã??ã?¦ä»?ã?®ã?¢ã?«ã?¦ã?³ã??ã??é?¸æ??ã??ã??ã??ã?¨ã??ã?¦ã??ã?¾ã??ã??\n"
 "æ?¬å½?ã?«ç¶?ç¶?ã??ã?¾ã??ã???"
 
-#: ../src/empathy-accounts-dialog.c:1475
+#: ../src/empathy-accounts-dialog.c:1997
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -1992,22 +2717,20 @@ msgstr ""
 "æ?¬å½?ã?«ç¶?ç¶?ã??ã?¾ã??ã???"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
-msgid "Accounts"
-msgstr "ã?¢ã?«ã?¦ã?³ã??"
+#, fuzzy
+msgid "Loading account information"
+msgstr "ä»²é??ã?®æ??å ±"
 
 #: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Add new"
-msgstr "æ?°ã??ã??è¿½å? ã??ã??"
+msgid "No protocol installed"
+msgstr "ã??ã?ã??ã?³ã?«ã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã??ã?¦ã??ã?¾ã??ã??"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "Cr_eate"
-msgstr "ç??æ??(_E)"
+#, fuzzy
+msgid "Protocol:"
+msgstr "ã??ã?ã??ã?³ã?«"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "No protocol installed"
-msgstr "ã??ã?ã??ã?³ã?«ã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã??ã?¦ã??ã?¾ã??ã??"
-
-#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -2015,111 +2738,307 @@ msgstr ""
 "æ?°ã??ã??ã?¢ã?«ã?¦ã?³ã??ã??ç?»é?²ã??ã??ã?«ã?¯ã??ã?¾ã??æ??å??ã?«å?©ç?¨ã??ã??ã??ã?ã??ã?³ã?«ã?®ã??ã??ã?¯ã?¨ã?³ã??ã??"
 "ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã?¦ã??ã??ã?¦ä¸?ã??ã??ã??"
 
+#: ../src/empathy-accounts-dialog.ui.h:5
+msgid "_Addâ?¦"
+msgstr ""
+
 #: ../src/empathy-accounts-dialog.ui.h:6
-msgid "_Add..."
-msgstr "è¿½å? (_A)..."
+#, fuzzy
+msgid "_Importâ?¦"
+msgstr "å??ã??è¾¼ã??"
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Create a new account"
-msgstr "ã?¢ã?«ã?¦ã?³ã??ã??ä½?ã??ï¼?_C)"
+#: ../src/empathy-auth-client.c:217
+#, fuzzy
+msgid " - Empathy authentication client"
+msgstr "- Empathy ã?¤ã?³ã?¹ã?¿ã?³ã??ã?»ã?¡ã??ã?»ã?³ã?¸ã?£ã?¼"
 
-#: ../src/empathy-accounts-dialog.ui.h:8
-msgid "_Reuse an existing account"
-msgstr "å?å?¨ã??ã??ã?¢ã?«ã?¦ã?³ã??ã??å??å?©ç?¨ã??ã??(_R)"
+#: ../src/empathy-auth-client.c:233
+#, fuzzy
+msgid "Empathy authentication client"
+msgstr "èª?è¨¼ã?«å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../src/empathy-accounts-dialog.ui.h:9
-msgid "account"
-msgstr "ã?¢ã?«ã?¦ã?³ã??"
+#: ../src/empathy-auto-salut-account-helper.c:83
+msgid "People nearby"
+msgstr "ã??ã??è¿?ã??ã?«ã??ã??äººé??"
+
+#: ../src/empathy-av.c:133
+#, fuzzy
+msgid "- Empathy Audio/Video Client"
+msgstr "- Empathy ã?¤ã?³ã?¹ã?¿ã?³ã??ã?»ã?¡ã??ã?»ã?³ã?¸ã?£ã?¼"
+
+#: ../src/empathy-av.c:149
+#, fuzzy
+msgid "Empathy Audio/Video Client"
+msgstr "Empathy ã?¤ã?³ã?¹ã?¿ã?³ã??ã?»ã?¡ã??ã?»ã?³ã?¸ã?£ã?¼"
 
-#: ../src/empathy-call-window.c:427
+#: ../src/empathy-call-window.c:479
 msgid "Contrast"
 msgstr "ã?³ã?³ã??ã?©ã?¹ã??"
 
-#: ../src/empathy-call-window.c:430
+#: ../src/empathy-call-window.c:482
 msgid "Brightness"
 msgstr "æ??ã??ã??"
 
-#: ../src/empathy-call-window.c:433
+#: ../src/empathy-call-window.c:485
 msgid "Gamma"
 msgstr "ã?¬ã?³ã??"
 
-#: ../src/empathy-call-window.c:541
+#: ../src/empathy-call-window.c:590
 msgid "Volume"
 msgstr "é?³é??"
 
-#: ../src/empathy-call-window.c:674
-msgid "Connecting..."
-msgstr "æ?¥ç¶?ä¸..."
-
-#: ../src/empathy-call-window.c:781
+#: ../src/empathy-call-window.c:1163
 msgid "_Sidebar"
 msgstr "ã?µã?¤ã??ã??ã?¼(_S)"
 
-#: ../src/empathy-call-window.c:800
-msgid "Dialpad"
-msgstr "ã??ã?¤ã?¢ã?«ã??ã??ã??"
-
-#: ../src/empathy-call-window.c:806
+#: ../src/empathy-call-window.c:1182
 msgid "Audio input"
 msgstr "é?³å£°"
 
-#: ../src/empathy-call-window.c:810
+#: ../src/empathy-call-window.c:1186
 msgid "Video input"
 msgstr "æ? å??"
 
+#: ../src/empathy-call-window.c:1190
+msgid "Dialpad"
+msgstr "ã??ã?¤ã?¢ã?«ã??ã??ã??"
+
+#: ../src/empathy-call-window.c:1195
+#, fuzzy
+msgid "Details"
+msgstr "ä»²é??ã?®è©³ç´°"
+
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:873
+#: ../src/empathy-call-window.c:1263
 #, c-format
 msgid "Call with %s"
 msgstr "%sã?§ç?ºä¿¡"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../src/empathy-call-window.c:954
+#: ../src/empathy-call-window.c:1342
 msgid "Call"
 msgstr "ç?ºä¿¡"
 
+#: ../src/empathy-call-window.c:1496
+msgid "The IP address as seen by the machine"
+msgstr ""
+
+#: ../src/empathy-call-window.c:1498
+msgid "The IP address as seen by a server on the Internet"
+msgstr ""
+
+#: ../src/empathy-call-window.c:1500
+msgid "The IP address of the peer as seen by the other side"
+msgstr ""
+
+#: ../src/empathy-call-window.c:1502
+msgid "The IP address of a relay server"
+msgstr ""
+
+#: ../src/empathy-call-window.c:1504
+msgid "The IP address of the multicast group"
+msgstr ""
+
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1455
+#: ../src/empathy-call-window.c:2237
 #, c-format
 msgid "Connected â?? %d:%02dm"
 msgstr "æ?¥ç¶?ã??ã?¾ã??ã?? â?? %då??%02dç§?"
 
+#: ../src/empathy-call-window.c:2298
+#, fuzzy
+msgid "Technical Details"
+msgstr "ä»²é??ã?®è©³ç´°"
+
+#: ../src/empathy-call-window.c:2336
+#, c-format
+msgid ""
+"%s's software does not understand any of the audio formats supported by your "
+"computer"
+msgstr ""
+
+#: ../src/empathy-call-window.c:2341
+#, c-format
+msgid ""
+"%s's software does not understand any of the video formats supported by your "
+"computer"
+msgstr ""
+
+#: ../src/empathy-call-window.c:2347
+#, c-format
+msgid ""
+"Can't establish a connection to %s. One of you might be on a network that "
+"does not allow direct connections."
+msgstr ""
+
+#: ../src/empathy-call-window.c:2353
+msgid "There was a failure on the network"
+msgstr ""
+
+#: ../src/empathy-call-window.c:2357
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
+msgstr ""
+
+#: ../src/empathy-call-window.c:2360
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
+msgstr ""
+
+#: ../src/empathy-call-window.c:2370
+#, c-format
+msgid ""
+"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
+"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
+"the Help menu."
+msgstr ""
+
+#: ../src/empathy-call-window.c:2378
+msgid "There was a failure in the call engine"
+msgstr ""
+
+#: ../src/empathy-call-window.c:2381
+msgid "The end of the stream was reached"
+msgstr ""
+
+#: ../src/empathy-call-window.c:2421
+msgid "Can't establish audio stream"
+msgstr ""
+
+#: ../src/empathy-call-window.c:2431
+msgid "Can't establish video stream"
+msgstr ""
+
 #: ../src/empathy-call-window.ui.h:1
+#, fuzzy
+msgid "Audio"
+msgstr "é?³å£°ã?®é??ä¿¡"
+
+#: ../src/empathy-call-window.ui.h:2
+#, fuzzy
+msgid "Call the contact again"
+msgstr "ä»²é??ã?ªã?¹ã??ã??å°?ã??ã??ã??ã??ã??ã?©ã??ã??"
+
+#: ../src/empathy-call-window.ui.h:3
+msgid "Camera Off"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:4
+msgid "Camera On"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:10
 msgid "Hang up"
 msgstr "æ?¥ç¶?ã??å??ã??"
 
-#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:11
+msgid "Hang up current call"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:12
+msgid "Local Candidate:"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:13
+#, fuzzy
+msgid "Preview"
+msgstr "ã??ã?¬ã??ã?¥ã?¼"
+
+#: ../src/empathy-call-window.ui.h:14
 msgid "Redial"
 msgstr "ã?ªã??ã?¤ã?¢ã?«"
 
-#: ../src/empathy-call-window.ui.h:3
+#: ../src/empathy-call-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:16
 msgid "Send Audio"
 msgstr "é?³å£°ã?®é??ä¿¡"
 
-#: ../src/empathy-call-window.ui.h:4
-msgid "Send video"
-msgstr "æ? å??ã?®é??ä¿¡"
+#: ../src/empathy-call-window.ui.h:17
+msgid "Toggle audio transmission"
+msgstr ""
 
-#: ../src/empathy-call-window.ui.h:5
-msgid "Video preview"
+#: ../src/empathy-call-window.ui.h:19
+msgid "V_ideo"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:20
+#, fuzzy
+msgid "Video"
+msgstr "æ? å??"
+
+#: ../src/empathy-call-window.ui.h:21
+#, fuzzy
+msgid "Video Off"
+msgstr "æ? å??"
+
+#: ../src/empathy-call-window.ui.h:22
+#, fuzzy
+msgid "Video On"
+msgstr "æ? å??"
+
+#: ../src/empathy-call-window.ui.h:23
+#, fuzzy
+msgid "Video Preview"
 msgstr "ã??ã?¬ã??ã?¥ã?¼"
 
-#: ../src/empathy-call-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:24
 msgid "_Call"
 msgstr "å?¼ã?³å?ºã??(_C)"
 
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:27
 msgid "_View"
 msgstr "è¡¨ç¤º(_V)"
 
-#: ../src/empathy-chat-window.c:349
+#: ../src/empathy-chat-window.c:452 ../src/empathy-chat-window.c:472
+#, c-format
+msgid "%s (%d unread)"
+msgid_plural "%s (%d unread)"
+msgstr[0] ""
+
+#: ../src/empathy-chat-window.c:464
+#, c-format
+msgid "%s (and %u other)"
+msgid_plural "%s (and %u others)"
+msgstr[0] ""
+
+#: ../src/empathy-chat-window.c:480
+#, c-format
+msgid "%s (%d unread from others)"
+msgid_plural "%s (%d unread from others)"
+msgstr[0] ""
+
+#: ../src/empathy-chat-window.c:489
 #, c-format
-msgid "Conversations (%d)"
-msgstr "ä¼?è©± (%d)"
+msgid "%s (%d unread from all)"
+msgid_plural "%s (%d unread from all)"
+msgstr[0] ""
 
-#: ../src/empathy-chat-window.c:481
+#: ../src/empathy-chat-window.c:695
 msgid "Typing a message."
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??å?¥å??ã??ã?¦ã??ã?¾ã??"
 
@@ -2128,70 +3047,89 @@ msgid "C_lear"
 msgstr "ã?¯ã?ªã?¢(_L)"
 
 #: ../src/empathy-chat-window.ui.h:2
+#, fuzzy
+msgid "C_ontact"
+msgstr "ä»²é??"
+
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Chat"
 msgstr "ã??ã?£ã??ã??"
 
-#: ../src/empathy-chat-window.ui.h:3
+#: ../src/empathy-chat-window.ui.h:4
 msgid "Insert _Smiley"
 msgstr "ã?¹ã??ã?¤ã?ªã?¼ã?®æ?¿å?¥(_S)"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:5
+msgid "Invite _Participantâ?¦"
+msgstr ""
+
+#: ../src/empathy-chat-window.ui.h:6
 msgid "Move Tab _Left"
 msgstr "ã?¿ã??ã??å·¦ã?¸ç§»å??(_L)"
 
-#: ../src/empathy-chat-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:7
 msgid "Move Tab _Right"
 msgstr "ã?¿ã??ã??å?³ã?¸ç§»å??(_R)"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "_Contact"
-msgstr "ä»²é??(_C)"
+#: ../src/empathy-chat-window.ui.h:8
+#, fuzzy
+msgid "Notify for All Messages"
+msgstr "ã?¨ã?©ã?¼ã?¡ã??ã?»ã?¼ã?¸ã?ªã??"
 
-#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:16
 msgid "_Contents"
 msgstr "ç?®æ¬¡(_C)"
 
-#: ../src/empathy-chat-window.ui.h:8
+#: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
 msgstr "ä¼?è©±(_C)"
 
-#: ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-chat-window.ui.h:11
 msgid "_Detach Tab"
 msgstr "ã?¿ã??ã?®å??ã??å¤?ã??(_D)"
 
-#: ../src/empathy-chat-window.ui.h:11
-msgid "_Favorite Chatroom"
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
+msgid "_Edit"
+msgstr "ç·¨é??(_E)"
+
+#: ../src/empathy-chat-window.ui.h:13
+#, fuzzy
+msgid "_Favorite Chat Room"
 msgstr "ã??æ°?ã?«å?¥ã??ã?®é?¨å±?(_F)"
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:20
 msgid "_Help"
 msgstr "ã??ã?«ã??(_H)"
 
-#: ../src/empathy-chat-window.ui.h:13
+#: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
 msgstr "æ¬¡ã?®ã?¿ã??ã?¸(_N)"
 
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:16
 msgid "_Previous Tab"
 msgstr "å??ã?®ã?¿ã??ã?¸(_P)"
 
-#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
 msgid "_Show Contact List"
 msgstr "ä»²é??ã?ªã?¹ã??ã?®è¡¨ç¤º(_S)"
 
-#: ../src/empathy-chat-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:18
 msgid "_Tabs"
 msgstr "ã?¿ã??(_T)"
 
-#: ../src/empathy-chatrooms-window.c:258
+#: ../src/empathy-chat-window.ui.h:19
+msgid "_Undo Close Tab"
+msgstr ""
+
+#: ../src/empathy-chatrooms-window.c:241
 msgid "Name"
 msgstr "å??å??"
 
-#: ../src/empathy-chatrooms-window.c:276
+#: ../src/empathy-chatrooms-window.c:259
 msgid "Room"
 msgstr "é?¨å±?"
 
-#: ../src/empathy-chatrooms-window.c:285
+#: ../src/empathy-chatrooms-window.c:267
 msgid "Auto-Connect"
 msgstr "è?ªå??ã?µã?¤ã?³ã?¤ã?³"
 
@@ -2199,75 +3137,87 @@ msgstr "è?ªå??ã?µã?¤ã?³ã?¤ã?³"
 msgid "Manage Favorite Rooms"
 msgstr "ã??æ°?ã?«å?¥ã??ã?®é?¨å±?"
 
-#: ../src/empathy-event-manager.c:322
+#: ../src/empathy-event-manager.c:468
+#, fuzzy
+msgid "Incoming video call"
+msgstr "é?³å£°ã?§å?¼ã?³ã??ã??ã??ã??ã??"
+
+#: ../src/empathy-event-manager.c:468
 msgid "Incoming call"
 msgstr "ç??ä¿¡ã??ã??ã??ã?¾ã??"
 
-#: ../src/empathy-event-manager.c:325
-#, c-format
-msgid "%s is calling you, do you want to answer?"
+#: ../src/empathy-event-manager.c:472
+#, fuzzy, c-format
+msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s ã??ã??ã??ã??ã?®ç??ä¿¡ã?§ã??ã??ã??å¿?ç?ã??ã?¾ã??ã??ï¼?"
 
-#: ../src/empathy-event-manager.c:332
-msgid "_Reject"
-msgstr "æ??å?¦ã??ã??(_R)"
-
-#: ../src/empathy-event-manager.c:338
-msgid "_Answer"
-msgstr "å¿?ç?ã??ã??(_A)"
+#: ../src/empathy-event-manager.c:473
+#, fuzzy, c-format
+msgid "%s is calling you. Do you want to answer?"
+msgstr "%s ã??ã??ã??ã??ã?®ç??ä¿¡ã?§ã??ã??ã??å¿?ç?ã??ã?¾ã??ã??ï¼?"
 
-#: ../src/empathy-event-manager.c:453
+#: ../src/empathy-event-manager.c:476 ../src/empathy-event-manager.c:618
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s ã??ã??ã??ã??ã?®å?¼ã?³å?ºã??ã?§ã??"
 
-#: ../src/empathy-event-manager.c:497
-#, c-format
-msgid "%s is offering you an invitation"
-msgstr "%s ã??ã??ã??ã??ã?ªã??ã??æ??å¾?ã??ã?¦ã??ã?¾ã??"
+#: ../src/empathy-event-manager.c:501
+msgid "_Reject"
+msgstr "æ??å?¦ã??ã??(_R)"
 
-#: ../src/empathy-event-manager.c:503
-msgid "An external application will be started to handle it."
-msgstr "ã??ã??ã?«å¯¾å¿?ã??ã??ã??ã??ã?®ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³ã??èµ·å??ã??ã??ã?¾ã??ã??"
+#: ../src/empathy-event-manager.c:507
+msgid "_Answer"
+msgstr "å¿?ç?ã??ã??(_A)"
 
-#: ../src/empathy-event-manager.c:508
-msgid "You don't have the needed external application to handle it."
-msgstr "ã??ã??ã?«å¯¾å¿?ã??ã??ã??ã??ã?®ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³ã??å?¥é??èµ·å??ã??ã??å¿?è¦?ã?¯ã??ã??ã?¾ã??ã??ã??"
+#: ../src/empathy-event-manager.c:618
+#, fuzzy, c-format
+msgid "Incoming video call from %s"
+msgstr "%s ã??ã??ã??ã??ã?®å?¼ã?³å?ºã??ã?§ã??"
 
-#: ../src/empathy-event-manager.c:635
+#: ../src/empathy-event-manager.c:695
 msgid "Room invitation"
 msgstr "æ??å¾?ç?¶"
 
-#: ../src/empathy-event-manager.c:638
+#: ../src/empathy-event-manager.c:697
+#, fuzzy, c-format
+msgid "Invitation to join %s"
+msgstr "%s ã??ã??ã??ã??ã?ªã??ã?? %s ã?«æ??å¾?ã??ã?¾ã??ã??"
+
+#: ../src/empathy-event-manager.c:704
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s ã??ã??ã??ã??ã?ªã??ã?? %s ã?«æ??å¾?ã??ã?¦ã??ã?¾ã??"
 
-#: ../src/empathy-event-manager.c:646
+#: ../src/empathy-event-manager.c:712
 msgid "_Decline"
 msgstr "ã??æ?ã??ã??ã??(_D)"
 
-#: ../src/empathy-event-manager.c:651
+#: ../src/empathy-event-manager.c:717
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "å??å? ã??ã??(_J)"
 
-#: ../src/empathy-event-manager.c:690
+#: ../src/empathy-event-manager.c:743
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s ã??ã??ã??ã??ã?ªã??ã?? %s ã?«æ??å¾?ã??ã?¾ã??ã??"
 
-#: ../src/empathy-event-manager.c:716
+#: ../src/empathy-event-manager.c:749
+#, fuzzy, c-format
+msgid "You have been invited to join %s"
+msgstr "ã??ã?ªã??ã?¯ã??ã?£ã??ã??ä¼?è°ã?«å??å? ã??ã??ã??ã??ã?«æ??å¾?ã??ã??ã?¾ã??ã??ã??"
+
+#: ../src/empathy-event-manager.c:797
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "%s ã??ã??ã??ã??ã??ã?¡ã?¤ã?«è»¢é??ã?®ã??ç?¥ã??ã??ã?§ã??"
 
-#: ../src/empathy-event-manager.c:896
+#: ../src/empathy-event-manager.c:1005
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "%s ã??ã??ã?®ç?»é?²ã?®ã?ªã?¯ã?¨ã?¹ã??"
 
-#: ../src/empathy-event-manager.c:900
+#: ../src/empathy-event-manager.c:1009
 #, c-format
 msgid ""
 "\n"
@@ -2276,118 +3226,116 @@ msgstr ""
 "\n"
 "ã?¡ã??ã?»ã?¼ã?¸: %s"
 
-#. someone is logging off
-#: ../src/empathy-event-manager.c:936
+#: ../src/empathy-event-manager.c:1052
 #, c-format
 msgid "%s is now offline."
 msgstr "%s ã??ã??ã?¯ã?ªã??ã?©ã?¤ã?³ã?§ã??ã??"
 
-#. someone is logging in
-#: ../src/empathy-event-manager.c:952
+#: ../src/empathy-event-manager.c:1072
 #, c-format
 msgid "%s is now online."
 msgstr "%s ã??ã??ã?¯ã?ªã?³ã?©ã?¤ã?³ã?§ã??ã??"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:101
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:104
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:180
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s / %s ã?§ %s/s"
 
-#: ../src/empathy-ft-manager.c:276
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s / %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:307
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "\"%s\" ã?? %s ã??ã??ã??ã??å??ä¿¡ä¸"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:310
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "\"%s\" ã??ã?? %s ã?¸é??ä¿¡ä¸"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:340
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "\"%s\" ã?? %s ã??ã??å??ä¿¡ã?¨ã?©ã?¼"
 
-#: ../src/empathy-ft-manager.c:343
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "ã??ã?¡ã?¤ã?«å??ä¿¡ã?¨ã?©ã?¼"
 
-#: ../src/empathy-ft-manager.c:348
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "\"%s\" ã?® %s ã?¸ã?®é??ä¿¡ã?¨ã?©ã?¼"
 
-#: ../src/empathy-ft-manager.c:351
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "ã??ã?¡ã?¤ã?«è»¢é??ã?¨ã?©ã?¼"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:490
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" ã?? %s ã??ã??ã??ã??å??ä¿¡ã??ã?¾ã??ã??"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:495
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" ã?? %s ã??ã??ã?«é??ä¿¡ã??ã?¾ã??"
 
-#: ../src/empathy-ft-manager.c:498
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "ã??ã?¡ã?¤ã?«ã?®è»¢é??ã??å®?äº?ã??ã?¾ã??ã??"
 
-#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
 msgid "Waiting for the other participant's response"
 msgstr "ä»?ã?®å??å? è??ã?®å¿?ç?ã??å¾?ã?£ã?¦ã??ã?¾ã??"
 
-#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "\"%s\" ã?®å®?å?¨æ?§ã??ã??ã?§ã??ã?¯ã??ã?¦ã??ã?¾ã??"
 
-#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "ã??ã??ã?·ã?¥è¨?ç®?ä¸ \"%s\""
 
-#: ../src/empathy-ft-manager.c:1024
+#: ../src/empathy-ft-manager.c:996
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1036
+#: ../src/empathy-ft-manager.c:1008
 msgid "File"
 msgstr "ã??ã?¡ã?¤ã?«"
 
-#: ../src/empathy-ft-manager.c:1058
+#: ../src/empathy-ft-manager.c:1030
 msgid "Remaining"
 msgstr "æ®?ã??"
 
@@ -2412,178 +3360,148 @@ msgid "Import Accounts"
 msgstr "ã?¢ã?«ã?¦ã?³ã??ã?®å??ã??è¾¼ã?¿"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:282
+#: ../src/empathy-import-widget.c:292
 msgid "Import"
 msgstr "å??ã??è¾¼ã??"
 
-#: ../src/empathy-import-widget.c:291
+#: ../src/empathy-import-widget.c:301
 msgid "Protocol"
 msgstr "ã??ã?ã??ã?³ã?«"
 
-#: ../src/empathy-import-widget.c:315
+#: ../src/empathy-import-widget.c:325
 msgid "Source"
 msgstr "æ??ä¾?å??"
 
-#: ../src/empathy-import-mc4-accounts.c:106
-#, c-format
-msgid "%s account"
-msgstr "%s ã?¢ã?«ã?¦ã?³ã??"
-
-#: ../src/empathy-main-window.c:399
-msgid "_Edit account"
-msgstr "ã?¢ã?«ã?¦ã?³ã??ã?®ç·¨é??(_E)"
-
-#: ../src/empathy-main-window.c:502
-msgid "No error specified"
-msgstr "å??å? ä¸?æ??ã?®ã?¨ã?©ã?¼ã?§ã??"
-
-#: ../src/empathy-main-window.c:505
-msgid "Network error"
-msgstr "ã??ã??ã??ã?¯ã?¼ã?¯ã?®ã?¨ã?©ã?¼ã?§ã??"
-
-#: ../src/empathy-main-window.c:508
-msgid "Authentication failed"
-msgstr "èª?è¨¼ã?«å¤±æ??ã??ã?¾ã??ã??"
-
-#: ../src/empathy-main-window.c:511
-msgid "Encryption error"
-msgstr "æ??å?·å??ã?®ã?¨ã?©ã?¼ã?§ã??"
-
-#: ../src/empathy-main-window.c:514
-msgid "Name in use"
-msgstr "ä½¿ç?¨ä¸ã?®å??å??"
-
-#: ../src/empathy-main-window.c:517
-msgid "Certificate not provided"
-msgstr "è¨¼æ??æ?¸ã??ã??ã??ã?¾ã??ã??"
-
-#: ../src/empathy-main-window.c:520
-msgid "Certificate untrusted"
-msgstr "ä¿¡ç?¨ã?®ã?ªã??è¨¼æ??æ?¸ã?§ã??"
-
-#: ../src/empathy-main-window.c:523
-msgid "Certificate expired"
-msgstr "è¨¼æ??æ?¸ã?®æ??å?¹æ??é??ã??å??ã??ã?¦ã??ã?¾ã??"
-
-#: ../src/empathy-main-window.c:526
-msgid "Certificate not activated"
-msgstr "è¨¼æ??æ?¸ã?¯å?©ç?¨ã?§ã??ã?¾ã??ã??"
+#: ../src/empathy-main-window.c:383
+#, fuzzy
+msgid "No match found"
+msgstr "ã??ã??ã??ã?¯ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../src/empathy-main-window.c:529
-msgid "Certificate hostname mismatch"
-msgstr "è¨¼æ??æ?¸ã?®ã??ã?¹ã??å??ã??ä¸?è?´ã??ã?¾ã??ã??"
+#: ../src/empathy-main-window.c:535
+#, fuzzy
+msgid "Reconnect"
+msgstr "ä¸?é??"
 
-#: ../src/empathy-main-window.c:532
-msgid "Certificate fingerprint mismatch"
-msgstr "è¨¼æ??æ?¸ã?®æ??ç´?ã??ä¸?è?´ã??ã?¾ã??ã??"
+#: ../src/empathy-main-window.c:541
+#, fuzzy
+msgid "Edit Account"
+msgstr "ã?¢ã?«ã?¦ã?³ã??ã?®ç·¨é??(_E)"
 
-#: ../src/empathy-main-window.c:535
-msgid "Certificate self-signed"
-msgstr "è¨¼æ??æ?¸è?ªèº«ã?®ç½²å??ã?§ã??"
+#: ../src/empathy-main-window.c:547
+#, fuzzy
+msgid "Close"
+msgstr "ã?¯ã?ªã?¼ã?³"
 
-#: ../src/empathy-main-window.c:538
-msgid "Certificate error"
-msgstr "è¨¼æ??æ?¸ã?«é?¢é?£ã??ã??ã?¨ã?©ã?¼ã?§ã??"
+#: ../src/empathy-main-window.c:1229
+msgid "Contact"
+msgstr "ä»²é??"
 
-#: ../src/empathy-main-window.c:541
-msgid "Unknown error"
-msgstr "å??å? ä¸?æ??ã?®ã?¨ã?©ã?¼ã?§ã??"
+#: ../src/empathy-main-window.c:1554
+msgid "Contact List"
+msgstr "ä»²é??ã?ªã?¹ã??"
 
-#: ../src/empathy-main-window.c:1288
+#: ../src/empathy-main-window.c:1663
 msgid "Show and edit accounts"
 msgstr "ã?¢ã?«ã?¦ã?³ã??ã?®ä¸?è¦§ã??è¡¨ç¤ºã??ã?¦ç·¨é??ã??ã?¾ã??"
 
 #: ../src/empathy-main-window.ui.h:1
-msgid "Contact List"
-msgstr "ä»²é??ã?ªã?¹ã??"
-
-#: ../src/empathy-main-window.ui.h:2
 msgid "Contacts on a _Map"
 msgstr "å?°å?³ä¸?ã?®ä»²é??(_M)"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window.ui.h:2
 msgid "Context"
 msgstr "ã?³ã?³ã??ã?ã?¹ã??"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window.ui.h:3
 msgid "Join _Favorites"
 msgstr "ã??æ°?ã?«å?¥ã??ã?«è¿½å? (_F)"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window.ui.h:4
 msgid "Manage Favorites"
 msgstr "ã??æ°?ã?«å?¥ã??ã?®ç®¡ç??"
 
-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window.ui.h:5
 msgid "N_ormal Size"
 msgstr "ã?¢ã??ã?¿ã?¼ã?ªã??ã?®é??å¸¸ã?µã?¤ã?º(_O)"
 
+#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "New _Callâ?¦"
+msgstr ""
+
 #: ../src/empathy-main-window.ui.h:7
 msgid "Normal Size With _Avatars"
 msgstr "ã?¢ã??ã?¿ã?¼ã??ã??ã?®é??å¸¸ã?µã?¤ã?º(_A)"
 
 #: ../src/empathy-main-window.ui.h:8
+#, fuzzy
+msgid "P_references"
+msgstr "è¨å®?"
+
+#: ../src/empathy-main-window.ui.h:9
+#, fuzzy
+msgid "Show P_rotocols"
+msgstr "ã??ã?ã??ã?³ã?«"
+
+#: ../src/empathy-main-window.ui.h:10
 msgid "Sort by _Name"
 msgstr "å??å??é ?ã?«ä¸¦ã?³æ?¿ã??(_N)"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:11
 msgid "Sort by _Status"
 msgstr "ç?¶æ??ã?§ä¸¦ã?³æ?¿ã??(_S)"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:12
 msgid "_Accounts"
 msgstr "ã?¢ã?«ã?¦ã?³ã??(_A)"
 
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:15
 msgid "_Compact Size"
 msgstr "ã?³ã?³ã??ã?¯ã??ã?µã?¤ã?º(_C)"
 
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window.ui.h:17
 msgid "_Debug"
 msgstr "ã??ã??ã??ã?°(_D)"
 
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window.ui.h:19
 msgid "_File Transfers"
 msgstr "ã??ã?¡ã?¤ã?«è»¢é??(_F)"
 
-#: ../src/empathy-main-window.ui.h:19
-msgid "_Join..."
+#: ../src/empathy-main-window.ui.h:21
+#, fuzzy
+msgid "_Joinâ?¦"
 msgstr "å??å? ã??ã??(_J)"
 
-#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversation..."
-msgstr "æ?°ã??ã??ä¼?è©±(_N)..."
+#: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3
+#, fuzzy
+msgid "_New Conversationâ?¦"
+msgstr "æ?°ã??ã??ä¼?è©±"
 
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window.ui.h:23
 msgid "_Offline Contacts"
 msgstr "ã?ªã??ã?©ã?¤ã?³ã?®ä»²é??ã??è¡¨ç¤º(_O)"
 
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window.ui.h:24
 msgid "_Personal Information"
 msgstr "å??äººæ??å ±(_P)"
 
-#: ../src/empathy-main-window.ui.h:24
-msgid "_Previous Conversations"
-msgstr "ä¼?è©±ã?®å±¥æ´(_P)"
-
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:26
 msgid "_Room"
 msgstr "é?¨å±?(_R)"
 
-#: ../src/empathy-new-chatroom-dialog.c:328
+#: ../src/empathy-new-chatroom-dialog.c:379
 msgid "Chat Room"
 msgstr "ä¼?è©±é?¨å±?"
 
-#: ../src/empathy-new-chatroom-dialog.c:344
+#: ../src/empathy-new-chatroom-dialog.c:395
 msgid "Members"
 msgstr "ã?¡ã?³ã??ã?¼"
 
-#: ../src/empathy-new-chatroom-dialog.c:494
-#, c-format
-msgctxt ""
-"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
-"and a number."
+#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
+#. yes/no, yes/no and a number.
+#: ../src/empathy-new-chatroom-dialog.c:607
+#, fuzzy, c-format
 msgid ""
-"<b>%s</b>\n"
+"%s\n"
 "Invite required: %s\n"
 "Password required: %s\n"
 "Members: %s"
@@ -2593,16 +3511,16 @@ msgstr ""
 "ã??ã?¹ã?¯ã?¼ã??ã??å¿?è¦?: %s\n"
 "ã?¡ã?³ã??ã?¼æ?°: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:496
-#: ../src/empathy-new-chatroom-dialog.c:497
+#: ../src/empathy-new-chatroom-dialog.c:609
+#: ../src/empathy-new-chatroom-dialog.c:610
 msgid "No"
 msgstr "ã??ã??ã??"
 
-#: ../src/empathy-new-chatroom-dialog.c:524
+#: ../src/empathy-new-chatroom-dialog.c:638
 msgid "Could not start room listing"
 msgstr "é?¨å±?ã?ªã?¹ã??ã?®ä½?æ??ã??é??å§?ã?§ã??ã?¾ã??ã??"
 
-#: ../src/empathy-new-chatroom-dialog.c:534
+#: ../src/empathy-new-chatroom-dialog.c:648
 msgid "Could not stop room listing"
 msgstr "é?¨å±?ã?ªã?¹ã??ã?®ä½?æ??ã??å??æ¢ã?§ã??ã?¾ã??ã??"
 
@@ -2637,119 +3555,108 @@ msgstr "é?¨å±?ã?®ä¸?è¦§"
 msgid "_Room:"
 msgstr "é?¨å±?(_R):"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:138
 msgid "Message received"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??å??ä¿¡ã??ã??"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:139
 msgid "Message sent"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ã??ã??"
 
-#: ../src/empathy-preferences.c:150
+#: ../src/empathy-preferences.c:140
 msgid "New conversation"
 msgstr "æ?°ã??ã??ä¼?è©±ã??å§?ã??ã??"
 
-#: ../src/empathy-preferences.c:151
+#: ../src/empathy-preferences.c:141
 msgid "Contact goes online"
 msgstr "ä»²é??ã??ã?µã?¤ã?³ã?¤ã?³ã??ã??"
 
-#: ../src/empathy-preferences.c:152
+#: ../src/empathy-preferences.c:142
 msgid "Contact goes offline"
 msgstr "ä»²é??ã??ã?µã?¤ã?³ã?¢ã?¦ã??ã??ã??"
 
-#: ../src/empathy-preferences.c:153
+#: ../src/empathy-preferences.c:143
 msgid "Account connected"
 msgstr "è?ªå??ã??ã?µã?¤ã?³ã?¤ã?³ã??ã??"
 
-#: ../src/empathy-preferences.c:154
+#: ../src/empathy-preferences.c:144
 msgid "Account disconnected"
 msgstr "è?ªå??ã??ã?µã?¤ã?³ã?¢ã?¦ã??ã??ã??"
 
-#: ../src/empathy-preferences.c:394
+#: ../src/empathy-preferences.c:445
 msgid "Language"
 msgstr "è¨?èª?"
 
-#: ../src/empathy-preferences.ui.h:1
-msgid "Allow _GPS usage"
-msgstr "GPSã?®ä½¿ç?¨ã??è¨±å?¯ã??ã??ï¼?_Gï¼?"
-
-#: ../src/empathy-preferences.ui.h:2
-msgid "Allow _cellphone usage"
-msgstr "ã?»ã?«ã?©ã?¼ã??ã?³ã?®ä½¿ç?¨ã??è¨±å?¯ã??ã??ï¼?_Cï¼?"
-
-#: ../src/empathy-preferences.ui.h:3
-msgid "Allow _network usage"
-msgstr "ã??ã??ã??ã?¯ã?¼ã?¯ã?®ä½¿ç?¨ã??è¨±å?¯ã??ã??ï¼?_Nï¼?"
+#: ../src/empathy-preferences.c:882
+msgid "Preferences"
+msgstr "è¨å®?"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:1
 msgid "Appearance"
 msgstr "å¤?è¦³"
 
-#: ../src/empathy-preferences.ui.h:5
-msgid "Automatically _connect on startup "
-msgstr "èµ·å??ã??ã??ã??è?ªå??ç??ã?«ã?ã?°ã?¤ã?³ã??ã??(_C)"
-
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:2
 msgid "Behavior"
 msgstr "æ??å??"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:3
 msgid "Chat Th_eme:"
 msgstr "ã??ã?¼ã??(_E):"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:4
 msgid "Disable notifications when _away or busy"
 msgstr "é?¢å¸ä¸ã?«ã?ªã?£ã??ã??é??ç?¥ã??ç?¡å?¹ã?«ã??ã??(_A)"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:5
 msgid "Disable sounds when _away or busy"
 msgstr "é?¢å¸ä¸ã?«ã?ªã?£ã??ã??ã?µã?¦ã?³ã??ã?®æ¼?å¥?ã??ç?¡å?¹ã?«ã??ã??(_A)"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:6
+msgid "Display incoming events in the notification area"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:7
 msgid "Enable notifications when a contact comes online"
 msgstr "ä»²é??ã??å?¨å¸ä¸ã?«ã?ªã?£ã??ã??é??ç?¥ã??æ??å?¹ã?«ã??ã??"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:8
 msgid "Enable notifications when a contact goes offline"
 msgstr "ä»²é??ã??ã?ªã??ã?©ã?¤ã?³ã?«ã?ªã?£ã??ã??é??ç?¥ã??æ??å?¹ã?«ã??ã??"
 
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:9
 msgid "Enable notifications when the _chat is not focused"
 msgstr "ã??ã?£ã??ã??ã?»ã?¦ã?£ã?³ã??ã?¦ã?«ã??ã?©ã?¼ã?«ã?¹ã??ç?¡ã??ã?¦ã??é??ç?¥ã??ã??(_C)"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable spell checking for languages:"
 msgstr "ã?¹ã??ã?«ã??ã?§ã??ã?¯ã??æ??å?¹ã?«ã??ã??:"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:11
 msgid "General"
 msgstr "å?¨è?¬"
 
-#: ../src/empathy-preferences.ui.h:15
-msgid "Geoclue Settings"
-msgstr "Geoclueã?®è¨å®?"
+#: ../src/empathy-preferences.ui.h:13
+msgid "Location sources:"
+msgstr "å ´æ??ã?®ã?½ã?¼ã?¹ï¼?"
 
-#: ../src/empathy-preferences.ui.h:16
-msgid "Location"
-msgstr "å ´æ??"
+#: ../src/empathy-preferences.ui.h:14
+#, fuzzy
+msgid "Log conversations"
+msgstr "ä¼?è©±"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:15
 msgid "Notifications"
 msgstr "é??ç?¥"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:16
 msgid "Play sound for events"
 msgstr "ã?¤ã??ã?³ã??ã?§ã?µã?¦ã?³ã??ã??é³´ã??ã??"
 
-#: ../src/empathy-preferences.ui.h:19
-msgid "Preferences"
-msgstr "è¨å®?"
-
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:17
 msgid "Privacy"
 msgstr "ã??ã?©ã?¤ã??ã?·ã?¼"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:18
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -2758,143 +3665,389 @@ msgstr ""
 "ä½?ç½®ç²¾åº¦ã??ä¸?ã??ã??ã??ã?¨ã?§ã??å¸?ç?ºæ??ã??å?½ã?®å?¬è¡¨ã??ã??ã??æ£ç¢ºã?§ã?¯ã?ªã??ã?ªã??ã?¾ã??ã??GPSåº§æ¨?ã?¯"
 "å°?æ?°ç?¹ç¬¬1ä½?ã?¾ã?§æ£ç¢ºã?§ã??ã??"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:19
 msgid "Show _smileys as images"
 msgstr "ã?¹ã??ã?¤ã?ªã?¼ã??ã?¢ã?¤ã?³ã?³ã?§è¡¨ç¤ºã??ã??(_S)"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:20
 msgid "Show contact _list in rooms"
 msgstr "é?¨å±?ã?®ä»²é??ã?ªã?¹ã??ã??è¡¨ç¤ºã??ã??(_L)"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:21
 msgid "Sounds"
 msgstr "ã?µã?¦ã?³ã??"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:22
 msgid "Spell Checking"
 msgstr "ã?¹ã??ã?«ã?®ã??ã?§ã??ã?¯"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "è¨?èª?ã?®ä¸?è¦§ã?¯ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã?¦ã??ã??è¾?æ?¸ã?®è¨?èª?ã?®ã?¿ã??å??æ? ã??ã?¾ã??ã??"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:24
 msgid "Themes"
 msgstr "ã??ã?¼ã??"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:25
+#, fuzzy
+msgid "_Automatically connect on startup"
+msgstr "èµ·å??ã??ã??ã??è?ªå??ç??ã?«ã?ã?°ã?¤ã?³ã??ã??(_C)"
+
+#: ../src/empathy-preferences.ui.h:26
+msgid "_Cellphone"
+msgstr "æ?ºå¸¯(_C)"
+
+#: ../src/empathy-preferences.ui.h:27
 msgid "_Enable bubble notifications"
 msgstr "ã??ã??ã??ã?¢ã??ã??é??ç?¥ã??æ??å?¹ã?«ã??ã??(_E)"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:28
 msgid "_Enable sound notifications"
 msgstr "ã?µã?¦ã?³ã??æ¼?å¥?ã?«ã??ã??é??ç?¥ã??æ??å?¹ã?«ã??ã??(_E)"
 
+#: ../src/empathy-preferences.ui.h:29
+msgid "_GPS"
+msgstr "GPS(_G)"
+
 #: ../src/empathy-preferences.ui.h:30
+#, fuzzy
+msgid "_Network (IP, Wi-Fi)"
+msgstr "ã??ã??ã??ã?¯ã?¼ã?¯(IPã??Wifiï¼?(_N)"
+
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Open new chats in separate windows"
 msgstr "æ?°ã??ã??ä¼?è©±ã?®åº¦ã?«å?¥ã?®ã?¦ã?£ã?³ã??ã?¦ã??é??ã??(_O)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Publish location to my contacts"
 msgstr "è?ªå??ã?®ä»²é??ã?«ä½?ç½®ã??å?¬è¡¨ã??ã??(_P)"
 
-#: ../src/empathy-preferences.ui.h:32
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345Â° is rounded to round(146,2345*10)/10 = 146,2 degrees.
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Reduce location accuracy"
 msgstr "ä½?ç½®ç²¾åº¦ã??ä¸?ã??ã??(_R)"
 
-#: ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-status-icon.c:141
+msgid "Respond"
+msgstr "å¿?ç?ã??ã??"
+
+#: ../src/empathy-status-icon.c:147
+#, fuzzy
+msgid "Reject"
+msgstr "æ??å?¦ã??ã??(_R)"
+
+#: ../src/empathy-status-icon.c:151
+#, fuzzy
+msgid "Answer"
+msgstr "å¿?ç?ã??ã??(_A)"
+
+#: ../src/empathy-status-icon.c:158
+#, fuzzy
+msgid "Decline"
+msgstr "ã??æ?ã??ã??ã??(_D)"
+
+#: ../src/empathy-status-icon.c:162
+#, fuzzy
+msgid "Accept"
+msgstr "å??ã??å??ã??(_A)"
+
+#: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "ç?¶æ??"
 
-#: ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-status-icon.ui.h:4
 msgid "_Quit"
 msgstr "çµ?äº?(_Q)"
 
-#: ../src/empathy-tube-dispatch.c:376
-#, c-format
-msgid "Unable to start application for service %s: %s"
-msgstr "%s ã?¨ã??ã??ã?µã?¼ã??ã?¹ã?®ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³ã??èµ·å??ã?§ã??ã?¾ã??ã??: %s"
-
-#: ../src/empathy-tube-dispatch.c:447
-#, c-format
-msgid ""
-"An invitation was offered for service %s, but you don't have the needed "
-"application to handle it"
-msgstr ""
-"%s ã?¨ã??ã??ã?µã?¼ã??ã?¹ã?¸ã?®æ??å¾?ã??å??ã??å??ã??ã?¾ã??ã?? (ã??ã?®ã?µã?¼ã??ã?¹ã??å?©ç?¨ã??ã??ã?¢ã??ã?ªã?±ã?¼"
-"ã?·ã?§ã?³ã??å?¥é??èµ·å??ã??ã??å¿?è¦?ã?¯ã??ã??ã?¾ã??ã??)"
-
-#: ../src/empathy-map-view.ui.h:1
+#: ../src/empathy-map-view.c:452
 msgid "Contact Map View"
 msgstr "Contact Map View"
 
-#: ../src/empathy-debug-window.c:111 ../src/empathy-debug-window.c:1081
-msgid "Error"
-msgstr "ã?¨ã?©ã?¼"
-
-#: ../src/empathy-debug-window.c:114 ../src/empathy-debug-window.c:1075
-msgid "Critical"
-msgstr "å?±é?º"
-
-#: ../src/empathy-debug-window.c:117 ../src/empathy-debug-window.c:1069
-msgid "Warning"
-msgstr "æ³¨æ??"
-
-#: ../src/empathy-debug-window.c:120 ../src/empathy-debug-window.c:1063
-#: ../src/empathy-debug-window.c:1111
-msgid "Message"
-msgstr "ã?¡ã??ã?»ã?¼ã?¸"
-
-#: ../src/empathy-debug-window.c:123 ../src/empathy-debug-window.c:1057
-msgid "Info"
-msgstr "æ??å ±"
-
-#: ../src/empathy-debug-window.c:126 ../src/empathy-debug-window.c:1051
-msgid "Debug"
-msgstr "ã??ã??ã??ã?°"
-
-#: ../src/empathy-debug-window.c:841
+#: ../src/empathy-debug-window.c:1219
 msgid "Save"
 msgstr "ä¿?å?"
 
-#: ../src/empathy-debug-window.c:944
+#: ../src/empathy-debug-window.c:1395
 msgid "Debug Window"
 msgstr "ã??ã??ã??ã?°ã?»ã?¦ã?£ã?³ã??ã?¦"
 
-#: ../src/empathy-debug-window.c:1019
+#: ../src/empathy-debug-window.c:1475
 msgid "Pause"
 msgstr "ä¸?æ??å??æ¢"
 
-#: ../src/empathy-debug-window.c:1031
+#: ../src/empathy-debug-window.c:1487
 msgid "Level "
 msgstr "ã?¬ã??ã?« "
 
-#: ../src/empathy-debug-window.c:1100
+#: ../src/empathy-debug-window.c:1507
+msgid "Debug"
+msgstr "ã??ã??ã??ã?°"
+
+#: ../src/empathy-debug-window.c:1513
+msgid "Info"
+msgstr "æ??å ±"
+
+#: ../src/empathy-debug-window.c:1519 ../src/empathy-debug-window.c:1568
+msgid "Message"
+msgstr "ã?¡ã??ã?»ã?¼ã?¸"
+
+#: ../src/empathy-debug-window.c:1525
+msgid "Warning"
+msgstr "æ³¨æ??"
+
+#: ../src/empathy-debug-window.c:1531
+msgid "Critical"
+msgstr "å?±é?º"
+
+#: ../src/empathy-debug-window.c:1537
+msgid "Error"
+msgstr "ã?¨ã?©ã?¼"
+
+#: ../src/empathy-debug-window.c:1556
 msgid "Time"
 msgstr "æ??å?»"
 
-#: ../src/empathy-debug-window.c:1102
+#: ../src/empathy-debug-window.c:1559
 msgid "Domain"
 msgstr "ã??ã?¡ã?¤ã?³"
 
-#: ../src/empathy-debug-window.c:1104
+#: ../src/empathy-debug-window.c:1561
 msgid "Category"
 msgstr "å??é¡?"
 
-#: ../src/empathy-debug-window.c:1106
+#: ../src/empathy-debug-window.c:1563
 msgid "Level"
 msgstr "ã?¬ã??ã?«"
 
-#: ../src/empathy-debug-window.c:1138
+#: ../src/empathy-debug-window.c:1600
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr "é?¸æ??ã??ã??æ?¥ç¶?ã??ã??ã?¼ã?¸ã?£ã?¯ã?ªã?¢ã?¼ã??ã??ã??ã??ã?°æ?¡å¼µã??ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??ã??"
 
-#~ msgid "Empathy Instant Messenger"
-#~ msgstr "Empathy ã?¤ã?³ã?¹ã?¿ã?³ã??ã?»ã?¡ã??ã?»ã?³ã?¸ã?£ã?¼"
+#: ../src/empathy-invite-participant-dialog.c:34
+#: ../src/empathy-invite-participant-dialog.c:48
+msgid "Invite Participant"
+msgstr ""
+
+#: ../src/empathy-invite-participant-dialog.c:35
+msgid "Choose a contact to invite into the conversation:"
+msgstr ""
+
+#: ../src/empathy-invite-participant-dialog.c:45
+msgid "Invite"
+msgstr "æ??å¾?ã??ã??"
+
+#: ../src/empathy-accounts.c:182
+msgid "Don't display any dialogs; do any work (eg, importing) and exit"
+msgstr ""
+
+#: ../src/empathy-accounts.c:186
+msgid "Don't display any dialogs if there are any non-Salut accounts"
+msgstr ""
+
+#: ../src/empathy-accounts.c:190
+msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
+msgstr ""
+
+#: ../src/empathy-accounts.c:192
+#, fuzzy
+msgid "<account-id>"
+msgstr "ã?¢ã?«ã?¦ã?³ã??"
+
+#: ../src/empathy-accounts.c:200
+#, fuzzy
+msgid "- Empathy Accounts"
+msgstr "ã?¢ã?«ã?¦ã?³ã??ã?®å??ã??è¾¼ã?¿"
+
+#: ../src/empathy-accounts.c:216
+#, fuzzy
+msgid "Empathy Accounts"
+msgstr "ã?¢ã?«ã?¦ã?³ã??ã?®å??ã??è¾¼ã?¿"
+
+#: ../src/empathy-debugger.c:40
+#, fuzzy
+msgid "Empathy Debugger"
+msgstr "Empathy"
+
+#~ msgid "Send and receive messages"
+#~ msgstr "ã?¤ã?³ã?¹ã?¿ã?³ã??ã?»ã?¡ã??ã?»ã?¼ã?¸ã??é??å??ä¿¡ã??ã?¾ã??"
+
+#~ msgid "MC 4 accounts have been imported"
+#~ msgstr "MC 4 ã?¢ã?«ã?¦ã?³ã??ã?®ã?¤ã?³ã??ã?¼ã??"
+
+#~ msgid "MC 4 accounts have been imported."
+#~ msgstr "MC 4 ã?¢ã?«ã?¦ã?³ã??ã??ã?¤ã?³ã??ã?¼ã??æ¸?ã?¿ã??ã?©ã??ã??ã??"
+
+#~ msgid "Salut account is created"
+#~ msgstr "Salut ã?®ã?¢ã?«ã?¦ã?³ã??ã??ç??æ??ã??ã??ã??ã?©ã??ã??"
+
+#~ msgid ""
+#~ "Whether or not the Salut account has been created on the first Empathy "
+#~ "run."
+#~ msgstr ""
+#~ "Empathy ã??å??ã??ã?¦èµ·å??ã??ã??æ??ã?« Salut ã?¢ã?«ã?¦ã?³ã??ã??ç??æ??ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
+
+#~ msgid "Can't set an empty display name"
+#~ msgstr "ç©ºã?®è¡¨ç¤ºå??ã?¯è¨å®?ã?§ã??ã?¾ã??ã??"
+
+#~ msgid "Hidden"
+#~ msgstr "é? ã??ã??"
+
+#~ msgid "New Network"
+#~ msgstr "æ?°ã??ã??ã??ã??ã??ã?¯ã?¼ã?¯"
+
+#~ msgid "Unsupported command"
+#~ msgstr "ã?µã??ã?¼ã??ã??ã??ã?¦ã??ã?ªã??ã?³ã??ã?³ã??ã?§ã??"
+
+#~ msgid "_View Previous Conversations"
+#~ msgstr "ä¼?è©±ã?®å±¥æ´(_V)"
+
+#~ msgid "<b>Location</b>"
+#~ msgstr "<b>å ´æ??</b>"
+
+#~ msgid "<b>Location</b>, "
+#~ msgstr "<b>å ´æ??</b>, "
+
+#~ msgid "Email:"
+#~ msgstr "E-ã?¡ã?¼ã?«:"
+
+#~ msgid "Edit Custom Messages..."
+#~ msgstr "ç?¬è?ªã?®ã?¡ã??ã?»ã?¼ã?¸ã??ç·¨é??..."
+
+#~ msgid "Select a destination"
+#~ msgstr "ä¿?å?å??ã?®é?¸æ??"
+
+#~ msgid ""
+#~ "The contact to display in the applet. Empty means no contact is displayed."
+#~ msgstr "ã?¢ã??ã?¬ã??ã??ã?®ä¸ã?«è¡¨ç¤ºã??ã??ä»²é??ã?ªã?¹ã??"
+
+#~ msgid "The contact's avatar token. Empty means contact has no avatar."
+#~ msgstr "ä»²é??ã?ªã?¹ã??ã?®ã?¢ã??ã?¿ã?¼"
+
+#~ msgid "Megaphone"
+#~ msgstr "ã?¡ã?¬ã??ã?³"
+
+#~ msgid "Talk!"
+#~ msgstr "ä»²é??ã?¨è©±ã??ã??ã??ã?¾ã??ã??ã??ï¼?"
+
+#~ msgid "_Information"
+#~ msgstr "æ??å ±(_I)"
+
+#~ msgid "_Preferences"
+#~ msgstr "è¨å®?(_P)"
+
+#~ msgid "Please configure a contact."
+#~ msgstr "é?£çµ¡å??ã??è¨å®?ã??ã?¦ä¸?ã??ã??"
+
+#~ msgid "Select contact..."
+#~ msgstr "é?£çµ¡å??ã?®é?¸æ??..."
+
+#~ msgid "Presence"
+#~ msgstr "å?¨å¸"
+
+#~ msgid "Set your own presence"
+#~ msgstr "ã??ã?ªã??ã?®å?¨å¸æ??å ±ã??ã?»ã??ã??ã??ã?¾ã??"
+
+#~ msgid "Show the accounts dialog"
+#~ msgstr "ã?¢ã?«ã?¦ã?³ã??ã?»ã??ã?¤ã?¢ã?ã?°ã??è¡¨ç¤ºã??ã??"
+
+#~ msgid "The error message was: <span style=\"italic\">%s</span>"
+#~ msgstr "ã?¨ã?©ã?¼ã?¡ã??ã?»ã?¼ã?¸: <span style=\"italic\">%s</span>"
+
+#~ msgid ""
+#~ "You are about to remove your %s account!\n"
+#~ "Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "%s ã?¨ã??ã??ã?¢ã?«ã?¦ã?³ã??ã??å??é?¤ã??ã??ã??ã?¨ã??ã?¦ã??ã?¾ã??ï¼?\n"
+#~ "æ?¬å½?ã?«å??é?¤ã??ã?¦ã??ã??ã??ã??ã??ã?§ã??ã??ï¼?"
+
+#~ msgid ""
+#~ "Any associated conversations and chat rooms will NOT be removed if you "
+#~ "decide to proceed.\n"
+#~ "\n"
+#~ "Should you decide to add the account back at a later time, they will "
+#~ "still be available."
+#~ msgstr ""
+#~ "ã??ã??ã?§ã?¢ã?«ã?¦ã?³ã??ã?®å??é?¤ã??ç¶?è¡?ã??ã?¦ã??ã??å®?é??ã?«ã??ã?®ã?¢ã?«ã?¦ã?³ã??ã?«é?¢é?£ã??ã??ä¼?è©±ã??é?¨"
+#~ "å±?ã?¯å??é?¤ã??ã??ã?¾ã??ã??ã??\n"
+#~ "\n"
+#~ "ã??ã?®ç??ç?±ã?¯ã??ã??ã?¨ã?§ã?¢ã?«ã?¦ã?³ã??ã??è¿½å? ã??ç?´ã??ã??æ??ã?«å??å?©ç?¨ã?§ã??ã??ã??ã??ã?«ã??ã??ã??ã??ã?§"
+#~ "ã??ã??"
+
+#~ msgid "_Next"
+#~ msgstr "æ¬¡ã?¸(_N)"
+
+#~ msgid "Accounts"
+#~ msgstr "ã?¢ã?«ã?¦ã?³ã??"
+
+#~ msgid "Add new"
+#~ msgstr "æ?°ã??ã??è¿½å? ã??ã??"
+
+#~ msgid "Cr_eate"
+#~ msgstr "ç??æ??(_E)"
+
+#~ msgid "_Add..."
+#~ msgstr "è¿½å? (_A)..."
+
+#~ msgid "_Reuse an existing account"
+#~ msgstr "å?å?¨ã??ã??ã?¢ã?«ã?¦ã?³ã??ã??å??å?©ç?¨ã??ã??(_R)"
+
+#~ msgid "Conversations (%d)"
+#~ msgstr "ä¼?è©± (%d)"
+
+#~ msgid "_Contact"
+#~ msgstr "ä»²é??(_C)"
+
+#~ msgid "%s is offering you an invitation"
+#~ msgstr "%s ã??ã??ã??ã??ã?ªã??ã??æ??å¾?ã??ã?¦ã??ã?¾ã??"
+
+#~ msgid "An external application will be started to handle it."
+#~ msgstr "ã??ã??ã?«å¯¾å¿?ã??ã??ã??ã??ã?®ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³ã??èµ·å??ã??ã??ã?¾ã??ã??"
+
+#~ msgid "You don't have the needed external application to handle it."
+#~ msgstr ""
+#~ "ã??ã??ã?«å¯¾å¿?ã??ã??ã??ã??ã?®ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³ã??å?¥é??èµ·å??ã??ã??å¿?è¦?ã?¯ã??ã??ã?¾ã??ã??ã??"
+
+#~ msgid "%s account"
+#~ msgstr "%s ã?¢ã?«ã?¦ã?³ã??"
+
+#~ msgid "No error specified"
+#~ msgstr "å??å? ä¸?æ??ã?®ã?¨ã?©ã?¼ã?§ã??"
+
+#~ msgid "Unknown error"
+#~ msgstr "å??å? ä¸?æ??ã?®ã?¨ã?©ã?¼ã?§ã??"
+
+#~ msgid "_Join..."
+#~ msgstr "å??å? ã??ã??(_J)"
+
+#~ msgid "_New Conversation..."
+#~ msgstr "æ?°ã??ã??ä¼?è©±(_N)..."
+
+#~ msgid "Allow _GPS usage"
+#~ msgstr "GPSã?®ä½¿ç?¨ã??è¨±å?¯ã??ã??ï¼?_Gï¼?"
+
+#~ msgid "Allow _cellphone usage"
+#~ msgstr "ã?»ã?«ã?©ã?¼ã??ã?³ã?®ä½¿ç?¨ã??è¨±å?¯ã??ã??ï¼?_Cï¼?"
+
+#~ msgid "Allow _network usage"
+#~ msgstr "ã??ã??ã??ã?¯ã?¼ã?¯ã?®ä½¿ç?¨ã??è¨±å?¯ã??ã??ï¼?_Nï¼?"
+
+#~ msgid "Geoclue Settings"
+#~ msgstr "Geoclueã?®è¨å®?"
+
+#~ msgid "Unable to start application for service %s: %s"
+#~ msgstr "%s ã?¨ã??ã??ã?µã?¼ã??ã?¹ã?®ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³ã??èµ·å??ã?§ã??ã?¾ã??ã??: %s"
+
+#~ msgid ""
+#~ "An invitation was offered for service %s, but you don't have the needed "
+#~ "application to handle it"
+#~ msgstr ""
+#~ "%s ã?¨ã??ã??ã?µã?¼ã??ã?¹ã?¸ã?®æ??å¾?ã??å??ã??å??ã??ã?¾ã??ã?? (ã??ã?®ã?µã?¼ã??ã?¹ã??å?©ç?¨ã??ã??ã?¢ã??ã?ª"
+#~ "ã?±ã?¼ã?·ã?§ã?³ã??å?¥é??èµ·å??ã??ã??å¿?è¦?ã?¯ã??ã??ã?¾ã??ã??)"
 
 #~ msgid "Forget password and clear the entry."
 #~ msgstr "ã??ã?¹ã?¯ã?¼ã??ã??ç ´æ£?ã??ã?¦ã??ã??ã?®ã?¨ã?³ã??ã?ªã??ã?¯ã?ªã?¢ã??ã?¾ã??"
@@ -2920,6 +4073,7 @@ msgstr "é?¸æ??ã??ã??æ?¥ç¶?ã??ã??ã?¼ã?¸ã?£ã?¯ã?ªã?¢ã?¼ã??ã??ã??ã??ã?°æ?¡å¼µã??ã?µ
 #~ msgid "Group Chat"
 #~ msgstr "ã?°ã?«ã?¼ã??ã?»ã??ã?£ã??ã??"
 
+#, fuzzy
 #~ msgid "Contact Information"
 #~ msgstr "ä»²é??ã?®æ??å ±"
 
@@ -2932,9 +4086,6 @@ msgstr "é?¸æ??ã??ã??æ?¥ç¶?ã??ã??ã?¼ã?¸ã?£ã?¯ã?ªã?¢ã?¼ã??ã??ã??ã??ã?°æ?¡å¼µã??ã?µ
 #~ msgid "<b>Groups</b>"
 #~ msgstr "<b>ã?°ã?«ã?¼ã??</b>"
 
-#~ msgid "Contact information"
-#~ msgstr "ä»²é??ã?®æ??å ±"
-
 #~ msgid "Word"
 #~ msgstr "å??èª?"
 
@@ -2962,12 +4113,6 @@ msgstr "é?¸æ??ã??ã??æ?¥ç¶?ã??ã??ã?¼ã?¸ã?£ã?¯ã?ªã?¢ã?¼ã??ã??ã??ã??ã?°æ?¡å¼µã??ã?µ
 #~ msgid "Invitation _message:"
 #~ msgstr "æ??å¾?ã?¡ã??ã?»ã?¼ã?¸(_M):"
 
-#~ msgid "Invite"
-#~ msgstr "æ??å¾?ã??ã??"
-
-#~ msgid "You have been invited to join a chat conference."
-#~ msgstr "ã??ã?ªã??ã?¯ã??ã?£ã??ã??ä¼?è°ã?«å??å? ã??ã??ã??ã??ã?«æ??å¾?ã??ã??ã?¾ã??ã??ã??"
-
 #~ msgid "Edit Favorite Room"
 #~ msgstr "ã??æ°?ã?«å?¥ã??ã?®é?¨å±?ã?®ç·¨é??"
 
@@ -3015,18 +4160,12 @@ msgstr "é?¸æ??ã??ã??æ?¥ç¶?ã??ã??ã?¼ã?¸ã?£ã?¯ã?ªã?¢ã?¼ã??ã??ã??ã??ã?°æ?¡å¼µã??ã?µ
 #~ msgid "Do you want to accept the file \"%s\" (%s)?"
 #~ msgstr " \"%s\" (%s) ã??å??ã??å??ã??ã?¾ã??ã??ï¼?"
 
-#~ msgid "_Accept"
-#~ msgstr "å??ã??å??ã??(_A)"
-
 #~ msgid "Join _New..."
 #~ msgstr "æ?°è¦?(N)..."
 
 #~ msgid "Browse:"
 #~ msgstr "å??ç?§:"
 
-#~ msgid "Join"
-#~ msgstr "å?¥å®¤ã??ã??"
-
 #~ msgid "Join New"
 #~ msgstr "æ?°ã??ã??ã??ã?£ã??ã??é?¨å±?"
 
@@ -3049,3 +4188,6 @@ msgstr "é?¸æ??ã??ã??æ?¥ç¶?ã??ã??ã?¼ã?¸ã?£ã?¯ã?ªã?¢ã?¼ã??ã??ã??ã??ã?°æ?¡å¼µã??ã?µ
 
 #~ msgid "Show co_mpact contact list"
 #~ msgstr "ä»²é??ã?ªã?¹ã??ã??ã?³ã?³ã??ã?¯ã??ã?«ã??ã??(_M)"
+
+#~ msgid "_Import..."
+#~ msgstr "ã?¤ã?³ã??ã?¼ã??...(_I)"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]