[empathy] Updated Japanese translation

From: Takayuki Kusano <kusano src gnome org>
To: commits-list gnome org
Cc:
Subject: [empathy] Updated Japanese translation
Date: Mon, 4 Apr 2011 04:30:36 +0000 (UTC)
commit c4d472673077829a974c57f48bc9f6650adf42b0
Author: OKANO Takayoshi <kano na rim or jp>
Date:   Mon Apr 4 13:29:44 2011 +0900

    Updated Japanese translation

 po/ja.po | 1720 +++++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 1041 insertions(+), 679 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index 2c8252e..164f0ad 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,5 +1,5 @@
 # empathy ja.po.
-# Copyright (C) 2007-2010 Free Software Foundation, Inc.
+# Copyright (C) 2007-2011 empathy's COPYRIGHT HOLDER
 # 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.
@@ -23,8 +23,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=empathy&component=general\n"
-"POT-Creation-Date: 2010-10-18 10:35+0000\n"
+"product=empathy&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-04-03 18:18+0000\n"
 "PO-Revision-Date: 2010-09-27 21:03+0900\n"
 "Last-Translator: Takayuki KUASNO <AE5T-KSN asahi-net or jp>\n"
 "Language-Team: Japanese <gnome-translation gnome gr jp>\n"
@@ -129,283 +129,273 @@ msgid "Empathy default download folder"
 msgstr "Empathy ã??ä½¿ã??ã??ã??ã?©ã?«ã??ã?®ã??ã?¦ã?³ã?ã?¼ã??ã?»ã??ã?©ã?«ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Empathy has asked about importing accounts"
-msgstr "ã?¢ã?«ã?¦ã?³ã??ã?®å??ã??è¾¼ã?¿ã??å??ã??å??ã??ã??ã??ã??ã?©ã??ã??"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Empathy has migrated butterfly logs"
 msgstr "Empathy ã?¯ butterfly ã?®ã?ã?°ã??ç§»è¡?ã??ã?¾ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Empathy should auto-away when idle"
 msgstr "ã?¢ã?¤ã??ã?«æ??ã?«è?ªå??ç??ã?«é?¢å¸ã??ã??ã??ã?©ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy should auto-connect on startup"
 msgstr "èµ·å??æ??ã?«è?ªå??æ?¥ç¶?ã??ã??ã??ã?©ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathyã?¯å ´æ??ã?®ç²¾åº¦ã??ä¸?ã??ã??ã??ã?©ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "ä»²é??ã?ªã?¹ã??ã?®ã?¢ã??ã?¿ã?¼ã??ã??ã?£ã??ã??ã?¦ã?£ã?³ã??ã?¦ã?®ã?¢ã?¤ã?³ã?³ã?«ã??ã??ã??ã?©ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Enable WebKit Developer Tools"
 msgstr "WebKit Developer Toolsã??æ??å?¹ã?«ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Enable popup notifications for new messages"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??å??ä¿¡ã??ã??ã??ã??ã??ã??ã?¢ã??ã??ã?§é??ç?¥ã??ã??ã??ã?©ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Enable spell checker"
 msgstr "ã?¹ã??ã?«ã??ã??ã?§ã??ã?¯ã??ã??ã??ã?©ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Hide main window"
 msgstr "ã?¡ã?¤ã?³ã?»ã?¦ã?£ã?³ã??ã?¦ã??é? ã??ã??ã?©ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Hide the main window."
 msgstr "ã?¡ã?¤ã?³ã?»ã?¦ã?£ã?³ã??ã?¦ã??é? ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Nick completed character"
 msgstr "ã??ã??ã?¯ã??è£?å®?ã??ã??æ??å?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Open new chats in separate windows"
 msgstr "æ?°ã??ã??ä¼?è©±æ¯?ã?«ã?¦ã?£ã?³ã??ã?¦ã??é??ã??ã??ã?©ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Path of the Adium theme to use"
 msgstr "ä½¿ç?¨ã??ã?? Adium ã??ã?¼ã??ã?®ã??ã?¹"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr ""
 "ä¼?è©±ã?§ä½¿ç?¨ã??ã??ã??ã?¼ã??ã?? Adium ã?®å ´å??ã?«ä½¿ç?¨ã??ã?? Adium ã??ã?¼ã??ã?®ã??ã?¹ã??æ??å®?ã??ã?¾"
 "ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Play a sound for incoming messages"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??å??ä¿¡ã??ã??ã??ã?µã?¦ã?³ã??ã??æ¼?å¥?ã??ã??ã??ã?©ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Play a sound for new conversations"
 msgstr "ã??ã?£ã??ã??ã?§æ?°ã??ã??ä¼?è©±ã??ã??ã??ã??ã?µã?¦ã?³ã??ã??æ¼?å¥?ã??ã??ã??ã?©ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Play a sound for outgoing messages"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ã??ã??ã??ã?µã?¦ã?³ã??ã??æ¼?å¥?ã??ã??ã??ã?©ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Play a sound when a contact logs in"
 msgstr "ä»²é??ã??ã?µã?¤ã?³ã?¤ã?³ã??ã??ã??ã?µã?¦ã?³ã??ã??æ¼?å¥?ã??ã??ã??ã?©ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Play a sound when a contact logs out"
 msgstr "ä»²é??ã??ã?µã?¤ã?³ã?¢ã?¦ã??ã??ã??ã??ã?µã?¦ã?³ã??ã??æ¼?å¥?ã??ã??ã??ã?©ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Play a sound when we log in"
 msgstr "ã?µã?¤ã?³ã?¤ã?³ã??ã??ã??ã?µã?¦ã?³ã??ã??æ¼?å¥?ã??ã??ã??ã?©ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Play a sound when we log out"
 msgstr "ã?µã?¤ã?³ã?¢ã?¦ã??ã??ã??ã??ã?µã?¦ã?³ã??ã??æ¼?å¥?ã??ã??ã??ã?©ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Pop up notifications if the chat isn't focused"
 msgstr ""
 "ã??ã?£ã??ã??ã?»ã?¦ã?£ã?³ã??ã?¦ã?«ã??ã?©ã?¼ã?«ã?¹ã??å½?ã??ã?£ã?¦ã??ã?ªã??å ´å??ã?«ã??ã??ã??ã?¢ã??ã??é??ç?¥ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Pop up notifications when a contact logs in"
 msgstr "ä»²é??ã??ã?µã?¤ã?³ã?¤ã?³ã??ã??é??ã?«ã??ã??ã??ã?¢ã??ã??é??ç?¥"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Pop up notifications when a contact logs out"
 msgstr "ä»²é??ã??ã?µã?¤ã?³ã?¢ã?¦ã??ã??ã??é??ã?«ã??ã??ã??ã?¢ã??ã??é??ç?¥"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Show avatars"
 msgstr "ã?¢ã??ã?¿ã?¼ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Show contact list in rooms"
 msgstr "é?¨å±?ã?«ä»²é??ã?®ä¸?è¦§ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Show hint about closing the main window"
 msgstr "ã?¡ã?¤ã?³ã?»ã?¦ã?£ã?³ã??ã?¦ã??é??ã??ã??é??ã?®ã??ã?³ã??ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Show offline contacts"
 msgstr "ã?ªã??ã?©ã?¤ã?³ã?ªä»²é??ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Show protocols"
 msgstr "ã??ã?ã??ã?³ã?«ã??è¡¨ç¤º"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Spell checking languages"
 msgstr "ã?¹ã??ã?«ã??ã??ã?§ã??ã?¯ã??ã??è¨?èª?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "The default folder to save file transfers in."
 msgstr "è»¢é??ã??ã??ã??ã?¡ã?¤ã?«ã??ä¿?å?ã??ã??ã??ã??ã?©ã?«ã??ã?®ã??ã?©ã?«ã??ã?§ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "The last directory that an avatar image was chosen from."
 msgstr "æ??å¾?ã?«ã?¢ã??ã?¿ã?¼ã??é?¸æ??ã??ã??æ??ã?«ä½¿ç?¨ã??ã??ã??ã?©ã?«ã??ã?§ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "The position for the chat window side pane"
 msgstr "ã??ã?£ã??ã??ã?¦ã?£ã?³ã??ã?¦ã?®æ¨ªã?®ã??ã?¤ã?³ã?®ä½?ç½®"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "ä¿?å?ã??ã??ã??ã??ã?£ã??ã??ã?¦ã?£ã?³ã??ã?¦ã?®æ¨ªã?®ã??ã?¤ã?³ã?®ä½?ç½® (ã??ã?¯ã?»ã?«å??ä½?)"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "ã??ã?£ã??ã??ã?¦ã?£ã?³ã??ã?¦ã?§ä½¿ç?¨ã??ã??ã??ã?¼ã??ã?§ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Use graphical smileys"
 msgstr "ã?¹ã??ã?¤ã?ªã?¼ã?»ã?¢ã?¤ã?³ã?³ã??ä½¿ã??ã??ã?©ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Use notification sounds"
 msgstr "ç?¶æ??ã??ã?µã?¦ã?³ã??ã?®æ¼?å¥?ã?§é??ç?¥ã??ã??ã??ã?©ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Use theme for chat rooms"
 msgstr "ã??ã?£ã??ã??ã?«ã?¼ã? ã?«ã??ã?¼ã??ã??é?©ç?¨ã??ã??ã??ã?©ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Empathyã??ä»²é??ã?«å ´æ??ã??å?¬é??ã??ã??ã??ã?©ã??ã??ã??è¨å®?ã??ã?¾ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Empathyã??GPSã?§å ´æ??ã??æ?¨æ¸¬ã??ã??ã??ã?©ã??ã??ã??è¨å®?ã??ã?¾ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Empathyã??ã?»ã?«ã?©ã?¼ã??ã??ã??ã?¯ã?¼ã?¯ã?§å ´æ??ã??æ?¨æ¸¬ã??ã??ã??ã?©ã??ã??ã??è¨å®?ã??ã?¾ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Empathyã??ã??ã??ã??ã?¯ã?¼ã?¯ã?§å ´æ??ã??æ?¨æ¸¬ã??ã??ã??ã?©ã??ã??ã??è¨å®?ã??ã?¾ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "Whether Empathy has asked about importing accounts from other programs."
-msgstr ""
-"Empathy ã??ä»?ã?®ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³ã??ã??ã?¢ã?«ã?¦ã?³ã??æ??å ±ã??å??ã??è¾¼ã?¿ã??ã?®ã??å??ã??å??ã??ã??ã??"
-"ã??ã?©ã??ã??ã?§ã??ã??"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr "Empathy ã?? butterfly ã?®ã?ã?°ã??ç§»è¡?ã??ã??ã??ã?©ã??ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr ""
 "Empathy ã??èµ·å??ã??ã??ã??è?ªå??ç??ã?«è?ªå??ã?®ã?¢ã?«ã?¦ã?³ã??ã?«ã?µã?¤ã?³ã?¤ã?³ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr "ã?¢ã?¤ã??ã?«ç?¶æ??ã?«ã?ªã?£ã??ã??ã??Empathy ã??è?ªå??ç??ã?«é?¢å¸ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "Empathyã??ã??ã?©ã?¤ã??ã?·ã?¼ã?®ç??ç?±ã?§å ´æ??ã?®ç²¾åº¦ã??ä¸?ã??ã??ã??ã?©ã??ã??ã??è¨å®?ã??ã?¾ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
 "Empathy ã??ä»²é??ã?®ã?¢ã??ã?¿ã?¼ã??ã??ã?£ã??ã??ã?¦ã?£ã?³ã??ã?¦ã?®ã?¢ã?¤ã?³ã?³ã?¨ã??ã?¦å?©ç?¨ã??ã??ã??ã?©ã??ã??"
 "ã?§ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "Web Inspectorã?®ã??ã??ã?ªWebKit developer toolsã??æ??å?¹ã?«ã??ã??ã??ã?©ã??ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
 msgstr ""
 "è?ªå??ç??ã?«å??æ?/å??æ?¥ç¶?ã??ã??ã?®ã?«æ?¥ç¶?ã??ã??ã?¼ã?¸ã?£ã??å?©ç?¨ã??ã?¹ã??ã??ã?©ã??ã??ã??è¨å®?ã??ã?¾ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "æ??å®?ã??ã??è¨?èª?ã?§å?¥å??ã??ã??å??èª?ã??ã??ã?§ã??ã?¯ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "ä¼?è©±ä¸ã?®ã?¹ã??ã?¤ã?ªã?¼ã??ã?°ã?©ã??ã?£ã?«ã?«ã?ªç?»å??ã?«å¤?æ??ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr ""
 "ä»²é??ã??ã?µã?¤ã?³ã?¤ã?³ã??ã??ã??ã?¨ã??é??ç?¥ã??ã??ã??ã??ã?«ã?µã?¦ã?³ã??ã??å??ç??ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr ""
 "ä»²é??ã??ã?µã?¤ã?³ã?¢ã?¦ã??ã??ã??ã??ã?¨ã??é??ç?¥ã??ã??ã??ã??ã?«ã?µã?¦ã?³ã??ã??å??ç??ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether to play a sound to notify of events."
 msgstr "ã?¤ã??ã?³ã??ã??ç?ºç??ã??ã??ã??ã?µã?¦ã?³ã??ã??å??ç??ã??ã?¦é??ç?¥ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??å??ã??å??ã?£ã??ã??ã?µã?¦ã?³ã??ã??å??ç??ã??ã?¦é??ç?¥ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "æ?°ã??ã??ä¼?è©±ã??é??å§?ã??ã??ã??ã?µã?¦ã?³ã??ã??å??ç??ã??ã?¦é??ç?¥ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ã??ã??ã??ã?µã?¦ã?³ã??ã??å??ç??ã??ã?¦é??ç?¥ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid "Whether to play a sound when logging into a network."
 msgstr "ã??ã??ã??ã?¯ã?¼ã?¯ã?«ã?µã?¤ã?³ã?¤ã?³ã??ã??ã??ã?µã?¦ã?³ã??ã??å??ç??ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid "Whether to play a sound when logging out of a network."
 msgstr "ã??ã??ã??ã?¯ã?¼ã?¯ã??ã??ã?µã?¤ã?³ã?¢ã?¦ã??ã??ã??ã??ã?µã?¦ã?³ã??ã??å??ç??ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid "Whether to play sound notifications when away or busy."
 msgstr "é?¢å¸ä¸ã?¾ã??ã?¯å¤?å¿?ã?«ã?ªã?£ã??ã??ã?µã?¦ã?³ã??ã?®å??ç??ã?«ã??ã??é??ç?¥ã??è¡?ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr ""
 "ä»²é??ã??ã?ªã??ã?©ã?¤ã?³ã?«ã?ªã?£ã??é??ã?«ã??ã??ã??ã?¢ã??ã??ã?§ã?®é??ç?¥ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr ""
 "ä»²é??ã??ã?ªã?³ã?©ã?¤ã?³ã?«ã?ªã?£ã??é??ã?«ã??ã??ã??ã?¢ã??ã??ã?§ã?®é??ç?¥ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -413,38 +403,38 @@ msgstr ""
 "ã??ã?£ã??ã??ã?»ã?¦ã?£ã?³ã??ã?¦ã??é??ã??ã?¦ã??ã?¦ã??ã??ã?©ã?¼ã?«ã?¹ã??å½?ã??ã?£ã?¦ã??ã?ªã??ã??ã?°ã??æ?°ã??ã??ã?¡ã??"
 "ã?»ã?¼ã?¸ã??å??ä¿¡ã??ã??åº¦ã?«ã??ã??ã??ã?¢ã??ã??é??ç?¥ã??è¡?ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "æ?°ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã??å??ä¿¡ã??ã??åº¦ã?«ã??ã??ã??ã?¢ã??ã??é??ç?¥ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
 "ä»²é??ã?ªã?¹ã??ã?¨ã??ã?£ã??ã??ã?¦ã?£ã?³ã??ã?¦ã?®ä¸ã?«ä»²é??ã?®ã?¢ã??ã?¿ã?¼ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "ä»²é??ã?ªã?¹ã??ã?®ä¸ã?§ã?ªã??ã?©ã?¤ã?³ã?®ä»²é??ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to show popup notifications when away or busy."
 msgstr ""
 "ç?¶æ??ã??é?¢å¸ä¸ã?¾ã??ã?¯å¤?å¿?ã?«ã?ªã?£ã?¦ã??ã??ã??ã??ã?¢ã??ã??é??ç?¥ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "ä»²é??ã?ªã?¹ã??ã?®ä¸ã?®ä»²é??ã?«ã??ã?ã??ã?³ã?«ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to show the contact list in chat rooms."
 msgstr "ã??ã?£ã??ã??ã?«ã?¼ã? ã?§ä»²é??ã?ªã?¹ã??ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to show the contact list in compact mode."
 msgstr "ä»²é??ã?ªã?¹ã??ã??å°?ã??ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -452,11 +442,11 @@ msgstr ""
 "ã?¿ã?¤ã??ã?«ã??ã?¼ã?«ã??ã?? 'x' ã??ã?¿ã?³ã??ã?¯ã?ªã??ã?¯ã??ã?¦ã?¡ã?¤ã?³ã?¦ã?£ã?³ã??ã?¦ã??é??ã??ã??ã??ã?¡ã??ã?»ã?¼"
 "ã?¸ã?»ã??ã?¤ã?¢ã?ã?°ã??è¡¨ç¤ºã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to use the theme for chat rooms."
 msgstr "ã??ã?£ã??ã??ã?«ã?¼ã? ã?§ã??ã?¼ã??ã??ä½¿ç?¨ã??ã??ã??ã?©ã??ã??ã?§ã??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid ""
 "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 "
@@ -471,15 +461,17 @@ msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?³ã?°ã?¨ VoIP ã?®ã?¢ã?«ã?¦ã?³ã??ã?®ç®¡ç??"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2156
+#: ../src/empathy-accounts-dialog.c:2269
 msgid "Messaging and VoIP Accounts"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?³ã?°ã?¨ VoIP ã?®ã?¢ã?«ã?¦ã?³ã??"
 
-#: ../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:825
+#, fuzzy
+#| msgid "File transfer completed"
+msgid "File transfer completed, but the file was corrupted"
+msgstr "ã??ã?¡ã?¤ã?«ã?®è»¢é??ã??å®?äº?ã??ã?¾ã??ã??"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1113
 msgid "File transfer not supported by remote contact"
 msgstr "ã?ªã?¢ã?¼ã??å?´ã?®ç?¸æ??ã?¯ã??ã?¡ã?¤ã?«è»¢é??ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??ã??"
 
@@ -491,184 +483,196 @@ msgstr "é?¸æ??ã??ã??ã??ã?¡ã?¤ã?«ã?¯ä¸?è?¬ç??ã?ªã??ã?¡ã?¤ã?«ã?§ã?¯ã??ã??ã?¾ã??ã??
 msgid "The selected file is empty"
 msgstr "é?¸æ??ã??ã??ã??ã??ã?¡ã?¤ã?«ã?¯ç©ºã?§ã??"
 
