[empathy] Updated Traditional Chinese translation(Hong Kong and Taiwan)



commit 7bd2be908e8d44d94166e8ae1f07358869bec879
Author: Cheng-Chia Tseng <pswo10680 gmail com>
Date:   Sat Jan 14 20:23:38 2012 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 1738 +++++++++++++++++++++++++++++------------------------------
 po/zh_TW.po | 1738 +++++++++++++++++++++++++++++------------------------------
 2 files changed, 1734 insertions(+), 1742 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 0bb97f1..12ebb28 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy 3.3.1\n"
+"Project-Id-Version: empathy 3.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-12 19:09+0800\n"
-"PO-Revision-Date: 2011-11-12 19:10+0800\n"
+"POT-Creation-Date: 2012-01-14 20:22+0800\n"
+"PO-Revision-Date: 2012-01-14 20:23+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "Language: zh_TW\n"
@@ -40,425 +40,417 @@ msgid "Always open a separate chat window for new chats."
 msgstr "æéçæåæçèåéåæçèåèçã"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "éèéé"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "éèééïççåæã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid "Camera device"
 msgstr "æåæèç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
 msgid "Camera position"
 msgstr "æåæäç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr "åççèåääççåèé (tab) æèååçåäåçåçã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
 msgid "Chat window theme"
 msgstr "èåèçäæäé"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid "Chat window theme variant"
 msgstr "èåèçäæäéæå"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr "äéèåéèäçæåææçèèæå (åïã en, fr, nlã)ã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Compact contact list"
 msgstr "ççèçäæå"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid "Connection managers should be used"
 msgstr "äçéççççå"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Contact list sort criterion"
 msgstr "èçäæåæåæå"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "D-Bus object path of the last account selected to join a room."
 msgstr "äæèååèååæéååèç D-Bus çäèåã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr "èçæèåéèçéèæåæèçïäï/dev/video0ã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Default directory to select an avatar image from"
 msgstr "çäéæåéèåççéèçé"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Disable popup notifications when away"
 msgstr "ççæçééæåçåååéç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable sounds when away"
 msgstr "ççæçééæåçéæ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Display incoming events in the status area"
 msgstr "åçæååéçæåää"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
 msgstr "åçæååéçæåääãåæäåççèïæåääæçæåççäçèã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid "Echo cancellation support"
 msgstr "åéæéææ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Empathy can publish the user's location"
 msgstr "Empathy åäçåäçèçäç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy åäåç GPS äææäç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy åäåçæåéèççååèäææäç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy åäåçççäææäç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy default download folder"
 msgstr "Empathy éèäèèæå"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy should auto-away when idle"
 msgstr "Empathy çéçææèèåèçéé"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy ååæèåéç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy æéääççæçå"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy èäçèçäçåéèåçèåèçåç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Enable WebKit Developer Tools"
 msgstr "åç WebKit éçèåå"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Enable popup notifications for new messages"
 msgstr "åçæèæçåååéç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable spell checker"
 msgstr "åçæåææçå"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Hide main window"
 msgstr "éèäèç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Hide the main window."
 msgstr "éèäèçã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Last account selected in Join Room dialog"
 msgstr "äæåãååèååãåèçéåçåè"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Nick completed character"
 msgstr "çåèéåç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Open new chats in separate windows"
 msgstr "åååèçéåæçèå"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Path of the Adium theme to use"
 msgstr "èäçç Adium äæäéèå"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 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:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Play a sound for incoming messages"
 msgstr "æåèææææéæ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for new conversations"
 msgstr "çéåæçèèæææéæ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for outgoing messages"
 msgstr "éåèææææéæ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound when a contact logs in"
 msgstr "çèçäçåæææéæ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs out"
 msgstr "çæèçäçåæææéæ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when we log in"
 msgstr "çæåçåæææéæ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log out"
 msgstr "çæåçåæææéæ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "åæèåèçååçéåååéç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications when a contact logs in"
 msgstr "çèçäçåæååéç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs out"
 msgstr "çèçäçåæååéç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Position the camera preview should be during a call."
 msgstr "éèææåæéèæèææçäçã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "Show Balance in contact list"
 msgstr "æèçäæååéçéé"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Show avatars"
 msgstr "éçåéè"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show contact list in rooms"
 msgstr "åèååéçèçäæå"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show hint about closing the main window"
 msgstr "ééäèçæéçæç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show offline contacts"
 msgstr "éçéçèçä"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show protocols"
 msgstr "éçåå"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Spell checking languages"
 msgstr "æåææçèè"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "The default folder to save file transfers in."
 msgstr "çäååææåèææææçéèèæåã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The last directory that an avatar image was chosen from."
 msgstr "äæéæåéèåçççéã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The position for the chat window side pane"
 msgstr "èåèçåçæçäç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "èåèçåçæçååäç (åäçåç)ã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "çäéçåèåèçäèèçäæäéã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr "çäåèåèçéçèèçäæäéæåã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "Use graphical smileys"
 msgstr "äçåçåèæçè"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use notification sounds"
 msgstr "äçéçéæ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use theme for chat rooms"
 msgstr "åèååäçäæäé"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Empathy æåèåäçèçäççåçäçèçäã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Empathy æåäç GPS äææäçã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Empathy æåäçæåéèççäææäçã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Empathy æåäçççäææäçã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Empathy æåæåååæèåçåäçåèã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr "Empathy æåæåäçèéçæèååæçééæåã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "Empathy æååæçéçççæääççæçåã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 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:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "æååç WebKit éçèååïäå Web Inspectorã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
 msgstr "æåäçéççççåèåæçæéæéçã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "æåääèåçèèææèåæçéåã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "æååèèäçèæçèèæçåçååã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr "æåèåç Pulseaudio çåéæééæåã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "æåææéæäéçæèçäçåççã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "æåææéæäéçæèçäçåççã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of events."
 msgstr "æåææéæäéçæääççã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "æåææéæäéçææåèæã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "æåææéæäéçæçèèã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "æåææéæäéçæéåèæã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound when logging into a network."
 msgstr "ççåæççææåææéæã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound when logging out of a network."
 msgstr "ççåæççææåææéæã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play sound notifications when away or busy."
 msgstr "ççæçééæåçææåææéæéçã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "çèçäéçææåéçåååéçã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "çèçääçææåéçåååéçã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
 msgstr "æåæèæææåéçåååéç (åäåéåèåèçïäææçåçé)ã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "çæåæèæææåéçåååéçã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid "Whether to show account balances in the contact list."
 msgstr "æåèåèçäæååéçåæééã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "æååèçäæåèèåèçéçèçäåéèã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "æååèçäæåäéçéççèçäã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid "Whether to show popup notifications when away or busy."
 msgstr "ççæçééæåçææåéçåååéçã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "æåèåèçäæååéçèçääçååã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show the contact list in chat rooms."
 msgstr "æååèååäéçèçäæåã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show the contact list in compact mode."
 msgstr "æåäççæåéçèçäæåã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
 msgstr "æååäçæéåçãxãæéééäèçæïéçèæåèçã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to use the theme for chat rooms."
 msgstr "æåçèååäçäæäéã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 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,23 +463,51 @@ msgstr "ççèæè VoIP åè"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2312
+#: ../src/empathy-accounts-dialog.c:2406
 msgid "Messaging and VoIP Accounts"
 msgstr "èæè VoIP åè"
 
-#: ../libempathy/empathy-ft-handler.c:838
+#: ../libempathy/empathy-ft-handler.c:736
+msgid "No reason was specified"
+msgstr "æææååå"
+
+#: ../libempathy/empathy-ft-handler.c:739
+msgid "The change in state was requested"
+msgstr "åèæææçæ"
+
+#: ../libempathy/empathy-ft-handler.c:742
+msgid "You canceled the file transfer"
+msgstr "äååæææåè"
+
+#: ../libempathy/empathy-ft-handler.c:745
+msgid "The other participant canceled the file transfer"
+msgstr "åäçåèèåæäææåè"
+
+#: ../libempathy/empathy-ft-handler.c:748
+msgid "Error while trying to transfer the file"
+msgstr "åèåèæææççéè"
+
+#: ../libempathy/empathy-ft-handler.c:751
+msgid "The other participant is unable to transfer the file"
+msgstr "åäçåèèçæåèèææ"
+
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:311
+msgid "Unknown reason"
+msgstr "äæåå"
+
+#: ../libempathy/empathy-ft-handler.c:917
 msgid "File transfer completed, but the file was corrupted"
 msgstr "ææåèåçïäæææåææ"
 
-#: ../libempathy/empathy-ft-handler.c:1124
+#: ../libempathy/empathy-ft-handler.c:1203
 msgid "File transfer not supported by remote contact"
 msgstr "éçèçääææææåè"
 
-#: ../libempathy/empathy-ft-handler.c:1180
+#: ../libempathy/empathy-ft-handler.c:1259
 msgid "The selected file is not a regular file"
 msgstr "éåçææäææèçææ"
 
-#: ../libempathy/empathy-ft-handler.c:1189
+#: ../libempathy/empathy-ft-handler.c:1268
 msgid "The selected file is empty"
 msgstr "éåçæææççç"
 
@@ -507,191 +527,159 @@ msgstr "åææ %s"
 msgid "Call from %s"
 msgstr "%s çäé"
 
-#: ../libempathy/empathy-tp-file.c:258
-msgid "Socket type not supported"
-msgstr "Socket éåäææ"
-
-#: ../libempathy/empathy-tp-file.c:377
-msgid "No reason was specified"
-msgstr "æææååå"
-
-#: ../libempathy/empathy-tp-file.c:380
-msgid "The change in state was requested"
-msgstr "åèæææçæ"
-
-#: ../libempathy/empathy-tp-file.c:383
-msgid "You canceled the file transfer"
-msgstr "äååæææåè"
-
-#: ../libempathy/empathy-tp-file.c:386
-msgid "The other participant canceled the file transfer"
-msgstr "åäçåèèåæäææåè"
-
-#: ../libempathy/empathy-tp-file.c:389
-msgid "Error while trying to transfer the file"
-msgstr "åèåèæææççéè"
-
-#: ../libempathy/empathy-tp-file.c:392
-msgid "The other participant is unable to transfer the file"
-msgstr "åäçåèèçæåèèææ"
-
-#: ../libempathy/empathy-tp-file.c:395 ../libempathy/empathy-utils.c:312
-msgid "Unknown reason"
-msgstr "äæåå"
-
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:231
 msgid "Available"
 msgstr "æç"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:233
 msgid "Busy"
 msgstr "åç"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:236
 msgid "Away"
 msgstr "éé"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:238
 msgid "Invisible"
 msgstr "éè"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:240
 msgid "Offline"
 msgstr "éç"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:243
 msgctxt "presence"
 msgid "Unknown"
 msgstr "æç"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:283
 msgid "No reason specified"
 msgstr "æææååå"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:341
 msgid "Status is set to offline"
 msgstr "çæèçéç"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:321
 #: ../libempathy-gtk/empathy-call-utils.c:49
-#: ../libempathy-gtk/empathy-new-message-dialog.c:82
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "ççéè"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
 msgid "Authentication failed"
 msgstr "éèåæ"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Encryption error"
 msgstr "ååççéè"
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:293
 msgid "Name in use"
 msgstr "äçäçåç"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:295 ../libempathy/empathy-utils.c:327
 msgid "Certificate not provided"
 msgstr "æææäèæ"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate untrusted"
 msgstr "èæäèää"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate expired"
 msgstr "èæåéæ"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate not activated"
 msgstr "èæåæäç"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate hostname mismatch"
 msgstr "èæäæåçäç"
 
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate fingerprint mismatch"
 msgstr "èææçæäç"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate self-signed"
 msgstr "èæçèæçç"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:309
 msgid "Certificate error"
 msgstr "èæéè"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:343
 msgid "Encryption is not available"
 msgstr "ååçæäç"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:345
 msgid "Certificate is invalid"
 msgstr "èæçæ"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:347
 msgid "Connection has been refused"
 msgstr "éçéæ"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection can't be established"
 msgstr "çæåçéç"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection has been lost"
 msgstr "åååéç"
 
-#: ../libempathy/empathy-utils.c:354
+#: ../libempathy/empathy-utils.c:353
 msgid "This resource is already connected to the server"
 msgstr "æèæåéæèèäæå"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:355
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "éçåèäççåèæçæéçåä"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:358
 msgid "The account already exists on the server"
 msgstr "èåèåçååæäæåä"
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:360
 msgid "Server is currently too busy to handle the connection"
 msgstr "äæåçåéæåçäèæçæèçèéç"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:362
 msgid "Certificate has been revoked"
 msgstr "åæéèæ"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:364
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "èæäçäååçåçæçæïææåçèçäèå"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:367
 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:372
+#: ../libempathy/empathy-utils.c:371
 msgid "Your software is too old"
 msgstr "äçèäéè"
 
-#: ../libempathy/empathy-utils.c:531
+#: ../libempathy/empathy-utils.c:530
 msgid "People Nearby"
 msgstr "éèçä"
 
-#: ../libempathy/empathy-utils.c:536
+#: ../libempathy/empathy-utils.c:535
 msgid "Yahoo! Japan"
 msgstr "Yahoo! ææ"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:564
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:566
+#: ../libempathy/empathy-utils.c:565
 msgid "Facebook Chat"
 msgstr "Facebook èå"
 
@@ -739,98 +727,70 @@ msgstr "æä"
 msgid "All accounts"
 msgstr "ææåè"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:335
 msgid "Account"
 msgstr "åè"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "åç"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "äæå"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "éæå"
 
-#: ../libempathy-gtk/empathy-account-widget.c:776
-#: ../libempathy-gtk/empathy-account-widget.c:828
+#: ../libempathy-gtk/empathy-account-widget.c:763
+#: ../libempathy-gtk/empathy-account-widget.c:815
 #, c-format
 msgid "%s:"
 msgstr "%sï"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1182
-msgid "My Web Accounts"
-msgstr "æçççåè"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1199
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "%s åèåéé %s äæã"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1205
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "%s åèçææ Empathy åäæã"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1224
-msgid "Launch My Web Accounts"
-msgstr "ååæçççåè"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1232
-#, c-format
-msgid "Edit %s"
-msgstr "çè %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1582
+#: ../libempathy-gtk/empathy-account-widget.c:1396
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "äçèåçï"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1900
+#: ../libempathy-gtk/empathy-account-widget.c:1708
 msgid "A_pply"
 msgstr "åç(_A)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1930
+#: ../libempathy-gtk/empathy-account-widget.c:1737
 msgid "L_og in"
 msgstr "çå(_O)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2004
+#: ../libempathy-gtk/empathy-account-widget.c:1810
 msgid "This account already exists on the server"
 msgstr "æåèåçååéåäæåä"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2007
+#: ../libempathy-gtk/empathy-account-widget.c:1814
 msgid "Create a new account on the server"
 msgstr "åéåäæåäåçæçåè"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2199
-msgid "Ca_ncel"
-msgstr "åæ(_N)"
-
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2477
+#: ../libempathy-gtk/empathy-account-widget.c:2239
 #, 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:2503
+#: ../libempathy-gtk/empathy-account-widget.c:2265
 #, c-format
 msgid "%s Account"
 msgstr "%s åè"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2507
+#: ../libempathy-gtk/empathy-account-widget.c:2269
 msgid "New account"
 msgstr "æååè"
 
@@ -878,7 +838,7 @@ msgstr "èäåç"
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
 msgid "Remember password"
 msgstr "èäåç"
 
@@ -1200,7 +1160,7 @@ msgid "STUN Server:"
 msgstr "STUN äæåï"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
 msgid "Server:"
 msgstr "äæåï"
 
@@ -1306,192 +1266,192 @@ msgstr "æååäææçæéèåè"
 msgid "You don't have enough credit in order to place this call"
 msgstr "äçåéäèäèäèéèã"
 
-#: ../libempathy-gtk/empathy-chat.c:706
+#: ../libempathy-gtk/empathy-chat.c:705
 msgid "Failed to open private chat"
 msgstr "éåçäèååæ"
 
-#: ../libempathy-gtk/empathy-chat.c:764
+#: ../libempathy-gtk/empathy-chat.c:763
 msgid "Topic not supported on this conversation"
 msgstr "æèèçäéäèææ"
 
-#: ../libempathy-gtk/empathy-chat.c:770
+#: ../libempathy-gtk/empathy-chat.c:769
 msgid "You are not allowed to change the topic"
 msgstr "ääèåèææéåäé"
 
-#: ../libempathy-gtk/empathy-chat.c:971
+#: ../libempathy-gtk/empathy-chat.c:970
 #, c-format
 msgid "â%sâ is not a valid contact ID"
 msgstr "ã%sãäæææçèçä ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1065
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clearïæéçåèèçææèæ"
 
-#: ../libempathy-gtk/empathy-chat.c:1069
+#: ../libempathy-gtk/empathy-chat.c:1068
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <äé>ïèççåèèçäé"
 
-#: ../libempathy-gtk/empathy-chat.c:1072
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <èåå ID>ïååæçèåå"
 
-#: ../libempathy-gtk/empathy-chat.c:1075
+#: ../libempathy-gtk/empathy-chat.c:1074
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <èåå ID>ïååæçèåå"
 
-#: ../libempathy-gtk/empathy-chat.c:1079
+#: ../libempathy-gtk/empathy-chat.c:1078
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr "/part [<èåå ID>] [<åå>]ïééèååïéèççåçèåå"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1082
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <èçä ID> [<èæ>]ïéåçäèå"
 
-#: ../libempathy-gtk/empathy-chat.c:1086
+#: ../libempathy-gtk/empathy-chat.c:1085
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <èçä ID> <èæ>ïéåçäèå"
 
-#: ../libempathy-gtk/empathy-chat.c:1089
+#: ../libempathy-gtk/empathy-chat.c:1088
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <çå>ïææåçåäæåäçäççå"
 
-#: ../libempathy-gtk/empathy-chat.c:1092
+#: ../libempathy-gtk/empathy-chat.c:1091
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <èæ>ïéåäå ACTION èæåçåçèèä"
 
-#: ../libempathy-gtk/empathy-chat.c:1095
+#: ../libempathy-gtk/empathy-chat.c:1094
 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 æçäååæçèååã"
 
-#: ../libempathy-gtk/empathy-chat.c:1100
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <èçä ID>ïéçèçäççéèè"
 
-#: ../libempathy-gtk/empathy-chat.c:1103
+#: ../libempathy-gtk/empathy-chat.c:1102
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr "/help [<åä>]ïéçææææçæäãåææåçéå <åä> çèïäéçåççæã"
 
-#: ../libempathy-gtk/empathy-chat.c:1122
+#: ../libempathy-gtk/empathy-chat.c:1121
 #, c-format
 msgid "Usage: %s"
 msgstr "çæï%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1167
+#: ../libempathy-gtk/empathy-chat.c:1166
 msgid "Unknown command"
 msgstr "æççåä"
 
-#: ../libempathy-gtk/empathy-chat.c:1293
+#: ../libempathy-gtk/empathy-chat.c:1292
 msgid "Unknown command; see /help for the available commands"
 msgstr "æççæäïèåè /help äåååççæä"
 
-#: ../libempathy-gtk/empathy-chat.c:1457
+#: ../libempathy-gtk/empathy-chat.c:1456
 msgid "insufficient balance to send message"
 msgstr "ééäèäåéèæ"
 