-#: ../libempathy/empathy-tp-file.c:283
+#: ../libempathy/empathy-tp-file.c:268
 msgid "Socket type not supported"
 msgstr "ã?µã??ã?¼ã??ã??ã??ã?¦ã??ã?ªã??ã?½ã?±ã??ã??ã?¿ã?¤ã??ã?§ã??"
 
-#: ../libempathy/empathy-tp-file.c:402
+#: ../libempathy/empathy-tp-file.c:387
 msgid "No reason was specified"
 msgstr "å??å? ã??ç?¹å®?ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../libempathy/empathy-tp-file.c:405
+#: ../libempathy/empathy-tp-file.c:390
 msgid "The change in state was requested"
 msgstr "ç?¶æ??ã?®å¤?æ?´ã??è¦?æ±?ã??ã??ã?¾ã??ã??"
 
-#: ../libempathy/empathy-tp-file.c:408
+#: ../libempathy/empathy-tp-file.c:393
 msgid "You canceled the file transfer"
 msgstr "ã??ã?¡ã?¤ã?«è»¢é??ã??ã?ã?£ã?³ã?»ã?«ã??ã?¾ã??ã??"
 
-#: ../libempathy/empathy-tp-file.c:411
+#: ../libempathy/empathy-tp-file.c:396
 msgid "The other participant canceled the file transfer"
 msgstr "ä»?ã?®ä»²é??ã??ã??ã?¡ã?¤ã?«è»¢é??ã??ã?ã?£ã?³ã?»ã?«ã??ã?¾ã??ã??"
 
-#: ../libempathy/empathy-tp-file.c:414
+#: ../libempathy/empathy-tp-file.c:399
 msgid "Error while trying to transfer the file"
 msgstr "ã??ã?¡ã?¤ã?«ã?®è»¢é??ä¸ã?«ã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??"
 
-#: ../libempathy/empathy-tp-file.c:417
+#: ../libempathy/empathy-tp-file.c:402
 msgid "The other participant is unable to transfer the file"
 msgstr "ä»?ã?®ä»²é??ã??ã??ã?¡ã?¤ã?«è»¢é??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:383
 msgid "Unknown reason"
 msgstr "å??å? ä¸?æ??ã?§ã??"
 
-#: ../libempathy/empathy-utils.c:246
+#: ../libempathy/empathy-utils.c:304
 msgid "Available"
 msgstr "å?¨å¸ä¸"
 
-#: ../libempathy/empathy-utils.c:248
+#: ../libempathy/empathy-utils.c:306
 msgid "Busy"
 msgstr "å??ã??è¾¼ã?¿ä¸"
 
-#: ../libempathy/empathy-utils.c:251
+#: ../libempathy/empathy-utils.c:309
 msgid "Away"
 msgstr "é?¢å¸ä¸"
 
-#: ../libempathy/empathy-utils.c:253
+#: ../libempathy/empathy-utils.c:311
 msgid "Invisible"
 msgstr "é??è¡¨ç¤º"
 
-#: ../libempathy/empathy-utils.c:255
+#: ../libempathy/empathy-utils.c:313
 msgid "Offline"
 msgstr "ã?ªã??ã?©ã?¤ã?³"
 
-#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1903
-#: ../src/empathy-call-window.c:1904 ../src/empathy-call-window.c:1905
-#: ../src/empathy-call-window.c:1906 ../src/empathy-call-window.ui.h:18
+#. translators: presence type is unknown
+#. translators: encoding video codec is unknown
+#. translators: encoding audio codec is unknown
+#. translators: decoding video codec is unknown
+#. translators: decoding audio codec is unknown
+#: ../libempathy/empathy-utils.c:316
+#: ../src/empathy-streamed-media-window.c:1905
+#: ../src/empathy-streamed-media-window.c:1907
+#: ../src/empathy-streamed-media-window.c:1909
+#: ../src/empathy-streamed-media-window.c:1911
+#: ../src/empathy-call-window.ui.h:18
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
-#: ../libempathy/empathy-utils.c:296
+#: ../libempathy/empathy-utils.c:355
 msgid "No reason specified"
 msgstr "å??å? ã??ç?¹å®?ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:354
+#: ../libempathy/empathy-utils.c:357 ../libempathy/empathy-utils.c:413
 msgid "Status is set to offline"
 msgstr "ç?¶æ??ã?¯ã?ªã??ã?©ã?¤ã?³ã?«è¨å®?ã??ã??ã?¦ã??ã?¾ã??"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:359 ../libempathy/empathy-utils.c:393
 msgid "Network error"
 msgstr "ã??ã??ã??ã?¯ã?¼ã?¯ã?®ã?¨ã?©ã?¼ã?§ã??"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:361 ../libempathy/empathy-utils.c:395
 msgid "Authentication failed"
 msgstr "èª?è¨¼ã?«å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:363 ../libempathy/empathy-utils.c:397
 msgid "Encryption error"
 msgstr "æ??å?·å??ã?®ã?¨ã?©ã?¼ã?§ã??"
 
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:365
 msgid "Name in use"
 msgstr "ä½¿ç?¨ä¸ã?®å??å??"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:367 ../libempathy/empathy-utils.c:399
 msgid "Certificate not provided"
 msgstr "è¨¼æ??æ?¸ã??ã??ã??ã?¾ã??ã??"
 
-#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:369 ../libempathy/empathy-utils.c:401
 msgid "Certificate untrusted"
 msgstr "ä¿¡ç?¨ã?®ã?ªã??è¨¼æ??æ?¸ã?§ã??"
 
-#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:371 ../libempathy/empathy-utils.c:403
 msgid "Certificate expired"
 msgstr "è¨¼æ??æ?¸ã?®æ??å?¹æ??é??ã??å??ã??ã?¦ã??ã?¾ã??"
 
-#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:373 ../libempathy/empathy-utils.c:405
 msgid "Certificate not activated"
 msgstr "è¨¼æ??æ?¸ã?¯å?©ç?¨ã?§ã??ã?¾ã??ã??"
 
-#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:375 ../libempathy/empathy-utils.c:407
 msgid "Certificate hostname mismatch"
 msgstr "è¨¼æ??æ?¸ã?®ã??ã?¹ã??å??ã??ä¸?è?´ã??ã?¾ã??ã??"
 
-#: ../libempathy/empathy-utils.c:318 ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:377 ../libempathy/empathy-utils.c:409
 msgid "Certificate fingerprint mismatch"
 msgstr "è¨¼æ??æ?¸ã?®æ??ç´?ã??ä¸?è?´ã??ã?¾ã??ã??"
 
-#: ../libempathy/empathy-utils.c:320 ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:379 ../libempathy/empathy-utils.c:411
 msgid "Certificate self-signed"
 msgstr "è¨¼æ??æ?¸è?ªèº«ã?®ç½²å??ã?§ã??"
 
-#: ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:381
 msgid "Certificate error"
 msgstr "è¨¼æ??æ?¸ã?«é?¢é?£ã??ã??ã?¨ã?©ã?¼ã?§ã??"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:415
 msgid "Encryption is not available"
 msgstr "æ??å?·ã??å?©ç?¨ã?§ã??ã?¾ã??ã??"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:417
 msgid "Certificate is invalid"
 msgstr "è¨¼æ??æ?¸ã??æ£ã??ã??ã??ã??ã?¾ã??ã??"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:419
 msgid "Connection has been refused"
 msgstr "æ?¥ç¶?ã??æ??å?¦ã??ã??ã?¾ã??ã??"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:421
 msgid "Connection can't be established"
 msgstr "æ?¥ç¶?ã??ç¢ºç«?ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:423
 msgid "Connection has been lost"
 msgstr "æ?¥ç¶?ã??å¤±ã??ã??ã?¾ã??ã??"
 
-#: ../libempathy/empathy-utils.c:366
+#: ../libempathy/empathy-utils.c:425
 msgid "This resource is already connected to the server"
 msgstr "ã??ã?®ã?ªã?½ã?¼ã?¹ã?¯æ?¢ã?«ã?µã?¼ã??ã?«æ?¥ç¶?æ¸?ã?¿ã?§ã??"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:427
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
-msgstr "æ?¥ç¶?ã?¯å??ã??ã?ªã?½ã?¼ã?¹ã??æ´¥é?¿Kã?£æ??æ?°ã??ã??æ?¥ç¶?ã?§ç½®ã??æ??ã??ã??ã?¾ã??ã??"
+msgstr "æ?¥ç¶?ã?¯å??ã??ã?ªã?½ã?¼ã?¹ã??ä½¿ã?£ã?¦æ?°ã??ã??æ?¥ç¶?ã?§ç½®ã??æ??ã??ã??ã?¾ã??ã??"
 
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:430
 msgid "The account already exists on the server"
 msgstr "ã?¢ã?«ã?¦ã?³ã??ã??ã?µã?¼ã??ã?«æ?¢ã?«å?å?¨ã??ã?¦ã??ã?¾ã??"
 
-#: ../libempathy/empathy-utils.c:373
+#: ../libempathy/empathy-utils.c:432
 msgid "Server is currently too busy to handle the connection"
 msgstr "ã?µã?¼ã??ã??ã??ã?®æ?¥ç¶?ã??å?¦ç??ã?§ã??ã?ªã??ã??ã??ã??ã?«å¿?ã??ã??ç?¶æ??ã?«ã??ã??ã?¾ã??"
 
-#: ../libempathy/empathy-utils.c:375
+#: ../libempathy/empathy-utils.c:434
 msgid "Certificate has been revoked"
 msgstr "è¨¼æ??æ?¸ã??ç?¡å?¹å??ã??ã??ã?¾ã??ã??"
 
-#: ../libempathy/empathy-utils.c:377
+#: ../libempathy/empathy-utils.c:436
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "è¨¼æ??æ?¸ã??å®?å?¨ã?§ã?ªã??æ??å?·ã?®ã?¢ã?«ã?´ã?ªã?ºã? ã??ä½¿ã?£ã?¦ã??ã??ã??ã??æ??å?·ç??ã?«å¼±ã??ã?§ã??"
 
-#: ../libempathy/empathy-utils.c:380
+#: ../libempathy/empathy-utils.c:439
 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:544
+#: ../libempathy/empathy-utils.c:602
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "ã??ã??è¿?ã??ã?«ã??ã??äººé??"
 
-#: ../libempathy/empathy-utils.c:549
+#: ../libempathy/empathy-utils.c:607
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:550
+#: ../libempathy/empathy-utils.c:636
+msgid "Google Talk"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:637
 msgid "Facebook Chat"
 msgstr "Facebook Chat"
 
@@ -712,71 +716,91 @@ msgstr[0] "%d ã?¶æ??å??"
 msgid "in the future"
 msgstr "æ?ªæ?¥ã?«"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:463
+#: ../libempathy-gtk/empathy-account-chooser.c:491
 msgid "All"
 msgstr "ã??ã?¹ã?¦"
 
-#: ../libempathy-gtk/empathy-account-widget.c:514
-#: ../libempathy-gtk/empathy-log-window.c:646
-#: ../src/empathy-import-widget.c:312
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-log-window.c:643
+#: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "ã?¢ã?«ã?¦ã?³ã??"
 
-#: ../libempathy-gtk/empathy-account-widget.c:515
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "ã??ã?¹ã?¯ã?¼ã??"
 
-#: ../libempathy-gtk/empathy-account-widget.c:516
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "ã?µã?¼ã??"
 
-#: ../libempathy-gtk/empathy-account-widget.c:517
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "ã??ã?¼ã??ç?ªå?·"
 
-#: ../libempathy-gtk/empathy-account-widget.c:589
-#: ../libempathy-gtk/empathy-account-widget.c:646
+#: ../libempathy-gtk/empathy-account-widget.c:757
+#: ../libempathy-gtk/empathy-account-widget.c:814
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
+#: ../libempathy-gtk/empathy-account-widget.c:1166
+#, c-format
+msgid "The account %s is edited via My Web Accounts."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget.c:1172
+#, c-format
+msgid "The account %s cannot be edited in Empathy."
+msgstr ""
+
 #: ../libempathy-gtk/empathy-account-widget.c:1192
+#, fuzzy
+#| msgid "Empathy Accounts"
+msgid "Launch My Web Accounts"
+msgstr "Empathy ã?®ã?¢ã?«ã?¦ã?³ã??"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1530
 msgid "Username:"
 msgstr "ã?¦ã?¼ã?¶å??:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1521
+#: ../libempathy-gtk/empathy-account-widget.c:1897
 msgid "A_pply"
 msgstr "é?©ç?¨(_P)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1551
+#: ../libempathy-gtk/empathy-account-widget.c:1927
 msgid "L_og in"
 msgstr "ã?ã?°ã?¤ã?³(_O)"
 
 #. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1617
+#: ../libempathy-gtk/empathy-account-widget.c:1993
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:520
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1401
+#: ../libempathy-gtk/empathy-individual-widget.c:1481
 #: ../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:1628
+#. translators: this is the label of a checkbox used to enable/disable IM
+#. * accounts
+#: ../libempathy-gtk/empathy-account-widget.c:2006
 msgid "_Enabled"
 msgstr "ã?µã?¤ã?³ã?¤ã?³(_E)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1693
+#: ../libempathy-gtk/empathy-account-widget.c:2071
 msgid "This account already exists on the server"
 msgstr "ã??ã?®ã?¢ã?«ã?¦ã?³ã??ã?¯ã??ã?§ã?«ã?µã?¼ã??ã?«å?å?¨ã??ã?¾ã??"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1696
+#: ../libempathy-gtk/empathy-account-widget.c:2074
 msgid "Create a new account on the server"
 msgstr "ã?µã?¼ã??ã?§æ?°ã??ã??ã?¢ã?«ã?¦ã?³ã??ã??ä½?ã??"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1789
+#: ../libempathy-gtk/empathy-account-widget.c:2266
 msgid "Ca_ncel"
 msgstr "ä¸æ¢(_N)"
 
@@ -785,19 +809,19 @@ msgstr "ä¸æ¢(_N)"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2077
+#: ../libempathy-gtk/empathy-account-widget.c:2563
 #, 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:2103
+#: ../libempathy-gtk/empathy-account-widget.c:2589
 #, c-format
 msgid "%s Account"
 msgstr "%s ã?¢ã?«ã?¦ã?³ã??"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2107
+#: ../libempathy-gtk/empathy-account-widget.c:2593
 msgid "New account"
 msgstr "æ?°ã??ã??ã?¢ã?«ã?¦ã?³ã??"
 
@@ -828,32 +852,54 @@ msgid "Pass_word:"
 msgstr "ã??ã?¹ã?¯ã?¼ã??(_W):"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#, fuzzy
+#| msgid "Password"
+msgid "Remember Password"
+msgstr "ã??ã?¹ã?¯ã?¼ã??"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-password-dialog.c:311
+msgid "Remember password"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 msgid "Screen _Name:"
 msgstr "ã?¹ã?¯ã?ªã?¼ã?³å??(_N):"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
 msgid "What is your AIM password?"
 msgstr "AIMã?®ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 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:24
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "_Port:"
 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:25
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
 #: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
 msgstr "ã?µã?¼ã??(_S):"
@@ -869,11 +915,11 @@ msgstr "<b>ä¾?:</b> username"
 msgid "Login I_D:"
 msgstr "ã?ã?°ã?¤ã?³å??(_D):"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
 msgid "What is your GroupWise User ID?"
 msgstr "GroupWiseã?®User IDã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise password?"
 msgstr "GroupWiseã?®ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
@@ -890,11 +936,11 @@ msgstr "æ??å?é??å??(_A):"
 msgid "ICQ _UIN:"
 msgstr "ICQ UIN(_U):"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
 msgid "What is your ICQ UIN?"
 msgstr "ICQ UINã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ password?"
 msgstr "ICQã?®ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
@@ -995,12 +1041,12 @@ msgstr "ã?µã?¼ã??ã?®è¨å®?ã??ä¸?æ?¸ã??ã??ã??"
 msgid "Priori_ty:"
 msgstr "å?ªå??åº¦(_T):"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 msgid "Reso_urce:"
 msgstr "ã?ªã?½ã?¼ã?¹(_U):"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1014,39 +1060,39 @@ msgstr ""
 "ã?¾ã? æ??ã?£ã?¦ã??ã?ªã??ã?®ã?§ã??ã??ã?°ã??<a href=\"http://www.facebook.com/username/\";>ã??"
 "ã?®ã??ã?¼ã?¸</a>ã??ä½¿ã?£ã?¦ Facebook ã?®ã?¦ã?¼ã?¶å??ã??é?¸æ??ã??ã?¦ã??ã? ã??ã??ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
 msgid "Use old SS_L"
 msgstr "å?¤ã?? SSL ã??ä½¿ã??(_L)"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
 msgid "What is your Facebook password?"
 msgstr "ã??ã?ªã??ã?® Facebook ã?®ã??ã?¹ã?¯ã?¼ã??ã?¯ä½?ã?§ã??ã???"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
 msgid "What is your Facebook username?"
 msgstr "ã??ã?ªã??ã?® Facebook ã?®ã?¦ã?¼ã?¶å??ã?¯ä½?ã?§ã??ã???"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 msgid "What is your Google ID?"
 msgstr "Google IDã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 msgid "What is your Google password?"
 msgstr "Googleã?®ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
 msgid "What is your Jabber ID?"
 msgstr "Jabber IDã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
 msgid "What is your Jabber password?"
 msgstr "Jabberã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your desired Jabber ID?"
 msgstr "å¸?æ??ã??ã??Jabber IDã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber password?"
 msgstr "å¸?æ??ã??ã??Jabberã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
@@ -1054,11 +1100,11 @@ msgstr "å¸?æ??ã??ã??Jabberã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 msgid "<b>Example:</b> user hotmail com"
 msgstr "<b>ä¾?:</b> user hotmail com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
 msgid "What is your Windows Live ID?"
 msgstr "ã??ã?ªã??ã?® Windows Live ID ã?¯ä½?ã?§ã??ã???"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live password?"
 msgstr "Windows Live ã?®ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
@@ -1134,27 +1180,27 @@ msgstr "ã??ã?¼ã??ç?ªå?·:"
 msgid "Proxy Options"
 msgstr "ã??ã?ã?ã?·ã?®ã?ªã??ã?·ã?§ã?³"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 msgid "STUN Server:"
 msgstr "STUN ã?µã?¼ã??:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "Server:"
 msgstr "ã?µã?¼ã??:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
 msgid "Transport:"
 msgstr "ã??ã?©ã?³ã?¹ã??ã?¼ã??:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 msgid "What is your SIP account password?"
 msgstr "SIPã?¢ã?«ã?¦ã?³ã??ã?®ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
 msgid "What is your SIP login ID?"
 msgstr "SIPã?®ã?ã?°ã?¤ã?³IDã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "_Username:"
 msgstr "ã?¦ã?¼ã?¶å??(_U):"
 
@@ -1162,106 +1208,112 @@ msgstr "ã?¦ã?¼ã?¶å??(_U):"
 msgid "I_gnore conference and chat room invitations"
 msgstr "ä¼?è°ã?¨ã??ã?£ã??ã??ã?«ã?¼ã? ã?¸ã?®å?§èª?ã??ç?¡è¦?(_G)"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "What is your Yahoo! ID?"
 msgstr "Yahoo! IDã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
 msgid "What is your Yahoo! password?"
 msgstr "Yahoo!ã?®ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
 msgid "Yahoo! I_D:"
 msgstr "Yahoo! ã?® ID(_D):"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "_Room List locale:"
 msgstr "é?¨å±?ã?®ä¸?è¦§ã??ã??ã??å ´æ??(_R):"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:443
-#: ../libempathy-gtk/empathy-avatar-chooser.c:519
+#: ../libempathy-gtk/empathy-avatar-chooser.c:448
+#: ../libempathy-gtk/empathy-avatar-chooser.c:524
 msgid "Couldn't convert image"
 msgstr "ç?»å??ã??å¤?æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:444
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
 msgid "None of the accepted image formats are supported on your system"
 msgstr "å??ä»?ã??ã??ã??ç?»å??ã?®å½¢å¼?ã??ã??ã??ä½¿ã??ã?®ã?·ã?¹ã??ã? ã?§ã?µã??ã?¼ã??ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:935
+#: ../libempathy-gtk/empathy-avatar-chooser.c:930
 msgid "Select Your Avatar Image"
 msgstr "ã?¢ã??ã?¿ã?¼ã?«ä½¿ç?¨ã??ã??ç?»å??ã?®é?¸æ??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:933
 msgid "No Image"
 msgstr "ç?»å??ã?ªã??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
+#: ../libempathy-gtk/empathy-avatar-chooser.c:995
 msgid "Images"
 msgstr "ç?»å??ã??ã?¡ã?¤ã?«"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
+#: ../libempathy-gtk/empathy-avatar-chooser.c:999
 msgid "All Files"
 msgstr "ã??ã?¹ã?¦ã?®ã??ã?¡ã?¤ã?«"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:323
+#: ../libempathy-gtk/empathy-avatar-image.c:322
 msgid "Click to enlarge"
 msgstr "ã?¯ã?ªã??ã?¯ã??ã??ã?¨å¤§ã??ã??ã?ªã??ã?¾ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:642
+#: ../libempathy-gtk/empathy-chat.c:652
 msgid "Failed to open private chat"
 msgstr "ã??ã?©ã?¤ã??ã?¼ã??ã?ªã??ã?£ã??ã??ã??é??ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:682
+#: ../libempathy-gtk/empathy-chat.c:717
 msgid "Topic not supported on this conversation"
 msgstr "ã??ã?®ä¼?è©±ã?§ã?¯ã??ã??ã??ã?¯ã?¯ã?µã??ã?¼ã??ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:688
+#: ../libempathy-gtk/empathy-chat.c:723
 msgid "You are not allowed to change the topic"
 msgstr "ã??ã??ã??ã?¯ã?®å¤?æ?´ã?¯è¨±å?¯ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:822
+#: ../libempathy-gtk/empathy-chat.c:906
 msgid "/clear: clear all messages from the current conversation"
-msgstr "/clear: ç?¾å?¨ã?®ä¼?è©±ã??kã??ã??ã?¹ã?¦ã?®ã?¡ã??ã?»ã?¼ã?¸ã??ã?¯ã?ªã?¢"
+msgstr "/clear: ç?¾å?¨ã?®ä¼?è©±ã??ã??ã??ã?¹ã?¦ã?®ã?¡ã??ã?»ã?¼ã?¸ã??ã?¯ã?ªã?¢"
 
-#: ../libempathy-gtk/empathy-chat.c:825
+#: ../libempathy-gtk/empathy-chat.c:909
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <ã??ã??ã??ã?¯>: ç?¾å?¨ã?®ä¼?è©±ã?®ã??ã??ã??ã?¯ã??è¨å®?"
 
-#: ../libempathy-gtk/empathy-chat.c:828
+#: ../libempathy-gtk/empathy-chat.c:912
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ã??ã?£ã??ã??ã?«ã?¼ã? ID>: æ?°ã??ã??ã??ã?£ã??ã??ã?«ã?¼ã? ã?«å??å? "
 
-#: ../libempathy-gtk/empathy-chat.c:831
+#: ../libempathy-gtk/empathy-chat.c:915
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <ã??ã?£ã??ã??ã?«ã?¼ã? ID>: æ?°ã??ã??ã??ã?£ã??ã??ã?«ã?¼ã? ã?«å??å? "
 
-#: ../libempathy-gtk/empathy-chat.c:836
+#: ../libempathy-gtk/empathy-chat.c:920
+msgid ""
+"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
+"current one"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:925
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <ã?³ã?³ã?¿ã?¯ã??ID> [<ã?¡ã??ã?»ã?¼ã?¸>]: ã??ã?©ã?¤ã??ã?¼ã??ã?ªã??ã?£ã??ã??ã??é??å§?"
 
-#: ../libempathy-gtk/empathy-chat.c:839
+#: ../libempathy-gtk/empathy-chat.c:928
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <ã?³ã?³ã?¿ã?¯ã??ID> <ã?¡ã??ã?»ã?¼ã?¸>: ã??ã?©ã?¤ã??ã?¼ã??ã?ªã??ã?£ã??ã??ã??é??å§?"
 
-#: ../libempathy-gtk/empathy-chat.c:843
+#: ../libempathy-gtk/empathy-chat.c:931
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <ã??ã??ã?¯ã??ã?¼ã? >: ç?¾å?¨ã?®ã?µã?¼ã??ã?§ã?®ã??ã?ªã??ã?®ã??ã??ã?¯ã??ã?¼ã? ã??å¤?æ?´"
 
-#: ../libempathy-gtk/empathy-chat.c:846
+#: ../libempathy-gtk/empathy-chat.c:934
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <ã?¡ã??ã?»ã?¼ã?¸>: ACTION ã?¡ã??ã?»ã?¼ã?¸ã??ç?¾å?¨ã?®ä¼?è©±ã?«é??ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:849
+#: ../libempathy-gtk/empathy-chat.c:937
 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 ""
 "/say <ã?¡ã??ã?»ã?¼ã?¸>: <ã?¡ã??ã?»ã?¼ã?¸> ã??ç?¾å?¨ã?®ä¼?è©±ã?«é??ã??è¾¼ã??ã??ã??ã??ã?¯ '/' ã?§å§?ã?¾ã??"
-"ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ã??ã??æ??ã?«ä½¿ã??ã??ã?¾ã??ã??ä¾?: \"/say /join ã??æ?°ã??ã??ã??ã?£ã??ã??ã?«ã?¼ã? ã?«"
+"ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ã??ã??æ??ã?«ä½¿ã??ã??ã?¾ã??ã??ä¾?: \"/say /join ã?¯æ?°ã??ã??ã??ã?£ã??ã??ã?«ã?¼ã? ã?«"
 "å??å? ã??ã??ã?®ã?«ä½¿ã??ã?¾ã??\""
 
-#: ../libempathy-gtk/empathy-chat.c:854
+#: ../libempathy-gtk/empathy-chat.c:942
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1269,84 +1321,98 @@ msgstr ""
 "/help [<ã?³ã??ã?³ã??>]: ã?µã??ã?¼ã??ã??ã??ã?¦ã??ã??ã?³ã??ã?³ã??ã??ã?¹ã?¦ã??è¡¨ç¤ºã??<ã?³ã??ã?³ã??> ã??æ??å®?"
 "ã??ã??ã??ã??ã??ã?®ä½¿ç?¨æ?¹æ³?ã??è¡¨ç¤º"
 
-#: ../libempathy-gtk/empathy-chat.c:864
+#: ../libempathy-gtk/empathy-chat.c:952
 #, c-format
 msgid "Usage: %s"
 msgstr "ä½¿ã??æ?¹: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:893
+#: ../libempathy-gtk/empathy-chat.c:991
 msgid "Unknown command"
 msgstr "ä¸?æ??ã?ªã?³ã??ã?³ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:1014
+#: ../libempathy-gtk/empathy-chat.c:1117
 msgid "Unknown command; see /help for the available commands"
 msgstr "ä¸?æ??ã?ªã?³ã??ã?³ã??ã?§ã??ã??/help ã?§å?©ç?¨å?¯è?½ã?ªã?³ã??ã?³ã??ã??è¡¨ç¤ºã??ã?¦ã??ã? ã??ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:1152
+#: ../libempathy-gtk/empathy-chat.c:1254
 msgid "offline"
 msgstr "ã?ªã??ã?©ã?¤ã?³"
 
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1257
 msgid "invalid contact"
 msgstr "ç?¡å?¹ã?ªä»²é??ã?§ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:1158
+#: ../libempathy-gtk/empathy-chat.c:1260
 msgid "permission denied"
 msgstr "æ¨©é??ã??ã??ã??ã?¾ã??ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:1161
+#: ../libempathy-gtk/empathy-chat.c:1263
 msgid "too long message"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??é?·ã??ã??ã?¾ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:1164
+#: ../libempathy-gtk/empathy-chat.c:1266
 msgid "not implemented"
 msgstr "æ?ªå®?è£?ã?§ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:1168
+#: ../libempathy-gtk/empathy-chat.c:1270
 msgid "unknown"
 msgstr "å??å? ä¸?æ??ã?§ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:1172
+#: ../libempathy-gtk/empathy-chat.c:1274
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "'%s' ã?¨ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ã??ã??é??ã?«ã?¨ã?©ã?¼: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:691
+#: ../libempathy-gtk/empathy-chat.c:1335 ../src/empathy-chat-window.c:717
 msgid "Topic:"
 msgstr "ã??ã??ã??ã?¯:"
 
-#: ../libempathy-gtk/empathy-chat.c:1294
+#: ../libempathy-gtk/empathy-chat.c:1347
 #, c-format
 msgid "Topic set to: %s"
 msgstr "æ?°ã??ã??ã??ã??ã??ã?¯: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1296
+#: ../libempathy-gtk/empathy-chat.c:1349
 msgid "No topic defined"
 msgstr "ã??ã??ã??ã?¯ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:1775
+#: ../libempathy-gtk/empathy-chat.c:1848
 msgid "(No Suggestions)"
 msgstr "(æ??æ¡?ã?ªã??)"
 
-#: ../libempathy-gtk/empathy-chat.c:1829
+#. translators: %s is the selected word
+#: ../libempathy-gtk/empathy-chat.c:1916
+#, c-format
+msgid "Add '%s' to Dictionary"
+msgstr ""
+
+#. translators: first %s is the selected word,
+#. * second %s is the language name of the target dictionary
+#: ../libempathy-gtk/empathy-chat.c:1953
+#, c-format
+msgid "Add '%s' to %s Dictionary"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:2010
 msgid "Insert Smiley"
 msgstr "ã?¹ã??ã?¤ã?ªã?¼ã?®æ?¿å?¥"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1847
-#: ../libempathy-gtk/empathy-ui-utils.c:1805
+#: ../libempathy-gtk/empathy-chat.c:2028
+#: ../libempathy-gtk/empathy-ui-utils.c:1808
 msgid "_Send"
 msgstr "é??ä¿¡(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1881
+#. Spelling suggestions
+#: ../libempathy-gtk/empathy-chat.c:2063
 msgid "_Spelling Suggestions"
 msgstr "ã?¹ã??ã?«ã?®æ??æ¡?(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1958
+#: ../libempathy-gtk/empathy-chat.c:2152
 msgid "Failed to retrieve recent logs"
 msgstr "æ??è¿?ã?®ã?ã?°ã?®å??å¾?ã?«å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:2064
+#: ../libempathy-gtk/empathy-chat.c:2263
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s ã?¯å??æ?ã??ã??ã?¾ã??ã??"
@@ -1354,12 +1420,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:2071
+#: ../libempathy-gtk/empathy-chat.c:2270
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s ã?¯ %2$s ã?«kickã??ã??ã?¾ã??ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:2074
+#: ../libempathy-gtk/empathy-chat.c:2273
 #, c-format
 msgid "%s was kicked"
 msgstr "%s ã?¯kickã??ã??ã?¾ã??ã??"
@@ -1367,17 +1433,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:2082
+#: ../libempathy-gtk/empathy-chat.c:2281
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s ã?? %2$s ã?«BANã??ã??ã?¾ã??ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:2085
+#: ../libempathy-gtk/empathy-chat.c:2284
 #, c-format
 msgid "%s was banned"
 msgstr "%s ã?¯BANã??ã??ã?¾ã??ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:2089
+#: ../libempathy-gtk/empathy-chat.c:2288
 #, c-format
 msgid "%s has left the room"
 msgstr "%s ã??ã??ã??é?¨å±?ã??ã??é??å®¤ã??ã?¾ã??ã??"
@@ -1387,82 +1453,151 @@ msgstr "%s ã??ã??ã??é?¨å±?ã??ã??é??å®¤ã??ã?¾ã??ã??"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2098
+#: ../libempathy-gtk/empathy-chat.c:2297
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2123
+#: ../libempathy-gtk/empathy-chat.c:2322
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s ã??ã??ã??é?¨å±?ã?«å?¥å®¤ã??ã?¾ã??ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:2148
+#: ../libempathy-gtk/empathy-chat.c:2347
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ã?¯ %s ã?«ã?ªã??ã?¾ã??ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1947
+#: ../libempathy-gtk/empathy-chat.c:2486
+#: ../src/empathy-streamed-media-window.c:1953
+#: ../src/empathy-event-manager.c:1126
 msgid "Disconnected"
 msgstr "ä¸?é??"
 
-#: ../libempathy-gtk/empathy-chat.c:2934
-msgid "Wrong password; please try again:"
-msgstr "ã??ã?¹ã?¯ã?¼ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??ã??å??åº¦æ??æ?¦ã??ã?¦ã??ã? ã??ã??:"
+#. Add message
+#: ../libempathy-gtk/empathy-chat.c:3116
+msgid "Would you like to store this password?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:3122
+#, fuzzy
+#| msgid "Members"
+msgid "Remember"
+msgstr "ã?¡ã?³ã??ã?¼"
 
-#: ../libempathy-gtk/empathy-chat.c:2935
+#: ../libempathy-gtk/empathy-chat.c:3132
+msgid "Not now"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:3176
 msgid "Retry"
 msgstr "å??æ??æ?¦"
 
-#: ../libempathy-gtk/empathy-chat.c:2940
+#: ../libempathy-gtk/empathy-chat.c:3180
+msgid "Wrong password; please try again:"
+msgstr "ã??ã?¹ã?¯ã?¼ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??ã??å??åº¦æ??æ?¦ã??ã?¦ã??ã? ã??ã??:"
+
+#. Add message
+#: ../libempathy-gtk/empathy-chat.c:3297
 msgid "This room is protected by a password:"
 msgstr "ã??ã?®é?¨å±?ã?¯ã??ã?¹ã?¯ã?¼ã??ã?§ä¿?è·ã??ã??ã?¦ã??ã?¾ã??:"
 
-#: ../libempathy-gtk/empathy-chat.c:2941
+#: ../libempathy-gtk/empathy-chat.c:3324
 msgid "Join"
 msgstr "å?¥å®¤ã??ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:3081
+#: ../libempathy-gtk/empathy-chat.c:3494 ../src/empathy-event-manager.c:1147
 msgid "Connected"
 msgstr "ã?ªã?³ã?©ã?¤ã?³"
 
-#: ../libempathy-gtk/empathy-chat.c:3134
-#: ../libempathy-gtk/empathy-log-window.c:653
+#: ../libempathy-gtk/empathy-chat.c:3547
+#: ../libempathy-gtk/empathy-log-window.c:650
 msgid "Conversation"
 msgstr "ä¼?è©±"
 
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:422
+msgid "Unknown or invalid identifier"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+msgid "Contact blocking temporarily unavailable"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+msgid "Contact blocking unavailable"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#, fuzzy
+#| msgid "permission denied"
+msgid "Permission Denied"
+msgstr "æ¨©é??ã??ã??ã??ã?¾ã??ã??"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432
+msgid "Could not block contact"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:701
+#, fuzzy
+#| msgid "Linked Contacts"
+msgid "Edit Blocked Contacts"
+msgstr "ã?ªã?³ã?¯ä¸ã?®ä»²é??"
+
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:324
-#: ../libempathy-gtk/empathy-theme-adium.c:791
+#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-theme-adium.c:794
 msgid "_Copy Link Address"
 msgstr "ã?ªã?³ã?¯å??ã?®ã?³ã??ã?¼(_C)"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:331
-#: ../libempathy-gtk/empathy-theme-adium.c:798
+#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-theme-adium.c:801
 msgid "_Open Link"
 msgstr "ã?ªã?³ã?¯ã??é??ã??(_O)"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:424
+#: ../libempathy-gtk/empathy-chat-text-view.c:420
 msgid "%A %B %d %Y"
 msgstr "%Yå¹´%B%eæ?¥ %A"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:241
+#: ../libempathy-gtk/empathy-contact-dialogs.c:299
 #: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
 msgid "Edit Contact Information"
 msgstr "ä»²é??æ??å ±ã?®ç·¨é??"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:292
+#: ../libempathy-gtk/empathy-contact-dialogs.c:350
 msgid "Personal Information"
 msgstr "å??äººã?®æ??å ±"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:397
-#: ../libempathy-gtk/empathy-individual-dialogs.c:111
+#: ../libempathy-gtk/empathy-contact-dialogs.c:459
+#: ../libempathy-gtk/empathy-individual-dialogs.c:119
 msgid "New Contact"
 msgstr "æ?°ã??ã??ä»²é??"
 
+#: ../libempathy-gtk/empathy-contact-dialogs.c:533
+#: ../libempathy-gtk/empathy-individual-dialogs.c:199
+#, c-format
+msgid "Block %s?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:538
+#: ../libempathy-gtk/empathy-individual-dialogs.c:247
+#, c-format
+msgid "Are you sure you want to block '%s' from contacting you again?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:543
+#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+msgid "_Block"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:559
+#: ../libempathy-gtk/empathy-individual-dialogs.c:278
+msgid "_Report this contact as abusive"
+msgid_plural "_Report these contacts as abusive"
+msgstr[0] ""
+
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
 msgid "Decide _Later"
 msgstr "ã??ã?¨ã?§æ±ºã??ã??(_L)"