-#: ../libempathy-gtk/empathy-chat.c:1461 ../libempathy-gtk/empathy-chat.c:1475
-#: ../libempathy-gtk/empathy-chat.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1460 ../libempathy-gtk/empathy-chat.c:1474
+#: ../libempathy-gtk/empathy-chat.c:1537
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "åéèæã%sãæççéèï%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1463 ../libempathy-gtk/empathy-chat.c:1480
-#: ../libempathy-gtk/empathy-chat.c:1542
+#: ../libempathy-gtk/empathy-chat.c:1462 ../libempathy-gtk/empathy-chat.c:1479
+#: ../libempathy-gtk/empathy-chat.c:1541
 #, c-format
 msgid "Error sending message: %s"
 msgstr "åéèææççéèï%s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1469
+#: ../libempathy-gtk/empathy-chat.c:1468
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "ééäèäåéèæã<a href='%s'>åå</a>ã"
 
-#: ../libempathy-gtk/empathy-chat.c:1509
+#: ../libempathy-gtk/empathy-chat.c:1508
 msgid "not capable"
 msgstr "çæ"
 
-#: ../libempathy-gtk/empathy-chat.c:1516
+#: ../libempathy-gtk/empathy-chat.c:1515
 msgid "offline"
 msgstr "éç"
 
-#: ../libempathy-gtk/empathy-chat.c:1519
+#: ../libempathy-gtk/empathy-chat.c:1518
 msgid "invalid contact"
 msgstr "çæçèçä"
 
-#: ../libempathy-gtk/empathy-chat.c:1522
+#: ../libempathy-gtk/empathy-chat.c:1521
 msgid "permission denied"
 msgstr "æéèæç"
 
-#: ../libempathy-gtk/empathy-chat.c:1525
+#: ../libempathy-gtk/empathy-chat.c:1524
 msgid "too long message"
 msgstr "åéçèæ"
 
-#: ../libempathy-gtk/empathy-chat.c:1528
+#: ../libempathy-gtk/empathy-chat.c:1527
 msgid "not implemented"
 msgstr "æåä"
 
-#: ../libempathy-gtk/empathy-chat.c:1532
+#: ../libempathy-gtk/empathy-chat.c:1531
 msgid "unknown"
 msgstr "äæ"
 
-#: ../libempathy-gtk/empathy-chat.c:1599 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1598 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "äéï"
 
-#: ../libempathy-gtk/empathy-chat.c:1611
+#: ../libempathy-gtk/empathy-chat.c:1610
 #, c-format
 msgid "Topic set to: %s"
 msgstr "äéèåç: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1612
 msgid "No topic defined"
 msgstr "åæåçäé"
 
-#: ../libempathy-gtk/empathy-chat.c:2126
+#: ../libempathy-gtk/empathy-chat.c:2125
 msgid "(No Suggestions)"
 msgstr "(ææåè)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2194
+#: ../libempathy-gtk/empathy-chat.c:2193
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "ååã%sãèåå"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2231
+#: ../libempathy-gtk/empathy-chat.c:2230
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "ååã%sãè %s åå"
 
-#: ../libempathy-gtk/empathy-chat.c:2301
+#: ../libempathy-gtk/empathy-chat.c:2300
 msgid "Insert Smiley"
 msgstr "æåèæçè"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2319
-#: ../libempathy-gtk/empathy-ui-utils.c:1867
+#: ../libempathy-gtk/empathy-chat.c:2318
+#: ../libempathy-gtk/empathy-ui-utils.c:1868
 msgid "_Send"
 msgstr "åé(_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2376
+#: ../libempathy-gtk/empathy-chat.c:2375
 msgid "_Spelling Suggestions"
 msgstr "æååè(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2465
+#: ../libempathy-gtk/empathy-chat.c:2464
 msgid "Failed to retrieve recent logs"
 msgstr "çæååæèçæè"
 
-#: ../libempathy-gtk/empathy-chat.c:2602
+#: ../libempathy-gtk/empathy-chat.c:2601
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s åæç"
@@ -1499,12 +1459,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:2609
+#: ../libempathy-gtk/empathy-chat.c:2608
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s è %2$s èåå"
 
-#: ../libempathy-gtk/empathy-chat.c:2612
+#: ../libempathy-gtk/empathy-chat.c:2611
 #, c-format
 msgid "%s was kicked"
 msgstr "%s èèå"
@@ -1512,17 +1472,17 @@ msgstr "%s èèå"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2620
+#: ../libempathy-gtk/empathy-chat.c:2619
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s è %2$s èçéåå"
 
-#: ../libempathy-gtk/empathy-chat.c:2623
+#: ../libempathy-gtk/empathy-chat.c:2622
 #, c-format
 msgid "%s was banned"
 msgstr "%s èèçéåå"
 
-#: ../libempathy-gtk/empathy-chat.c:2627
+#: ../libempathy-gtk/empathy-chat.c:2626
 #, c-format
 msgid "%s has left the room"
 msgstr "%s åçééæèåå"
@@ -1532,17 +1492,17 @@ msgstr "%s åçééæèåå"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2636
+#: ../libempathy-gtk/empathy-chat.c:2635
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2661
+#: ../libempathy-gtk/empathy-chat.c:2660
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s åçååæèåå"
 
-#: ../libempathy-gtk/empathy-chat.c:2686
+#: ../libempathy-gtk/empathy-chat.c:2685
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s çåèçç %s"
@@ -1550,79 +1510,80 @@ msgstr "%s çåèçç %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2839
-#: ../src/empathy-streamed-media-window.c:1886
-#: ../src/empathy-event-manager.c:1260 ../src/empathy-call-window.c:1539
-#: ../src/empathy-call-window.c:1589 ../src/empathy-call-window.c:2635
+#: ../libempathy-gtk/empathy-chat.c:2846
+#: ../src/empathy-streamed-media-window.c:1889
+#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538
+#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631
 msgid "Disconnected"
 msgstr "åæç"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3485
+#: ../libempathy-gtk/empathy-chat.c:3492
 msgid "Would you like to store this password?"
 msgstr "äæèååæåçï"
 
-#: ../libempathy-gtk/empathy-chat.c:3491
+#: ../libempathy-gtk/empathy-chat.c:3498
 msgid "Remember"
 msgstr "èä"
 
-#: ../libempathy-gtk/empathy-chat.c:3501
+#: ../libempathy-gtk/empathy-chat.c:3508
 msgid "Not now"
 msgstr "çåäè"
 
-#: ../libempathy-gtk/empathy-chat.c:3545
+#: ../libempathy-gtk/empathy-chat.c:3552
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "éè"
 
-#: ../libempathy-gtk/empathy-chat.c:3549
+#: ../libempathy-gtk/empathy-chat.c:3556
 msgid "Wrong password; please try again:"
 msgstr "åçéèïèåèäæï"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3679
+#: ../libempathy-gtk/empathy-chat.c:3686
 msgid "This room is protected by a password:"
 msgstr "æèåååèåçäèï"
 
-#: ../libempathy-gtk/empathy-chat.c:3706
+#: ../libempathy-gtk/empathy-chat.c:3713
 msgid "Join"
 msgstr "åå"
 
-#: ../libempathy-gtk/empathy-chat.c:3894 ../src/empathy-event-manager.c:1281
+#: ../libempathy-gtk/empathy-chat.c:3901 ../src/empathy-event-manager.c:1301
 msgid "Connected"
 msgstr "æåéç"
 
-#: ../libempathy-gtk/empathy-chat.c:3949
+#: ../libempathy-gtk/empathy-chat.c:3956
 msgid "Conversation"
 msgstr "èè"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3954
+#: ../libempathy-gtk/empathy-chat.c:3961
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:265
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "æçæçæçèåèå"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:267
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "èçäåéææçæäç"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:269
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "èçäåéçæäç"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:271
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "åæçææ"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:275
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "çæåéèçä"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:622
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "çèåéçèçä"
 
@@ -1630,7 +1591,7 @@ msgstr "çèåéçèçä"
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:506
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1441
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid "Account:"
@@ -1660,155 +1621,54 @@ msgid "_Open Link"
 msgstr "éåéç(_O)"
 
 #. Translators: timestamp displayed between conversations in
-#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:417
-msgid "%A %B %d %Y"
-msgstr "%Y %B %d %A"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:287
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "çèèçäèè"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:338
-msgid "Personal Information"
-msgstr "åäèæ"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:439
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
-msgid "New Contact"
-msgstr "æåèçä"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:508
-#: ../libempathy-gtk/empathy-individual-dialogs.c:198
-#, c-format
-msgid "Block %s?"
-msgstr "åé %sï"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:513
-#: ../libempathy-gtk/empathy-individual-dialogs.c:253
-#, c-format
-msgid "Are you sure you want to block '%s' from contacting you again?"
-msgstr "äçåæèåéã%sãèäçæåèäèçåï"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:518
-#: ../libempathy-gtk/empathy-individual-dialogs.c:275
-msgid "_Block"
-msgstr "åé(_B)"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:536
-#: ../libempathy-gtk/empathy-individual-dialogs.c:284
-msgid "_Report this contact as abusive"
-msgid_plural "_Report these contacts as abusive"
-msgstr[0] "ååéäèçäæçåè(_R)"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "çååæå(_L)"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
-msgid "Subscription Request"
-msgstr "èéèæ"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
-msgid "_Block User"
-msgstr "åéäçè(_B)"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1935
-#: ../libempathy-gtk/empathy-individual-view.c:2375
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "æåæèçéççã%sãï"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1937
-#: ../libempathy-gtk/empathy-individual-view.c:2378
-msgid "Removing group"
-msgstr "æåçéçç"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-contact-list-view.c:2059
-#: ../libempathy-gtk/empathy-individual-view.c:2433
-#: ../libempathy-gtk/empathy-individual-view.c:2636
-msgid "_Remove"
-msgstr "çé(_R)"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2015
-#: ../libempathy-gtk/empathy-individual-view.c:2500
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "æåæèçéèçäã%sãï"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2017
-#: ../libempathy-gtk/empathy-individual-view.c:2521
-msgid "Removing contact"
-msgstr "æåçéèçä"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:212
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contactâ"
-msgstr "ååèçä(_A)â"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:287
-msgid "_Block Contact"
-msgstr "åéèçä(_B)"
-
-#. add chat button
-#: ../libempathy-gtk/empathy-contact-menu.c:316
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../libempathy-gtk/empathy-new-message-dialog.c:320
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "èå(_C)"
+#. * chat windows (strftime format string)
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
+msgid "%A %B %d %Y"
+msgstr "%Y %B %d %A"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:348
-#: ../libempathy-gtk/empathy-individual-menu.c:850
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "èééè(_A)"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:278
+msgid "Personal Information"
+msgstr "åäèæ"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:381
-#: ../libempathy-gtk/empathy-individual-menu.c:895
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "èåéè(_V)"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:379
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+msgid "New Contact"
+msgstr "æåèçä"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:427
-#: ../libempathy-gtk/empathy-individual-menu.c:948
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "éåèè(_P)"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:448
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
+#, c-format
+msgid "Block %s?"
+msgstr "åé %sï"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:449
-#: ../libempathy-gtk/empathy-individual-menu.c:989
-msgid "Send File"
-msgstr "åéææ"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:453
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#, c-format
+msgid "Are you sure you want to block '%s' from contacting you again?"
+msgstr "äçåæèåéã%sãèäçæåèäèçåï"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:472
-#: ../libempathy-gtk/empathy-individual-menu.c:1031
-msgid "Share My Desktop"
-msgstr "åäæçæé"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:458
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
+msgid "_Block"
+msgstr "åé(_B)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:501
-#: ../libempathy-gtk/empathy-individual-menu.c:1094
-msgid "Infor_mation"
-msgstr "èè(_M)"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:476
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
+msgid "_Report this contact as abusive"
+msgid_plural "_Report these contacts as abusive"
+msgstr[0] "ååéäèçäæçåè(_R)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:547
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "çè(_E)"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
+msgid "Decide _Later"
+msgstr "çååæå(_L)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:601
-#: ../libempathy-gtk/empathy-individual-menu.c:1285
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "éèäåéåèåå"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
+msgid "Subscription Request"
+msgstr "èéèæ"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:632
-#: ../libempathy-gtk/empathy-individual-menu.c:1331
-msgid "_Invite to Chat Room"
-msgstr "éèåèåå(_I)"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "_Block User"
+msgstr "åéäçè(_B)"
 
 #. Title
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:499
@@ -1835,228 +1695,223 @@ msgstr "äçèæ"
 msgid "Please let me see when you're online. Thanks!"
 msgstr "çääçæèèæçéãæèï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "ééï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:799
-#: ../libempathy-gtk/empathy-individual-widget.c:421
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "åå ISO çï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:801
-#: ../libempathy-gtk/empathy-individual-widget.c:423
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "ååï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:803
-#: ../libempathy-gtk/empathy-individual-widget.c:425
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "åï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:805
-#: ../libempathy-gtk/empathy-individual-widget.c:427
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "åï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:807
-#: ../libempathy-gtk/empathy-individual-widget.c:429
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "ååï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:809
-#: ../libempathy-gtk/empathy-individual-widget.c:431
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "ééåèï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:811
-#: ../libempathy-gtk/empathy-individual-widget.c:433
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "èï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:813
-#: ../libempathy-gtk/empathy-individual-widget.c:435
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "åçï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:815
-#: ../libempathy-gtk/empathy-individual-widget.c:437
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "æåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:817
-#: ../libempathy-gtk/empathy-individual-widget.c:439
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "åï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:819
-#: ../libempathy-gtk/empathy-individual-widget.c:441
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "æåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:821
-#: ../libempathy-gtk/empathy-individual-widget.c:443
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "æèï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:823
-#: ../libempathy-gtk/empathy-individual-widget.c:445
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URIï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:825
-#: ../libempathy-gtk/empathy-individual-widget.c:447
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "æçåççï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:827
-#: ../libempathy-gtk/empathy-individual-widget.c:449
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "éèï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:829
-#: ../libempathy-gtk/empathy-individual-widget.c:451
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "åçèå (ç)ï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:831
-#: ../libempathy-gtk/empathy-individual-widget.c:453
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "æåèå (ç)ï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:833
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "éåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:835
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "æäï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:837
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "çåéåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:839
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "äææææï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:841
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "çåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:843
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "çåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:845
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "çåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:898
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:559
-#: ../libempathy-gtk/empathy-individual-widget.c:574
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:15
 msgid "Location"
 msgstr "äç"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:576
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%sï%s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:967
-#: ../libempathy-gtk/empathy-individual-widget.c:625
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%Y %B %e æ %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1049
-#: ../libempathy-gtk/empathy-individual-widget.c:867
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "åååéè"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1105
-#: ../libempathy-gtk/empathy-individual-widget.c:925
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "çæåååéè"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1793
-#: ../libempathy-gtk/empathy-individual-menu.c:1066
-#: ../libempathy-gtk/empathy-individual-widget.c:1324
-msgid "Favorite"
-msgstr "åå"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
 msgid "Full name"
 msgstr "åå"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
 msgid "Phone number"
 msgstr "éèèç"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
 msgid "E-mail address"
 msgstr "éåäçäå"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
 msgid "Website"
 msgstr "çç"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
 msgid "Birthday"
 msgstr "çæ"
 
 #. Note to translators: this is the caption for a string of the form "5
 #. * minutes ago", and refers to the time since the contact last interacted
 #. * with their IM client.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:111
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
 msgid "Last seen:"
 msgstr "äæçèï"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
 msgid "Connected from:"
 msgstr "åéæåï"
 
 #. FIXME: once Idle implements SimplePresence using this information, we can
 #. * and should bin this.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:117
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
 msgid "Away message:"
 msgstr "ééèæï"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
 msgid "work"
 msgstr "åä"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
 msgid "home"
 msgstr "äå"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
 msgid "mobile"
 msgstr "èå"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
 msgid "voice"
 msgstr "èé"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
 msgid "preferred"
 msgstr "åå"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
 msgid "postal"
 msgstr "éé"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
 msgid "parcel"
 msgstr "åè"
 
@@ -2066,7 +1921,7 @@ msgstr "<b>äç</b> æ (date)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1260
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
 msgid "Alias:"
 msgstr "ååï"
 
@@ -2086,7 +1941,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:1469
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "èåèåï"
 
@@ -2123,100 +1978,185 @@ msgid "Select"
 msgstr "éå"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1953
+#: ../src/empathy-roster-window.c:1919
 msgid "Group"
 msgstr "çç"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:258
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "äåèåèååèåéï"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:265
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "äåèåèåçæèåéï"
 
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "çèèçäèè"
+
 #. Translators: the heading at the top of the Information dialogue
 #: ../libempathy-gtk/empathy-individual-information-dialog.c:288
 msgid "Linked Contacts"
 msgstr "éçèçç"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:370
+#: ../libempathy-gtk/empathy-individual-linker.c:372
 msgid "Select contacts to link"
 msgstr "éåèéççèçä"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:444
+#: ../libempathy-gtk/empathy-individual-linker.c:447
 msgid "New contact preview"
 msgstr "æåèçäéè"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:488
+#: ../libempathy-gtk/empathy-individual-linker.c:491
 msgid "Contacts selected in the list on the left will be linked together."
 msgstr "åæååæçæéèçäåéçåäèã"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo jabber org) and the second is one
 #. * of the user's account IDs (e.g. me hotmail com).
-#: ../libempathy-gtk/empathy-individual-menu.c:145
+#: ../libempathy-gtk/empathy-individual-menu.c:181
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:363
 msgid "Select account to use to place the call"
 msgstr "éåèçäæçéèçåè"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-individual-menu.c:367
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1285
+#: ../src/empathy-streamed-media-window.c:1288
 #: ../src/empathy-call-window.ui.h:2
 msgid "Call"
 msgstr "éè"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:432
 msgid "Mobile"
 msgstr "æåéè"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:434
 msgid "Work"
 msgstr "åä"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:436
 msgid "HOME"
 msgstr "äå"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:677
+msgid "_Block Contact"
+msgstr "åéèçä(_B)"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1055
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "_Chat"
+msgstr "èå(_C)"
+
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:805
-#: ../libempathy-gtk/empathy-new-message-dialog.c:314
+#: ../libempathy-gtk/empathy-individual-menu.c:1090
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1143
+#: ../libempathy-gtk/empathy-individual-menu.c:1123
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "èééè(_A)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1156
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "èåéè(_V)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1197
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Previous Conversations"
+msgstr "éåèè(_P)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1226
+msgid "Send File"
+msgstr "åéææ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1256
+msgid "Share My Desktop"
+msgstr "åäæçæé"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1282
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "åå"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1310
+msgid "Infor_mation"
+msgstr "èè(_M)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1359
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "çè(_E)"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1169
+#: ../libempathy-gtk/empathy-individual-menu.c:1385
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contactsâ"
 msgstr "éçèçä(_L)â"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2340
+#: ../libempathy-gtk/empathy-individual-menu.c:1501
+#: ../src/empathy-chat-window.c:1011
+msgid "Inviting you to this room"
+msgstr "éèäåéåèåå"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1547
+msgid "_Invite to Chat Room"
+msgstr "éèåèåå(_I)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1743
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Add Contactâ"
+msgstr "ååèçä(_A)â"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2355
 msgid "Delete and _Block"
 msgstr "åéäåé(_B)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2509