@@ -1471,6 +1606,10 @@ msgstr "ã??ã?¨ã?§æ±ºã??ã??(_L)"
 msgid "Subscription Request"
 msgstr "ç?»é?²ã?®ã?ªã?¯ã?¨ã?¹ã??"
 
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "_Block User"
+msgstr ""
+
 #: ../libempathy-gtk/empathy-contact-list-store.h:71
 msgid "Ungrouped"
 msgstr "ã?°ã?«ã?¼ã??ç?¡æ??å±?"
@@ -1479,280 +1618,311 @@ msgstr "ã?°ã?«ã?¼ã??ç?¡æ??å±?"
 msgid "Favorite People"
 msgstr "ã??æ°?ã?«å?¥ã??ã?®äººé??"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2004
-#: ../libempathy-gtk/empathy-individual-view.c:2232
+#: ../libempathy-gtk/empathy-contact-list-view.c:2001
+#: ../libempathy-gtk/empathy-individual-view.c:2336
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "æ?¬å½?ã?« '%s' ã?¨ã??ã??ã?°ã?«ã?¼ã??ã??å??é?¤ã??ã?¾ã??ã???"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2006
-#: ../libempathy-gtk/empathy-individual-view.c:2235
+#: ../libempathy-gtk/empathy-contact-list-view.c:2003
+#: ../libempathy-gtk/empathy-individual-view.c:2339
 msgid "Removing group"
 msgstr "ã?°ã?«ã?¼ã??ã?®å??é?¤"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2055
-#: ../libempathy-gtk/empathy-contact-list-view.c:2132
-#: ../libempathy-gtk/empathy-individual-view.c:2289
-#: ../libempathy-gtk/empathy-individual-view.c:2387
+#: ../libempathy-gtk/empathy-contact-list-view.c:2052
+#: ../libempathy-gtk/empathy-contact-list-view.c:2129
+#: ../libempathy-gtk/empathy-individual-view.c:2394
+#: ../libempathy-gtk/empathy-individual-view.c:2588
 #: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Remove"
 msgstr "å??é?¤(_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2085
-#: ../libempathy-gtk/empathy-individual-view.c:2320
+#: ../libempathy-gtk/empathy-contact-list-view.c:2082
+#: ../libempathy-gtk/empathy-individual-view.c:2458
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "æ?¬å½?ã?« '%s' ã?¨ã??ã??ä»²é??ã??å??é?¤ã??ã?¾ã??ã???"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2087
-#: ../libempathy-gtk/empathy-individual-view.c:2322
+#: ../libempathy-gtk/empathy-contact-list-view.c:2084
+#: ../libempathy-gtk/empathy-individual-view.c:2479
 msgid "Removing contact"
 msgstr "ä»²é??ã?®å??é?¤"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:203
+#: ../libempathy-gtk/empathy-contact-menu.c:219
 #: ../src/empathy-main-window.ui.h:13
 msgid "_Add Contactâ?¦"
 msgstr "ä»²é??ã?®è¿½å? (_A)â?¦"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:230
-#: ../libempathy-gtk/empathy-individual-menu.c:516
-#: ../src/empathy-main-window.ui.h:14
+#: ../libempathy-gtk/empathy-contact-menu.c:299
+#, fuzzy
+#| msgid "_Contact"
+msgid "_Block Contact"
+msgstr "ä»²é??(_C)"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:328
+#: ../libempathy-gtk/empathy-individual-menu.c:517
+#: ../src/empathy-main-window.ui.h:15
 msgid "_Chat"
 msgstr "ä¼?è©±(_C)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:260
-#: ../libempathy-gtk/empathy-individual-menu.c:559
+#: ../libempathy-gtk/empathy-contact-menu.c:359
+#: ../libempathy-gtk/empathy-individual-menu.c:560
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "é?³å£°ã?§ä¼?è©±(_A)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:290
-#: ../libempathy-gtk/empathy-individual-menu.c:601
+#: ../libempathy-gtk/empathy-contact-menu.c:390
+#: ../libempathy-gtk/empathy-individual-menu.c:602
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "æ? å??ã?§ä¼?è©±(_V)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:330
-#: ../libempathy-gtk/empathy-individual-menu.c:644
-#: ../src/empathy-main-window.ui.h:25
+#: ../libempathy-gtk/empathy-contact-menu.c:436
+#: ../libempathy-gtk/empathy-individual-menu.c:645
+#: ../src/empathy-main-window.ui.h:26
 msgid "_Previous Conversations"
 msgstr "ä¼?è©±ã?®å±¥æ´(_P)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:352
-#: ../libempathy-gtk/empathy-individual-menu.c:685
+#: ../libempathy-gtk/empathy-contact-menu.c:458
+#: ../libempathy-gtk/empathy-individual-menu.c:686
 msgid "Send File"
 msgstr "ã??ã?¡ã?¤ã?«ã?®é??ä¿¡"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:374
-#: ../libempathy-gtk/empathy-individual-menu.c:727
+#: ../libempathy-gtk/empathy-contact-menu.c:481
+#: ../libempathy-gtk/empathy-individual-menu.c:728
 msgid "Share My Desktop"
 msgstr "ã??ã?¹ã?¯ã??ã??ã??ã??å?±æ??ã??ã??"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:414
-#: ../libempathy-gtk/empathy-contact-widget.c:1570
-#: ../libempathy-gtk/empathy-individual-menu.c:761
-#: ../libempathy-gtk/empathy-individual-widget.c:1292
+#: ../libempathy-gtk/empathy-contact-menu.c:521
+#: ../libempathy-gtk/empathy-contact-widget.c:1763
+#: ../libempathy-gtk/empathy-individual-menu.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "ã??æ°?ã?«å?¥ã??"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:443
-#: ../libempathy-gtk/empathy-individual-menu.c:788
+#: ../libempathy-gtk/empathy-contact-menu.c:550
+#: ../libempathy-gtk/empathy-individual-menu.c:791
 msgid "Infor_mation"
 msgstr "æ??å ±(_M)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:489
+#: ../libempathy-gtk/empathy-contact-menu.c:596
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "ç·¨é??(_E)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:543
+#: ../libempathy-gtk/empathy-contact-menu.c:650
 #: ../libempathy-gtk/empathy-individual-menu.c:972
-#: ../src/empathy-chat-window.c:903
+#: ../src/empathy-chat-window.c:935
 msgid "Inviting you to this room"
 msgstr "ã??ã?®é?¨å±?ã?«æ??å¾?ã??ã?¾ã??"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:574
+#: ../libempathy-gtk/empathy-contact-menu.c:681
 #: ../libempathy-gtk/empathy-individual-menu.c:1019
 msgid "_Invite to Chat Room"
 msgstr "ã??ã?£ã??ã??ã?«ã?¼ã? ã?«æ??å¾?ã??ã??(_I)"
 
+#. Title
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:513
+#, fuzzy
+#| msgid "Select a contact"
+msgid "Search contacts"
+msgstr "é?£çµ¡å??ã?®é?¸æ??"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:543
+#, fuzzy
+#| msgid "Search"
+msgid "Search: "
+msgstr "æ¤?ç´¢"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:601
+#, fuzzy
+#| msgid "_Add Contactâ?¦"
+msgid "_Add Contact"
+msgstr "ä»²é??ã?®è¿½å? (_A)â?¦"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:619
+#, fuzzy
+#| msgid "No match found"
+msgid "No contacts found"
+msgstr "è¦?ã?¤ã??ã??ã?¾ã??ã??ã?§ã??ã??"
+
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "é?£çµ¡å??ã?®é?¸æ??"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:226
-#: ../libempathy-gtk/empathy-individual-widget.c:148
+#: ../libempathy-gtk/empathy-contact-widget.c:295
+#: ../libempathy-gtk/empathy-individual-widget.c:153
 msgid "Full name:"
 msgstr "æ°?å??:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:227
-#: ../libempathy-gtk/empathy-individual-widget.c:149
+#: ../libempathy-gtk/empathy-contact-widget.c:296
+#: ../libempathy-gtk/empathy-individual-widget.c:154
 msgid "Phone number:"
 msgstr "é?»è©±ç?ªå?·:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:228
-#: ../libempathy-gtk/empathy-individual-widget.c:150
+#: ../libempathy-gtk/empathy-contact-widget.c:297
+#: ../libempathy-gtk/empathy-individual-widget.c:155
 msgid "E-mail address:"
 msgstr "E-ã?¡ã?¼ã?«ã?¢ã??ã?¬ã?¹:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:229
-#: ../libempathy-gtk/empathy-individual-widget.c:151
+#: ../libempathy-gtk/empathy-contact-widget.c:298
+#: ../libempathy-gtk/empathy-individual-widget.c:156
 msgid "Website:"
 msgstr "ã?¦ã?§ã??ã?µã?¤ã??:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:230
-#: ../libempathy-gtk/empathy-individual-widget.c:152
+#: ../libempathy-gtk/empathy-contact-widget.c:299
+#: ../libempathy-gtk/empathy-individual-widget.c:157
 msgid "Birthday:"
 msgstr "èª?ç??æ?¥:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:609
-#: ../libempathy-gtk/empathy-individual-widget.c:454
+#: ../libempathy-gtk/empathy-contact-widget.c:762
+#: ../libempathy-gtk/empathy-individual-widget.c:488
 msgid "Country ISO Code:"
 msgstr "ISOã?«ã??ã??å?½ã?³ã?¼ã??:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:611
-#: ../libempathy-gtk/empathy-individual-widget.c:456
+#: ../libempathy-gtk/empathy-contact-widget.c:764
+#: ../libempathy-gtk/empathy-individual-widget.c:490
 msgid "Country:"
 msgstr "å?½:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:613
-#: ../libempathy-gtk/empathy-individual-widget.c:458
+#: ../libempathy-gtk/empathy-contact-widget.c:766
+#: ../libempathy-gtk/empathy-individual-widget.c:492
 msgid "State:"
 msgstr "é?£é?¦ã?»å·?:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:615
-#: ../libempathy-gtk/empathy-individual-widget.c:460
+#: ../libempathy-gtk/empathy-contact-widget.c:768
+#: ../libempathy-gtk/empathy-individual-widget.c:494
 msgid "City:"
 msgstr "é?½å¸?:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:617
-#: ../libempathy-gtk/empathy-individual-widget.c:462
+#: ../libempathy-gtk/empathy-contact-widget.c:770
+#: ../libempathy-gtk/empathy-individual-widget.c:496
 msgid "Area:"
 msgstr "å?°å??:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:619
-#: ../libempathy-gtk/empathy-individual-widget.c:464
+#: ../libempathy-gtk/empathy-contact-widget.c:772
+#: ../libempathy-gtk/empathy-individual-widget.c:498
 msgid "Postal Code:"
 msgstr "é?µä¾¿ç?ªå?·:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:621
-#: ../libempathy-gtk/empathy-individual-widget.c:466
+#: ../libempathy-gtk/empathy-contact-widget.c:774
+#: ../libempathy-gtk/empathy-individual-widget.c:500
 msgid "Street:"
 msgstr "é??ã??:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:623
-#: ../libempathy-gtk/empathy-individual-widget.c:468
+#: ../libempathy-gtk/empathy-contact-widget.c:776
+#: ../libempathy-gtk/empathy-individual-widget.c:502
 msgid "Building:"
 msgstr "ã??ã?«:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:625
-#: ../libempathy-gtk/empathy-individual-widget.c:470
+#: ../libempathy-gtk/empathy-contact-widget.c:778
+#: ../libempathy-gtk/empathy-individual-widget.c:504
 msgid "Floor:"
 msgstr "é??:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:627
-#: ../libempathy-gtk/empathy-individual-widget.c:472
+#: ../libempathy-gtk/empathy-contact-widget.c:780
+#: ../libempathy-gtk/empathy-individual-widget.c:506
 msgid "Room:"
 msgstr "é?¨å±?ç?ªå?·:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:629
-#: ../libempathy-gtk/empathy-individual-widget.c:474
+#: ../libempathy-gtk/empathy-contact-widget.c:782
+#: ../libempathy-gtk/empathy-individual-widget.c:508
 msgid "Text:"
 msgstr "ã??ã?ã?¹ã??:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:631
-#: ../libempathy-gtk/empathy-individual-widget.c:476
+#: ../libempathy-gtk/empathy-contact-widget.c:784
+#: ../libempathy-gtk/empathy-individual-widget.c:510
 msgid "Description:"
 msgstr "èª¬æ??:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:633
-#: ../libempathy-gtk/empathy-individual-widget.c:478
+#: ../libempathy-gtk/empathy-contact-widget.c:786
+#: ../libempathy-gtk/empathy-individual-widget.c:512
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:635
-#: ../libempathy-gtk/empathy-individual-widget.c:480
+#: ../libempathy-gtk/empathy-contact-widget.c:788
+#: ../libempathy-gtk/empathy-individual-widget.c:514
 msgid "Accuracy Level:"
 msgstr "ç²¾åº¦ã?®ã?¬ã??ã?«:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:637
-#: ../libempathy-gtk/empathy-individual-widget.c:482
+#: ../libempathy-gtk/empathy-contact-widget.c:790
+#: ../libempathy-gtk/empathy-individual-widget.c:516
 msgid "Error:"
 msgstr "ã?¨ã?©ã?¼:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:639
-#: ../libempathy-gtk/empathy-individual-widget.c:484
+#: ../libempathy-gtk/empathy-contact-widget.c:792
+#: ../libempathy-gtk/empathy-individual-widget.c:518
 msgid "Vertical Error (meters):"
 msgstr "å??ç?´èª¤å·® (ã?¡ã?¼ã??ã?«):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:641
-#: ../libempathy-gtk/empathy-individual-widget.c:486
+#: ../libempathy-gtk/empathy-contact-widget.c:794
+#: ../libempathy-gtk/empathy-individual-widget.c:520
 msgid "Horizontal Error (meters):"
 msgstr "æ°´å¹³èª¤å·® (ã?¡ã?¼ã??ã?«):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:643
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#: ../libempathy-gtk/empathy-contact-widget.c:796
+#: ../libempathy-gtk/empathy-individual-widget.c:522
 msgid "Speed:"
 msgstr "é??åº¦:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:645
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:798
+#: ../libempathy-gtk/empathy-individual-widget.c:524
 msgid "Bearing:"
 msgstr "æ?¹ä½?:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:647
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:800
+#: ../libempathy-gtk/empathy-individual-widget.c:526
 msgid "Climb Speed:"
 msgstr "ä¸?æ??é??åº¦:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:649
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:802
+#: ../libempathy-gtk/empathy-individual-widget.c:528
 msgid "Last Updated on:"
 msgstr "æ??å¾?ã?®ã?¢ã??ã??ã??ã?¼ã??ã?¯:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:651
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:804
+#: ../libempathy-gtk/empathy-individual-widget.c:530
 msgid "Longitude:"
 msgstr "çµ?åº¦:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:653
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:806
+#: ../libempathy-gtk/empathy-individual-widget.c:532
 msgid "Latitude:"
 msgstr "ç·¯åº¦:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:655
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:808
+#: ../libempathy-gtk/empathy-individual-widget.c:534
 msgid "Altitude:"
 msgstr "é«?åº¦:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:718
-#: ../libempathy-gtk/empathy-contact-widget.c:735
-#: ../libempathy-gtk/empathy-individual-widget.c:582
-#: ../libempathy-gtk/empathy-individual-widget.c:599
+#: ../libempathy-gtk/empathy-contact-widget.c:871
+#: ../libempathy-gtk/empathy-contact-widget.c:888
+#: ../libempathy-gtk/empathy-individual-widget.c:616
+#: ../libempathy-gtk/empathy-individual-widget.c:633
 #: ../src/empathy-preferences.ui.h:12
 msgid "Location"
 msgstr "å ´æ??"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:737
-#: ../libempathy-gtk/empathy-individual-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:890
+#: ../libempathy-gtk/empathy-individual-widget.c:635
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:789
-#: ../libempathy-gtk/empathy-individual-widget.c:650
+#: ../libempathy-gtk/empathy-contact-widget.c:942
+#: ../libempathy-gtk/empathy-individual-widget.c:684
 msgid "%B %e, %Y at %R UTC"
 msgstr "%Yå¹´%B%eæ?¥ %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:872
-#: ../libempathy-gtk/empathy-individual-widget.c:841
+#: ../libempathy-gtk/empathy-contact-widget.c:1024
+#: ../libempathy-gtk/empathy-individual-widget.c:919
 msgid "Save Avatar"
 msgstr "ã?¢ã??ã?¿ã?¼ã?®ä¿?å?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:928
-#: ../libempathy-gtk/empathy-individual-widget.c:899
+#: ../libempathy-gtk/empathy-contact-widget.c:1080
+#: ../libempathy-gtk/empathy-individual-widget.c:977
 msgid "Unable to save avatar"
 msgstr "ã?¢ã??ã?¿ã?¼ã??ä¿?å?ã?§ã??ã?¾ã??ã??"
 
@@ -1762,7 +1932,7 @@ msgstr "<b>å ´æ??</b> ã?§ (date)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1227
+#: ../libempathy-gtk/empathy-individual-widget.c:1307
 msgid "Alias:"
 msgstr "å?¥å??:"
 
@@ -1782,7 +1952,7 @@ msgstr "ä»²é??ã?®è©³ç´°"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1431
+#: ../libempathy-gtk/empathy-individual-widget.c:1511
 msgid "Identifier:"
 msgstr "ã?¹ã?¯ã?ªã?¼ã?³å??:"
 
@@ -1815,16 +1985,28 @@ msgstr ""
 msgid "_Add Group"
 msgstr "ã?°ã?«ã?¼ã??ã?®è¿½å? (_A)"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:397
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:554
+#: ../libempathy-gtk/empathy-groups-widget.c:398
+#, fuzzy
+#| msgid "Select"
+msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "é?¸æ??"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:407
-#: ../src/empathy-main-window.c:1250
+#: ../libempathy-gtk/empathy-groups-widget.c:408
+#: ../src/empathy-main-window.c:1436
 msgid "Group"
 msgstr "ã?°ã?«ã?¼ã??"
 
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+msgid "The following identity will be blocked:"
+msgid_plural "The following identities will be blocked:"
+msgstr[0] ""
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:259
+msgid "The following identity can not be blocked:"
+msgid_plural "The following identities can not be blocked:"
+msgstr[0] ""
+
 #. Translators: the heading at the top of the Information dialogue
 #: ../libempathy-gtk/empathy-individual-information-dialog.c:281
 msgid "Linked Contacts"
@@ -1845,7 +2027,7 @@ 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:132
+#: ../libempathy-gtk/empathy-individual-menu.c:131
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -1862,24 +2044,52 @@ msgctxt "Link individual (contextual menu)"
 msgid "_Link Contactsâ?¦"
 msgstr "ä»²é??ã??ã?ªã?³ã?¯(_L)â?¦"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1569
+#: ../libempathy-gtk/empathy-individual-view.c:2301
+msgid "Delete and _Block"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-individual-view.c:2467
 #, c-format
-msgid "Meta-contact containing %u contact"
-msgid_plural "Meta-contact containing %u contacts"
+msgid ""
+"Do you really want to remove the linked contact '%s'? Note that this will "
+"remove all the contacts which make up this linked contact."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#, fuzzy, c-format
+#| msgid "Meta-contact containing %u contact"
+#| msgid_plural "Meta-contact containing %u contacts"
+msgid "Linked contact containing %u contact"
+msgid_plural "Linked contacts containing %u contacts"
 msgstr[0] "%u äººã?®ä»²é??ã??å?«ã??ã?¡ã?¿ã?³ã?³ã?¿ã?¯ã??"
 
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:1
 msgid "<b>Location</b> at (date)"
 msgstr "(date) ã?« <b>å ´æ??</b>"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Online from a phone or mobile device"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
 msgid "New Network"
 msgstr "æ?°ã??ã??ã??ã??ã??ã?¯ã?¼ã?¯"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:495
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
 msgid "Choose an IRC network"
 msgstr "IRC ã??ã??ã??ã?¯ã?¼ã?¯ã??é?¸æ??"
 
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+msgid "Reset _Networks List"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#, fuzzy
+#| msgid "Select"
+msgctxt "verb displayed on a button to select an IRC network"
+msgid "Select"
+msgstr "é?¸æ??"
+
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:280
 msgid "new server"
 msgstr "æ?°ã??ã??ã?µã?¼ã??"
@@ -1901,8 +2111,11 @@ msgid "_Unlinkâ?¦"
 msgstr "ã?ªã?³ã?¯ã??å¤?ã??(_U)â?¦"
 
 #: ../libempathy-gtk/empathy-linking-dialog.c:121
+#, fuzzy
+#| msgid ""
+#| "Completely split the displayed meta-contact into the contacts it contains."
 msgid ""
-"Completely split the displayed meta-contact into the contacts it contains."
+"Completely split the displayed linked contacts into the separate contacts."
 msgstr "ã?¡ã?¿ã?³ã?³ã?¿ã?¯ã??ã??ã?¡ã?¿ã?³ã?³ã?¿ã?¯ã??ã??å?«ã??ã?§ã??ã??ä»²é??ã?«å®?å?¨ã?«å??å?²ã??ã?¾ã??ã??"
 
 #. Add button
@@ -1913,15 +2126,20 @@ msgstr "ã?¡ã?¿ã?³ã?³ã?¿ã?¯ã??ã??ã?¡ã?¿ã?³ã?³ã?¿ã?¯ã??ã??å?«ã??ã?§ã??ã??ä»²é??ã?«
 msgid "_Link"
 msgstr "ã?ªã?³ã?¯(_L)"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:182
-#, c-format
-msgid "Unlink meta-contact '%s'?"
+#: ../libempathy-gtk/empathy-linking-dialog.c:183
+#, fuzzy, c-format
+#| msgid "Unlink meta-contact '%s'?"
+msgid "Unlink linked contacts '%s'?"
 msgstr "ã?¡ã?¿ã?³ã?³ã?¿ã?¯ã?? '%s' ã?®ã?ªã?³ã?¯ã??å¤?ã??ã?¾ã??ã???"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:185
+#: ../libempathy-gtk/empathy-linking-dialog.c:186
+#, fuzzy
+#| msgid ""
+#| "Are you sure you want to unlink this meta-contact? This will completely "
+#| "split the meta-contact into the contacts it contains."
 msgid ""
-"Are you sure you want to unlink this meta-contact? This will completely "
-"split the meta-contact into the contacts it contains."
+"Are you sure you want to unlink these linked contacts? This will completely "
+"split the linked contacts into separate contacts."
 msgstr ""
 "ã??ã?®ã?¡ã?¿ã?³ã?³ã?¿ã?¯ã??ã?®ã?ªã?³ã?¯ã??å¤?ã??ã??ã??ã?§ã??ã??? ã?¡ã?¿ã?³ã?³ã?¿ã?¯ã??ã??ã??ã??ã??ã??å?«ã??ã?§ã??"
 "ä»²é??ã?«å®?å?¨ã?«å??å?²ã??ã??ã??ã?¨ã?«ã?ªã??ã?¾ã??ã??"
@@ -1931,7 +2149,7 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "ã?ªã?³ã?¯ã??å¤?ã??(_U)"
 
-#: ../libempathy-gtk/empathy-log-window.c:663
+#: ../libempathy-gtk/empathy-log-window.c:660
 msgid "Date"
 msgstr "æ?¥ä»?"
 
@@ -1969,67 +2187,83 @@ msgid "Contact ID:"
 msgstr "ä»²é??ã?® ID:"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:145
+#: ../libempathy-gtk/empathy-new-message-dialog.c:171
 msgid "C_hat"
 msgstr "ã??ã?£ã??ã??(_H)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:155
+#: ../libempathy-gtk/empathy-new-message-dialog.c:181
 msgid "New Conversation"
 msgstr "æ?°ã??ã??ä¼?è©±"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:205
+#: ../libempathy-gtk/empathy-new-call-dialog.c:253
 msgid "Send _Video"
 msgstr "æ? å??ã?®é??ä¿¡(_V)"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:213
+#: ../libempathy-gtk/empathy-new-call-dialog.c:261
 msgid "C_all"
 msgstr "å?¼ã?³å?ºã??(_A)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+#: ../libempathy-gtk/empathy-new-call-dialog.c:271
 msgid "New Call"
 msgstr "æ?°è¦?å?¼å?º"
 
+#: ../libempathy-gtk/empathy-password-dialog.c:274
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:168
-#: ../libempathy-gtk/empathy-presence-chooser.c:204
+#: ../libempathy-gtk/empathy-presence-chooser.c:170
+#: ../libempathy-gtk/empathy-presence-chooser.c:206
 msgid "Custom Messageâ?¦"
 msgstr "ç?¬è?ªã?®ã?¡ã??ã?»ã?¼ã?¸â?¦"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:221
 #: ../libempathy-gtk/empathy-presence-chooser.c:223
+#: ../libempathy-gtk/empathy-presence-chooser.c:225
 msgid "Edit Custom Messagesâ?¦"
 msgstr "ç?¬è?ªã?®ã?¡ã??ã?»ã?¼ã?¸ã??ç·¨é??â?¦"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:346
+#: ../libempathy-gtk/empathy-presence-chooser.c:348
 msgid "Click to remove this status as a favorite"
 msgstr "ã??æ°?ã?«å?¥ã??ã?®ç?¶æ??ã??ã??è§£é?¤ã??ã??ã?«ã?¯ã?¯ã?ªã??ã?¯ã??ã?¾ã??"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:355
+#: ../libempathy-gtk/empathy-presence-chooser.c:357
 msgid "Click to make this status a favorite"
 msgstr "ã??ã?®ç?¶æ??ã??ã??æ°?ã?«å?¥ã??ã?«ã??ã??ã?«ã?¯ã?¯ã?ªã??ã?¯ã??ã?¾ã??"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:389
+#: ../libempathy-gtk/empathy-presence-chooser.c:391
 msgid "Set status"
 msgstr "ç?¶æ??ã??è¨å®?"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:939
+#: ../libempathy-gtk/empathy-presence-chooser.c:946
 msgid "Set your presence and current status"
 msgstr "å?¨å¸ä¸ã?«ã??ç?¾å?¨ã?®ç?¶æ??ã??è¨å®?ã??ã??"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1124
+#: ../libempathy-gtk/empathy-presence-chooser.c:1134
 msgid "Custom messagesâ?¦"
 msgstr "ç?¬è?ªã?®ã?¡ã??ã?»ã?¼ã?¸â?¦"
 
+#. Create account
+#. To translator: %s is the name of the protocol, such as "Google Talk" or
+#. * "Yahoo!"
+#.
+#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#, c-format
+msgid "New %s account"
+msgstr "æ?°ã??ã?? %s ã??ã??ã?®ã?¢ã?«ã?¦ã?³ã??"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
 msgid "Find:"
 msgstr "æ¤?ç´¢:"
@@ -2042,43 +2276,43 @@ msgstr "å¤§æ??å?å°?æ??å?ã??å?ºå?¥ã??ã?¦ä¸?è?´"
 msgid "Phrase not found"
 msgstr "ã??ã?¬ã?¼ã?ºã??è¦?ã?¤ã??ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../libempathy-gtk/empathy-sound.c:50
+#: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
 msgstr "ã?¤ã?³ã?¹ã?¿ã?³ã??ã?»ã?¡ã??ã?»ã?¼ã?¸ã??å??ä¿¡ã??ã??"
 
-#: ../libempathy-gtk/empathy-sound.c:52
+#: ../libempathy-gtk/empathy-sound-manager.c:53
 msgid "Sent an instant message"
 msgstr "ã?¤ã?³ã?¹ã?¿ã?³ã??ã?»ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ã??ã??"
 
-#: ../libempathy-gtk/empathy-sound.c:54
+#: ../libempathy-gtk/empathy-sound-manager.c:55
 msgid "Incoming chat request"
 msgstr "ã??ã?£ã??ã??å??å? ã?®è¦?æ±?ã??ã??ã??"
 
-#: ../libempathy-gtk/empathy-sound.c:56
+#: ../libempathy-gtk/empathy-sound-manager.c:57
 msgid "Contact connected"
 msgstr "ä»²é??ã??ã?µã?¤ã?³ã?¤ã?³ã??ã??"
 
-#: ../libempathy-gtk/empathy-sound.c:58
+#: ../libempathy-gtk/empathy-sound-manager.c:59
 msgid "Contact disconnected"
 msgstr "ä»²é??ã??ã?µã?¤ã?³ã?¢ã?¦ã??ã??ã??"
 
-#: ../libempathy-gtk/empathy-sound.c:60
+#: ../libempathy-gtk/empathy-sound-manager.c:61
 msgid "Connected to server"
 msgstr "ã?µã?¼ã??ã?«æ?¥ç¶?ã??ã??"
 
-#: ../libempathy-gtk/empathy-sound.c:62
+#: ../libempathy-gtk/empathy-sound-manager.c:63
 msgid "Disconnected from server"
 msgstr "ã?µã?¼ã??ã?®æ?¥ç¶?ã??æ?ã??ã??"
 
-#: ../libempathy-gtk/empathy-sound.c:64
+#: ../libempathy-gtk/empathy-sound-manager.c:65
 msgid "Incoming voice call"
 msgstr "é?³å£°ã?§å?¼ã?³ã??ã??ã??ã??ã??"
 
-#: ../libempathy-gtk/empathy-sound.c:66
+#: ../libempathy-gtk/empathy-sound-manager.c:67
 msgid "Outgoing voice call"
 msgstr "é?³å£°ã?§å?¼ã?³ã??ã??ã??"
 
-#: ../libempathy-gtk/empathy-sound.c:68
+#: ../libempathy-gtk/empathy-sound-manager.c:69
 msgid "Voice call ended"
 msgstr "é?³å£°ã?®ä¼?è©±ã??çµ?äº?ã??ã??"
 
@@ -2091,12 +2325,14 @@ msgid "Edit Custom Messages"
 msgstr "ç?¬è?ªã?®ã?¡ã??ã?»ã?¼ã?¸ã??ç·¨é??"
 
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Add _New Preset"
-msgstr "æ?°ã??ã??ç?¶æ??ã??è¿½å? (_N)"
+msgid "Save _New Status Message"
+msgstr ""
 
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Presets"
-msgstr "ç?¶æ??ã??ä¿?å?ã??ã?¾ã??ã??"
+#, fuzzy
+#| msgid "Edit Custom Messages"
+msgid "Saved Status Messages"
+msgstr "ç?¬è?ªã?®ã?¡ã??ã?»ã?¼ã?¸ã??ç·¨é??"
 
 #: ../libempathy-gtk/empathy-theme-manager.c:67
 msgid "Classic"
@@ -2115,84 +2351,120 @@ msgid "Blue"
 msgstr "ã??ã?«ã?¼"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:150
-msgid "The identity provided by the chat server cannot be verified.\n"
+#, fuzzy
+#| msgid "The identity provided by the chat server cannot be verified.\n"
+msgid "The identity provided by the chat server cannot be verified."
 msgstr "ã??ã?£ã??ã??ã?µã?¼ã??ã??ã??æ??ä¾?ã??ã??ã??ã?¢ã?¤ã??ã?³ã??ã?£ã??ã?£ã??æ¤?è¨¼ã?§ã??ã?¾ã??ã??ã??\n"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:156
-msgid "The certificate is not signed by a Certification Authority"
+#: ../libempathy-gtk/empathy-tls-dialog.c:157
+#, fuzzy
+#| msgid "The certificate is not signed by a Certification Authority"
+msgid "The certificate is not signed by a Certification Authority."
 msgstr "è¨¼æ??æ?¸ã??èª?è¨¼å±?ã?«ã??ã?£ã?¦ç½²å??ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:160
-msgid "The certificate has expired"
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
+#, fuzzy
+#| msgid "The certificate has expired"
+msgid "The certificate has expired."
 msgstr "è¨¼æ??æ?¸ã?®æ??å?¹æ??é??ã??å??ã??ã?¦ã??ã?¾ã??"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:163
-msgid "The certificate hasn't yet been activated"
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
+#, fuzzy
+#| msgid "The certificate hasn't yet been activated"
+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"
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
+#, fuzzy
+#| msgid "The certificate does not have the expected fingerprint"
+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"
+#: ../libempathy-gtk/empathy-tls-dialog.c:170
+#, fuzzy
+#| msgid ""
+#| "The hostname verified by the certificate doesn't match the server name"
+msgid "The hostname verified by the certificate doesn't match the server name."
 msgstr "è¨¼æ??æ?¸ã?§æ¤?è¨¼ã??ã??ã??ã??ã?¹ã??å??ã??ã?µã?¼ã??ã?®å??ã?¨ä¸?è?´ã??ã?¾ã??ã??"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:173
-msgid "The certificate is self-signed"
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
+#, fuzzy
+#| msgid "The certificate is self-signed"
+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"
+#: ../libempathy-gtk/empathy-tls-dialog.c:177
+#, fuzzy
+#| msgid ""
+#| "The certificate has been revoked by the issuing Certification Authority"
+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"
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
+#, fuzzy
+#| msgid "The certificate is cryptographically weak"
+msgid "The certificate is cryptographically weak."
 msgstr "è¨¼æ??æ?¸ã??æ??å?·ç??ã?«å¼±ã??ã?§ã??"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:183
-msgid "The certificate length exceeds verifiable limits"
+#: ../libempathy-gtk/empathy-tls-dialog.c:184
+#, fuzzy
+#| msgid "The certificate length exceeds verifiable limits"
+msgid "The certificate length exceeds verifiable limits."
 msgstr "è¨¼æ??æ?¸ã??æ¤?è¨¼å?¯è?½ã?ªé?·ã??ã??è¶?ã??ã?¦ã??ã?¾ã??"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:187
-msgid "The certificate is malformed"
+#: ../libempathy-gtk/empathy-tls-dialog.c:188
+#, fuzzy
+#| msgid "The certificate is malformed"
+msgid "The certificate is malformed."
 msgstr "è¨¼æ??æ?¸ã?«ç?°å¸¸ã??ã??ã??ã?¾ã??"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:205
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
 #, c-format
 msgid "Expected hostname: %s"
 msgstr "æ??å¾?ã??ã??ã??ã?¹ã??å??: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:208
+#: ../libempathy-gtk/empathy-tls-dialog.c:209
 #, c-format
 msgid "Certificate hostname: %s"
 msgstr "è¨¼æ??æ?¸ã?®ã??ã?¹ã??å??: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:263
+#: ../libempathy-gtk/empathy-tls-dialog.c:281
 msgid "Continue"
 msgstr "ç¶?è¡?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:269
+#: ../libempathy-gtk/empathy-tls-dialog.c:287
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "ã??ã?®æ?¥ç¶?ã?¯ä¿¡ç?¨ã?§ã??ã?¾ã??ã??ã??ç?¡è¦?ã??ã?¦ç¶?ã??ã?¾ã??ã???"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:286
+#: ../libempathy-gtk/empathy-tls-dialog.c:297
 msgid "Remember this choice for future connections"
 msgstr "ã??ã?®é?¸æ??ã??å°?æ?¥ã?®æ?¥ç¶?ã?§ã??è¨?æ?¶ã??ã??"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:294
+#: ../libempathy-gtk/empathy-tls-dialog.c:303
 msgid "Certificate Details"
 msgstr "è¨¼æ??æ?¸ã?®è©³ç´°"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1702
+#: ../libempathy-gtk/empathy-ui-utils.c:1705
 msgid "Unable to open URI"
 msgstr "URI ã??é??ã??ã?¾ã??ã??"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1797
+#: ../libempathy-gtk/empathy-ui-utils.c:1800
 msgid "Select a file"
 msgstr "ã??ã?¡ã?¤ã?«ã?®é?¸æ??"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1866
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
+msgid "Insufficient free space to save file"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#, c-format
+msgid ""
+"%s of free space are required to save this file, but only %s is available. "
+"Please choose another location."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1924
 #, c-format
 msgid "Incoming file from %s"
 msgstr "%s ã??ã??ã??ã??é??ã??ã??ã?¦ã??ã??ã??ã?¡ã?¤ã?«"
@@ -2380,19 +2652,33 @@ msgstr "ã?¨ã?©ã?¼ã?¡ã??ã?»ã?¼ã?¸ã?ªã??"
 msgid "Instant Message (Empathy)"
 msgstr "ã?¤ã?³ã?¹ã?¿ã?³ã?? ã?¡ã??ã?»ã?¼ã?¸ (Empathy)"
 
-#: ../src/empathy.c:414
+#: ../src/empathy.c:308
 msgid "Don't connect on startup"
 msgstr "èµ·å??ã??ã??ã??è?ªå??ç??ã?«ã?µã?¤ã?³ã?¤ã?³ã??ã?ªã??"
 
-#: ../src/empathy.c:418
+#: ../src/empathy.c:312
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "èµ·å??æ??ã?«ä»²é??ã?ªã?¹ã??ã??ä»?ã?®ã??ã?¤ã?¢ã?ã?°ã??è¡¨ç¤ºã??ã?ªã??"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:320
 msgid "- Empathy IM Client"
 msgstr "- Empathy ã?¤ã?³ã?¹ã?¿ã?³ã??ã?»ã?¡ã??ã?»ã?³ã?¸ã?£ã?¼"
 