+#: ../libempathy-gtk/empathy-individual-view.c:2390
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "æåæèçéççã%sãï"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2393
+msgid "Removing group"
+msgstr "æåçéçç"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2448
+#: ../libempathy-gtk/empathy-individual-view.c:2665
+msgid "_Remove"
+msgstr "çé(_R)"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2525
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "æåæèçéèçäã%sãï"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2534
 #, c-format
 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 "äççæèçééçèçäã%sãåïèææéæçéæææææéçèçççèçäã"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1608
+#: ../libempathy-gtk/empathy-individual-view.c:2546
+msgid "Removing contact"
+msgstr "æåçéèçä"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2230,19 +2170,19 @@ msgstr "<b>äç</b> æ (ææ)"
 msgid "Online from a phone or mobile device"
 msgstr "åææææåéèåæäç"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "æåçç"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "éæ IRC çç"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "éèççæå(_N)"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "éå"
@@ -2296,133 +2236,133 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "åæéç(_U)"
 
-#: ../libempathy-gtk/empathy-log-window.c:620
+#: ../libempathy-gtk/empathy-log-window.c:622
 msgid "History"
 msgstr "æå"
 
-#: ../libempathy-gtk/empathy-log-window.c:675
+#: ../libempathy-gtk/empathy-log-window.c:677
 msgid "Show"
 msgstr "éç"
 
-#: ../libempathy-gtk/empathy-log-window.c:697
+#: ../libempathy-gtk/empathy-log-window.c:699
 msgid "Search"
 msgstr "æå"
 
-#: ../libempathy-gtk/empathy-log-window.c:1145
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat in %s"
 msgstr "æ %s åèå"
 
-#: ../libempathy-gtk/empathy-log-window.c:1147
+#: ../libempathy-gtk/empathy-log-window.c:1152
 #, c-format
 msgid "Chat with %s"
 msgstr "è %s èåä"
 
-#: ../libempathy-gtk/empathy-log-window.c:1197
-#: ../libempathy-gtk/empathy-log-window.c:1344
+#: ../libempathy-gtk/empathy-log-window.c:1202
+#: ../libempathy-gtk/empathy-log-window.c:1349
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%Y %B %d %A"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1286
+#: ../libempathy-gtk/empathy-log-window.c:1291
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1292
+#: ../libempathy-gtk/empathy-log-window.c:1297
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%sï</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1368
+#: ../libempathy-gtk/empathy-log-window.c:1373
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s ç"
 
-#: ../libempathy-gtk/empathy-log-window.c:1375
+#: ../libempathy-gtk/empathy-log-window.c:1380
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s åé"
 
-#: ../libempathy-gtk/empathy-log-window.c:1383
+#: ../libempathy-gtk/empathy-log-window.c:1388
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "éèæé %sïçææ %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1715
+#: ../libempathy-gtk/empathy-log-window.c:1722
 msgid "Today"
 msgstr "äæ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1719
+#: ../libempathy-gtk/empathy-log-window.c:1726
 msgid "Yesterday"
 msgstr "ææ"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1734
+#: ../libempathy-gtk/empathy-log-window.c:1741
 msgid "%e %B %Y"
 msgstr "%Yå%B%eæ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1815
-#: ../libempathy-gtk/empathy-log-window.c:3430
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3489
 msgid "Anytime"
 msgstr "ääæé"
 
-#: ../libempathy-gtk/empathy-log-window.c:1902
-#: ../libempathy-gtk/empathy-log-window.c:2358
+#: ../libempathy-gtk/empathy-log-window.c:1918
+#: ../libempathy-gtk/empathy-log-window.c:2402
 msgid "Anyone"
 msgstr "ääå"
 
-#: ../libempathy-gtk/empathy-log-window.c:2671
+#: ../libempathy-gtk/empathy-log-window.c:2715
 msgid "Who"
 msgstr "è"
 
-#: ../libempathy-gtk/empathy-log-window.c:2875
+#: ../libempathy-gtk/empathy-log-window.c:2924
 msgid "When"
 msgstr "äæ"
 
-#: ../libempathy-gtk/empathy-log-window.c:2991
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Anything"
 msgstr "äää"
 
-#: ../libempathy-gtk/empathy-log-window.c:2993
+#: ../libempathy-gtk/empathy-log-window.c:3042
 msgid "Text chats"
 msgstr "æåèå"
 
-#: ../libempathy-gtk/empathy-log-window.c:2995
+#: ../libempathy-gtk/empathy-log-window.c:3044
 #: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "éè"
 
-#: ../libempathy-gtk/empathy-log-window.c:3000
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Incoming calls"
 msgstr "äé"
 
-#: ../libempathy-gtk/empathy-log-window.c:3001
+#: ../libempathy-gtk/empathy-log-window.c:3050
 msgid "Outgoing calls"
 msgstr "æå"
 
-#: ../libempathy-gtk/empathy-log-window.c:3002
+#: ../libempathy-gtk/empathy-log-window.c:3051
 msgid "Missed calls"
 msgstr "ææäé"
 
-#: ../libempathy-gtk/empathy-log-window.c:3024
+#: ../libempathy-gtk/empathy-log-window.c:3073
 msgid "What"
 msgstr "äé"
 
-#: ../libempathy-gtk/empathy-log-window.c:3719
+#: ../libempathy-gtk/empathy-log-window.c:3782
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "äçåèåééåèèçææçéåï"
 
-#: ../libempathy-gtk/empathy-log-window.c:3723
+#: ../libempathy-gtk/empathy-log-window.c:3786
 msgid "Clear All"
 msgstr "æéåé"
 
-#: ../libempathy-gtk/empathy-log-window.c:3730
+#: ../libempathy-gtk/empathy-log-window.c:3793
 msgid "Delete from:"
 msgstr "åéåï"
 
@@ -2451,7 +2391,7 @@ msgstr "èå"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
 #: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
+#: ../src/empathy-roster-window-menubar.ui.h:20
 msgid "_Edit"
 msgstr "çè(_E)"
 
@@ -2463,76 +2403,82 @@ msgstr "ææ(_F)"
 msgid "page 2"
 msgstr "éé 2"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:84
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
 msgid "The contact is offline"
 msgstr "èçäåçéç"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:86
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
 msgid "The specified contact is either invalid or unknown"
 msgstr "æåçèçäçæææç"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:88
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
 msgid "The contact does not support this kind of conversation"
 msgstr "èèçääææééèè"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:90
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
 msgid "The requested functionality is not implemented for this protocol"
 msgstr "èæçåèåæåæååäåä"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:96
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
 msgid "Could not start a conversation with the given contact"
 msgstr "çæååèçåèçäçèè"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
 msgid "You are banned from this channel"
 msgstr "äèæééçå"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
 msgid "This channel is full"
 msgstr "æééåæ"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:102
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
 msgid "You must be invited to join this channel"
 msgstr "äåéèéèæèååæéé"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:104
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
 msgid "Can't proceed while disconnected"
 msgstr "æçæçæèç"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:106
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
 msgid "Permission denied"
 msgstr "èåèæç"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:112
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
 msgid "There was an error starting the conversation"
 msgstr "ååèèæççéè"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:291
-#: ../libempathy-gtk/empathy-new-call-dialog.c:203
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:202
 msgid "Enter a contact identifier or phone number:"
 msgstr "èèåèçäèèèäæéèèçï"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:334
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "æåèè"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:226
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "_Video Call"
 msgstr "èåéè(_V)"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:236
+#: ../libempathy-gtk/empathy-new-call-dialog.c:235
 msgid "_Audio Call"
 msgstr "èééè(_A)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:246
+#: ../libempathy-gtk/empathy-new-call-dialog.c:245
 msgid "New Call"
 msgstr "æåéè"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "<b>%s</b> åèéèåæ"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
 "Enter your password for account\n"
@@ -2743,26 +2689,26 @@ msgstr "èèäæéæääæäéçäç"
 msgid "Certificate Details"
 msgstr "èæèçèæ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1741
+#: ../libempathy-gtk/empathy-ui-utils.c:1742
 msgid "Unable to open URI"
 msgstr "çæéå URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1859
+#: ../libempathy-gtk/empathy-ui-utils.c:1860
 msgid "Select a file"
 msgstr "éæäåææ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1934
+#: ../libempathy-gtk/empathy-ui-utils.c:1935
 msgid "Insufficient free space to save file"
 msgstr "çéäèäååææ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1942
+#: ../libempathy-gtk/empathy-ui-utils.c:1943
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 msgstr "éè %s ççéäååæææïäåæ %s åçãèéæåääçã"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1986
+#: ../libempathy-gtk/empathy-ui-utils.c:1987
 #, c-format
 msgid "Incoming file from %s"
 msgstr "æåäè %s çææ"
@@ -2934,31 +2880,31 @@ msgstr "èæèç"
 msgid "Vietnamese"
 msgstr "èåæ"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:203
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "ææéèèæ"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:276
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "åæéè (Empathy)"
 
-#: ../src/empathy.c:433
+#: ../src/empathy.c:437
 msgid "Don't connect on startup"
 msgstr "ååæäèèåéç"
 
-#: ../src/empathy.c:437
+#: ../src/empathy.c:441
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "ååæäéçèçäæåæääåäåèç"
 
-#: ../src/empathy.c:452
+#: ../src/empathy.c:456
 msgid "- Empathy IM Client"
 msgstr "- Empathy åæéçæç"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:643
 msgid "Error contacting the Account Manager"
 msgstr "èçåèçççåæççéè"
 
-#: ../src/empathy.c:641
+#: ../src/empathy.c:645
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2993,11 +2939,11 @@ msgid ""
 "Street, Fifth Floor, Boston, MA 02110-130159 USA"
 msgstr "äæèåçå Empathy äèæåää GNU éçååèåèçåæïåæéææïåäçï Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "GNOME çåæèæçæççå"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "ååçèæääæèïèéäåéåéäç\n"
@@ -3037,35 +2983,36 @@ msgid ""
 msgstr "äåäåååéåæèååèçèçèææçææåçïçåååãçèãéååååèã"
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
+#: ../src/empathy-account-assistant.c:1274
 msgid "An error occurred"
 msgstr "ççéè"
 
-#: ../src/empathy-account-assistant.c:467
+#: ../src/empathy-account-assistant.c:469
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
 msgid "What kind of chat account do you have?"
 msgstr "äçèååèæåäçï"
 
-#: ../src/empathy-account-assistant.c:473
+#: ../src/empathy-account-assistant.c:475
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "äéæèèååäçèååèåï"
 
-#: ../src/empathy-account-assistant.c:479
+#: ../src/empathy-account-assistant.c:481
 msgid "Enter your account details"
 msgstr "èèåäçåèèçèæ"
 
-#: ../src/empathy-account-assistant.c:484
+#: ../src/empathy-account-assistant.c:486
 msgid "What kind of chat account do you want to create?"
 msgstr "äæèåçäçèååèï"
 
-#: ../src/empathy-account-assistant.c:490
+#: ../src/empathy-account-assistant.c:492
 msgid "Do you want to create other chat accounts?"
 msgstr "æåæèåçåäèååèï"
 
-#: ../src/empathy-account-assistant.c:497
+#: ../src/empathy-account-assistant.c:499
 msgid "Enter the details for the new account"
 msgstr "èèåæåèçèçèæ"
 
-#: ../src/empathy-account-assistant.c:612
+#: ../src/empathy-account-assistant.c:614
 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 "
@@ -3073,41 +3020,41 @@ msgid ""
 "calls."
 msgstr "äç Empathy åäåçäèéèçäèåïææåäç Google TalkãAIMãWindows Live çåäèåçåçæåååäèåãåçéåéæççæåæéåäéèèéæèåéèã"
 
-#: ../src/empathy-account-assistant.c:629
+#: ../src/empathy-account-assistant.c:631
 msgid "Do you have an account you've been using with another chat program?"
 msgstr "äæåæäçåäèåçåçåèï"
 
-#: ../src/empathy-account-assistant.c:652
+#: ../src/empathy-account-assistant.c:655
 msgid "Yes, import my account details from "
 msgstr "æçïèååæçåèèçèææ"
 
-#: ../src/empathy-account-assistant.c:673
+#: ../src/empathy-account-assistant.c:676
 msgid "Yes, I'll enter my account details now"
 msgstr "æçïæçåèèååèçèçèæ"
 
-#: ../src/empathy-account-assistant.c:695
+#: ../src/empathy-account-assistant.c:698
 msgid "No, I want a new account"
 msgstr "äïææèæçåè"
 
-#: ../src/empathy-account-assistant.c:705
+#: ../src/empathy-account-assistant.c:708
 msgid "No, I just want to see people online nearby for now"
 msgstr "äïæçååæççéèæèäç"
 
-#: ../src/empathy-account-assistant.c:726
+#: ../src/empathy-account-assistant.c:729
 msgid "Select the accounts you want to import:"
 msgstr "éæèååçåèï"
 
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
+#: ../src/empathy-account-assistant.c:816
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "Yes"
 msgstr "æ"
 
-#: ../src/empathy-account-assistant.c:820
+#: ../src/empathy-account-assistant.c:823
 msgid "No, that's all for now"
 msgstr "äïçååéæ"
 
-#: ../src/empathy-account-assistant.c:1085
+#: ../src/empathy-account-assistant.c:1088
 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 "
@@ -3115,16 +3062,16 @@ msgid ""
 "disable this feature by using the 'Accounts' dialog"
 msgstr "Empathy åäèåæçèäéçåçåççäçäåïääåäåèåãåæäæèäçæåèïèææäåèçèææåæçãääåäåäåçååææéäççïææçãåèãåèçäåçæåè"
 
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
+#: ../src/empathy-account-assistant.c:1094
+#: ../src/empathy-account-assistant.c:1150
 msgid "Edit->Accounts"
 msgstr "çè -> åè"
 
-#: ../src/empathy-account-assistant.c:1107
+#: ../src/empathy-account-assistant.c:1110
 msgid "I do _not want to enable this feature for now"
 msgstr "æçåäæèåçééåè(_N)"
 
-#: ../src/empathy-account-assistant.c:1143
+#: ../src/empathy-account-assistant.c:1146
 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 "
@@ -3132,85 +3079,93 @@ msgid ""
 "the Accounts dialog"
 msgstr "äçæèéçåäææçççäåèåïåç telepathy-salut åæåèãåæäæèåçæåèïèåè telepathy-salut åäïäåãåèãåèçåçãéèçäãåè"
 
-#: ../src/empathy-account-assistant.c:1149
+#: ../src/empathy-account-assistant.c:1152
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut åæåè"
 
-#: ../src/empathy-account-assistant.c:1195
+#: ../src/empathy-account-assistant.c:1198
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "èæè VoIP åèåç"
 
-#: ../src/empathy-account-assistant.c:1229
+#: ../src/empathy-account-assistant.c:1232
 msgid "Welcome to Empathy"
 msgstr "æèäç Empathy"
 
-#: ../src/empathy-account-assistant.c:1238
+#: ../src/empathy-account-assistant.c:1241
 msgid "Import your existing accounts"
 msgstr "ååçæçåè"
 
-#: ../src/empathy-account-assistant.c:1256
+#: ../src/empathy-account-assistant.c:1259
 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:64
+#: ../src/empathy-accounts-dialog.c:69
 #, 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:68
+#: ../src/empathy-accounts-dialog.c:73
 msgid "Your new account has not been saved yet."
 msgstr "åæååäçæåèã"
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:755
-#: ../src/empathy-call-window.c:1326
+#: ../src/empathy-accounts-dialog.c:352
+#: ../src/empathy-streamed-media-window.c:757
+#: ../src/empathy-call-window.c:1325
 msgid "Connectingâ"
 msgstr "éçäâ"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:393
 #, c-format
 msgid "Offline â %s"
 msgstr "éç â %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:405
 #, c-format
 msgid "Disconnected â %s"
 msgstr "åæç â %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:416
 msgid "Offline â No Network Connection"
 msgstr "éç â çççéç"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:423
 msgid "Unknown Status"
 msgstr "æçççæ"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:435
 msgid "Offline â Account Disabled"
 msgstr "éç â åèååç"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"äåååçæçåèïéææææ\n"
-"äæåçææãçåèççï"
+#: ../src/empathy-accounts-dialog.c:538
+msgid "Edit Connection Parameters"
+msgstr "çèéçåæ"
+
+#: ../src/empathy-accounts-dialog.c:701
+msgid "Failed to retrieve your personal information from the server."
+msgstr "çæåäæåæåäçåäèæã"
+
+#: ../src/empathy-accounts-dialog.c:707
+msgid "Go online to edit your personal information."
+msgstr "äçäçèäçåäèæã"
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:792
+msgid "_Edit Connection Parameters..."
+msgstr "çèéçåæ(_E)..."
+
+#: ../src/empathy-accounts-dialog.c:1293
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "æåæèåäçéèäçéçç %sï"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1297
 msgid "This will not remove your account on the server."
 msgstr "éäæçéäæåäçäçåèã"
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1533
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3219,15 +3174,15 @@ msgstr ""
 "äæåçææãçåèççï"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1744
 msgid "_Enable"
 msgstr "åç(_E)"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1745
 msgid "_Disable"
 msgstr "åç(_D)"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2255
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3261,11 +3216,11 @@ msgstr "èååæçåèïäåéååèæåæçåçéèåå
 msgid "_Importâ"
 msgstr "åå(_I)â"
 
-#: ../src/empathy-auth-client.c:251
+#: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
 msgstr "- Empathy èèçæç"
 
-#: ../src/empathy-auth-client.c:267
+#: ../src/empathy-auth-client.c:302
 msgid "Empathy authentication client"
 msgstr "Empathy èèçæç"
 
@@ -3281,137 +3236,137 @@ msgstr "- Empathy éèèåçæç"
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy éèèåçæç"
 
-#: ../src/empathy-streamed-media-window.c:432
+#: ../src/empathy-streamed-media-window.c:433
 msgid "Contrast"
 msgstr "åæ"
 
-#: ../src/empathy-streamed-media-window.c:435
+#: ../src/empathy-streamed-media-window.c:436
 msgid "Brightness"
 msgstr "äå"
 
-#: ../src/empathy-streamed-media-window.c:438
+#: ../src/empathy-streamed-media-window.c:439
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:543
+#: ../src/empathy-streamed-media-window.c:545
 msgid "Volume"
 msgstr "éé"
 
-#: ../src/empathy-streamed-media-window.c:1094
+#: ../src/empathy-streamed-media-window.c:1097
 msgid "_Sidebar"
 msgstr "åéæ(_S)"
 
-#: ../src/empathy-streamed-media-window.c:1114
+#: ../src/empathy-streamed-media-window.c:1117
 msgid "Audio input"
 msgstr "éæèå"
 
-#: ../src/empathy-streamed-media-window.c:1118
+#: ../src/empathy-streamed-media-window.c:1121
 msgid "Video input"
 msgstr "èåèå"
 
-#: ../src/empathy-streamed-media-window.c:1126
+#: ../src/empathy-streamed-media-window.c:1129
 msgid "Dialpad"
 msgstr "æèç"
 
-#: ../src/empathy-streamed-media-window.c:1137
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Details"
 msgstr "èçèæ"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1206
-#: ../src/empathy-call-window.c:1932
+#: ../src/empathy-streamed-media-window.c:1209
+#: ../src/empathy-call-window.c:1927
 #, c-format
 msgid "Call with %s"
 msgstr "è %s éèä"
 