-#: ../src/empathy-about-dialog.c:85
+#: ../src/empathy.c:499
+msgid "Error contacting the Account Manager"
+msgstr ""
+
+#: ../src/empathy.c:501
+#, fuzzy, c-format
+#| msgid "There was an error while parsing the account details."
+msgid ""
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
+"\n"
+"%s"
+msgstr "ã?¢ã?«ã?¦ã?³ã??ã?®è©³ç´°ã??è§£æ??ä¸ã?«ã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??ã??"
+
+#: ../src/empathy-about-dialog.c:81
 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 "
@@ -2403,7 +2689,7 @@ msgstr ""
 "è¡?å?©ç?¨è¨±è«¾å¥?ç´?æ?¸ã?®ç¬¬äº?ç??ã??ã??ã??ã??ã?¯ã??ã??ä»¥é??ã?®ç??ã??å®?ã??ã??æ?¡é ?ã?®ä¸?ã?§æ?¬ã??ã?ã?°ã?©ã? "
 "ã??å??é ?å¸?ã?¾ã??ã?¯å¤?æ?´ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??"
 
-#: ../src/empathy-about-dialog.c:89
+#: ../src/empathy-about-dialog.c:85
 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 "
@@ -2414,7 +2700,7 @@ msgstr ""
 "é?©å??æ?§ã?«ã?¤ã??ã?¦ã?®æ??é»?ã?®ä¿?è¨¼ã??å?«ã??ã?¦ã??ã??ã??ã?ªã??ä¿?è¨¼ã??è¡?ã?ªã??ã?¾ã??ã??ã??è©³ç´°ã?«ã?¤ã??ã?¦"
 "ã?¯ GNU ä¸?è?¬å?¬è¡?å?©ç?¨è¨±è«¾å¥?ç´?æ?¸ã??ã??è¦§ã??ã? ã??ã??ã??"
 
-#: ../src/empathy-about-dialog.c:93
+#: ../src/empathy-about-dialog.c:89
 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 "
@@ -2424,11 +2710,11 @@ msgstr ""
 "ã??ã?¯ã??ã?§ã??ã??ã??ã??ã?§ã?ªã??å ´å??ã?¯ã??Free Software Foundation, Inc., 51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-130159 USA ã?¾ã?§æ??ç´?ã??æ?¸ã??ã?¦ã??ã? ã??ã??ã??"
 
-#: ../src/empathy-about-dialog.c:121
+#: ../src/empathy-about-dialog.c:107
 msgid "An Instant Messaging client for GNOME"
 msgstr "GNOME å??ã??ã?®ã?¤ã?³ã?¹ã?¿ã?³ã??ã?»ã?¡ã??ã?»ã?³ã?¸ã?£ã?¼ã?»ã?¯ã?©ã?¤ã?¢ã?³ã??ã?§ã??ã??"
 
-#: ../src/empathy-about-dialog.c:127
+#: ../src/empathy-about-dialog.c:113
 msgid "translator-credits"
 msgstr ""
 "ç?¸è?± æ¯? <takeshi aihana gmail com>\n"
@@ -2469,45 +2755,35 @@ msgstr ""
 "ã??ã?¢ã?«ã?¦ã?³ã??ã??å¾?ã?§è¿½å? ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??"
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1315
+#: ../src/empathy-account-assistant.c:1271
 msgid "An error occurred"
 msgstr "ã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??"
 
-#. 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:412 ../src/empathy-accounts-dialog.c:614
-#, c-format
-msgid "New %s account"
-msgstr "æ?°ã??ã?? %s ã??ã??ã?®ã?¢ã?«ã?¦ã?³ã??"
-
-#: ../src/empathy-account-assistant.c:514
+#: ../src/empathy-account-assistant.c:467
 msgid "What kind of chat account do you have?"
 msgstr "ã?©ã?®ç¨®é¡?ã?®ã?¢ã?«ã?¦ã?³ã??ã??ã??ã??ã?¾ã??ã???"
 
-#: ../src/empathy-account-assistant.c:520
+#: ../src/empathy-account-assistant.c:473
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "è¨å®?ã??ã??ã??ä»?ã?®ã?¢ã?«ã?¦ã?³ã??ã?¯ã??ã??ã?¾ã??ã???"
 
-#: ../src/empathy-account-assistant.c:526
+#: ../src/empathy-account-assistant.c:479
 msgid "Enter your account details"
 msgstr "ã?¢ã?«ã?¦ã?³ã??ã?®è©³ç´°ã??å?¥å??"
 
-#: ../src/empathy-account-assistant.c:531
+#: ../src/empathy-account-assistant.c:484
 msgid "What kind of chat account do you want to create?"
 msgstr "ç??æ??ã??ã??ã??ã?¢ã?«ã?¦ã?³ã??ã?®ç¨®é¡?ã?¯?"
 
-#: ../src/empathy-account-assistant.c:537
+#: ../src/empathy-account-assistant.c:490
 msgid "Do you want to create other chat accounts?"
 msgstr "ä»?ã?®ã?¢ã?«ã?¦ã?³ã??ã??ç??æ??ã??ã?¾ã??ã???"
 
-#: ../src/empathy-account-assistant.c:544
+#: ../src/empathy-account-assistant.c:497
 msgid "Enter the details for the new account"
 msgstr "æ?°ã??ã??ã?¢ã?«ã?¦ã?³ã??ã?®è©³ç´°ã??å?¥å??"
 
-#: ../src/empathy-account-assistant.c:659
+#: ../src/empathy-account-assistant.c:612
 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 "
@@ -2517,41 +2793,41 @@ msgstr ""
 "Empathyã?§è¿?ã??ã?®äººã??å??é??ã??å??å??ã?¨Google Talkã??AIMã??Windows Liveã??ä»?ã?®ã??ã?ã?°ã?©ã? "
 "ã?§ä¼?è©±ã??ã?§ã??ã?¾ã??ã??ã??ã?¤ã?¯ã??ã?¦ã?§ã??ã?«ã?¡ã?©ã?§ã??é?³å£°ã??æ? å??ã?§ä¼?è©±ã??ã?§ã??ã?¾ã??ã??"
 
-#: ../src/empathy-account-assistant.c:676
+#: ../src/empathy-account-assistant.c:629
 msgid "Do you have an account you've been using with another chat program?"
 msgstr "ä»?ã?®ä¼?è©±ç?¨ã??ã?ã?°ã?©ã? ã?§å?©ç?¨ã??ã?¦ã??ã??ã?¢ã?«ã?¦ã?³ã??ã?¯ã??ã??ã?¾ã??ã???"
 
-#: ../src/empathy-account-assistant.c:699
+#: ../src/empathy-account-assistant.c:652
 msgid "Yes, import my account details from "
 msgstr "ã?¯ã??ã??ã?¢ã?«ã?¦ã?³ã??ã?®è©³ç´°ã??ã?¤ã?³ã??ã?¼ã??ã??ã?¾ã?? "
 
-#: ../src/empathy-account-assistant.c:720
+#: ../src/empathy-account-assistant.c:673
 msgid "Yes, I'll enter my account details now"
 msgstr "ã?¯ã??ã??ä»?ã?¢ã?«ã?¦ã?³ã??ã?®è©³ç´°ã??å?¥å??ã??ã?¾ã??"
 
-#: ../src/empathy-account-assistant.c:742
+#: ../src/empathy-account-assistant.c:695
 msgid "No, I want a new account"
 msgstr "ã??ã??ã??ã??æ?°ã??ã??ã?¢ã?«ã?¦ã?³ã??ã??ä½?æ??ã??ã?¾ã??"
 
-#: ../src/empathy-account-assistant.c:752
+#: ../src/empathy-account-assistant.c:705
 msgid "No, I just want to see people online nearby for now"
 msgstr "ã??ã??ã??ã??ä»?è¿?ã??ã?§ã?ªã?³ã?©ã?¤ã?³ã?®äººã??è¦?ã??ã??ã? ã??ã?§ã??"
 
-#: ../src/empathy-account-assistant.c:773
+#: ../src/empathy-account-assistant.c:726
 msgid "Select the accounts you want to import:"
 msgstr "ã?¤ã?³ã??ã?¼ã??ã??ã??ã??ã?¢ã?«ã?¦ã?³ã??ã??é?¸æ??ã??ã?¾ã??:"
 
-#: ../src/empathy-account-assistant.c:857
-#: ../src/empathy-new-chatroom-dialog.c:609
-#: ../src/empathy-new-chatroom-dialog.c:610
+#: ../src/empathy-account-assistant.c:813
+#: ../src/empathy-new-chatroom-dialog.c:562
+#: ../src/empathy-new-chatroom-dialog.c:563
 msgid "Yes"
 msgstr "ã?¯ã??"
 
-#: ../src/empathy-account-assistant.c:864
+#: ../src/empathy-account-assistant.c:820
 msgid "No, that's all for now"
 msgstr "ã??ã??ã??ã??ä»?ã?¯ã??ã??ã?§å??å??ã?§ã??"
 
-#: ../src/empathy-account-assistant.c:1129
+#: ../src/empathy-account-assistant.c:1085
 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 "
@@ -2560,90 +2836,93 @@ msgid ""
 msgstr ""
 "Empathy ã?¯ã??ã?ªã??ã?¨å??ã??ã??ã??ã??ã?¯ã?¼ã?¯ã?«ã?¤ã?ªã??ã?£ã?¦ã??ã??äººã??ã??è?ªå??ç??ã?«ç?ºè¦?ã??ã??"
 "ã??ã?£ã??ã??ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??ã??ã?®æ©?è?½ã??ä½¿ã??ã?«ã?¯ã??ä»¥ä¸?ã?®ã??ã?¨ã??ã??ã?§ã??ã?¯ã??ã??ä¿®æ£"
-"ã??ã?¦ã??ã? ã??ã??ã??'ã?¢ã?«ã?¦ã?³ã??' ã?®ã? ã??ã??ã??ã??ã?§ã??å¾?ã?§è©³ç´°ã?¯ç°¡å??ã?«å¤?æ?´ã?§ã??ã?¾ã??ã??ã?¾"
+"ã??ã?¦ã??ã? ã??ã??ã??'ã?¢ã?«ã?¦ã?³ã??' ã?®ã??ã?¤ã?¢ã?ã?°ã?§ã??å¾?ã?§è©³ç´°ã?¯ç°¡å??ã?«å¤?æ?´ã?§ã??ã?¾ã??ã??ã?¾"
 "ã??ã??ã??ã?®æ©?è?½ã??ç?¡å?¹ã?«ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??"
 
-#: ../src/empathy-account-assistant.c:1135
-#: ../src/empathy-account-assistant.c:1191
+#: ../src/empathy-account-assistant.c:1091
+#: ../src/empathy-account-assistant.c:1147
 msgid "Edit->Accounts"
 msgstr "ç·¨é?? â?? ã?¢ã?«ã?¦ã?³ã??"
 
-#: ../src/empathy-account-assistant.c:1151
-msgid "I don't want to enable this feature for now"
+#: ../src/empathy-account-assistant.c:1107
+#, fuzzy
+#| msgid "I don't want to enable this feature for now"
+msgid "I do _not want to enable this feature for now"
 msgstr "ã??ã?®æ©?è?½ã??ä»?ã?¯æ??å?¹ã?«ã??ã??ã??ã??ã??ã?¾ã??ã??"
 
-#: ../src/empathy-account-assistant.c:1187
+#: ../src/empathy-account-assistant.c:1143
 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 ""
-"ã?ã?¼ã?«ã?«ã??ã??ã??ã?¯ã?¼ã?¯ã?«æ?¥ç¶?ã??ã??äººã??ã?¨ã??ã?£ã??ã??ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??ã??telpathy-"
+"ã?ã?¼ã?«ã?«ã??ã??ã??ã?¯ã?¼ã?¯ã?«æ?¥ç¶?ã??ã??äººã??ã?¨ã??ã?£ã??ã??ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??ã??telepathy-"
 "salut ã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã??ã?¦ã??ã?ªã??ã??ã??ã?§ã??ã??ã??ã?®æ©?è?½ã??æ??å?¹ã?«ã??ã??ã?«ã?¯ã??"
 "telepathy-salut ã??ã??ã?±ã?¼ã?¸ã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã??ã?¢ã?«ã?¦ã?³ã??ã??ã?¤ã?¢ã?ã?°ã??ã??ã??ã??ã??è¿?"
 "ã??ã?«ã??ã??äººé??ã??ã?®ã?¢ã?«ã?¦ã?³ã??ã??ä½?æ??ã??ã?¦ã??ã? ã??ã??ã??"
 
-#: ../src/empathy-account-assistant.c:1193
+#: ../src/empathy-account-assistant.c:1149
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut ã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../src/empathy-account-assistant.c:1239
+#: ../src/empathy-account-assistant.c:1195
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?³ã?°ã?¨ VoIP ã?®ã?¢ã?«ã?¦ã?³ã??ã?¢ã?·ã?¹ã?¿ã?³ã??"
 
-#: ../src/empathy-account-assistant.c:1273
+#: ../src/empathy-account-assistant.c:1229
 msgid "Welcome to Empathy"
 msgstr "ã??ã??ã??ã??Empathyã?¸"
 
-#: ../src/empathy-account-assistant.c:1282
+#: ../src/empathy-account-assistant.c:1238
 msgid "Import your existing accounts"
 msgstr "å?å?¨ã??ã??ã?¢ã?«ã?¦ã?³ã??ã??ã?¤ã?³ã??ã?¼ã??ã??ã?¾ã??"
 
-#: ../src/empathy-account-assistant.c:1300
+#: ../src/empathy-account-assistant.c:1256
 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:65
+#: ../src/empathy-accounts-dialog.c:64
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "ä¿?å?ã??ã??ã?¦ã?ªã??ã??%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
+#: ../src/empathy-accounts-dialog.c:68
 msgid "Your new account has not been saved yet."
 msgstr "ã??ã?ªã??ã?®æ?°ã??ã??ã?¢ã?«ã?¦ã?³ã??ã?¯ã?¾ã? ä¿?å?ã??ã??ã?¦ã??ã?¾ã??ã??ã??"
 
-#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:818
+#: ../src/empathy-accounts-dialog.c:286
+#: ../src/empathy-streamed-media-window.c:809
 msgid "Connectingâ?¦"
 msgstr "æ?¥ç¶?ä¸â?¦"
 
-#: ../src/empathy-accounts-dialog.c:322
+#: ../src/empathy-accounts-dialog.c:327
 #, c-format
 msgid "Offline â?? %s"
 msgstr "ã?ªã??ã?©ã?¤ã?³ â?? %s"
 
-#: ../src/empathy-accounts-dialog.c:334
+#: ../src/empathy-accounts-dialog.c:339
 #, c-format
 msgid "Disconnected â?? %s"
 msgstr "å??æ? - %s"
 
-#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-accounts-dialog.c:350
 msgid "Offline â?? No Network Connection"
 msgstr "ã?ªã??ã?©ã?¤ã?³ - ã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶?ã??ã??ã??ã?¾ã??ã??"
 
-#: ../src/empathy-accounts-dialog.c:352
+#: ../src/empathy-accounts-dialog.c:357
 msgid "Unknown Status"
 msgstr "ä¸?æ??ã?ªç?¶æ??"
 
-#: ../src/empathy-accounts-dialog.c:364
+#: ../src/empathy-accounts-dialog.c:369
 msgid "Offline â?? Account Disabled"
 msgstr "ã?ªã??ã?©ã?¤ã?³ - ã?¢ã?«ã?¦ã?³ã??ã??ç?¡å?¹"
 
-#: ../src/empathy-accounts-dialog.c:810
+#: ../src/empathy-accounts-dialog.c:772
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2651,16 +2930,16 @@ msgstr ""
 "å¤?æ?´ã??ç ´æ£?ã??ã?¦æ?°ã??ã??ã?¢ã?«ã?¦ã?³ã??ã??ç??æ??ã??ã??ã??ã?¨ã??ã?¦ã??ã?¾ã??ã??\n"
 "æ?¬å½?ã?«ç¶?ç¶?ã??ã?¾ã??ã???"
 
-#: ../src/empathy-accounts-dialog.c:1157
+#: ../src/empathy-accounts-dialog.c:1133
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "ã?³ã?³ã??ã?¥ã?¼ã?¿ã?¼ã??ã?? %s ã??å??é?¤ã??ã?¾ã??ã???"
 
-#: ../src/empathy-accounts-dialog.c:1161
+#: ../src/empathy-accounts-dialog.c:1137
 msgid "This will not remove your account on the server."
 msgstr "ã??ã??ã?«ã??ã?£ã?¦ã??ã?µã?¼ã??ã?¼ã??ã??ã?¢ã?«ã?¦ã?³ã??ã??å??é?¤ã??ã??ã??ã??ã?¨ã?¯ã??ã??ã?¾ã??ã??ã??"
 
-#: ../src/empathy-accounts-dialog.c:1399
+#: ../src/empathy-accounts-dialog.c:1375
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2668,7 +2947,20 @@ msgstr ""
 "å¤?æ?´ã??ç ´æ£?ã??ã?¦ä»?ã?®ã?¢ã?«ã?¦ã?³ã??ã??é?¸æ??ã??ã??ã??ã?¨ã??ã?¦ã??ã?¾ã??ã??\n"
 "æ?¬å½?ã?«ç¶?ç¶?ã??ã?¾ã??ã???"
 
-#: ../src/empathy-accounts-dialog.c:2002
+#. Menu items: to enabled/disable the account
+#: ../src/empathy-accounts-dialog.c:1593
+#, fuzzy
+#| msgid "_Enabled"
+msgid "_Enable"
+msgstr "ã?µã?¤ã?³ã?¤ã?³(_E)"
+
+#: ../src/empathy-accounts-dialog.c:1594
+#, fuzzy
+#| msgid "_Enabled"
+msgid "_Disable"
+msgstr "ã?µã?¤ã?³ã?¤ã?³(_E)"
+
+#: ../src/empathy-accounts-dialog.c:2113
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2704,11 +2996,11 @@ msgstr "è¿½å? (_A)â?¦"
 msgid "_Importâ?¦"
 msgstr "ã?¤ã?³ã??ã?¼ã??(_I)â?¦"
 
-#: ../src/empathy-auth-client.c:217
+#: ../src/empathy-auth-client.c:250
 msgid " - Empathy authentication client"
 msgstr " - Empathy èª?è¨¼ã?¯ã?©ã?¤ã?¢ã?³ã??"
 