-#: ../src/empathy-streamed-media-window.c:1439
-#: ../src/empathy-call-window.c:2176
+#: ../src/empathy-streamed-media-window.c:1442
+#: ../src/empathy-call-window.c:2171
 msgid "The IP address as seen by the machine"
 msgstr "æåçèç IP äå"
 
-#: ../src/empathy-streamed-media-window.c:1441
-#: ../src/empathy-call-window.c:2178
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2173
 msgid "The IP address as seen by a server on the Internet"
 msgstr "äèçäçäæåçèç IP äå"
 
-#: ../src/empathy-streamed-media-window.c:1443
-#: ../src/empathy-call-window.c:2180
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2175
 msgid "The IP address of the peer as seen by the other side"
 msgstr "åäççèçéç IP äå"
 
-#: ../src/empathy-streamed-media-window.c:1445
-#: ../src/empathy-call-window.c:2182
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2177
 msgid "The IP address of a relay server"
 msgstr "äçäæåç IP äå"
 
-#: ../src/empathy-streamed-media-window.c:1447
-#: ../src/empathy-call-window.c:2184
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2179
 msgid "The IP address of the multicast group"
 msgstr "åéåæççç IP äå"
 
-#: ../src/empathy-streamed-media-window.c:1835
 #: ../src/empathy-streamed-media-window.c:1838
 #: ../src/empathy-streamed-media-window.c:1841
 #: ../src/empathy-streamed-media-window.c:1844
+#: ../src/empathy-streamed-media-window.c:1847
 msgctxt "codec"
 msgid "Unknown"
 msgstr "æç"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2136
+#: ../src/empathy-streamed-media-window.c:2139
 #, c-format
 msgid "Connected â %d:%02dm"
 msgstr "åéç â %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2197
-#: ../src/empathy-call-window.c:3045
+#: ../src/empathy-streamed-media-window.c:2200
+#: ../src/empathy-call-window.c:3033
 msgid "Technical Details"
 msgstr "æèçç"
 
-#: ../src/empathy-streamed-media-window.c:2235
-#: ../src/empathy-call-window.c:3084
+#: ../src/empathy-streamed-media-window.c:2238
+#: ../src/empathy-call-window.c:3072
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr "%s çèääçèäääéèäæææçéèæå"
 
-#: ../src/empathy-streamed-media-window.c:2240
-#: ../src/empathy-call-window.c:3089
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:3077
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr "%s çèääçèäääéèäæææçèåæå"
 
-#: ../src/empathy-streamed-media-window.c:2246
-#: ../src/empathy-call-window.c:3095
+#: ../src/empathy-streamed-media-window.c:2249
+#: ../src/empathy-call-window.c:3083
 #, 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 åçéçãäååäääåèåäåäåèçæéççççääã"
 
-#: ../src/empathy-streamed-media-window.c:2252
-#: ../src/empathy-call-window.c:3101
+#: ../src/empathy-streamed-media-window.c:2255
+#: ../src/empathy-call-window.c:3089
 msgid "There was a failure on the network"
 msgstr "éåççäæéèçç"
 
-#: ../src/empathy-streamed-media-window.c:2256
-#: ../src/empathy-call-window.c:3105
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3093
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "æéèæåèçéèæååæåäçéèäåè"
 
-#: ../src/empathy-streamed-media-window.c:2259
-#: ../src/empathy-call-window.c:3108
+#: ../src/empathy-streamed-media-window.c:2262
+#: ../src/empathy-call-window.c:3096
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "æéèæåèçèåæååæåäçéèäåè"
 
-#: ../src/empathy-streamed-media-window.c:2269
-#: ../src/empathy-call-window.c:3120
+#: ../src/empathy-streamed-media-window.c:2272
+#: ../src/empathy-call-window.c:3108
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3419,23 +3374,23 @@ msgid ""
 "the Help menu."
 msgstr "å Telepathy åääççæéæççæãè<a href=\"%s\">ååéåéè</a>äéäåæåéååçãééãèçäææéççéã"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:3129
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3117
 msgid "There was a failure in the call engine"
 msgstr "éèåæåæéèçç"
 
-#: ../src/empathy-streamed-media-window.c:2280
-#: ../src/empathy-call-window.c:3132
+#: ../src/empathy-streamed-media-window.c:2283
+#: ../src/empathy-call-window.c:3120
 msgid "The end of the stream was reached"
 msgstr "åéäææç"
 
-#: ../src/empathy-streamed-media-window.c:2320
-#: ../src/empathy-call-window.c:3172
+#: ../src/empathy-streamed-media-window.c:2323
+#: ../src/empathy-call-window.c:3160
 msgid "Can't establish audio stream"
 msgstr "çæåçéèäæ"
 
-#: ../src/empathy-streamed-media-window.c:2330
-#: ../src/empathy-call-window.c:3182
+#: ../src/empathy-streamed-media-window.c:2333
+#: ../src/empathy-call-window.c:3170
 msgid "Can't establish video stream"
 msgstr "çæåçèåäæ"
 
@@ -3526,8 +3481,8 @@ msgstr "åæèååæ"
 
 #: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2584 ../src/empathy-call-window.c:2585
-#: ../src/empathy-call-window.c:2586 ../src/empathy-call-window.c:2587
+#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581
+#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583
 msgid "Unknown"
 msgstr "äæ"
 
@@ -3545,17 +3500,17 @@ msgid "_Camera"
 msgstr "æåæ(_C)"
 
 #: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "_Contents"
 msgstr "åå(_C)"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "_Debug"
 msgstr "åé(_D)"
 
 #: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Help"
 msgstr "æå(_H)"
 
@@ -3568,7 +3523,7 @@ msgid "_Settings"
 msgstr "èåå(_S)"
 
 #: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-roster-window-menubar.ui.h:30
 #: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "æè(_V)"
@@ -3687,96 +3642,96 @@ msgstr "èåéç"
 msgid "Manage Favorite Rooms"
 msgstr "ççååçèåå"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:523
 msgid "Incoming video call"
 msgstr "ååçèåéè"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1556
+#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555
 msgid "Incoming call"
 msgstr "äé"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s èèäéèèåéèãäæåèæèï"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:528
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s èèäéèéèãäæåèæèï"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1562
+#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732
+#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s çäé"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:556
 msgid "_Reject"
 msgstr "æç(_R)"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572
 msgid "_Answer"
 msgstr "æè(_A)"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:572
 msgid "_Answer with video"
 msgstr "äèåæè(_A)"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1562
+#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765
+#: ../src/empathy-call-window.c:1561
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "äè %s çèåéè"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:838
 msgid "Room invitation"
 msgstr "èååéè"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:840
 #, c-format
 msgid "Invitation to join %s"
 msgstr "éèåå %s"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:847
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s æåéèäåå %s"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:855
 msgid "_Decline"
 msgstr "æç(_D)"
 
-#: ../src/empathy-event-manager.c:858
+#: ../src/empathy-event-manager.c:860
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "åå(_J)"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:887
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s æéèäåå %s"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:893
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "äèéèåå %s"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:944
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "æåäè %s çææåè"
 
-#: ../src/empathy-event-manager.c:1145 ../src/empathy-main-window.c:378
+#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:371
 msgid "Password required"
 msgstr "éèåç"
 
-#: ../src/empathy-event-manager.c:1210
+#: ../src/empathy-event-manager.c:1217
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s æèååæçäæåäççèå"
 
-#: ../src/empathy-event-manager.c:1214
+#: ../src/empathy-event-manager.c:1223
 #, c-format
 msgid ""
 "\n"
@@ -3786,105 +3741,105 @@ msgstr ""
 "èæï%s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "äæ"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s / %s æ %s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s / %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "æåææ %2$s éåçã%1$sã"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "æååéã%sãç %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "å %2$s ææã%1$sãæççéè"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "æææææççéè"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "åéã%sãç %s æççéè"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "åéæææççéè"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "ã%sãææè %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "ã%sãåéç %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "ææåèåç"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "æåçååäåèèçåæ"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "æåææææã%sãçåææ"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "æåèçã%sãéæå"
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "ææ"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "åé"
 
@@ -3907,161 +3862,162 @@ msgid "Import Accounts"
 msgstr "åååè"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:315
 msgid "Import"
 msgstr "åå"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:324
 msgid "Protocol"
 msgstr "éèåå"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:348
 msgid "Source"
 msgstr "äæ"
 
-#: ../src/empathy-main-window.c:395
+#: ../src/empathy-roster-window.c:388
 msgid "Provide Password"
 msgstr "æäåç"
 
-#: ../src/empathy-main-window.c:401
+#: ../src/empathy-roster-window.c:394
 msgid "Disconnect"
 msgstr "æç"
 
-#: ../src/empathy-main-window.c:638
+#: ../src/empathy-roster-window.c:626
 msgid "No match found"
 msgstr "æäåçåéç"
 
-#: ../src/empathy-main-window.c:746
+#: ../src/empathy-roster-window.c:733
 #, c-format
 msgid "Sorry, %s accounts canât be used until your %s software is updated."
 msgstr "åææï%s åèçæäçïééäç %s èäåææã"
 
-#: ../src/empathy-main-window.c:814
+#: ../src/empathy-roster-window.c:799
 msgid "Update software..."
 msgstr "ææèä..."
 
-#: ../src/empathy-main-window.c:820 ../src/empathy-main-window.c:941
+#: ../src/empathy-roster-window.c:805 ../src/empathy-roster-window.c:922
 msgid "Close"
 msgstr "éé"
 
-#: ../src/empathy-main-window.c:929
+#: ../src/empathy-roster-window.c:910
 msgid "Reconnect"
 msgstr "éæéæ"
 
-#: ../src/empathy-main-window.c:935
+#: ../src/empathy-roster-window.c:916
 msgid "Edit Account"
 msgstr "çèåè"
 
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:1074
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1060
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "åå %s (%s)..."
 
-#: ../src/empathy-main-window.c:1121
+#: ../src/empathy-roster-window.c:1106
 msgid "Top up account credit"
 msgstr "åååèåé"
 
 #. top up button
-#: ../src/empathy-main-window.c:1192
+#: ../src/empathy-roster-window.c:1178
 msgid "Top Up..."
 msgstr "åå..."
 
-#: ../src/empathy-main-window.c:1935
+#: ../src/empathy-roster-window.c:1901
 msgid "Contact"
 msgstr "èçä"
 
-#: ../src/empathy-main-window.c:2310
+#: ../src/empathy-roster-window.c:2296
 msgid "Contact List"
 msgstr "èçäæå"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
+#: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "èçäåå(_M)"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
+#: ../src/empathy-roster-window-menubar.ui.h:2
 msgid "Credit Balance"
 msgstr "ååéé"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
+#: ../src/empathy-roster-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "æèçäæåååæ(_L)"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
+#: ../src/empathy-roster-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "ååååèåå(_F)"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
+#: ../src/empathy-roster-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "ççåå"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
+#: ../src/empathy-roster-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "æååå(_O)"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-roster-window-menubar.ui.h:7
+#: ../src/empathy-status-icon.ui.h:1
 msgid "New _Callâ"
 msgstr "æåéè(_C)â"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
+#: ../src/empathy-roster-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "æåååèåéè(_A)"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "ååèå(_R)"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
+#: ../src/empathy-roster-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "éçåå(_R)"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "ææåçæå(_N)"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "ææçææå(_S)"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
+#: ../src/empathy-roster-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "åè(_A)"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "èåéçèçä"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "ççåå(_C)"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
+#: ../src/empathy-roster-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "ææåè(_F)"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:23
 msgid "_Joinâ"
 msgstr "åå(_J)â"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-roster-window-menubar.ui.h:24
 #: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversationâ"
 msgstr "æåèè(_N)â"
 
-#: ../src/empathy-main-window-menubar.ui.h:25
+#: ../src/empathy-roster-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "éçèçä(_O)"
 
-#: ../src/empathy-main-window-menubar.ui.h:26
+#: ../src/empathy-roster-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "åäèæ(_P)"
 
-#: ../src/empathy-main-window-menubar.ui.h:28
+#: ../src/empathy-roster-window-menubar.ui.h:28
 msgid "_Room"
 msgstr "èåå(_R)"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
+#: ../src/empathy-roster-window-menubar.ui.h:29
 msgid "_Search for Contactsâ"
 msgstr "æåèçä(_S)â"
 
@@ -4075,7 +4031,7 @@ 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:623
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4088,16 +4044,16 @@ msgstr ""
 "éèåçï%s\n"
 "æåï%s"
 
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "å"
 
-#: ../src/empathy-new-chatroom-dialog.c:654
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "çæéåååèååæå"
 
-#: ../src/empathy-new-chatroom-dialog.c:664
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "çæåæååèååæå"
 
@@ -4128,79 +4084,79 @@ msgstr "èååæå"
 msgid "_Room:"
 msgstr "èåå(_R)ï"
 
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "èæåæå"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "èæåéå"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "æåèè"
 
-#: ../src/empathy-preferences.c:172
+#: ../src/empathy-preferences.c:169
 msgid "Contact goes online"
 msgstr "èçääç"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "èçäéç"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "åèåéç"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "åèåæç"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "èè"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:725
 msgid "Juliet"
 msgstr "çèå"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:732
 msgid "Romeo"
 msgstr "æåä"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:738
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "çççèèèåïçääèååéï"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:741
 msgid "Deny thy father and refuse thy name;"
 msgstr "èçäæèääïçäçåæèåã"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:744
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "èçåäæèèïææééåéåã"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:747
 msgid "And I'll no longer be a Capulet."
 msgstr "ççèäéååïååçïæéäã"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:750
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "åäæåççèïçåäçäçéã"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:753
 msgid "Juliet has disconnected"
 msgstr "çèååæç"
 
-#: ../src/empathy-preferences.c:1175
+#: ../src/empathy-preferences.c:1157
 msgid "Preferences"
 msgstr "ååèå"
 
@@ -4256,109 +4212,101 @@ msgstr "çèèåçæåææï"
 msgid "General"
 msgstr "äè"
 
-#: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "èåççï"
-
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "èåééï"
-
-#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "äçäæï"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:17
 msgid "Log conversations"
 msgstr "çéèè"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:18
 msgid "Notifications"
 msgstr "éç"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:19
 msgid "Play sound for events"
 msgstr "ææääéæ"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:20
 msgid "Privacy"
 msgstr "çé"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:21
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
 "decimal place."
 msgstr "éääçæçåææéääæåçååãæåååæèåéäåïäææäåäèæãGPS çåææçååæéçåäæã"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:22
 msgid "Show _smileys as images"
 msgstr "åèæçèäåçéç(_S)"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:23
 msgid "Show contact _list in rooms"
 msgstr "åèååéçèçäæå(_L)"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "éæ"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:25
 msgid "Spell Checking"
 msgstr "æåææ"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:26
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "éèçèèæåååæåäåçåèååçèèã"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:27
 msgid "Themes"
 msgstr "äæäé"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:28
 msgid "Use _echo cancellation to improve call quality"
 msgstr "äçåéæéäæåéèåè(_E)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:29
 msgid "Variant:"
 msgstr "æåï"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:30
 msgid "_Automatically connect on startup"
 msgstr "ååæèåéç(_A)"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Cellphone"
 msgstr "ææ(_C)"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Enable bubble notifications"
 msgstr "åçææåéç(_E)"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable sound notifications"
 msgstr "åçéæéç(_E)"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:34
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:35
 msgid "_Network (IP, Wi-Fi)"
 msgstr "çç (IP, Wi-Fi)(_N)"
 
-#: ../src/empathy-preferences.ui.h:38
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Open new chats in separate windows"
 msgstr "åååèçéåæçèå(_O)"
 
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Publish location to my contacts"
 msgstr "åæçèçäåéäç(_P)"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345Â is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:41
+#: ../src/empathy-preferences.ui.h:39
 msgid "_Reduce location accuracy"
 msgstr "éääçæçå(_R)"
 
@@ -4418,7 +4366,7 @@ msgstr "èåéå"
 msgid "Video Preview"
 msgstr "èåéè"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "èçäååæè"
 
@@ -4484,16 +4432,16 @@ msgid ""
 "extension."
 msgstr "éåçéççççåäææéçåéæååèã"
 
-#: ../src/empathy-invite-participant-dialog.c:197
-#: ../src/empathy-invite-participant-dialog.c:225
+#: ../src/empathy-invite-participant-dialog.c:200
+#: ../src/empathy-invite-participant-dialog.c:228
 msgid "Invite Participant"
 msgstr "éèåè"
 
-#: ../src/empathy-invite-participant-dialog.c:198
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Choose a contact to invite into the conversation:"
 msgstr "éææèéèéåèèçèçäï"
 
-#: ../src/empathy-invite-participant-dialog.c:221
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite"
 msgstr "éè"
 
@@ -4547,13 +4495,13 @@ msgid "Respond"
 msgstr "åæ"
 
 #: ../src/empathy-notifications-approver.c:204
-#: ../src/empathy-call-window.c:1566
+#: ../src/empathy-call-window.c:1565
 msgid "Reject"
 msgstr "æç"
 
 #: ../src/empathy-notifications-approver.c:209
 #: ../src/empathy-notifications-approver.c:214
-#: ../src/empathy-call-window.c:1567
+#: ../src/empathy-call-window.c:1566
 msgid "Answer"
 msgstr "æè"
 
@@ -4585,38 +4533,38 @@ msgstr "%s ååææçäïääæèääéèã"
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1173 ../src/empathy-call-window.c:1196
+#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195
 msgid "i"
 msgstr "è"
 
-#: ../src/empathy-call-window.c:2941
+#: ../src/empathy-call-window.c:2929
 msgid "On hold"
 msgstr "äç"
 
-#: ../src/empathy-call-window.c:2944
+#: ../src/empathy-call-window.c:2932
 msgid "Mute"
 msgstr "éé"
 
-#: ../src/empathy-call-window.c:2946
+#: ../src/empathy-call-window.c:2934
 msgid "Duration"
 msgstr "æé"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2949
+#: ../src/empathy-call-window.c:2937
 #, c-format
 msgid "%s â %d:%02dm"
 msgstr "%s â %d:%02dm"
 
-#: ../src/empathy-call-window.c:3219
+#: ../src/empathy-call-window.c:3207
 #, c-format
 msgid "Your current balance is %s."
 msgstr "äçåçééç %sã"
 
-#: ../src/empathy-call-window.c:3223
+#: ../src/empathy-call-window.c:3211
 msgid "Sorry, you donât have enough credit for that call."
 msgstr "åææïäçåéäèäéèèéèã"
 
-#: ../src/empathy-call-window.c:3225
+#: ../src/empathy-call-window.c:3213
 msgid "Top Up"
 msgstr "åå"
 
@@ -4624,6 +4572,54 @@ msgstr "åå"
 msgid "_Match case"
 msgstr "æåååå(_M)"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "æååè"
+
+#~ msgid "Call volume"
+#~ msgstr "éèéé"
+
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "éèééïççåæã"
+
+#~ msgid "Socket type not supported"
+#~ msgstr "Socket éåäææ"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "æççèåè"
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "%s åèåéé %s äæã"
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "%s åèçææ Empathy åäæã"
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "ååæççèåè"
+
+#~ msgid "Edit %s"
+#~ msgstr "çè %s"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "åæ(_N)"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "çè(_E)"
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "æåååçæçåèïéææææ\n"
+#~ "ææåçèæãçåèççï"
+
+#~ msgid "Input level:"
+#~ msgstr "èåççï"
+
+#~ msgid "Input volume:"
+#~ msgstr "èåééï"
+
 #~ msgid "Empathy has migrated butterfly logs"
 #~ msgstr "Empathy åèç butterfly æè"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 26d7e05..45ccd3b 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy 3.3.1\n"