-#: ../src/empathy-auth-client.c:233
+#: ../src/empathy-auth-client.c:266
 msgid "Empathy authentication client"
 msgstr "Empathy èª?è¨¼ã?¯ã?©ã?¤ã?¢ã?³ã??"
 
@@ -2716,94 +3008,94 @@ msgstr "Empathy èª?è¨¼ã?¯ã?©ã?¤ã?¢ã?³ã??"
 msgid "People nearby"
 msgstr "ã??ã??è¿?ã??ã?«ã??ã??äººé??"
 
-#: ../src/empathy-av.c:133
+#: ../src/empathy-av.c:118
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathy é?³å£°/æ? å??ã?¯ã?©ã?¤ã?¢ã?³ã??"
 
-#: ../src/empathy-av.c:149
+#: ../src/empathy-av.c:134
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy é?³å£°/æ? å??ã?¯ã?©ã?¤ã?¢ã?³ã??"
 
-#: ../src/empathy-call-window.c:479
+#: ../src/empathy-streamed-media-window.c:479
 msgid "Contrast"
 msgstr "ã?³ã?³ã??ã?©ã?¹ã??"
 
-#: ../src/empathy-call-window.c:482
+#: ../src/empathy-streamed-media-window.c:482
 msgid "Brightness"
 msgstr "æ??ã??ã??"
 
-#: ../src/empathy-call-window.c:485
+#: ../src/empathy-streamed-media-window.c:485
 msgid "Gamma"
 msgstr "ã?¬ã?³ã??"
 
-#: ../src/empathy-call-window.c:590
+#: ../src/empathy-streamed-media-window.c:590
 msgid "Volume"
 msgstr "é?³é??"
 
-#: ../src/empathy-call-window.c:1175
+#: ../src/empathy-streamed-media-window.c:1166
 msgid "_Sidebar"
 msgstr "ã?µã?¤ã??ã??ã?¼(_S)"
 
-#: ../src/empathy-call-window.c:1194
+#: ../src/empathy-streamed-media-window.c:1186
 msgid "Audio input"
 msgstr "é?³å£°"
 
-#: ../src/empathy-call-window.c:1198
+#: ../src/empathy-streamed-media-window.c:1190
 msgid "Video input"
 msgstr "æ? å??"
 
-#: ../src/empathy-call-window.c:1202
+#: ../src/empathy-streamed-media-window.c:1194
 msgid "Dialpad"
 msgstr "ã??ã?¤ã?¢ã?«ã??ã??ã??"
 
-#: ../src/empathy-call-window.c:1207
+#: ../src/empathy-streamed-media-window.c:1205
 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:1275
+#: ../src/empathy-streamed-media-window.c:1274
 #, 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:1354
+#: ../src/empathy-streamed-media-window.c:1353
 msgid "Call"
 msgstr "ç?ºä¿¡"
 
-#: ../src/empathy-call-window.c:1508
+#: ../src/empathy-streamed-media-window.c:1507
 msgid "The IP address as seen by the machine"
 msgstr "ã??ã?®ã??ã?·ã?³ã?§è¦?ã??ã??ã??IPã?¢ã??ã?¬ã?¹"
 
-#: ../src/empathy-call-window.c:1510
+#: ../src/empathy-streamed-media-window.c:1509
 msgid "The IP address as seen by a server on the Internet"
 msgstr "ã?¤ã?³ã?¿ã?¼ã??ã??ã??ä¸?ã?®ã?µã?¼ã??ã?§è¦?ã??ã??ã??IPã?¢ã??ã?¬ã?¹"
 
-#: ../src/empathy-call-window.c:1512
+#: ../src/empathy-streamed-media-window.c:1511
 msgid "The IP address of the peer as seen by the other side"
 msgstr "ã??ã??ä¸?æ?¹ã?®ã?»ã??ã?§è¦?ã??ã??ã??ã??ã?¢ã?®IPã?¢ã??ã?¬ã?¹"
 
-#: ../src/empathy-call-window.c:1514
+#: ../src/empathy-streamed-media-window.c:1513
 msgid "The IP address of a relay server"
 msgstr "ã?ªã?¬ã?¼ã?µã?¼ã??ã?®IPã?¢ã??ã?¬ã?¹"
 
-#: ../src/empathy-call-window.c:1516
+#: ../src/empathy-streamed-media-window.c:1515
 msgid "The IP address of the multicast group"
 msgstr "ã??ã?«ã??ã?ã?£ã?¹ã??ã?°ã?«ã?¼ã??ã?®IPã?¢ã??ã?¬ã?¹"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2263
+#: ../src/empathy-streamed-media-window.c:2270
 #, c-format
 msgid "Connected â?? %d:%02dm"
 msgstr "æ?¥ç¶?ã??ã?¾ã??ã?? â?? %då??%02dç§?"
 
-#: ../src/empathy-call-window.c:2324
+#: ../src/empathy-streamed-media-window.c:2331
 msgid "Technical Details"
 msgstr "æ??è¡?ç??ã?ªè©³ç´°"
 
-#: ../src/empathy-call-window.c:2362
+#: ../src/empathy-streamed-media-window.c:2369
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -2812,7 +3104,7 @@ msgstr ""
 "%s ã?®ã?½ã??ã??ã?¦ã?§ã?¢ã?¯ã??ã?ªã??ã?®ã?³ã?³ã??ã?¥ã?¼ã?¿ã?§ã?µã??ã?¼ã??ã??ã??ã?¦ã??ã??ã?©ã?®é?³å£°å½¢å¼?ã??ç??è§£"
 "ã?§ã??ã?¾ã??ã??"
 
-#: ../src/empathy-call-window.c:2367
+#: ../src/empathy-streamed-media-window.c:2374
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -2821,34 +3113,34 @@ msgstr ""
 "%s ã?®ã?½ã??ã??ã?¦ã?§ã?¢ã?¯ã??ã?ªã??ã?®ã?³ã?³ã??ã?¥ã?¼ã?¿ã?§ã?µã??ã?¼ã??ã??ã??ã?¦ã??ã??ã?©ã?®æ? å??å½¢å¼?ã??ç??è§£"
 "ã?§ã??ã?¾ã??ã??"
 
-#: ../src/empathy-call-window.c:2373
+#: ../src/empathy-streamed-media-window.c:2380
 #, 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 ""
-"%s ã?¸ã?®æ?¥ç¶?ã??ç¢ºç«?ã?§ã??ã?¾ã??ã??ã?§ã??ã??ã??ã??ã??ã??ã?¯ã?¼ã?¯ä¸?ã?®ã?©ã?£ã?¡ã??ã??ã??ã??ç?´æ?¥æ?¥ç¶?ã??è¨±"
-"å?¯ã??ã??ã??ã?ªã??ã?®ã??ã??ã??ã??ã?¾ã??ã??ã??"
+"%s ã?¸ã?®æ?¥ç¶?ã??ç¢ºç«?ã?§ã??ã?¾ã??ã??ã?§ã??ã??ã??ã??ã??ã??ã?¯ã?¼ã?¯ä¸?ã?®ã?©ã?¡ã??ã??ã??ç?´æ?¥æ?¥ç¶?ã??è¨±å?¯ã??"
+"ã??ã?¦ã??ã?ªã??ã?®ã??ã??ã??ã??ã?¾ã??ã??ã??"
 
-#: ../src/empathy-call-window.c:2379
+#: ../src/empathy-streamed-media-window.c:2386
 msgid "There was a failure on the network"
 msgstr "ã??ã??ã??ã?¯ã?¼ã?¯ã?§å??é¡?ã??ç?ºç??ã??ã?¾ã??ã??"
 
-#: ../src/empathy-call-window.c:2383
+#: ../src/empathy-streamed-media-window.c:2390
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "ã??ã?®å?¼ã?³å?ºã??ã?«å¿?è¦?ã?ªé?³å£°å½¢å¼?ã??ã??ã?ªã??ã?®ã?³ã?³ã??ã?¥ã?¼ã?¿ã?«ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã??ã?¦ã??ã?¾ã??"
 "ã??"
 
-#: ../src/empathy-call-window.c:2386
+#: ../src/empathy-streamed-media-window.c:2393
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "ã??ã?®å?¼ã?³å?ºã??ã?«å¿?è¦?ã?ªæ? å??å½¢å¼?ã??ã??ã?ªã??ã?®ã?³ã?³ã??ã?¥ã?¼ã?¿ã?«ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã??ã?¦ã??ã?¾ã??"
 "ã??"
 
-#: ../src/empathy-call-window.c:2396
+#: ../src/empathy-streamed-media-window.c:2403
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2859,19 +3151,19 @@ msgstr ""
 "ã?®ä¸?å?·å??ã??å ±å??</a>ã??ã?¦ã??ã? ã??ã??ã??ã??ã?®æ??ã?«ã??ã??ã?«ã??ã?¡ã??ã?¥ã?¼ã?®ã??'ã??ã??ã??ã?°' ã?¦ã?£ã?³"
 "ã??ã?¦ã?§é??ã??ã??ã?ã?°ã??æ·»ä»?ã??ã?¦ã??ã? ã??ã??ã??"
 
-#: ../src/empathy-call-window.c:2404
+#: ../src/empathy-streamed-media-window.c:2411
 msgid "There was a failure in the call engine"
 msgstr "å?¼ã?³å?ºã??ã?¨ã?³ã?¸ã?³ã?§å??é¡?ã??ç?ºç??ã??ã?¾ã??ã??"
 
-#: ../src/empathy-call-window.c:2407
+#: ../src/empathy-streamed-media-window.c:2414
 msgid "The end of the stream was reached"
 msgstr "ã?¹ã??ã?ªã?¼ã? ã?®çµ?ç«¯ã?«å?°é??ã??ã?¾ã??ã??"
 
-#: ../src/empathy-call-window.c:2447
+#: ../src/empathy-streamed-media-window.c:2454
 msgid "Can't establish audio stream"
 msgstr "é?³å£°ã?¹ã??ã?ªã?¼ã? ã??ç¢ºç«?ã?§ã??ã?¾ã??ã??"
 
-#: ../src/empathy-call-window.c:2457
+#: ../src/empathy-streamed-media-window.c:2464
 msgid "Can't establish video stream"
 msgstr "æ? å??ã?¹ã??ã?ªã?¼ã? ã??ç¢ºç«?ã?§ã??ã?¾ã??ã??"
 
@@ -2967,35 +3259,35 @@ msgstr "æ? å??ã?®ã??ã?¬ã??ã?¥ã?¼"
 msgid "_Call"
 msgstr "å?¼ã?³å?ºã??(_C)"
 
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:29
 msgid "_View"
 msgstr "è¡¨ç¤º(_V)"
 
-#: ../src/empathy-chat-window.c:452 ../src/empathy-chat-window.c:472
+#: ../src/empathy-chat-window.c:474 ../src/empathy-chat-window.c:494
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (æ?ªèª %d)"
 
-#: ../src/empathy-chat-window.c:464
+#: ../src/empathy-chat-window.c:486
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (ä»?ã?« %u)"
 
-#: ../src/empathy-chat-window.c:480
+#: ../src/empathy-chat-window.c:502
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (ä»?ã??ã?? %d ã?®æ?ªèª)"
 
-#: ../src/empathy-chat-window.c:489
+#: ../src/empathy-chat-window.c:511
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (æ?ªèªã?¯å?¨é?¨ã?§ %d)"
 
-#: ../src/empathy-chat-window.c:695
+#: ../src/empathy-chat-window.c:721
 msgid "Typing a message."
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??å?¥å??ã??ã?¦ã??ã?¾ã??"
 
@@ -3031,7 +3323,7 @@ msgstr "ã?¿ã??ã??å?³ã?¸ç§»å??(_R)"
 msgid "Notify for All Messages"
 msgstr "ã??ã?¹ã?¦ã?®ã?¡ã??ã?»ã?¼ã?¸ã??é??ç?¥"
 
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
 msgid "_Contents"
 msgstr "ç?®æ¬¡(_C)"
 
@@ -3043,7 +3335,7 @@ msgstr "ä¼?è©±(_C)"
 msgid "_Detach Tab"
 msgstr "ã?¿ã??ã?®å??ã??å¤?ã??(_D)"
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
 msgid "_Edit"
 msgstr "ç·¨é??(_E)"
 
@@ -3051,7 +3343,7 @@ msgstr "ç·¨é??(_E)"
 msgid "_Favorite Chat Room"
 msgstr "ã??æ°?ã?«å?¥ã??ã?®ã??ã?£ã??ã??ã?«ã?¼ã? (_F)"
 
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
 msgid "_Help"
 msgstr "ã??ã?«ã??(_H)"
 
@@ -3091,86 +3383,93 @@ msgstr "è?ªå??ã?µã?¤ã?³ã?¤ã?³"
 msgid "Manage Favorite Rooms"
 msgstr "ã??æ°?ã?«å?¥ã??ã?®é?¨å±?"
 
-#: ../src/empathy-event-manager.c:468
+#: ../src/empathy-event-manager.c:507
 msgid "Incoming video call"
 msgstr "æ? å??ã?§å?¼ã?³ã??ã??ã??ã??ã??"
 
-#: ../src/empathy-event-manager.c:468
+#: ../src/empathy-event-manager.c:507
 msgid "Incoming call"
 msgstr "ç??ä¿¡ã??ã??ã??ã?¾ã??"
 
-#: ../src/empathy-event-manager.c:472
+#: ../src/empathy-event-manager.c:511
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s ã??ã??ã??ã??ã?®æ? å??ã?®ç??ä¿¡ã?§ã??ã??ã??å¿?ç?ã??ã?¾ã??ã???"
 
-#: ../src/empathy-event-manager.c:473
+#: ../src/empathy-event-manager.c:512
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s ã??ã??ã??ã??ã?®ç??ä¿¡ã?§ã??ã??ã??å¿?ç?ã??ã?¾ã??ã???"
 
-#: ../src/empathy-event-manager.c:476 ../src/empathy-event-manager.c:618
+#: ../src/empathy-event-manager.c:515 ../src/empathy-event-manager.c:667
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s ã??ã??ã??ã??ã?®å?¼ã?³å?ºã??ã?§ã??"
 
-#: ../src/empathy-event-manager.c:501
+#: ../src/empathy-event-manager.c:540
 msgid "_Reject"
 msgstr "æ??å?¦ã??ã??(_R)"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:546
 msgid "_Answer"
 msgstr "å¿?ç?ã??ã??(_A)"
 
-#: ../src/empathy-event-manager.c:618
+#: ../src/empathy-event-manager.c:667
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "%s ã??ã??ã??ã??ã?®æ? å??ã?§ã?®å?¼ã?³å?ºã??ã?§ã??"
 
-#: ../src/empathy-event-manager.c:695
+#: ../src/empathy-event-manager.c:744
 msgid "Room invitation"
 msgstr "ã??ã?£ã??ã??ã?«ã?¼ã? ã?¸ã?®æ??å¾?"
 
-#: ../src/empathy-event-manager.c:697
+#: ../src/empathy-event-manager.c:746
 #, c-format
 msgid "Invitation to join %s"
 msgstr "%s ã?¸ã?®å??å? ã?®æ??å¾?"
 
-#: ../src/empathy-event-manager.c:704
+#: ../src/empathy-event-manager.c:753
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s ã??ã??ã??ã??ã?ªã??ã?? %s ã?«æ??å¾?ã??ã?¦ã??ã?¾ã??"
 
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:761
 msgid "_Decline"
 msgstr "ã??æ?ã??ã??ã??(_D)"
 
-#: ../src/empathy-event-manager.c:717
+#: ../src/empathy-event-manager.c:766
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "å??å? ã??ã??(_J)"
 
-#: ../src/empathy-event-manager.c:743
+#: ../src/empathy-event-manager.c:793
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s ã??ã??ã??ã??ã?ªã??ã?? %s ã?«æ??å¾?ã??ã?¾ã??ã??"
 
-#: ../src/empathy-event-manager.c:749
+#: ../src/empathy-event-manager.c:799
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "ã??ã?ªã??ã?¯ %s ã?¸ã?®å??å? ã?®æ??å¾?ã??å??ã??å??ã??ã?¾ã??ã??"
 
-#: ../src/empathy-event-manager.c:797
+#: ../src/empathy-event-manager.c:850
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "%s ã??ã??ã??ã??ã??ã?¡ã?¤ã?«è»¢é??ã?®ã??ç?¥ã??ã??ã?§ã??"
 
-#: ../src/empathy-event-manager.c:1005
-#, c-format
-msgid "Subscription requested by %s"
-msgstr "%s ã??ã??ã?®ç?»é?²ã?®ã?ªã?¯ã?¨ã?¹ã??"
+#: ../src/empathy-event-manager.c:1020 ../src/empathy-main-window.c:370
+#, fuzzy
+#| msgid "Password"
+msgid "Password required"
+msgstr "ã??ã?¹ã?¯ã?¼ã??"
+
+#: ../src/empathy-event-manager.c:1076
+#, fuzzy, c-format
+#| msgid "%s would like to send you a file"
+msgid "%s would like permission to see when you are online"
+msgstr "%s ã??ã??ã??ã??ã?ªã??ã?«ã??ã?¡ã?¤ã?«ã??é??ä¿¡ã??ã??ã??ã??ã??ã?§ã??"
 
-#: ../src/empathy-event-manager.c:1009
+#: ../src/empathy-event-manager.c:1080
 #, c-format
 msgid ""
 "\n"
@@ -3179,16 +3478,6 @@ msgstr ""
 "\n"
 "ã?¡ã??ã?»ã?¼ã?¸: %s"
 
-#: ../src/empathy-event-manager.c:1052
-#, c-format
-msgid "%s is now offline."
-msgstr "%s ã??ã??ã?¯ã?ªã??ã?©ã?¤ã?³ã?§ã??ã??"
-
-#: ../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:99
 #, c-format
@@ -3280,15 +3569,15 @@ msgstr "\"%s\" ã?®å®?å?¨æ?§ã??ã??ã?§ã??ã?¯ã??ã?¦ã??ã?¾ã??"
 msgid "Hashing \"%s\""
 msgstr "ã??ã??ã?·ã?¥è¨?ç®?ä¸ \"%s\""
 
-#: ../src/empathy-ft-manager.c:996
+#: ../src/empathy-ft-manager.c:1016
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1008
+#: ../src/empathy-ft-manager.c:1028
 msgid "File"
 msgstr "ã??ã?¡ã?¤ã?«"
 
-#: ../src/empathy-ft-manager.c:1030
+#: ../src/empathy-ft-manager.c:1050
 msgid "Remaining"
 msgstr "æ®?ã??"
 
@@ -3313,43 +3602,55 @@ msgid "Import Accounts"
 msgstr "ã?¢ã?«ã?¦ã?³ã??ã?®å??ã??è¾¼ã?¿"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:292