+"Project-Id-Version: empathy 3.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-12 19:09+0800\n"
-"PO-Revision-Date: 2011-11-12 13:49+0800\n"
+"POT-Creation-Date: 2012-01-14 20:22+0800\n"
+"PO-Revision-Date: 2012-01-14 00:38+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
 "Language-Team: Chinese (traditional) <chinese-l10n googlegroups com>\n"
 "Language: zh_TW\n"
@@ -40,425 +40,417 @@ msgid "Always open a separate chat window for new chats."
 msgstr "æéçæåæçèåéåæçèåèçã"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "éèéé"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "éèééïççåæã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid "Camera device"
 msgstr "æåæèç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
 msgid "Camera position"
 msgstr "æåæäç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr "åççèåääçæçèé (tab) æèååæçäåçååã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
 msgid "Chat window theme"
 msgstr "èåèçäæäé"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid "Chat window theme variant"
 msgstr "èåèçäæäéæå"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr "äéèåéèäçæåææçèèæå (åïã en, fr, nlã)ã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Compact contact list"
 msgstr "ççéçäæå"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid "Connection managers should be used"
 msgstr "äçéççççå"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Contact list sort criterion"
 msgstr "éçäæåæåæå"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "D-Bus object path of the last account selected to join a room."
 msgstr "äæèååèååæéååèç D-Bus çäèåã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr "èçæèèéèçéèæåæèçïäï/dev/video0ã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Default directory to select an avatar image from"
 msgstr "çäéæåéèåççéèçé"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Disable popup notifications when away"
 msgstr "ççæçééæåçåååéç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable sounds when away"
 msgstr "ççæçééæåçéæ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Display incoming events in the status area"
 msgstr "åçæååéçæåää"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
 msgstr "åçæååéçæåääãåæäåççèïæåääæçæåççäçèã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid "Echo cancellation support"
 msgstr "åéæéææ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Empathy can publish the user's location"
 msgstr "Empathy åäçåäçèçäç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy åäåç GPS äææäç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy åäåçèåéèçèååèäææäç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy åäåççèäææäç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy default download folder"
 msgstr "Empathy éèäèèæå"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy should auto-away when idle"
 msgstr "Empathy çéçææèèåèçéé"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy ååæèåéç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy æéääççæçå"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy èäçéçäçåéèåçèåèçåç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Enable WebKit Developer Tools"
 msgstr "åç WebKit éçèåå"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Enable popup notifications for new messages"
 msgstr "åçæèæçåååéç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable spell checker"
 msgstr "åçæåææçå"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Hide main window"
 msgstr "éèäèç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Hide the main window."
 msgstr "éèäèçã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Last account selected in Join Room dialog"
 msgstr "äæåãååèååãåèçéåçåè"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Nick completed character"
 msgstr "æçèéåå"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Open new chats in separate windows"
 msgstr "åååèçéåæçèå"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Path of the Adium theme to use"
 msgstr "èäçç Adium äæäéèå"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 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:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Play a sound for incoming messages"
 msgstr "æåèææææéæ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for new conversations"
 msgstr "çéåæçèèæææéæ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for outgoing messages"
 msgstr "éåèææææéæ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound when a contact logs in"
 msgstr "çéçäçåæææéæ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs out"
 msgstr "çæéçäçåæææéæ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when we log in"
 msgstr "çæåçåæææéæ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log out"
 msgstr "çæåçåæææéæ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "åæèåèçååçéåååéç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications when a contact logs in"
 msgstr "çéçäçåæååéç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs out"
 msgstr "çéçäçåæååéç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Position the camera preview should be during a call."
 msgstr "éèææåæéèæèææçäçã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "Show Balance in contact list"
 msgstr "æèçäæååéçéé"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Show avatars"
 msgstr "éçåéè"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show contact list in rooms"
 msgstr "åèååéçéçäæå"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show hint about closing the main window"
 msgstr "ééäèçæéçæç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show offline contacts"
 msgstr "éçéçéçä"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show protocols"
 msgstr "éçåå"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Spell checking languages"
 msgstr "æåææçèè"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "The default folder to save file transfers in."
 msgstr "çäååææåèææææçéèèæåã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The last directory that an avatar image was chosen from."
 msgstr "äæéæåéèåçççéã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The position for the chat window side pane"
 msgstr "èåèçåçæçäç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "èåèçåçæçååäç (åäçåç)ã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "çäéçåèåèçäèèçäæäéã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr "çäåèåèçéçèèçäæäéæåã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "Use graphical smileys"
 msgstr "äçåçåèæçè"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use notification sounds"
 msgstr "äçéçéæ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use theme for chat rooms"
 msgstr "åèååäçäæäé"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Empathy æåèåäçèçäççåçäçéçäã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Empathy æåäç GPS äææäçã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Empathy æåäçèåéèçèäææäçã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Empathy æåäççèäææäçã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Empathy æåæåååæèåçåæçåèã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr "Empathy æåæåäçèéçæèååæçééæåã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "Empathy æååæéççççæääççæçåã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 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:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "æååç WebKit éçèååïäå Web Inspectorã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
 msgstr "æåäçéççççåèåæçæéæéçã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "æåäæèåçèèææèåæçéåã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "æååèèäçèæçèèæçåçååã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr "æåèåç Pulseaudio çåéæééæåã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "æåææéæäéçæéçäçåçèã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "æåææéæäéçæéçäçåçèã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of events."
 msgstr "æåææéæäéçæääççã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "æåææéæäéçææåèæã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "æåææéæäéçæçèèã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "æåææéæäéçæéåèæã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound when logging into a network."
 msgstr "ççåæçèææåææéæã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound when logging out of a network."
 msgstr "ççåæçèææåææéæã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play sound notifications when away or busy."
 msgstr "ççæçééæåçææåææéæéçã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "çéçäéçææåéçåååéçã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "çéçääçææåéçåååéçã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
 msgstr "æåæèæææåéçåååéç (åäåéåèåèçïäææçåçé)ã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "çæåæèæææåéçåååéçã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid "Whether to show account balances in the contact list."
 msgstr "æåèåèçäæååéçåæééã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "æååéçäæåèèåèçéçéçäåéèã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "æååéçäæåäéçéççéçäã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid "Whether to show popup notifications when away or busy."
 msgstr "ççæçééæåçææåéçåååéçã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "æåèåèçäæååéçèçääçååã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show the contact list in chat rooms."
 msgstr "æååèååäéçéçäæåã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show the contact list in compact mode."
 msgstr "æåäççæåéçéçäæåã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
 msgstr "æååäçæéåçãxãæéééäèçæïéçèæåèçã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to use the theme for chat rooms."
 msgstr "æåçèååäçäæäéã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 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 "
@@ -473,23 +465,51 @@ msgstr "ççèæè VoIP åè"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2312
+#: ../src/empathy-accounts-dialog.c:2406
 msgid "Messaging and VoIP Accounts"
 msgstr "èæè VoIP åè"
 
-#: ../libempathy/empathy-ft-handler.c:838
+#: ../libempathy/empathy-ft-handler.c:736
+msgid "No reason was specified"
+msgstr "æææååå"
+
+#: ../libempathy/empathy-ft-handler.c:739
+msgid "The change in state was requested"
+msgstr "åèæèæçæ"
+
+#: ../libempathy/empathy-ft-handler.c:742
+msgid "You canceled the file transfer"
+msgstr "æååæææåè"
+
+#: ../libempathy/empathy-ft-handler.c:745
+msgid "The other participant canceled the file transfer"
+msgstr "åäçåèèåæäææåè"
+
+#: ../libempathy/empathy-ft-handler.c:748
+msgid "Error while trying to transfer the file"
+msgstr "åèåèæææççéè"
+
+#: ../libempathy/empathy-ft-handler.c:751
+msgid "The other participant is unable to transfer the file"
+msgstr "åäçåèèçæåèèææ"
+
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:311
+msgid "Unknown reason"
+msgstr "äæåå"
+
+#: ../libempathy/empathy-ft-handler.c:917
 msgid "File transfer completed, but the file was corrupted"
 msgstr "ææåèåçïäæææåææ"
 
-#: ../libempathy/empathy-ft-handler.c:1124
+#: ../libempathy/empathy-ft-handler.c:1203
 msgid "File transfer not supported by remote contact"
 msgstr "éçéçääææææåè"
 
-#: ../libempathy/empathy-ft-handler.c:1180
+#: ../libempathy/empathy-ft-handler.c:1259
 msgid "The selected file is not a regular file"
 msgstr "éåçææäææèçææ"
 
-#: ../libempathy/empathy-ft-handler.c:1189
+#: ../libempathy/empathy-ft-handler.c:1268
 msgid "The selected file is empty"
 msgstr "éåçæææççç"
 
@@ -509,191 +529,159 @@ msgstr "åææ %s"
 msgid "Call from %s"
 msgstr "%s çäé"
 
-#: ../libempathy/empathy-tp-file.c:258
-msgid "Socket type not supported"
-msgstr "Socket éåäææ"
-
-#: ../libempathy/empathy-tp-file.c:377
-msgid "No reason was specified"
-msgstr "æææååå"
-
-#: ../libempathy/empathy-tp-file.c:380
-msgid "The change in state was requested"
-msgstr "åèæèæçæ"
-
-#: ../libempathy/empathy-tp-file.c:383
-msgid "You canceled the file transfer"
-msgstr "æååæææåè"
-
-#: ../libempathy/empathy-tp-file.c:386
-msgid "The other participant canceled the file transfer"
-msgstr "åäçåèèåæäææåè"
-
-#: ../libempathy/empathy-tp-file.c:389
-msgid "Error while trying to transfer the file"
-msgstr "åèåèæææççéè"
-
-#: ../libempathy/empathy-tp-file.c:392
-msgid "The other participant is unable to transfer the file"
-msgstr "åäçåèèçæåèèææ"
-
-#: ../libempathy/empathy-tp-file.c:395 ../libempathy/empathy-utils.c:312
-msgid "Unknown reason"
-msgstr "äæåå"
-
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:231
 msgid "Available"
 msgstr "æç"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:233
 msgid "Busy"
 msgstr "åç"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:236
 msgid "Away"
 msgstr "éé"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:238
 msgid "Invisible"
 msgstr "éè"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:240
 msgid "Offline"
 msgstr "éç"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:243
 msgctxt "presence"
 msgid "Unknown"
 msgstr "æç"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:283
 msgid "No reason specified"
 msgstr "æææååå"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:341
 msgid "Status is set to offline"
 msgstr "çæèçéç"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:321
 #: ../libempathy-gtk/empathy-call-utils.c:49
-#: ../libempathy-gtk/empathy-new-message-dialog.c:82
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "çèéè"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
 msgid "Authentication failed"
 msgstr "éèåæ"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Encryption error"
 msgstr "ååççéè"
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:293
 msgid "Name in use"
 msgstr "äçäçåç"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:295 ../libempathy/empathy-utils.c:327
 msgid "Certificate not provided"
 msgstr "æææäæè"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate untrusted"
 msgstr "æèäèää"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate expired"
 msgstr "æèåéæ"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate not activated"
 msgstr "æèåæäç"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate hostname mismatch"
 msgstr "æèäæåçäç"
 
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate fingerprint mismatch"
 msgstr "æèæçæäç"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate self-signed"
 msgstr "æèçèæçç"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:309
 msgid "Certificate error"
 msgstr "æèéè"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:343
 msgid "Encryption is not available"
 msgstr "ååçæäç"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:345
 msgid "Certificate is invalid"
 msgstr "æèçæ"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:347
 msgid "Connection has been refused"
 msgstr "éçéæ"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection can't be established"
 msgstr "çæåçéç"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection has been lost"
 msgstr "åååéç"
 
-#: ../libempathy/empathy-utils.c:354
+#: ../libempathy/empathy-utils.c:353
 msgid "This resource is already connected to the server"
 msgstr "æèæåéæèèäæå"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:355
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "éçåèäççåèæçæéçåä"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:358
 msgid "The account already exists on the server"
 msgstr "èåèåçååæäæåä"
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:360
 msgid "Server is currently too busy to handle the connection"
 msgstr "äæåçåéæåçäèæçæèçèéç"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:362
 msgid "Certificate has been revoked"
 msgstr "åæéæè"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:364
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "æèäçäååçåçæçæïææåçèçäèå"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:367
 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:372
+#: ../libempathy/empathy-utils.c:371
 msgid "Your software is too old"
 msgstr "æçèééè"
 
-#: ../libempathy/empathy-utils.c:531
+#: ../libempathy/empathy-utils.c:530
 msgid "People Nearby"
 msgstr "éèçä"
 
-#: ../libempathy/empathy-utils.c:536
+#: ../libempathy/empathy-utils.c:535
 msgid "Yahoo! Japan"
 msgstr "Yahoo! ææ"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:564
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:566
+#: ../libempathy/empathy-utils.c:565
 msgid "Facebook Chat"
 msgstr "Facebook èå"
 
@@ -741,98 +729,70 @@ msgstr "æä"
 msgid "All accounts"
 msgstr "ææåè"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:335
 msgid "Account"
 msgstr "åè"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "åç"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "äæå"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "éæå"
 
-#: ../libempathy-gtk/empathy-account-widget.c:776
-#: ../libempathy-gtk/empathy-account-widget.c:828
+#: ../libempathy-gtk/empathy-account-widget.c:763
+#: ../libempathy-gtk/empathy-account-widget.c:815
 #, c-format
 msgid "%s:"
 msgstr "%sï"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1182
-msgid "My Web Accounts"
-msgstr "æççèåè"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1199
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "%s åèåéé %s äæã"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1205
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "%s åèçææ Empathy åäæã"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1224
-msgid "Launch My Web Accounts"
-msgstr "ååæççèåè"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1232
-#, c-format
-msgid "Edit %s"
-msgstr "çè %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1582
+#: ../libempathy-gtk/empathy-account-widget.c:1396
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "äçèåçï"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1900
+#: ../libempathy-gtk/empathy-account-widget.c:1708
 msgid "A_pply"
 msgstr "åç(_A)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1930
+#: ../libempathy-gtk/empathy-account-widget.c:1737
 msgid "L_og in"
 msgstr "çå(_O)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2004
+#: ../libempathy-gtk/empathy-account-widget.c:1810
 msgid "This account already exists on the server"
 msgstr "æåèåçååéåäæåä"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2007
+#: ../libempathy-gtk/empathy-account-widget.c:1814
 msgid "Create a new account on the server"
 msgstr "åéåäæåäåçæçåè"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2199
-msgid "Ca_ncel"
-msgstr "åæ(_N)"
-
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2477
+#: ../libempathy-gtk/empathy-account-widget.c:2239
 #, 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:2503
+#: ../libempathy-gtk/empathy-account-widget.c:2265
 #, c-format
 msgid "%s Account"
 msgstr "%s åè"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2507
+#: ../libempathy-gtk/empathy-account-widget.c:2269
 msgid "New account"
 msgstr "æååè"
 
@@ -880,7 +840,7 @@ msgstr "èäåç"
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
 msgid "Remember password"
 msgstr "èäåç"
 
@@ -1203,7 +1163,7 @@ msgid "STUN Server:"
 msgstr "STUN äæåï"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
 msgid "Server:"
 msgstr "äæåï"
 
@@ -1309,62 +1269,62 @@ msgstr "æååäææçæéèåè"
 msgid "You don't have enough credit in order to place this call"
 msgstr "æçåéäèäèäèéèã"
 
-#: ../libempathy-gtk/empathy-chat.c:706
+#: ../libempathy-gtk/empathy-chat.c:705
 msgid "Failed to open private chat"
 msgstr "éåçäèååæ"
 
-#: ../libempathy-gtk/empathy-chat.c:764
+#: ../libempathy-gtk/empathy-chat.c:763
 msgid "Topic not supported on this conversation"
 msgstr "æèèçäéäèææ"
 
-#: ../libempathy-gtk/empathy-chat.c:770
+#: ../libempathy-gtk/empathy-chat.c:769
 msgid "You are not allowed to change the topic"
 msgstr "æäèåèèæéåäé"
 
-#: ../libempathy-gtk/empathy-chat.c:971
+#: ../libempathy-gtk/empathy-chat.c:970
 #, c-format
 msgid "â%sâ is not a valid contact ID"
 msgstr "ã%sãäæææçéçä ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1065
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clearïæéçåèèçææèæ"
 
-#: ../libempathy-gtk/empathy-chat.c:1069
+#: ../libempathy-gtk/empathy-chat.c:1068
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <äé>ïèççåèèçäé"
 
-#: ../libempathy-gtk/empathy-chat.c:1072
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <èåå ID>ïååæçèåå"
 
-#: ../libempathy-gtk/empathy-chat.c:1075
+#: ../libempathy-gtk/empathy-chat.c:1074
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <èåå ID>ïååæçèåå"
 
-#: ../libempathy-gtk/empathy-chat.c:1079
+#: ../libempathy-gtk/empathy-chat.c:1078
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr "/part [<èåå ID>] [<åå>]ïééèååïéèççåçèåå"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1082
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <èçä ID> [<èæ>]ïéåçäèå"
 
-#: ../libempathy-gtk/empathy-chat.c:1086
+#: ../libempathy-gtk/empathy-chat.c:1085
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <èçä ID> <èæ>ïéåçäèå"
 
-#: ../libempathy-gtk/empathy-chat.c:1089
+#: ../libempathy-gtk/empathy-chat.c:1088
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <æç>ïèæåçåäæåäçæçæç"
 
-#: ../libempathy-gtk/empathy-chat.c:1092
+#: ../libempathy-gtk/empathy-chat.c:1091
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <èæ>ïéåäå ACTION èæåçåçèèä"
 
-#: ../libempathy-gtk/empathy-chat.c:1095
+#: ../libempathy-gtk/empathy-chat.c:1094
 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 "
@@ -1373,11 +1333,11 @@ msgstr ""
 "/say <èæ>ïéå <èæ> åçåçèèäãéçæåéäã/ãééçèæãèää"
 "èïã/say /join æçäååæçèååã"
 
-#: ../libempathy-gtk/empathy-chat.c:1100
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <èçä ID>ïéçèçäççéèè"
 
-#: ../libempathy-gtk/empathy-chat.c:1103
+#: ../libempathy-gtk/empathy-chat.c:1102
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1385,120 +1345,120 @@ msgstr ""
 "/help [<åä>]ïéçææææçæäãåææåçéå <åä> çèïäéçåçç"
 "æã"
 
-#: ../libempathy-gtk/empathy-chat.c:1122
+#: ../libempathy-gtk/empathy-chat.c:1121
 #, c-format
 msgid "Usage: %s"
 msgstr "çæï%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1167
+#: ../libempathy-gtk/empathy-chat.c:1166
 msgid "Unknown command"
 msgstr "æççåä"
 
-#: ../libempathy-gtk/empathy-chat.c:1293
+#: ../libempathy-gtk/empathy-chat.c:1292
 msgid "Unknown command; see /help for the available commands"
 msgstr "æççæäïèåè /help äåååççæä"
 
-#: ../libempathy-gtk/empathy-chat.c:1457
+#: ../libempathy-gtk/empathy-chat.c:1456
 msgid "insufficient balance to send message"
 msgstr "ééäèäåéèæ"
 
-#: ../libempathy-gtk/empathy-chat.c:1461 ../libempathy-gtk/empathy-chat.c:1475
-#: ../libempathy-gtk/empathy-chat.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1460 ../libempathy-gtk/empathy-chat.c:1474
+#: ../libempathy-gtk/empathy-chat.c:1537
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "åéèæã%sãæççéèï%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1463 ../libempathy-gtk/empathy-chat.c:1480
-#: ../libempathy-gtk/empathy-chat.c:1542
+#: ../libempathy-gtk/empathy-chat.c:1462 ../libempathy-gtk/empathy-chat.c:1479
+#: ../libempathy-gtk/empathy-chat.c:1541
 #, c-format
 msgid "Error sending message: %s"
 msgstr "åéèææççéèï%s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1469
+#: ../libempathy-gtk/empathy-chat.c:1468
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "ééäèäåéèæã<a href='%s'>åå</a>ã"
 
-#: ../libempathy-gtk/empathy-chat.c:1509
+#: ../libempathy-gtk/empathy-chat.c:1508
 msgid "not capable"
 msgstr "çæ"
 
-#: ../libempathy-gtk/empathy-chat.c:1516
+#: ../libempathy-gtk/empathy-chat.c:1515
 msgid "offline"
 msgstr "éç"
 
-#: ../libempathy-gtk/empathy-chat.c:1519
+#: ../libempathy-gtk/empathy-chat.c:1518
 msgid "invalid contact"
 msgstr "çæçéçä"
 
-#: ../libempathy-gtk/empathy-chat.c:1522
+#: ../libempathy-gtk/empathy-chat.c:1521
 msgid "permission denied"
 msgstr "æéèæç"
 
-#: ../libempathy-gtk/empathy-chat.c:1525
+#: ../libempathy-gtk/empathy-chat.c:1524
 msgid "too long message"
 msgstr "åéçèæ"
 
-#: ../libempathy-gtk/empathy-chat.c:1528
+#: ../libempathy-gtk/empathy-chat.c:1527
 msgid "not implemented"
 msgstr "æåä"
 
-#: ../libempathy-gtk/empathy-chat.c:1532
+#: ../libempathy-gtk/empathy-chat.c:1531
 msgid "unknown"
 msgstr "äæ"
 
-#: ../libempathy-gtk/empathy-chat.c:1599 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1598 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "äéï"
 
-#: ../libempathy-gtk/empathy-chat.c:1611
+#: ../libempathy-gtk/empathy-chat.c:1610
 #, c-format
 msgid "Topic set to: %s"
 msgstr "äéèåç: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1612
 msgid "No topic defined"
 msgstr "åæåçäé"
 
-#: ../libempathy-gtk/empathy-chat.c:2126
+#: ../libempathy-gtk/empathy-chat.c:2125
 msgid "(No Suggestions)"
 msgstr "(ææåè)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2194
+#: ../libempathy-gtk/empathy-chat.c:2193
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "ååã%sãèåå"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2231
+#: ../libempathy-gtk/empathy-chat.c:2230
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "ååã%sãè %s åå"
 
-#: ../libempathy-gtk/empathy-chat.c:2301
+#: ../libempathy-gtk/empathy-chat.c:2300
 msgid "Insert Smiley"
 msgstr "æåèæçè"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2319
-#: ../libempathy-gtk/empathy-ui-utils.c:1867
+#: ../libempathy-gtk/empathy-chat.c:2318
+#: ../libempathy-gtk/empathy-ui-utils.c:1868
 msgid "_Send"
 msgstr "åé(_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2376
+#: ../libempathy-gtk/empathy-chat.c:2375
 msgid "_Spelling Suggestions"
 msgstr "æååè(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2465
+#: ../libempathy-gtk/empathy-chat.c:2464
 msgid "Failed to retrieve recent logs"
 msgstr "çæååæèçæè"
 
-#: ../libempathy-gtk/empathy-chat.c:2602
+#: ../libempathy-gtk/empathy-chat.c:2601
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s åæç"
@@ -1506,12 +1466,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:2609
+#: ../libempathy-gtk/empathy-chat.c:2608
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s è %2$s èåå"
 
-#: ../libempathy-gtk/empathy-chat.c:2612
+#: ../libempathy-gtk/empathy-chat.c:2611
 #, c-format
 msgid "%s was kicked"
 msgstr "%s èèå"
@@ -1519,17 +1479,17 @@ msgstr "%s èèå"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2620
+#: ../libempathy-gtk/empathy-chat.c:2619
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s è %2$s èçéåå"
 
-#: ../libempathy-gtk/empathy-chat.c:2623
+#: ../libempathy-gtk/empathy-chat.c:2622
 #, c-format
 msgid "%s was banned"
 msgstr "%s èèçéåå"
 
-#: ../libempathy-gtk/empathy-chat.c:2627
+#: ../libempathy-gtk/empathy-chat.c:2626
 #, c-format
 msgid "%s has left the room"
 msgstr "%s åçééæèåå"
@@ -1539,17 +1499,17 @@ msgstr "%s åçééæèåå"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2636
+#: ../libempathy-gtk/empathy-chat.c:2635
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2661
+#: ../libempathy-gtk/empathy-chat.c:2660
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s åçååæèåå"
 
-#: ../libempathy-gtk/empathy-chat.c:2686
+#: ../libempathy-gtk/empathy-chat.c:2685
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s çåèçç %s"
@@ -1557,79 +1517,80 @@ msgstr "%s çåèçç %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2839
-#: ../src/empathy-streamed-media-window.c:1886
-#: ../src/empathy-event-manager.c:1260 ../src/empathy-call-window.c:1539
-#: ../src/empathy-call-window.c:1589 ../src/empathy-call-window.c:2635
+#: ../libempathy-gtk/empathy-chat.c:2846
+#: ../src/empathy-streamed-media-window.c:1889
+#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538
+#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631
 msgid "Disconnected"
 msgstr "åæç"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3485
+#: ../libempathy-gtk/empathy-chat.c:3492
 msgid "Would you like to store this password?"
 msgstr "ææèååæåçï"
 
-#: ../libempathy-gtk/empathy-chat.c:3491
+#: ../libempathy-gtk/empathy-chat.c:3498
 msgid "Remember"
 msgstr "èä"
 
-#: ../libempathy-gtk/empathy-chat.c:3501
+#: ../libempathy-gtk/empathy-chat.c:3508
 msgid "Not now"
 msgstr "çåäè"
 
-#: ../libempathy-gtk/empathy-chat.c:3545
+#: ../libempathy-gtk/empathy-chat.c:3552
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "éè"
 
-#: ../libempathy-gtk/empathy-chat.c:3549
+#: ../libempathy-gtk/empathy-chat.c:3556
 msgid "Wrong password; please try again:"
 msgstr "åçéèïèåèäæï"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3679
+#: ../libempathy-gtk/empathy-chat.c:3686
 msgid "This room is protected by a password:"
 msgstr "æèåååèåçäèï"
 
-#: ../libempathy-gtk/empathy-chat.c:3706
+#: ../libempathy-gtk/empathy-chat.c:3713
 msgid "Join"
 msgstr "åå"
 
-#: ../libempathy-gtk/empathy-chat.c:3894 ../src/empathy-event-manager.c:1281
+#: ../libempathy-gtk/empathy-chat.c:3901 ../src/empathy-event-manager.c:1301
 msgid "Connected"
 msgstr "æåéç"
 
-#: ../libempathy-gtk/empathy-chat.c:3949
+#: ../libempathy-gtk/empathy-chat.c:3956
 msgid "Conversation"
 msgstr "èè"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3954
+#: ../libempathy-gtk/empathy-chat.c:3961
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:265
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "æçæçæçèåèå"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:267
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "èçäåéææçæäç"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:269
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "èçäåéçæäç"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:271
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "åæçææ"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:275
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "çæåéèçä"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:622
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "çèåéçèçä"
 
@@ -1637,7 +1598,7 @@ msgstr "çèåéçèçä"
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:506
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1441
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid "Account:"
@@ -1667,155 +1628,54 @@ msgid "_Open Link"
 msgstr "éåéç(_O)"
 
 #. Translators: timestamp displayed between conversations in
-#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:417
-msgid "%A %B %d %Y"
-msgstr "%Y %B %d %A"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:287
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "çèéçäèè"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:338
-msgid "Personal Information"
-msgstr "åäèè"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:439
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
-msgid "New Contact"
-msgstr "æåéçä"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:508
-#: ../libempathy-gtk/empathy-individual-dialogs.c:198
-#, c-format
-msgid "Block %s?"
-msgstr "åé %sï"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:513
-#: ../libempathy-gtk/empathy-individual-dialogs.c:253
-#, c-format
-msgid "Are you sure you want to block '%s' from contacting you again?"
-msgstr "æçåæèåéã%sãèäçæåèæèçåï"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:518
-#: ../libempathy-gtk/empathy-individual-dialogs.c:275
-msgid "_Block"
-msgstr "åé(_B)"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:536
-#: ../libempathy-gtk/empathy-individual-dialogs.c:284
-msgid "_Report this contact as abusive"
-msgid_plural "_Report these contacts as abusive"
-msgstr[0] "ååéäèçäæçåè(_R)"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "çååæå(_L)"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
-msgid "Subscription Request"
-msgstr "èéèæ"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
-msgid "_Block User"
-msgstr "åéäçè(_B)"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1935
-#: ../libempathy-gtk/empathy-individual-view.c:2375
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "æåæèçéççã%sãï"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1937
-#: ../libempathy-gtk/empathy-individual-view.c:2378
-msgid "Removing group"
-msgstr "æåçéçç"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-contact-list-view.c:2059
-#: ../libempathy-gtk/empathy-individual-view.c:2433
-#: ../libempathy-gtk/empathy-individual-view.c:2636
-msgid "_Remove"
-msgstr "çé(_R)"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2015
-#: ../libempathy-gtk/empathy-individual-view.c:2500
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "æåæèçééçäã%sãï"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2017
-#: ../libempathy-gtk/empathy-individual-view.c:2521
-msgid "Removing contact"
-msgstr "æåçééçä"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:212
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contactâ"
-msgstr "ååèçä(_A)â"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:287
-msgid "_Block Contact"
-msgstr "åéèçä(_B)"
-
-#. add chat button
-#: ../libempathy-gtk/empathy-contact-menu.c:316
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../libempathy-gtk/empathy-new-message-dialog.c:320
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "èå(_C)"
+#. * chat windows (strftime format string)
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
+msgid "%A %B %d %Y"
+msgstr "%Y %B %d %A"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:348
-#: ../libempathy-gtk/empathy-individual-menu.c:850
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "èééè(_A)"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:278
+msgid "Personal Information"
+msgstr "åäèè"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:381
-#: ../libempathy-gtk/empathy-individual-menu.c:895
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "èèéè(_V)"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:379
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+msgid "New Contact"
+msgstr "æåéçä"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:427
-#: ../libempathy-gtk/empathy-individual-menu.c:948
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "éåèè(_P)"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:448
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
+#, c-format
+msgid "Block %s?"
+msgstr "åé %sï"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:449
-#: ../libempathy-gtk/empathy-individual-menu.c:989
-msgid "Send File"
-msgstr "åéææ"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:453
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#, c-format
+msgid "Are you sure you want to block '%s' from contacting you again?"
+msgstr "æçåæèåéã%sãèäçæåèæèçåï"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:472
-#: ../libempathy-gtk/empathy-individual-menu.c:1031
-msgid "Share My Desktop"
-msgstr "åäæçæé"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:458
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
+msgid "_Block"
+msgstr "åé(_B)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:501
-#: ../libempathy-gtk/empathy-individual-menu.c:1094
-msgid "Infor_mation"
-msgstr "èè(_M)"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:476
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
+msgid "_Report this contact as abusive"
+msgid_plural "_Report these contacts as abusive"
+msgstr[0] "ååéäèçäæçåè(_R)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:547
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "çè(_E)"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
+msgid "Decide _Later"
+msgstr "çååæå(_L)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:601
-#: ../libempathy-gtk/empathy-individual-menu.c:1285
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "éèæåéåèåå"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
+msgid "Subscription Request"
+msgstr "èéèæ"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:632
-#: ../libempathy-gtk/empathy-individual-menu.c:1331
-msgid "_Invite to Chat Room"
-msgstr "éèåèåå(_I)"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "_Block User"
+msgstr "åéäçè(_B)"
 
 #. Title
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:499
@@ -1842,228 +1702,223 @@ msgstr "æçèæ"
 msgid "Please let me see when you're online. Thanks!"
 msgstr "çæäçæèèæçéãæèï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "ééï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:799
-#: ../libempathy-gtk/empathy-individual-widget.c:421
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "åå ISO çï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:801
-#: ../libempathy-gtk/empathy-individual-widget.c:423
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "ååï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:803
-#: ../libempathy-gtk/empathy-individual-widget.c:425
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "åï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:805
-#: ../libempathy-gtk/empathy-individual-widget.c:427
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "åï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:807
-#: ../libempathy-gtk/empathy-individual-widget.c:429
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "ååï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:809
-#: ../libempathy-gtk/empathy-individual-widget.c:431
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "ééåèï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:811
-#: ../libempathy-gtk/empathy-individual-widget.c:433
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "èï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:813
-#: ../libempathy-gtk/empathy-individual-widget.c:435
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "åçï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:815
-#: ../libempathy-gtk/empathy-individual-widget.c:437
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "æåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:817
-#: ../libempathy-gtk/empathy-individual-widget.c:439
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "åï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:819
-#: ../libempathy-gtk/empathy-individual-widget.c:441
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "æåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:821
-#: ../libempathy-gtk/empathy-individual-widget.c:443
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "æèï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:823
-#: ../libempathy-gtk/empathy-individual-widget.c:445
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URIï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:825
-#: ../libempathy-gtk/empathy-individual-widget.c:447
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "æçåççï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:827
-#: ../libempathy-gtk/empathy-individual-widget.c:449
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "éèï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:829
-#: ../libempathy-gtk/empathy-individual-widget.c:451
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "åçèå (åå)ï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:831
-#: ../libempathy-gtk/empathy-individual-widget.c:453
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "æåèå (åå)ï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:833
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "éåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:835
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "æäï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:837
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "çåéåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:839
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "äææææï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:841
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "çåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:843
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "çåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:845
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "çåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:898
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:559
-#: ../libempathy-gtk/empathy-individual-widget.c:574
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:15
 msgid "Location"
 msgstr "äç"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:576
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%sï%s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:967
-#: ../libempathy-gtk/empathy-individual-widget.c:625
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%Y %B %e æ %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1049
-#: ../libempathy-gtk/empathy-individual-widget.c:867
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "åååéè"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1105
-#: ../libempathy-gtk/empathy-individual-widget.c:925
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "çæåååéè"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1793
-#: ../libempathy-gtk/empathy-individual-menu.c:1066
-#: ../libempathy-gtk/empathy-individual-widget.c:1324
-msgid "Favorite"
-msgstr "åå"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
 msgid "Full name"
 msgstr "åå"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
 msgid "Phone number"
 msgstr "éèèç"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
 msgid "E-mail address"
 msgstr "éåäçäå"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
 msgid "Website"
 msgstr "çç"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
 msgid "Birthday"
 msgstr "çæ"
 
 #. Note to translators: this is the caption for a string of the form "5
 #. * minutes ago", and refers to the time since the contact last interacted
 #. * with their IM client.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:111
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
 msgid "Last seen:"
 msgstr "äæçèï"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
 msgid "Connected from:"
 msgstr "åéæåï"
 
 #. FIXME: once Idle implements SimplePresence using this information, we can
 #. * and should bin this.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:117
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
 msgid "Away message:"
 msgstr "ééèæï"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
 msgid "work"
 msgstr "åä"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
 msgid "home"
 msgstr "äå"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
 msgid "mobile"
 msgstr "èå"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
 msgid "voice"
 msgstr "èé"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
 msgid "preferred"
 msgstr "åå"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
 msgid "postal"
 msgstr "éé"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
 msgid "parcel"
 msgstr "åè"
 
@@ -2073,7 +1928,7 @@ msgstr "<b>äç</b> æ (date)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1260
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
 msgid "Alias:"
 msgstr "ååï"
 
@@ -2093,7 +1948,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:1469
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "èåèåï"
 
@@ -2131,93 +1986,174 @@ msgid "Select"
 msgstr "éå"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1953
+#: ../src/empathy-roster-window.c:1919
 msgid "Group"
 msgstr "çç"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:258
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "äåèåèååèåéï"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:265
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "äåèåèåçæèåéï"
 
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "çèéçäèè"
+
 #. Translators: the heading at the top of the Information dialogue
 #: ../libempathy-gtk/empathy-individual-information-dialog.c:288
 msgid "Linked Contacts"
 msgstr "éçèçç"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:370
+#: ../libempathy-gtk/empathy-individual-linker.c:372
 msgid "Select contacts to link"
 msgstr "éåèéççéçä"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:444
+#: ../libempathy-gtk/empathy-individual-linker.c:447
 msgid "New contact preview"
 msgstr "æåéçäéè"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:488
+#: ../libempathy-gtk/empathy-individual-linker.c:491
 msgid "Contacts selected in the list on the left will be linked together."
 msgstr "åæååæçæéèçäåéçåäèã"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo jabber org) and the second is one
 #. * of the user's account IDs (e.g. me hotmail com).
-#: ../libempathy-gtk/empathy-individual-menu.c:145
+#: ../libempathy-gtk/empathy-individual-menu.c:181
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:363
 msgid "Select account to use to place the call"
 msgstr "éåèçäæçéèçåè"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-individual-menu.c:367
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1285
+#: ../src/empathy-streamed-media-window.c:1288
 #: ../src/empathy-call-window.ui.h:2
 msgid "Call"
 msgstr "éè"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:432
 msgid "Mobile"
 msgstr "èåéè"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:434
 msgid "Work"
 msgstr "åä"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:436
 msgid "HOME"
 msgstr "äå"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:677
+msgid "_Block Contact"
+msgstr "åéèçä(_B)"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1055
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "_Chat"
+msgstr "èå(_C)"
+
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:805
-#: ../libempathy-gtk/empathy-new-message-dialog.c:314
+#: ../libempathy-gtk/empathy-individual-menu.c:1090
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1143
+#: ../libempathy-gtk/empathy-individual-menu.c:1123
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "èééè(_A)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1156
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "èèéè(_V)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1197
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Previous Conversations"
+msgstr "éåèè(_P)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1226
+msgid "Send File"
+msgstr "åéææ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1256
+msgid "Share My Desktop"
+msgstr "åäæçæé"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1282
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "åå"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1310
+msgid "Infor_mation"
+msgstr "èè(_M)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1359
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "çè(_E)"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1169
+#: ../libempathy-gtk/empathy-individual-menu.c:1385
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contactsâ"
 msgstr "éçèçä(_L)â"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2340
+#: ../libempathy-gtk/empathy-individual-menu.c:1501
+#: ../src/empathy-chat-window.c:1011
+msgid "Inviting you to this room"
+msgstr "éèæåéåèåå"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1547
+msgid "_Invite to Chat Room"
+msgstr "éèåèåå(_I)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1743
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Add Contactâ"
+msgstr "ååèçä(_A)â"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2355
 msgid "Delete and _Block"
 msgstr "åéäåé(_B)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2509