+#: ../src/empathy-import-widget.c:301
 msgid "Import"
 msgstr "å??ã??è¾¼ã??"
 
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:310
 msgid "Protocol"
 msgstr "ã??ã?ã??ã?³ã?«"
 
-#: ../src/empathy-import-widget.c:325
+#: ../src/empathy-import-widget.c:334
 msgid "Source"
 msgstr "æ??ä¾?å??"
 
-#: ../src/empathy-main-window.c:383
+#: ../src/empathy-main-window.c:387
+#, fuzzy
+#| msgid "Password"
+msgid "Provide Password"
+msgstr "ã??ã?¹ã?¯ã?¼ã??"
+
+#: ../src/empathy-main-window.c:393
+#, fuzzy
+#| msgid "Disconnected"
+msgid "Disconnect"
+msgstr "ä¸?é??"
+
+#: ../src/empathy-main-window.c:533
 msgid "No match found"
 msgstr "è¦?ã?¤ã??ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../src/empathy-main-window.c:538
+#: ../src/empathy-main-window.c:688
 msgid "Reconnect"
 msgstr "å??æ?¥ç¶?"
 
-#: ../src/empathy-main-window.c:544
+#: ../src/empathy-main-window.c:694
 msgid "Edit Account"
 msgstr "ã?¢ã?«ã?¦ã?³ã??ã?®ç·¨é??"
 
-#: ../src/empathy-main-window.c:550
+#: ../src/empathy-main-window.c:700
 msgid "Close"
 msgstr "é??ã??ã??"
 
-#: ../src/empathy-main-window.c:1232
+#: ../src/empathy-main-window.c:1418
 msgid "Contact"
 msgstr "ä»²é??"
 
-#: ../src/empathy-main-window.c:1557
+#: ../src/empathy-main-window.c:1765
 msgid "Contact List"
 msgstr "ä»²é??ã?ªã?¹ã??"
 
-#: ../src/empathy-main-window.c:1666
+#: ../src/empathy-main-window.c:1881
 msgid "Show and edit accounts"
 msgstr "ã?¢ã?«ã?¦ã?³ã??ã?®ä¸?è¦§ã??è¡¨ç¤ºã??ã?¦ç·¨é??ã??ã?¾ã??"
 
@@ -3358,8 +3659,10 @@ msgid "Contacts on a _Map"
 msgstr "å?°å?³ä¸?ã?®ä»²é??(_M)"
 
 #: ../src/empathy-main-window.ui.h:2
-msgid "Context"
-msgstr "ã?³ã?³ã??ã?ã?¹ã??"
+#, fuzzy
+#| msgid "Contact List"
+msgid "Find in Contact _List"
+msgstr "ä»²é??ã?ªã?¹ã??"
 
 #: ../src/empathy-main-window.ui.h:3
 msgid "Join _Favorites"
@@ -3401,49 +3704,62 @@ msgstr "ç?¶æ??ã?§ä¸¦ã?³æ?¿ã??(_S)"
 msgid "_Accounts"
 msgstr "ã?¢ã?«ã?¦ã?³ã??(_A)"
 
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window.ui.h:14
+#, fuzzy
+#| msgid "Linked Contacts"
+msgid "_Blocked Contacts"
+msgstr "ã?ªã?³ã?¯ä¸ã?®ä»²é??"
+
+#: ../src/empathy-main-window.ui.h:16
 msgid "_Compact Size"
 msgstr "ã?³ã?³ã??ã?¯ã??ã?µã?¤ã?º(_C)"
 
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window.ui.h:18
 msgid "_Debug"
 msgstr "ã??ã??ã??ã?°(_D)"
 
-#: ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-main-window.ui.h:20
 msgid "_File Transfers"
 msgstr "ã??ã?¡ã?¤ã?«è»¢é??(_F)"
 
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window.ui.h:22
 msgid "_Joinâ?¦"
 msgstr "å??å? (_J)â?¦"
 
-#: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversationâ?¦"
 msgstr "æ?°ã??ã??ä¼?è©±(_N)â?¦"
 
-#: ../src/empathy-main-window.ui.h:23
+#: ../src/empathy-main-window.ui.h:24
 msgid "_Offline Contacts"
 msgstr "ã?ªã??ã?©ã?¤ã?³ã?®ä»²é??ã??è¡¨ç¤º(_O)"
 
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window.ui.h:25
 msgid "_Personal Information"
 msgstr "å??äººæ??å ±(_P)"
 
-#: ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-main-window.ui.h:27
 msgid "_Room"
 msgstr "é?¨å±?(_R)"
 
-#: ../src/empathy-new-chatroom-dialog.c:379
+#: ../src/empathy-main-window.ui.h:28
+#, fuzzy
+#| msgctxt "Link individual (contextual menu)"
+#| msgid "_Link Contactsâ?¦"
+msgid "_Search for Contactsâ?¦"
+msgstr "ä»²é??ã??ã?ªã?³ã?¯(_L)â?¦"
+
+#: ../src/empathy-new-chatroom-dialog.c:337
 msgid "Chat Room"
 msgstr "ã??ã?£ã??ã??ã?«ã?¼ã? "
 
-#: ../src/empathy-new-chatroom-dialog.c:395
+#: ../src/empathy-new-chatroom-dialog.c:353
 msgid "Members"
 msgstr "ã?¡ã?³ã??ã?¼"
 
 #. 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
+#: ../src/empathy-new-chatroom-dialog.c:560
 #, c-format
 msgid ""
 "%s\n"
@@ -3456,16 +3772,16 @@ msgstr ""
 "ã??ã?¹ã?¯ã?¼ã??ã??å¿?è¦?: %s\n"
 "ã?¡ã?³ã??ã?¼æ?°: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:609
-#: ../src/empathy-new-chatroom-dialog.c:610
+#: ../src/empathy-new-chatroom-dialog.c:562
+#: ../src/empathy-new-chatroom-dialog.c:563
 msgid "No"
 msgstr "ã??ã??ã??"
 
-#: ../src/empathy-new-chatroom-dialog.c:638
+#: ../src/empathy-new-chatroom-dialog.c:591
 msgid "Could not start room listing"
 msgstr "é?¨å±?ã?ªã?¹ã??ã?®ä½?æ??ã??é??å§?ã?§ã??ã?¾ã??ã??"
 
-#: ../src/empathy-new-chatroom-dialog.c:648
+#: ../src/empathy-new-chatroom-dialog.c:601
 msgid "Could not stop room listing"
 msgstr "é?¨å±?ã?ªã?¹ã??ã?®ä½?æ??ã??å??æ¢ã?§ã??ã?¾ã??ã??"
 
@@ -3500,39 +3816,39 @@ msgstr "é?¨å±?ã?®ä¸?è¦§"
 msgid "_Room:"
 msgstr "é?¨å±?(_R):"
 
-#: ../src/empathy-preferences.c:138
+#: ../src/empathy-preferences.c:139
 msgid "Message received"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??å??ä¿¡ã??ã??"
 
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:140
 msgid "Message sent"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ã??ã??"
 
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:141
 msgid "New conversation"
 msgstr "æ?°ã??ã??ä¼?è©±ã??å§?ã??ã??"
 
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:142
 msgid "Contact goes online"
 msgstr "ä»²é??ã??ã?µã?¤ã?³ã?¤ã?³ã??ã??"
 
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:143
 msgid "Contact goes offline"
 msgstr "ä»²é??ã??ã?µã?¤ã?³ã?¢ã?¦ã??ã??ã??"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:144
 msgid "Account connected"
 msgstr "è?ªå??ã??ã?µã?¤ã?³ã?¤ã?³ã??ã??"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:145
 msgid "Account disconnected"
 msgstr "è?ªå??ã??ã?µã?¤ã?³ã?¢ã?¦ã??ã??ã??"
 
-#: ../src/empathy-preferences.c:445
+#: ../src/empathy-preferences.c:446
 msgid "Language"
 msgstr "è¨?èª?"
 
-#: ../src/empathy-preferences.c:882
+#: ../src/empathy-preferences.c:875
 msgid "Preferences"
 msgstr "è¨å®?"
 
@@ -3672,26 +3988,6 @@ msgstr "è?ªå??ã?®ä»²é??ã?«ä½?ç½®ã??å?¬è¡¨ã??ã??(_P)"
 msgid "_Reduce location accuracy"
 msgstr "ä½?ç½®ç²¾åº¦ã??ä¸?ã??ã??(_R)"
 
-#: ../src/empathy-status-icon.c:141
-msgid "Respond"
-msgstr "å¿?ç?ã??ã??"
-
-#: ../src/empathy-status-icon.c:147
-msgid "Reject"
-msgstr "æ??å?¦"
-
-#: ../src/empathy-status-icon.c:151
-msgid "Answer"
-msgstr "å¿?ç?"
-
-#: ../src/empathy-status-icon.c:158
-msgid "Decline"
-msgstr "ã??æ?ã??"
-
-#: ../src/empathy-status-icon.c:162
-msgid "Accept"
-msgstr "å??ã??å??ã??"
-
 #: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "ç?¶æ??"
@@ -3700,67 +3996,67 @@ msgstr "ç?¶æ??"
 msgid "_Quit"
 msgstr "çµ?äº?(_Q)"
 
-#: ../src/empathy-map-view.c:452
+#: ../src/empathy-map-view.c:442
 msgid "Contact Map View"
 msgstr "Contact Map View"
 
-#: ../src/empathy-debug-window.c:1219
+#: ../src/empathy-debug-window.c:1218
 msgid "Save"
 msgstr "ä¿?å?"
 
-#: ../src/empathy-debug-window.c:1395
+#: ../src/empathy-debug-window.c:1394
 msgid "Debug Window"
 msgstr "ã??ã??ã??ã?°ã?»ã?¦ã?£ã?³ã??ã?¦"
 
-#: ../src/empathy-debug-window.c:1475
+#: ../src/empathy-debug-window.c:1476
 msgid "Pause"
 msgstr "ä¸?æ??å??æ¢"
 
-#: ../src/empathy-debug-window.c:1487
+#: ../src/empathy-debug-window.c:1488
 msgid "Level "
 msgstr "ã?¬ã??ã?« "
 
-#: ../src/empathy-debug-window.c:1507
+#: ../src/empathy-debug-window.c:1508
 msgid "Debug"
 msgstr "ã??ã??ã??ã?°"
 
-#: ../src/empathy-debug-window.c:1513
+#: ../src/empathy-debug-window.c:1514
 msgid "Info"
 msgstr "æ??å ±"
 
-#: ../src/empathy-debug-window.c:1519 ../src/empathy-debug-window.c:1568
+#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
 msgid "Message"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸"
 
-#: ../src/empathy-debug-window.c:1525
+#: ../src/empathy-debug-window.c:1526
 msgid "Warning"
 msgstr "æ³¨æ??"
 
-#: ../src/empathy-debug-window.c:1531
+#: ../src/empathy-debug-window.c:1532
 msgid "Critical"
 msgstr "å?±é?º"
 
-#: ../src/empathy-debug-window.c:1537
+#: ../src/empathy-debug-window.c:1538
 msgid "Error"
 msgstr "ã?¨ã?©ã?¼"
 
-#: ../src/empathy-debug-window.c:1556
+#: ../src/empathy-debug-window.c:1557
 msgid "Time"
 msgstr "æ??å?»"
 
-#: ../src/empathy-debug-window.c:1559
+#: ../src/empathy-debug-window.c:1560
 msgid "Domain"
 msgstr "ã??ã?¡ã?¤ã?³"
 
-#: ../src/empathy-debug-window.c:1561
+#: ../src/empathy-debug-window.c:1562
 msgid "Category"
 msgstr "å??é¡?"
 
-#: ../src/empathy-debug-window.c:1563
+#: ../src/empathy-debug-window.c:1564
 msgid "Level"
 msgstr "ã?¬ã??ã?«"
 
-#: ../src/empathy-debug-window.c:1600
+#: ../src/empathy-debug-window.c:1601
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -3779,36 +4075,108 @@ msgstr "ä¼?è©±ã?«æ??å¾?ã??ã??ä»²é??ã??é?¸ã??ã?§ã??ã? ã??ã??"
 msgid "Invite"
 msgstr "æ??å¾?ã??ã??"
 
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:183
 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"
+#: ../src/empathy-accounts.c:187
+#, fuzzy
+#| msgid "Don't display any dialogs if there are any non-Salut accounts"
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "Salut ã?¢ã?«ã?¦ã?³ã??ã??ã?ªã??ã??ã?°ã??ã??ã?¤ã?¢ã?ã?°ã??ä½?ã??è¡¨ç¤ºã??ã?ªã??"
 
-#: ../src/empathy-accounts.c:190
+#: ../src/empathy-accounts.c:191
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "æ??å??ã?¯ä¸?ã??ã??ã??ã??ã?¢ã?«ã?¦ã?³ã??ã??é?¸æ??ã??ã?¦ã??ã? ã??ã?? (ä¾? gabble/jabber/"
 "hoge_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:192
+#: ../src/empathy-accounts.c:193
 msgid "<account-id>"
 msgstr "<ã?¢ã?«ã?¦ã?³ã?? ID>"
 
-#: ../src/empathy-accounts.c:200
+#: ../src/empathy-accounts.c:198
 msgid "- Empathy Accounts"
 msgstr "- Empathy ã?®ã?¢ã?«ã?¦ã?³ã??"
 
-#: ../src/empathy-accounts.c:216
+#: ../src/empathy-accounts.c:237
 msgid "Empathy Accounts"
 msgstr "Empathy ã?®ã?¢ã?«ã?¦ã?³ã??"
 
-#: ../src/empathy-debugger.c:40
+#: ../src/empathy-debugger.c:66
 msgid "Empathy Debugger"
 msgstr "Empathy ã??ã??ã??ã?¬"
 
+#: ../src/empathy-chat.c:107
+#, fuzzy
+#| msgid "- Empathy IM Client"
+msgid "- Empathy Chat Client"
+msgstr "- Empathy ã?¤ã?³ã?¹ã?¿ã?³ã??ã?»ã?¡ã??ã?»ã?³ã?¸ã?£ã?¼"
+
+#: ../src/empathy-notifications-approver.c:184
+msgid "Respond"
+msgstr "å¿?ç?ã??ã??"
+
+#: ../src/empathy-notifications-approver.c:190
+msgid "Reject"
+msgstr "æ??å?¦"
+
+#: ../src/empathy-notifications-approver.c:194
+msgid "Answer"
+msgstr "å¿?ç?"
+
+#: ../src/empathy-notifications-approver.c:201
+#: ../src/empathy-notifications-approver.c:211
+msgid "Decline"
+msgstr "ã??æ?ã??"
+
+#: ../src/empathy-notifications-approver.c:205
+#: ../src/empathy-notifications-approver.c:216
+msgid "Accept"
+msgstr "å??ã??å??ã??"
+
+#: ../src/empathy-call-observer.c:130
+#, fuzzy, c-format
+#| msgid "Incoming call from %s"
+msgid "Missed call from %s"
+msgstr "%s ã??ã??ã??ã??ã?®å?¼ã?³å?ºã??ã?§ã??"
+
+#: ../src/empathy-call-observer.c:133
+#, c-format
+msgid "%s just tried to call you, but you were in another call."
+msgstr ""
+
+#~ msgid "Empathy has asked about importing accounts"
+#~ msgstr "ã?¢ã?«ã?¦ã?³ã??ã?®å??ã??è¾¼ã?¿ã??å??ã??å??ã??ã??ã??ã??ã?©ã??ã??"
+
+#~ msgid ""
+#~ "Whether Empathy has asked about importing accounts from other programs."
+#~ msgstr ""
+#~ "Empathy ã??ä»?ã?®ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³ã??ã??ã?¢ã?«ã?¦ã?³ã??æ??å ±ã??å??ã??è¾¼ã?¿ã??ã?®ã??å??ã??å??ã??ã??"
+#~ "ã??ã??ã?©ã??ã??ã?§ã??ã??"
+
+#~ msgid "The hash of the received file and the sent one do not match"
+#~ msgstr "å??ä¿¡æ¸?ã?¿ã??ã?¡ã?¤ã?«ã?¨é??ä¿¡ã??ã??ã??ã??ã?¡ã?¤ã?«ã?®ã??ã??ã?·ã?¥ã??ä¸?è?´ã??ã?¾ã??ã??"
+
+#~ msgid "Add _New Preset"
+#~ msgstr "æ?°ã??ã??ç?¶æ??ã??è¿½å? (_N)"
+
+#~ msgid "Saved Presets"
+#~ msgstr "ç?¶æ??ã??ä¿?å?ã??ã?¾ã??ã??"
+
+#~ msgid "Subscription requested by %s"
+#~ msgstr "%s ã??ã??ã?®ç?»é?²ã?®ã?ªã?¯ã?¨ã?¹ã??"
+
+#~ msgid "%s is now offline."
+#~ msgstr "%s ã??ã??ã?¯ã?ªã??ã?©ã?¤ã?³ã?§ã??ã??"
+
+#~ msgid "%s is now online."
+#~ msgstr "%s ã??ã??ã?¯ã?ªã?³ã?©ã?¤ã?³ã?§ã??ã??"
+
+#~ msgid "Context"
+#~ msgstr "ã?³ã?³ã??ã?ã?¹ã??"
+
 #~ msgid "Use _Yahoo! Japan"
 #~ msgstr "Yahoo! Japan ã?«æ?¥ç¶?(_Y)"
 
@@ -3945,9 +4313,6 @@ msgstr "Empathy ã??ã??ã??ã?¬"
 #~ msgid "Conversations (%d)"
 #~ msgstr "ä¼?è©± (%d)"
 
-#~ msgid "_Contact"
-#~ msgstr "ä»²é??(_C)"
-
 #~ msgid "%s is offering you an invitation"
 #~ msgstr "%s ã??ã??ã??ã??ã?ªã??ã??æ??å¾?ã??ã?¦ã??ã?¾ã??"
 
@@ -4097,9 +4462,6 @@ msgstr "Empathy ã??ã??ã??ã?¬"
 #~ msgid "unknown size"
 #~ msgstr "ã?µã?¤ã?ºã?¯ä¸?æ??ã?§ã??"
 
-#~ msgid "%s would like to send you a file"
-#~ msgstr "%s ã??ã??ã??ã??ã?ªã??ã?«ã??ã?¡ã?¤ã?«ã??é??ä¿¡ã??ã??ã??ã??ã??ã?§ã??"
-
 #~ msgid "Do you want to accept the file \"%s\" (%s)?"
 #~ msgstr " \"%s\" (%s) ã??å??ã??å??ã??ã?¾ã??ã???"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]