+#: ../libempathy-gtk/empathy-individual-view.c:2390
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "æåæèçéççã%sãï"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2393
+msgid "Removing group"
+msgstr "æåçéçç"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2448
+#: ../libempathy-gtk/empathy-individual-view.c:2665
+msgid "_Remove"
+msgstr "çé(_R)"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2525
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "æåæèçééçäã%sãï"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2534
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2226,7 +2162,11 @@ msgstr ""
 "æççæèçééçèçäã%sãåïèææéæçéæææææéçèçççèç"
 "äã"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1608
+#: ../libempathy-gtk/empathy-individual-view.c:2546
+msgid "Removing contact"
+msgstr "æåçééçä"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2240,19 +2180,19 @@ msgstr "<b>äç</b> æ (ææ)"
 msgid "Online from a phone or mobile device"
 msgstr "åæææèåèçäç"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "æåçè"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "éæ IRC çè"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "éèçèæå(_N)"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "éå"
@@ -2307,133 +2247,133 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "åæéç(_U)"
 
-#: ../libempathy-gtk/empathy-log-window.c:620
+#: ../libempathy-gtk/empathy-log-window.c:622
 msgid "History"
 msgstr "æå"
 
-#: ../libempathy-gtk/empathy-log-window.c:675
+#: ../libempathy-gtk/empathy-log-window.c:677
 msgid "Show"
 msgstr "éç"
 
-#: ../libempathy-gtk/empathy-log-window.c:697
+#: ../libempathy-gtk/empathy-log-window.c:699
 msgid "Search"
 msgstr "æå"
 
-#: ../libempathy-gtk/empathy-log-window.c:1145
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat in %s"
 msgstr "æ %s åèå"
 
-#: ../libempathy-gtk/empathy-log-window.c:1147
+#: ../libempathy-gtk/empathy-log-window.c:1152
 #, c-format
 msgid "Chat with %s"
 msgstr "è %s èåä"
 
-#: ../libempathy-gtk/empathy-log-window.c:1197
-#: ../libempathy-gtk/empathy-log-window.c:1344
+#: ../libempathy-gtk/empathy-log-window.c:1202
+#: ../libempathy-gtk/empathy-log-window.c:1349
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%Y %B %d %A"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1286
+#: ../libempathy-gtk/empathy-log-window.c:1291
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1292
+#: ../libempathy-gtk/empathy-log-window.c:1297
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%sï</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1368
+#: ../libempathy-gtk/empathy-log-window.c:1373
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s ç"
 
-#: ../libempathy-gtk/empathy-log-window.c:1375
+#: ../libempathy-gtk/empathy-log-window.c:1380
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s åé"
 
-#: ../libempathy-gtk/empathy-log-window.c:1383
+#: ../libempathy-gtk/empathy-log-window.c:1388
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "éèæé %sïçææ %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1715
+#: ../libempathy-gtk/empathy-log-window.c:1722
 msgid "Today"
 msgstr "äæ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1719
+#: ../libempathy-gtk/empathy-log-window.c:1726
 msgid "Yesterday"
 msgstr "ææ"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1734
+#: ../libempathy-gtk/empathy-log-window.c:1741
 msgid "%e %B %Y"
 msgstr "%Yå%B%eæ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1815
-#: ../libempathy-gtk/empathy-log-window.c:3430
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3489
 msgid "Anytime"
 msgstr "ääæé"
 
-#: ../libempathy-gtk/empathy-log-window.c:1902
-#: ../libempathy-gtk/empathy-log-window.c:2358
+#: ../libempathy-gtk/empathy-log-window.c:1918
+#: ../libempathy-gtk/empathy-log-window.c:2402
 msgid "Anyone"
 msgstr "ääå"
 
-#: ../libempathy-gtk/empathy-log-window.c:2671
+#: ../libempathy-gtk/empathy-log-window.c:2715
 msgid "Who"
 msgstr "è"
 
-#: ../libempathy-gtk/empathy-log-window.c:2875
+#: ../libempathy-gtk/empathy-log-window.c:2924
 msgid "When"
 msgstr "äæ"
 
-#: ../libempathy-gtk/empathy-log-window.c:2991
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Anything"
 msgstr "äää"
 
-#: ../libempathy-gtk/empathy-log-window.c:2993
+#: ../libempathy-gtk/empathy-log-window.c:3042
 msgid "Text chats"
 msgstr "æåèå"
 
-#: ../libempathy-gtk/empathy-log-window.c:2995
+#: ../libempathy-gtk/empathy-log-window.c:3044
 #: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "éè"
 
-#: ../libempathy-gtk/empathy-log-window.c:3000
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Incoming calls"
 msgstr "äé"
 
-#: ../libempathy-gtk/empathy-log-window.c:3001
+#: ../libempathy-gtk/empathy-log-window.c:3050
 msgid "Outgoing calls"
 msgstr "æå"
 
-#: ../libempathy-gtk/empathy-log-window.c:3002
+#: ../libempathy-gtk/empathy-log-window.c:3051
 msgid "Missed calls"
 msgstr "ææäé"
 
-#: ../libempathy-gtk/empathy-log-window.c:3024
+#: ../libempathy-gtk/empathy-log-window.c:3073
 msgid "What"
 msgstr "äé"
 
-#: ../libempathy-gtk/empathy-log-window.c:3719
+#: ../libempathy-gtk/empathy-log-window.c:3782
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "æçåèåééåèèçææçéåï"
 
-#: ../libempathy-gtk/empathy-log-window.c:3723
+#: ../libempathy-gtk/empathy-log-window.c:3786
 msgid "Clear All"
 msgstr "æéåé"
 
-#: ../libempathy-gtk/empathy-log-window.c:3730
+#: ../libempathy-gtk/empathy-log-window.c:3793
 msgid "Delete from:"
 msgstr "åéåï"
 
@@ -2462,7 +2402,7 @@ msgstr "èè"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
 #: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
+#: ../src/empathy-roster-window-menubar.ui.h:20
 msgid "_Edit"
 msgstr "çè(_E)"
 
@@ -2474,76 +2414,82 @@ msgstr "ææ(_F)"
 msgid "page 2"
 msgstr "éé 2"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:84
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
 msgid "The contact is offline"
 msgstr "èçäåçéç"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:86
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
 msgid "The specified contact is either invalid or unknown"
 msgstr "æåçèçäçæææç"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:88
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
 msgid "The contact does not support this kind of conversation"
 msgstr "èèçääææééèè"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:90
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
 msgid "The requested functionality is not implemented for this protocol"
 msgstr "èæçåèåæåæååäåä"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:96
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
 msgid "Could not start a conversation with the given contact"
 msgstr "çæååèçåèçäçèè"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
 msgid "You are banned from this channel"
 msgstr "æèæééçå"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
 msgid "This channel is full"
 msgstr "æééåæ"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:102
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
 msgid "You must be invited to join this channel"
 msgstr "æåéèéèæèååæéé"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:104
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
 msgid "Can't proceed while disconnected"
 msgstr "æçæçæèç"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:106
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
 msgid "Permission denied"
 msgstr "èåèæç"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:112
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
 msgid "There was an error starting the conversation"
 msgstr "ååèèæççéè"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:291
-#: ../libempathy-gtk/empathy-new-call-dialog.c:203
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:202
 msgid "Enter a contact identifier or phone number:"
 msgstr "èèåèçäèèèäæéèèçï"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:334
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "æåèè"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:226
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "_Video Call"
 msgstr "èèéè(_V)"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:236
+#: ../libempathy-gtk/empathy-new-call-dialog.c:235
 msgid "_Audio Call"
 msgstr "èééè(_A)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:246
+#: ../libempathy-gtk/empathy-new-call-dialog.c:245
 msgid "New Call"
 msgstr "æåéè"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "<b>%s</b> åèéèåæ"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
 "Enter your password for account\n"
@@ -2754,26 +2700,26 @@ msgstr "èèäæéæääæäéçäç"
 msgid "Certificate Details"
 msgstr "æèèçèæ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1741
+#: ../libempathy-gtk/empathy-ui-utils.c:1742
 msgid "Unable to open URI"
 msgstr "çæéå URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1859
+#: ../libempathy-gtk/empathy-ui-utils.c:1860
 msgid "Select a file"
 msgstr "éæäåææ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1934
+#: ../libempathy-gtk/empathy-ui-utils.c:1935
 msgid "Insufficient free space to save file"
 msgstr "çéäèäååææ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1942
+#: ../libempathy-gtk/empathy-ui-utils.c:1943
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 msgstr "éè %s ççéäååæææïäåæ %s åçãèéæåääçã"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1986
+#: ../libempathy-gtk/empathy-ui-utils.c:1987
 #, c-format
 msgid "Incoming file from %s"
 msgstr "æåäè %s çææ"
@@ -2945,31 +2891,31 @@ msgstr "èæèç"
 msgid "Vietnamese"
 msgstr "èåæ"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:203
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "ææéèèæ"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:276
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "åæéè (Empathy)"
 
-#: ../src/empathy.c:433
+#: ../src/empathy.c:437
 msgid "Don't connect on startup"
 msgstr "ååæäèèåéç"
 
-#: ../src/empathy.c:437
+#: ../src/empathy.c:441
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "ååæäéçéçäæåæääåäåèç"
 
-#: ../src/empathy.c:452
+#: ../src/empathy.c:456
 msgid "- Empathy IM Client"
 msgstr "- Empathy åæéçæç"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:643
 msgid "Error contacting the Account Manager"
 msgstr "èçåèçççåæççéè"
 
-#: ../src/empathy.c:641
+#: ../src/empathy.c:645
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3012,11 +2958,11 @@ msgstr ""
 "çï Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, "
 "Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "GNOME çåæèæçæççå"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "ååçèæääæèïèéäåéåéäç\n"
@@ -3058,35 +3004,36 @@ msgstr ""
 "èã"
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
+#: ../src/empathy-account-assistant.c:1274
 msgid "An error occurred"
 msgstr "ççéè"
 
-#: ../src/empathy-account-assistant.c:467
+#: ../src/empathy-account-assistant.c:469
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
 msgid "What kind of chat account do you have?"
 msgstr "æçèååèæåäçï"
 
-#: ../src/empathy-account-assistant.c:473
+#: ../src/empathy-account-assistant.c:475
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "æéæèèååäçèååèåï"
 
-#: ../src/empathy-account-assistant.c:479
+#: ../src/empathy-account-assistant.c:481
 msgid "Enter your account details"
 msgstr "èèåæçåèèçèæ"
 
-#: ../src/empathy-account-assistant.c:484
+#: ../src/empathy-account-assistant.c:486
 msgid "What kind of chat account do you want to create?"
 msgstr "ææèåçäçèååèï"
 
-#: ../src/empathy-account-assistant.c:490
+#: ../src/empathy-account-assistant.c:492
 msgid "Do you want to create other chat accounts?"
 msgstr "æåæèåçåäèååèï"
 
-#: ../src/empathy-account-assistant.c:497
+#: ../src/empathy-account-assistant.c:499
 msgid "Enter the details for the new account"
 msgstr "èèåæåèçèçèæ"
 
-#: ../src/empathy-account-assistant.c:612
+#: ../src/empathy-account-assistant.c:614
 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 "
@@ -3097,41 +3044,41 @@ msgstr ""
 "Live çåäèåçåçæåååäèåãåçéåéæçèæåæéåäéèèéæè"
 "èéèã"
 
-#: ../src/empathy-account-assistant.c:629
+#: ../src/empathy-account-assistant.c:631
 msgid "Do you have an account you've been using with another chat program?"
 msgstr "ææåæäçåäèåçåçåèï"
 
-#: ../src/empathy-account-assistant.c:652
+#: ../src/empathy-account-assistant.c:655
 msgid "Yes, import my account details from "
 msgstr "æçïèååæçåèèçèææ"
 
-#: ../src/empathy-account-assistant.c:673
+#: ../src/empathy-account-assistant.c:676
 msgid "Yes, I'll enter my account details now"
 msgstr "æçïæçåèèååèçèçèæ"
 
-#: ../src/empathy-account-assistant.c:695
+#: ../src/empathy-account-assistant.c:698
 msgid "No, I want a new account"
 msgstr "äïææèæçåè"
 
-#: ../src/empathy-account-assistant.c:705
+#: ../src/empathy-account-assistant.c:708
 msgid "No, I just want to see people online nearby for now"
 msgstr "äïæçååæççéèæèäç"
 
-#: ../src/empathy-account-assistant.c:726
+#: ../src/empathy-account-assistant.c:729
 msgid "Select the accounts you want to import:"
 msgstr "éæèååçåèï"
 
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
+#: ../src/empathy-account-assistant.c:816
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "Yes"
 msgstr "æ"
 
-#: ../src/empathy-account-assistant.c:820
+#: ../src/empathy-account-assistant.c:823
 msgid "No, that's all for now"
 msgstr "äïçååéæ"
 
-#: ../src/empathy-account-assistant.c:1085
+#: ../src/empathy-account-assistant.c:1088
 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 "
@@ -3142,16 +3089,16 @@ msgstr ""
 "çæåèïèææäåèçèææåæçãæäåäåäåçååèæéäççïææ"
 "çãåèãåèçäåçæåè"
 
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
+#: ../src/empathy-account-assistant.c:1094
+#: ../src/empathy-account-assistant.c:1150
 msgid "Edit->Accounts"
 msgstr "çè -> åè"
 
-#: ../src/empathy-account-assistant.c:1107
+#: ../src/empathy-account-assistant.c:1110
 msgid "I do _not want to enable this feature for now"
 msgstr "æçåäæèåçééåè(_N)"
 
-#: ../src/empathy-account-assistant.c:1143
+#: ../src/empathy-account-assistant.c:1146
 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 "
@@ -3162,85 +3109,93 @@ msgstr ""
 "åçæåèïèåè telepathy-salut åäïäåãåèãåèçåçãéèçäãå"
 "è"
 
-#: ../src/empathy-account-assistant.c:1149
+#: ../src/empathy-account-assistant.c:1152
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut åæåè"
 
-#: ../src/empathy-account-assistant.c:1195
+#: ../src/empathy-account-assistant.c:1198
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "èæè VoIP åèåç"
 
-#: ../src/empathy-account-assistant.c:1229
+#: ../src/empathy-account-assistant.c:1232
 msgid "Welcome to Empathy"
 msgstr "æèäç Empathy"
 
-#: ../src/empathy-account-assistant.c:1238
+#: ../src/empathy-account-assistant.c:1241
 msgid "Import your existing accounts"
 msgstr "ååçæçåè"
 
-#: ../src/empathy-account-assistant.c:1256
+#: ../src/empathy-account-assistant.c:1259
 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:64
+#: ../src/empathy-accounts-dialog.c:69
 #, 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:68
+#: ../src/empathy-accounts-dialog.c:73
 msgid "Your new account has not been saved yet."
 msgstr "åæååæçæåèã"
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:755
-#: ../src/empathy-call-window.c:1326
+#: ../src/empathy-accounts-dialog.c:352
+#: ../src/empathy-streamed-media-window.c:757
+#: ../src/empathy-call-window.c:1325
 msgid "Connectingâ"
 msgstr "éçäâ"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:393
 #, c-format
 msgid "Offline â %s"
 msgstr "éç â %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:405
 #, c-format
 msgid "Disconnected â %s"
 msgstr "åæç â %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:416
 msgid "Offline â No Network Connection"
 msgstr "éç â ççèéç"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:423
 msgid "Unknown Status"
 msgstr "æçççæ"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:435
 msgid "Offline â Account Disabled"
 msgstr "éç â åèååç"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"æåååçæçåèïéææææ\n"
-"ææåçèæãçåèççï"
+#: ../src/empathy-accounts-dialog.c:538
+msgid "Edit Connection Parameters"
+msgstr "çèéçåæ"
+
+#: ../src/empathy-accounts-dialog.c:701
+msgid "Failed to retrieve your personal information from the server."
+msgstr "çæåäæåæåæçåäèèã"
+
+#: ../src/empathy-accounts-dialog.c:707
+msgid "Go online to edit your personal information."
+msgstr "äçäçèæçåäèèã"
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:792
+msgid "_Edit Connection Parameters..."
+msgstr "çèéçåæ(_E)..."
+
+#: ../src/empathy-accounts-dialog.c:1293
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "æåæèåæçéèäçéçç %sï"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1297
 msgid "This will not remove your account on the server."
 msgstr "éäæçéäæåäçæçåèã"
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1533
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3249,15 +3204,15 @@ msgstr ""
 "ææåçèæãçåèççï"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1744
 msgid "_Enable"
 msgstr "åç(_E)"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1745
 msgid "_Disable"
 msgstr "åç(_D)"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2255
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3291,11 +3246,11 @@ msgstr "èååæçåèïæåéååèæåæçåçéèåå
 msgid "_Importâ"
 msgstr "åå(_I)â"
 
-#: ../src/empathy-auth-client.c:251
+#: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
 msgstr "- Empathy èèçæç"
 
-#: ../src/empathy-auth-client.c:267
+#: ../src/empathy-auth-client.c:302
 msgid "Empathy authentication client"
 msgstr "Empathy èèçæç"
 
@@ -3311,137 +3266,137 @@ msgstr "- Empathy éèèèçæç"
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy éèèèçæç"
 
-#: ../src/empathy-streamed-media-window.c:432
+#: ../src/empathy-streamed-media-window.c:433
 msgid "Contrast"
 msgstr "åæ"
 
-#: ../src/empathy-streamed-media-window.c:435
+#: ../src/empathy-streamed-media-window.c:436
 msgid "Brightness"
 msgstr "äå"
 
-#: ../src/empathy-streamed-media-window.c:438
+#: ../src/empathy-streamed-media-window.c:439
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:543
+#: ../src/empathy-streamed-media-window.c:545
 msgid "Volume"
 msgstr "éé"
 
-#: ../src/empathy-streamed-media-window.c:1094
+#: ../src/empathy-streamed-media-window.c:1097
 msgid "_Sidebar"
 msgstr "åéæ(_S)"
 
-#: ../src/empathy-streamed-media-window.c:1114
+#: ../src/empathy-streamed-media-window.c:1117
 msgid "Audio input"
 msgstr "éæèå"
 
-#: ../src/empathy-streamed-media-window.c:1118
+#: ../src/empathy-streamed-media-window.c:1121
 msgid "Video input"
 msgstr "èèèå"
 
-#: ../src/empathy-streamed-media-window.c:1126
+#: ../src/empathy-streamed-media-window.c:1129
 msgid "Dialpad"
 msgstr "æèç"
 
-#: ../src/empathy-streamed-media-window.c:1137
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Details"
 msgstr "èçèæ"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1206
-#: ../src/empathy-call-window.c:1932
+#: ../src/empathy-streamed-media-window.c:1209
+#: ../src/empathy-call-window.c:1927
 #, c-format
 msgid "Call with %s"
 msgstr "è %s éèä"
 
-#: ../src/empathy-streamed-media-window.c:1439
-#: ../src/empathy-call-window.c:2176
+#: ../src/empathy-streamed-media-window.c:1442
+#: ../src/empathy-call-window.c:2171
 msgid "The IP address as seen by the machine"
 msgstr "æåçèç IP äå"
 
-#: ../src/empathy-streamed-media-window.c:1441
-#: ../src/empathy-call-window.c:2178
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2173
 msgid "The IP address as seen by a server on the Internet"
 msgstr "çéçèäçäæåçèç IP äå"
 
-#: ../src/empathy-streamed-media-window.c:1443
-#: ../src/empathy-call-window.c:2180
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2175
 msgid "The IP address of the peer as seen by the other side"
 msgstr "åäççèçéç IP äå"
 
-#: ../src/empathy-streamed-media-window.c:1445
-#: ../src/empathy-call-window.c:2182
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2177
 msgid "The IP address of a relay server"
 msgstr "äçäæåç IP äå"
 
-#: ../src/empathy-streamed-media-window.c:1447
-#: ../src/empathy-call-window.c:2184
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2179
 msgid "The IP address of the multicast group"
 msgstr "åéåæççç IP äå"
 
-#: ../src/empathy-streamed-media-window.c:1835
 #: ../src/empathy-streamed-media-window.c:1838
 #: ../src/empathy-streamed-media-window.c:1841
 #: ../src/empathy-streamed-media-window.c:1844
+#: ../src/empathy-streamed-media-window.c:1847
 msgctxt "codec"
 msgid "Unknown"
 msgstr "æç"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2136
+#: ../src/empathy-streamed-media-window.c:2139
 #, c-format
 msgid "Connected â %d:%02dm"
 msgstr "åéç â %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2197
-#: ../src/empathy-call-window.c:3045
+#: ../src/empathy-streamed-media-window.c:2200
+#: ../src/empathy-call-window.c:3033
 msgid "Technical Details"
 msgstr "æèçç"
 
-#: ../src/empathy-streamed-media-window.c:2235
-#: ../src/empathy-call-window.c:3084
+#: ../src/empathy-streamed-media-window.c:2238
+#: ../src/empathy-call-window.c:3072
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr "%s çèéäçèääæéèäæææçéèæå"
 
-#: ../src/empathy-streamed-media-window.c:2240
-#: ../src/empathy-call-window.c:3089
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:3077
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr "%s çèéäçèääæéèäæææçèèæå"
 
-#: ../src/empathy-streamed-media-window.c:2246
-#: ../src/empathy-call-window.c:3095
+#: ../src/empathy-streamed-media-window.c:2249
+#: ../src/empathy-call-window.c:3083
 #, 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 åçéçãæååäääåèåäåäåèçæéçççèääã"
 
-#: ../src/empathy-streamed-media-window.c:2252
-#: ../src/empathy-call-window.c:3101
+#: ../src/empathy-streamed-media-window.c:2255
+#: ../src/empathy-call-window.c:3089
 msgid "There was a failure on the network"
 msgstr "éåçèäæéèçç"
 
-#: ../src/empathy-streamed-media-window.c:2256
-#: ../src/empathy-call-window.c:3105
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3093
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "æéèæåèçéèæååæåæçéèäåè"
 
-#: ../src/empathy-streamed-media-window.c:2259
-#: ../src/empathy-call-window.c:3108
+#: ../src/empathy-streamed-media-window.c:2262
+#: ../src/empathy-call-window.c:3096
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "æéèæåèçèèæååæåæçéèäåè"
 
-#: ../src/empathy-streamed-media-window.c:2269
-#: ../src/empathy-call-window.c:3120
+#: ../src/empathy-streamed-media-window.c:2272
+#: ../src/empathy-call-window.c:3108
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3451,23 +3406,23 @@ msgstr ""
 "å Telepathy åääççæéæççæãè<a href=\"%s\">ååéåéè</a>äéä"
 "åæåéååçãééãèçäææéççéã"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:3129
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3117
 msgid "There was a failure in the call engine"
 msgstr "éèåæåæéèçç"
 
-#: ../src/empathy-streamed-media-window.c:2280
-#: ../src/empathy-call-window.c:3132
+#: ../src/empathy-streamed-media-window.c:2283
+#: ../src/empathy-call-window.c:3120
 msgid "The end of the stream was reached"
 msgstr "åéäææç"
 
-#: ../src/empathy-streamed-media-window.c:2320
-#: ../src/empathy-call-window.c:3172
+#: ../src/empathy-streamed-media-window.c:2323
+#: ../src/empathy-call-window.c:3160
 msgid "Can't establish audio stream"
 msgstr "çæåçéèäæ"
 
-#: ../src/empathy-streamed-media-window.c:2330
-#: ../src/empathy-call-window.c:3182
+#: ../src/empathy-streamed-media-window.c:2333
+#: ../src/empathy-call-window.c:3170
 msgid "Can't establish video stream"
 msgstr "çæåçèèäæ"
 
@@ -3558,8 +3513,8 @@ msgstr "åæèèåæ"
 
 #: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2584 ../src/empathy-call-window.c:2585
-#: ../src/empathy-call-window.c:2586 ../src/empathy-call-window.c:2587
+#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581
+#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583
 msgid "Unknown"
 msgstr "äæ"
 
@@ -3577,17 +3532,17 @@ msgid "_Camera"
 msgstr "æåæ(_C)"
 
 #: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "_Contents"
 msgstr "åå(_C)"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "_Debug"
 msgstr "åé(_D)"
 
 #: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Help"
 msgstr "æå(_H)"
 
@@ -3600,7 +3555,7 @@ msgid "_Settings"
 msgstr "èåå(_S)"
 
 #: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-roster-window-menubar.ui.h:30
 #: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "æè(_V)"
@@ -3719,96 +3674,96 @@ msgstr "èåéç"
 msgid "Manage Favorite Rooms"
 msgstr "ççååçèåå"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:523
 msgid "Incoming video call"
 msgstr "ååçèèéè"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1556
+#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555
 msgid "Incoming call"
 msgstr "äé"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s èèæéèèèéèãææåèæèï"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:528
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s èèæéèéèãææåèæèï"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1562
+#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732
+#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s çäé"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:556
 msgid "_Reject"
 msgstr "æç(_R)"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572
 msgid "_Answer"
 msgstr "æè(_A)"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:572
 msgid "_Answer with video"
 msgstr "äèèæè(_A)"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1562
+#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765
+#: ../src/empathy-call-window.c:1561
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "äè %s çèèéè"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:838
 msgid "Room invitation"
 msgstr "èååéè"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:840
 #, c-format
 msgid "Invitation to join %s"
 msgstr "éèåå %s"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:847
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s æåéèæåå %s"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:855
 msgid "_Decline"
 msgstr "æç(_D)"
 
-#: ../src/empathy-event-manager.c:858
+#: ../src/empathy-event-manager.c:860
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "åå(_J)"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:887
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s æéèæåå %s"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:893
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "æèéèåå %s"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:944
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "æåäè %s çææåè"
 
-#: ../src/empathy-event-manager.c:1145 ../src/empathy-main-window.c:378
+#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:371
 msgid "Password required"
 msgstr "éèåç"
 
-#: ../src/empathy-event-manager.c:1210
+#: ../src/empathy-event-manager.c:1217
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s æèååæçææåäççèå"
 
-#: ../src/empathy-event-manager.c:1214
+#: ../src/empathy-event-manager.c:1223
 #, c-format
 msgid ""
 "\n"
@@ -3818,105 +3773,105 @@ msgstr ""
 "èæï%s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "äæ"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s / %s æ %s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s / %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "æåææ %2$s éåçã%1$sã"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "æååéã%sãç %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "å %2$s ææã%1$sãæççéè"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "æææææççéè"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "åéã%sãç %s æççéè"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "åéæææççéè"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "ã%sãææè %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "ã%sãåéç %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "ææåèåç"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "æåçååäåèèçåæ"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "æåææææã%sãçåææ"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "æåèçã%sãéæå"
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "ææ"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "åé"
 
@@ -3939,161 +3894,162 @@ msgid "Import Accounts"
 msgstr "åååè"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:315
 msgid "Import"
 msgstr "åå"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:324
 msgid "Protocol"
 msgstr "éèåå"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:348
 msgid "Source"
 msgstr "äæ"
 
-#: ../src/empathy-main-window.c:395
+#: ../src/empathy-roster-window.c:388
 msgid "Provide Password"
 msgstr "æäåç"
 
-#: ../src/empathy-main-window.c:401
+#: ../src/empathy-roster-window.c:394
 msgid "Disconnect"
 msgstr "æç"
 
-#: ../src/empathy-main-window.c:638
+#: ../src/empathy-roster-window.c:626
 msgid "No match found"
 msgstr "æäåçåéç"
 
-#: ../src/empathy-main-window.c:746
+#: ../src/empathy-roster-window.c:733
 #, c-format
 msgid "Sorry, %s accounts canât be used until your %s software is updated."
 msgstr "åææï%s åèçæäçïééæç %s èéåææã"
 
-#: ../src/empathy-main-window.c:814
+#: ../src/empathy-roster-window.c:799
 msgid "Update software..."
 msgstr "ææèé..."
 
-#: ../src/empathy-main-window.c:820 ../src/empathy-main-window.c:941
+#: ../src/empathy-roster-window.c:805 ../src/empathy-roster-window.c:922
 msgid "Close"
 msgstr "éé"
 
-#: ../src/empathy-main-window.c:929
+#: ../src/empathy-roster-window.c:910
 msgid "Reconnect"
 msgstr "éæéæ"
 
-#: ../src/empathy-main-window.c:935
+#: ../src/empathy-roster-window.c:916
 msgid "Edit Account"
 msgstr "çèåè"
 
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:1074
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1060
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "åå %s (%s)..."
 
-#: ../src/empathy-main-window.c:1121
+#: ../src/empathy-roster-window.c:1106
 msgid "Top up account credit"
 msgstr "åååèåé"
 
 #. top up button
-#: ../src/empathy-main-window.c:1192
+#: ../src/empathy-roster-window.c:1178
 msgid "Top Up..."
 msgstr "åå..."
 
-#: ../src/empathy-main-window.c:1935
+#: ../src/empathy-roster-window.c:1901
 msgid "Contact"
 msgstr "éçä"
 
-#: ../src/empathy-main-window.c:2310
+#: ../src/empathy-roster-window.c:2296
 msgid "Contact List"
 msgstr "éçäæå"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
+#: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "éçäåå(_M)"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
+#: ../src/empathy-roster-window-menubar.ui.h:2
 msgid "Credit Balance"
 msgstr "ååéé"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
+#: ../src/empathy-roster-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "æéçäæåååæ(_L)"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
+#: ../src/empathy-roster-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "ååååèåå(_F)"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
+#: ../src/empathy-roster-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "ççåå"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
+#: ../src/empathy-roster-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "æååå(_O)"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-roster-window-menubar.ui.h:7
+#: ../src/empathy-status-icon.ui.h:1
 msgid "New _Callâ"
 msgstr "æåéè(_C)â"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
+#: ../src/empathy-roster-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "æåååèåéè(_A)"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "ååèå(_R)"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
+#: ../src/empathy-roster-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "éçåå(_R)"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "äåçæå(_N)"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "äçææå(_S)"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
+#: ../src/empathy-roster-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "åè(_A)"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "èåéçèçä"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "ççåå(_C)"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
+#: ../src/empathy-roster-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "ææåè(_F)"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:23
 msgid "_Joinâ"
 msgstr "åå(_J)â"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-roster-window-menubar.ui.h:24
 #: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversationâ"
 msgstr "æåèè(_N)â"
 
-#: ../src/empathy-main-window-menubar.ui.h:25
+#: ../src/empathy-roster-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "éçéçä(_O)"
 
-#: ../src/empathy-main-window-menubar.ui.h:26
+#: ../src/empathy-roster-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "åäèè(_P)"
 
-#: ../src/empathy-main-window-menubar.ui.h:28
+#: ../src/empathy-roster-window-menubar.ui.h:28
 msgid "_Room"
 msgstr "èåå(_R)"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
+#: ../src/empathy-roster-window-menubar.ui.h:29
 msgid "_Search for Contactsâ"
 msgstr "æåèçä(_S)â"
 
@@ -4107,7 +4063,7 @@ 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:623
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4120,16 +4076,16 @@ msgstr ""
 "éèåçï%s\n"
 "æåï%s"
 
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "å"
 
-#: ../src/empathy-new-chatroom-dialog.c:654
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "çæéåååèååæå"
 
-#: ../src/empathy-new-chatroom-dialog.c:664
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "çæåæååèååæå"
 
@@ -4161,79 +4117,79 @@ msgstr "èååæå"
 msgid "_Room:"
 msgstr "èåå(_R)ï"
 
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "èæåæå"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "èæåéå"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "æåèè"
 
-#: ../src/empathy-preferences.c:172
+#: ../src/empathy-preferences.c:169
 msgid "Contact goes online"
 msgstr "éçääç"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "éçäéç"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "åèåéç"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "åèåæç"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "èè"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:725
 msgid "Juliet"
 msgstr "çèå"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:732
 msgid "Romeo"
 msgstr "æåä"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:738
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "çççèèèåïçääèååéï"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:741
 msgid "Deny thy father and refuse thy name;"
 msgstr "èçäæèääïçäçåæèåã"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:744
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "èçåäæèèïææééåéåã"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:747
 msgid "And I'll no longer be a Capulet."
 msgstr "ççèäéååïååçïæéäã"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:750
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "åäæåççèïçåäçäçéã"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:753
 msgid "Juliet has disconnected"
 msgstr "çèååæç"
 
-#: ../src/empathy-preferences.c:1175
+#: ../src/empathy-preferences.c:1157
 msgid "Preferences"
 msgstr "ååèå"
 
@@ -4292,35 +4248,27 @@ msgstr "çèèåçæåææï"
 msgid "General"
 msgstr "äè"
 
-#: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "èåççï"
-
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "èåééï"
-
-#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "äçäæï"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:17
 msgid "Log conversations"
 msgstr "çéèè"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:18
 msgid "Notifications"
 msgstr "éç"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:19
 msgid "Play sound for events"
 msgstr "ææääéæ"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:20
 msgid "Privacy"
 msgstr "éç"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:21
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -4329,74 +4277,74 @@ msgstr ""
 "éääçæçåææéäææåçååãæåååæèåéäåïäææäåäèæã"
 "GPS çåææçååæéçåäæã"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:22
 msgid "Show _smileys as images"
 msgstr "åèæçèäåçéç(_S)"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:23
 msgid "Show contact _list in rooms"
 msgstr "åèååéçéçäæå(_L)"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "éæ"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:25
 msgid "Spell Checking"
 msgstr "æåææ"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:26
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "éèçèèæåååæåæåçåèååçèèã"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:27
 msgid "Themes"
 msgstr "äæäé"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:28
 msgid "Use _echo cancellation to improve call quality"
 msgstr "äçåéæéäæåéèåè(_E)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:29
 msgid "Variant:"
 msgstr "æåï"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:30
 msgid "_Automatically connect on startup"
 msgstr "ååæèåéç(_A)"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Cellphone"
 msgstr "ææ(_C)"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Enable bubble notifications"
 msgstr "åçææåéç(_E)"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable sound notifications"
 msgstr "åçéæéç(_E)"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:34
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:35
 msgid "_Network (IP, Wi-Fi)"
 msgstr "çè (IP, Wi-Fi)(_N)"
 
-#: ../src/empathy-preferences.ui.h:38
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Open new chats in separate windows"
 msgstr "åååèçéåæçèå(_O)"
 
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Publish location to my contacts"
 msgstr "åæçéçäåéäç(_P)"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345Â is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:41
+#: ../src/empathy-preferences.ui.h:39
 msgid "_Reduce location accuracy"
 msgstr "éääçæçå(_R)"
 
@@ -4456,7 +4404,7 @@ msgstr "èèéå"
 msgid "Video Preview"
 msgstr "èèéè"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "éçäååæè"
 
@@ -4522,16 +4470,16 @@ msgid ""
 "extension."
 msgstr "éåçéççççåäææéçåéæååèã"
 
-#: ../src/empathy-invite-participant-dialog.c:197
-#: ../src/empathy-invite-participant-dialog.c:225
+#: ../src/empathy-invite-participant-dialog.c:200
+#: ../src/empathy-invite-participant-dialog.c:228
 msgid "Invite Participant"
 msgstr "éèåè"
 
-#: ../src/empathy-invite-participant-dialog.c:198
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Choose a contact to invite into the conversation:"
 msgstr "éææèéèéåèèçèçäï"
 
-#: ../src/empathy-invite-participant-dialog.c:221
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite"
 msgstr "éè"
 
@@ -4585,13 +4533,13 @@ msgid "Respond"
 msgstr "åæ"
 
 #: ../src/empathy-notifications-approver.c:204
-#: ../src/empathy-call-window.c:1566
+#: ../src/empathy-call-window.c:1565
 msgid "Reject"
 msgstr "æç"
 
 #: ../src/empathy-notifications-approver.c:209
 #: ../src/empathy-notifications-approver.c:214
-#: ../src/empathy-call-window.c:1567
+#: ../src/empathy-call-window.c:1566
 msgid "Answer"
 msgstr "æè"
 
@@ -4623,38 +4571,38 @@ msgstr "%s ååææçæïäææèääéèã"
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1173 ../src/empathy-call-window.c:1196
+#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195
 msgid "i"
 msgstr "è"
 
-#: ../src/empathy-call-window.c:2941
+#: ../src/empathy-call-window.c:2929
 msgid "On hold"
 msgstr "äç"
 
-#: ../src/empathy-call-window.c:2944
+#: ../src/empathy-call-window.c:2932
 msgid "Mute"
 msgstr "éé"
 
-#: ../src/empathy-call-window.c:2946
+#: ../src/empathy-call-window.c:2934
 msgid "Duration"
 msgstr "æé"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2949
+#: ../src/empathy-call-window.c:2937
 #, c-format
 msgid "%s â %d:%02dm"
 msgstr "%s â %d:%02dm"
 
-#: ../src/empathy-call-window.c:3219
+#: ../src/empathy-call-window.c:3207
 #, c-format
 msgid "Your current balance is %s."
 msgstr "æçåçééç %sã"
 
-#: ../src/empathy-call-window.c:3223
+#: ../src/empathy-call-window.c:3211
 msgid "Sorry, you donât have enough credit for that call."
 msgstr "åææïæçåéäèäéèèéèã"
 
-#: ../src/empathy-call-window.c:3225
+#: ../src/empathy-call-window.c:3213
 msgid "Top Up"
 msgstr "åå"
 
@@ -4662,6 +4610,54 @@ msgstr "åå"
 msgid "_Match case"
 msgstr "æåååå(_M)"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "æååè"
+
+#~ msgid "Call volume"
+#~ msgstr "éèéé"
+
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "éèééïççåæã"
+
+#~ msgid "Socket type not supported"
+#~ msgstr "Socket éåäææ"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "æççèåè"
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "%s åèåéé %s äæã"
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "%s åèçææ Empathy åäæã"
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "ååæççèåè"
+
+#~ msgid "Edit %s"
+#~ msgstr "çè %s"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "åæ(_N)"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "çè(_E)"
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "æåååçæçåèïéææææ\n"
+#~ "ææåçèæãçåèççï"
+
+#~ msgid "Input level:"
+#~ msgstr "èåççï"
+
+#~ msgid "Input volume:"
+#~ msgstr "èåééï"
+
 #~ msgid "Empathy has migrated butterfly logs"
 #~ msgstr "Empathy åèç butterfly æè"
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]