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



commit 5c5aed18fd1d54352fb835b10693bc69b0a13d5c
Author: Cheng-Chia Tseng <pswo10680 gmail com>
Date:   Mon May 28 18:14:04 2012 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 2657 ++++++++++++++++++++++++++++-------------------------------
 po/zh_TW.po | 2668 ++++++++++++++++++++++++++++-------------------------------
 2 files changed, 2523 insertions(+), 2802 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 078d0f2..59ea972 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy 3.3.92\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-25 06:40+0800\n"
-"PO-Revision-Date: 2012-03-25 06:40+0800\n"
+"POT-Creation-Date: 2012-05-28 18:13+0800\n"
+"PO-Revision-Date: 2012-05-28 18:13+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "Language: zh_TW\n"
@@ -41,678 +41,227 @@ msgstr "ççèæè VoIP åè"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2513
+#: ../src/empathy-accounts-dialog.c:2516
 msgid "Messaging and VoIP Accounts"
 msgstr "èæè VoIP åè"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "æéçæåæçèåéåæçèåèçã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Camera device"
-msgstr "æåæèç"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Camera position"
-msgstr "æåæäç"
-
-#: ../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:5
-msgid "Chat window theme"
-msgstr "èåèçäæäé"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
-msgid "Chat window theme variant"
-msgstr "èåèçäæäéæå"
-
-#: ../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:8
-msgid "Compact contact list"
-msgstr "ççèçäæå"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid "Connection managers should be used"
-msgstr "äçéççççå"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Contact list sort criterion"
-msgstr "èçäæåæåæå"
-
-#: ../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: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:13
-msgid "Default directory to select an avatar image from"
-msgstr "çäéæåéèåççéèçé"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Disable popup notifications when away"
-msgstr "ççæçééæåçåååéç"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable sounds when away"
-msgstr "ççæçééæåçéæ"
-
-#: ../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: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:18
-msgid "Echo cancellation support"
-msgstr "åéæéææ"
-
-#: ../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:20
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy åäåç GPS äææäç"
-
-#: ../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:22
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy åäåçççäææäç"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy default download folder"
-msgstr "Empathy éèäèèæå"
-
-#: ../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:25
-msgid "Empathy should auto-connect on startup"
-msgstr "Empathy ååæèåéç"
-
-#: ../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: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:28
-msgid "Enable WebKit Developer Tools"
-msgstr "åç WebKit éçèåå"
-
-#: ../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:30
-msgid "Enable spell checker"
-msgstr "åçæåææçå"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Hide main window"
-msgstr "éèäèç"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Hide the main window."
-msgstr "éèäèçã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Inform other users when you are typing to them"
-msgstr "çäæèåèæçåääçèæéçäå"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Last account selected in Join Room dialog"
-msgstr "äæåãååèååãåèçéåçåè"
-
-#. translators: Automatic tasks which are run once to port/update account settings. Ideally, this shouldn't be exposed to users at all, we just use a gsettings key here as an optimization to only run it only once.
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Magic number used to check if sanity cleaning tasks should be run"
-msgstr "éèèççäæææåæåè sanity æçäæ"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Nick completed character"
-msgstr "çåèéåç"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Open new chats in separate windows"
-msgstr "åååèçéåæçèå"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Path of the Adium theme to use"
-msgstr "èäçç Adium äæäéèå"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-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:41
-msgid "Play a sound for incoming messages"
-msgstr "æåèææææéæ"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound for new conversations"
-msgstr "çéåæçèèæææéæ"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound for outgoing messages"
-msgstr "éåèææææéæ"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when a contact logs in"
-msgstr "çèçäçåæææéæ"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Play a sound when a contact logs out"
-msgstr "çæèçäçåæææéæ"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Play a sound when we log in"
-msgstr "çæåçåæææéæ"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Play a sound when we log out"
-msgstr "çæåçåæææéæ"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "åæèåèçååçéåååéç"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Pop up notifications when a contact logs in"
-msgstr "çèçäçåæååéç"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Pop up notifications when a contact logs out"
-msgstr "çèçäçåæååéç"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Position the camera preview should be during a call."
-msgstr "éèææåæéèæèææçäçã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show Balance in contact list"
-msgstr "æèçäæååéçéé"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show avatars"
-msgstr "éçåéè"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show contact groups"
-msgstr "éçèçäçç"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Show contact list in rooms"
-msgstr "åèååéçèçäæå"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Show hint about closing the main window"
-msgstr "ééäèçæéçæç"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "Show offline contacts"
-msgstr "éçéçèçä"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "Show protocols"
-msgstr "éçåå"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "Spell checking languages"
-msgstr "æåææçèè"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The default folder to save file transfers in."
-msgstr "çäååææåèææææçéèèæåã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The last directory that an avatar image was chosen from."
-msgstr "äæéæåéèåçççéã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid "The position for the chat window side pane"
-msgstr "èåèçåçæçäç"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "èåèçåçæçååäç (åäçåç)ã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "çäéçåèåèçäèèçäæäéã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr "çäåèåèçéçèèçäæäéæåã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Use graphical smileys"
-msgstr "äçåçåèæçè"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Use notification sounds"
-msgstr "äçéçéæ"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Use theme for chat rooms"
-msgstr "åèååäçäæäé"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Empathy æåèåäçèçäççåçäçèçäã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Empathy æåäç GPS äææäçã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Empathy æåäçæåéèççäææäçã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Empathy æåäçççäææäçã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Empathy æåæåååæèåçåäçåèã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "Empathy æåæåäçèéçæèååæçééæåã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "Empathy æååæçéçççæääççæçåã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-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:77
-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:78
-msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr "æåäçéççççåèåæçæéæéçã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr "æåääèåçèèææèåæçéåã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "æååèèäçèæçèèæçåçååã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "æåèåç Pulseaudio çåéæééæåã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "æåææéæäéçæèçäçåççã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "æåææéæäéçæèçäçåççã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound to notify of events."
-msgstr "æåææéæäéçæääççã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "æåææéæäéçææåèæã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "æåææéæäéçæçèèã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "æåææéæäéçæéåèæã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to play a sound when logging into a network."
-msgstr "ççåæççææåææéæã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to play a sound when logging out of a network."
-msgstr "ççåæççææåææéæã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to play sound notifications when away or busy."
-msgstr "ççæçééæåçææåææéæéçã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid ""
-"Whether to send the 'composing' or 'paused' chat states. Does not currently "
-"affect the 'gone' state."
-msgstr "æåèåéãæåäãæãåäæãçèåçæãèçåæãåééãçæåäååéã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "çèçäéçææåéçåååéçã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "çèçääçææåéçåååéçã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-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:95
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "çæåæèæææåéçåååéçã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show account balances in the contact list."
-msgstr "æåèåèçäæååéçåæééã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "æååèçäæåèèåèçéçèçäåéèã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "æååèçäæåäéçéççèçäã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to show groups in the contact list."
-msgstr "æåèåèçäæååéçççã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid "Whether to show popup notifications when away or busy."
-msgstr "ççæçééæåçææåéçåååéçã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "æåèåèçäæååéçèçääçååã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
-msgid "Whether to show the contact list in chat rooms."
-msgstr "æååèååäéçèçäæåã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
-msgid "Whether to show the contact list in compact mode."
-msgstr "æåäççæåéçèçäæåã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
-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:105
-msgid "Whether to use the theme for chat rooms."
-msgstr "æåçèååäçäæäéã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
-msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's state with the value \"state\". A value of \"name\" will sort "
-"the contact list by name."
-msgstr "æåèçäæåæèäçååæåãéèåæäçèçäççæãstateã(çæ) åäæåãèãnameã(åç) ååææææåçäæåèçäæåã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:107
-msgid ""
-"empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
-"should be executed or not. Users should not change this key manually."
-msgstr "empathy-sanity-cleaning.c äçæèçäæææåæèåèæçäæãäçèäæèæåææéæåçåã"
-
-#: ../libempathy/empathy-ft-handler.c:738
+#: ../libempathy/empathy-ft-handler.c:737
 msgid "No reason was specified"
 msgstr "æææååå"
 
-#: ../libempathy/empathy-ft-handler.c:741
+#: ../libempathy/empathy-ft-handler.c:740
 msgid "The change in state was requested"
 msgstr "åèæææçæ"
 
-#: ../libempathy/empathy-ft-handler.c:744
+#: ../libempathy/empathy-ft-handler.c:743
 msgid "You canceled the file transfer"
 msgstr "äååæææåè"
 
-#: ../libempathy/empathy-ft-handler.c:747
+#: ../libempathy/empathy-ft-handler.c:746
 msgid "The other participant canceled the file transfer"
 msgstr "åäçåèèåæäææåè"
 
-#: ../libempathy/empathy-ft-handler.c:750
+#: ../libempathy/empathy-ft-handler.c:749
 msgid "Error while trying to transfer the file"
 msgstr "åèåèæææççéè"
 
-#: ../libempathy/empathy-ft-handler.c:753
+#: ../libempathy/empathy-ft-handler.c:752
 msgid "The other participant is unable to transfer the file"
 msgstr "åäçåèèçæåèèææ"
 
-#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313
+#: ../libempathy/empathy-ft-handler.c:755 ../libempathy/empathy-utils.c:312
 msgid "Unknown reason"
 msgstr "äæåå"
 
-#: ../libempathy/empathy-ft-handler.c:919
+#: ../libempathy/empathy-ft-handler.c:918
 msgid "File transfer completed, but the file was corrupted"
 msgstr "ææåèåçïäæææåææ"
 
-#: ../libempathy/empathy-ft-handler.c:1205
+#: ../libempathy/empathy-ft-handler.c:1204
 msgid "File transfer not supported by remote contact"
 msgstr "éçèçääææææåè"
 
-#: ../libempathy/empathy-ft-handler.c:1261
+#: ../libempathy/empathy-ft-handler.c:1260
 msgid "The selected file is not a regular file"
 msgstr "éåçææäææèçææ"
 
-#: ../libempathy/empathy-ft-handler.c:1270
+#: ../libempathy/empathy-ft-handler.c:1269
 msgid "The selected file is empty"
 msgstr "éåçæææççç"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
+#: ../libempathy/empathy-message.c:407 ../src/empathy-call-observer.c:116
 #, c-format
 msgid "Missed call from %s"
 msgstr "ææ %s çäé"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:419
+#: ../libempathy/empathy-message.c:411
 #, c-format
 msgid "Called %s"
 msgstr "åææ %s"
 
-#: ../libempathy/empathy-message.c:422
+#: ../libempathy/empathy-message.c:414
 #, c-format
 msgid "Call from %s"
 msgstr "%s çäé"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:232
 msgid "Available"
 msgstr "æç"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:234
 msgid "Busy"
 msgstr "åç"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:237
 msgid "Away"
 msgstr "éé"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:239
 msgid "Invisible"
 msgstr "éè"
 
-#: ../libempathy/empathy-utils.c:242
+#: ../libempathy/empathy-utils.c:241
 msgid "Offline"
 msgstr "éç"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:245
+#: ../libempathy/empathy-utils.c:244
 msgctxt "presence"
 msgid "Unknown"
 msgstr "æç"
 
-#: ../libempathy/empathy-utils.c:285
+#: ../libempathy/empathy-utils.c:284
 msgid "No reason specified"
 msgstr "æææååå"
 
-#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
 msgid "Status is set to offline"
 msgstr "çæèçéç"
 
-#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
 #: ../libempathy-gtk/empathy-call-utils.c:47
-#: ../libempathy-gtk/empathy-new-message-dialog.c:81
+#: ../libempathy-gtk/empathy-new-message-dialog.c:80
 msgid "Network error"
 msgstr "ççéè"
 
-#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
 msgid "Authentication failed"
 msgstr "éèåæ"
 
-#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
 msgid "Encryption error"
 msgstr "ååççéè"
 
-#: ../libempathy/empathy-utils.c:295
+#: ../libempathy/empathy-utils.c:294
 msgid "Name in use"
 msgstr "äçäçåç"
 
-#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate not provided"
 msgstr "æææäèæ"
 
-#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate untrusted"
 msgstr "èæäèää"
 
-#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
 msgid "Certificate expired"
 msgstr "èæåéæ"
 
-#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
 msgid "Certificate not activated"
 msgstr "èæåæäç"
 
-#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
 msgid "Certificate hostname mismatch"
 msgstr "èæäæåçäç"
 
-#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
 msgid "Certificate fingerprint mismatch"
 msgstr "èææçæäç"
 
-#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
 msgid "Certificate self-signed"
 msgstr "èæçèæçç"
 
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate error"
 msgstr "èæéè"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:344
 msgid "Encryption is not available"
 msgstr "ååçæäç"
 
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:346
 msgid "Certificate is invalid"
 msgstr "èæçæ"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:348
 msgid "Connection has been refused"
 msgstr "éçéæ"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:350
 msgid "Connection can't be established"
 msgstr "çæåçéç"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:352
 msgid "Connection has been lost"
 msgstr "åååéç"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:354
 msgid "This account is already connected to the server"
 msgstr "éååèåéæèäæå"
 
-#: ../libempathy/empathy-utils.c:357
+#: ../libempathy/empathy-utils.c:356
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "éçåèäççåèæçæéçåä"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:359
 msgid "The account already exists on the server"
 msgstr "èåèåçååæäæåä"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:361
 msgid "Server is currently too busy to handle the connection"
 msgstr "äæåçåéæåçäèæçæèçèéç"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:363
 msgid "Certificate has been revoked"
 msgstr "åæéèæ"
 
-#: ../libempathy/empathy-utils.c:366
+#: ../libempathy/empathy-utils.c:365
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "èæäçäååçåçæçæïææåçèçäèå"
 
-#: ../libempathy/empathy-utils.c:369
+#: ../libempathy/empathy-utils.c:368
 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:373
+#: ../libempathy/empathy-utils.c:372
 msgid "Your software is too old"
 msgstr "äçèäéè"
 
-#: ../libempathy/empathy-utils.c:375
+#: ../libempathy/empathy-utils.c:374
 msgid "Internal error"
 msgstr "åééè"
 
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:533
 msgid "People Nearby"
 msgstr "éèçä"
 
-#: ../libempathy/empathy-utils.c:539
+#: ../libempathy/empathy-utils.c:538
 msgid "Yahoo! Japan"
 msgstr "Yahoo! ææ"
 
-#: ../libempathy/empathy-utils.c:568
+#: ../libempathy/empathy-utils.c:567
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:569
+#: ../libempathy/empathy-utils.c:568
 msgid "Facebook Chat"
 msgstr "Facebook èå"
 
@@ -775,7 +324,7 @@ msgid "All accounts"
 msgstr "ææåè"
 
 #: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../src/empathy-import-widget.c:336
+#: ../src/empathy-import-widget.c:323
 msgid "Account"
 msgstr "åè"
 
@@ -799,24 +348,24 @@ msgstr "éæå"
 msgid "%s:"
 msgstr "%sï"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget.c:1424
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
 msgid "Username:"
 msgstr "äçèåçï"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1710
+#: ../libempathy-gtk/empathy-account-widget.c:1741
 msgid "A_pply"
 msgstr "åç(_A)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1739
+#: ../libempathy-gtk/empathy-account-widget.c:1770
 msgid "L_og in"
 msgstr "çå(_O)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1812
+#: ../libempathy-gtk/empathy-account-widget.c:1840
 msgid "This account already exists on the server"
 msgstr "æåèåçååéåäæåä"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1816
+#: ../libempathy-gtk/empathy-account-widget.c:1844
 msgid "Create a new account on the server"
 msgstr "åéåäæåäåçæçåè"
 
@@ -825,19 +374,19 @@ msgstr "åéåäæåäåçæçåè"
 #. * 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:2241
+#: ../libempathy-gtk/empathy-account-widget.c:2251
 #, 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:2267
+#: ../libempathy-gtk/empathy-account-widget.c:2277
 #, c-format
 msgid "%s Account"
 msgstr "%s åè"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2271
+#: ../libempathy-gtk/empathy-account-widget.c:2281
 msgid "New account"
 msgstr "æååè"
 
@@ -863,7 +412,7 @@ msgstr "éé"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "Pass_word:"
 msgstr "åç(_W)ï"
@@ -873,7 +422,7 @@ msgstr "åç(_W)ï"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 msgid "Remember Password"
 msgstr "èäåç"
 
@@ -883,7 +432,7 @@ msgstr "èäåç"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 #: ../libempathy-gtk/empathy-base-password-dialog.c:261
 msgid "Remember password"
@@ -915,7 +464,7 @@ msgstr "éæå(_P)ï"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
 msgid "_Server:"
 msgstr "äæå(_S)ï"
 
@@ -959,36 +508,32 @@ msgstr "äç ICQ UIN æï"
 msgid "What is your ICQ password?"
 msgstr "äç ICQ åçæï"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:206
-#: ../libempathy-gtk/empathy-account-widget-sip.c:239
+#: ../libempathy-gtk/empathy-account-widget-sip.c:207
+#: ../libempathy-gtk/empathy-account-widget-sip.c:240
 msgid "Auto"
 msgstr "èå"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:209
+#: ../libempathy-gtk/empathy-account-widget-sip.c:210
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:212
+#: ../libempathy-gtk/empathy-account-widget-sip.c:213
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:215
+#: ../libempathy-gtk/empathy-account-widget-sip.c:216
 msgid "TLS"
 msgstr "TLS"
 
-#. translators: this string is very specific to SIP's internal; maybe
-#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:244
+#: ../libempathy-gtk/empathy-account-widget-sip.c:245
 msgid "Register"
 msgstr "èå"
 
-#. translators: this string is very specific to SIP's internal; maybe
-#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:249
+#: ../libempathy-gtk/empathy-account-widget-sip.c:250
 msgid "Options"
 msgstr "éé"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:252
+#: ../libempathy-gtk/empathy-account-widget-sip.c:253
 msgid "None"
 msgstr "ç"
 
@@ -1202,55 +747,59 @@ msgid "Keep-Alive Options"
 msgstr "äæäæçéé"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+msgid "Local IP Address:"
+msgstr "åå IP äåï"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
 msgid "Loose Routing"
 msgstr "åéèç"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
 msgid "Mechanism:"
 msgstr "æåï"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
 msgid "Miscellaneous Options"
 msgstr "éé"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
 msgid "NAT Traversal Options"
 msgstr "NAT åèéé"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
 msgid "Port:"
 msgstr "éæåï"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
 msgid "Proxy Options"
 msgstr "Proxy éé"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
 msgid "STUN Server:"
 msgstr "STUN äæåï"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 #: ../libempathy-gtk/empathy-contactinfo-utils.c:114
 msgid "Server:"
 msgstr "äæåï"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
 msgid "Transport:"
 msgstr "åééèåï"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "Use this account to call _landlines and mobile phones"
 msgstr "äçéååèäææåèèæåéè(_L)"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP account password?"
 msgstr "äç SIP åèåçæï"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "What is your SIP login ID?"
 msgstr "äæèç SIP çå ID æï"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
 msgid "_Username:"
 msgstr "äçèåç(_U)ï"
 
@@ -1336,198 +885,197 @@ msgstr "æååäææçæéèåè"
 msgid "You don't have enough credit in order to place this call"
 msgstr "äçåéäèäèäèéèã"
 
-#: ../libempathy-gtk/empathy-chat.c:729
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "éåçäèååæ"
 
-#: ../libempathy-gtk/empathy-chat.c:787
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "æèèçäéäèææ"
 
-#: ../libempathy-gtk/empathy-chat.c:793
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "ääèåèææéåäé"
 
-#: ../libempathy-gtk/empathy-chat.c:992
-#, c-format
-msgid "â%sâ is not a valid contact ID"
-msgstr "ã%sãäæææçèçä ID"
+#: ../libempathy-gtk/empathy-chat.c:968
+msgid "Invalid contact ID"
+msgstr "çæçèçä ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1087
+#: ../libempathy-gtk/empathy-chat.c:1056
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clearïæéçåèèçææèæ"
 
-#: ../libempathy-gtk/empathy-chat.c:1090
+#: ../libempathy-gtk/empathy-chat.c:1059
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <äé>ïèççåèèçäé"
 
-#: ../libempathy-gtk/empathy-chat.c:1093
+#: ../libempathy-gtk/empathy-chat.c:1062
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <èåå ID>ïååæçèåå"
 
-#: ../libempathy-gtk/empathy-chat.c:1096
+#: ../libempathy-gtk/empathy-chat.c:1065
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <èåå ID>ïååæçèåå"
 
-#: ../libempathy-gtk/empathy-chat.c:1100
+#: ../libempathy-gtk/empathy-chat.c:1069
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr "/part [<èåå ID>] [<åå>]ïééèååïéèççåçèåå"
 
-#: ../libempathy-gtk/empathy-chat.c:1104
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <èçä ID> [<èæ>]ïéåçäèå"
 
-#: ../libempathy-gtk/empathy-chat.c:1107
+#: ../libempathy-gtk/empathy-chat.c:1076
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <èçä ID> <èæ>ïéåçäèå"
 
-#: ../libempathy-gtk/empathy-chat.c:1110
+#: ../libempathy-gtk/empathy-chat.c:1079
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <çå>ïææåçåäæåäçäççå"
 
-#: ../libempathy-gtk/empathy-chat.c:1113
+#: ../libempathy-gtk/empathy-chat.c:1082
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <èæ>ïéåäå ACTION èæåçåçèèä"
 
-#: ../libempathy-gtk/empathy-chat.c:1116
+#: ../libempathy-gtk/empathy-chat.c:1085
 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:1121
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <èçä ID>ïéçèçäççéèè"
 
-#: ../libempathy-gtk/empathy-chat.c:1124
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr "/help [<åä>]ïéçææææçæäãåææåçéå <åä> çèïäéçåççæã"
 
-#: ../libempathy-gtk/empathy-chat.c:1143
+#: ../libempathy-gtk/empathy-chat.c:1112
 #, c-format
 msgid "Usage: %s"
 msgstr "çæï%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1188
+#: ../libempathy-gtk/empathy-chat.c:1157
 msgid "Unknown command"
 msgstr "æççåä"
 
-#: ../libempathy-gtk/empathy-chat.c:1314
+#: ../libempathy-gtk/empathy-chat.c:1283
 msgid "Unknown command; see /help for the available commands"
 msgstr "æççæäïèåè /help äåååççæä"
 
-#: ../libempathy-gtk/empathy-chat.c:1565
+#: ../libempathy-gtk/empathy-chat.c:1540
 msgid "insufficient balance to send message"
 msgstr "ééäèäåéèæ"
 
-#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
-#: ../libempathy-gtk/empathy-chat.c:1646
+#: ../libempathy-gtk/empathy-chat.c:1544 ../libempathy-gtk/empathy-chat.c:1558
+#: ../libempathy-gtk/empathy-chat.c:1621
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "åéèæã%sãæççéèï%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
-#: ../libempathy-gtk/empathy-chat.c:1650
+#: ../libempathy-gtk/empathy-chat.c:1546 ../libempathy-gtk/empathy-chat.c:1563
+#: ../libempathy-gtk/empathy-chat.c:1625
 #, 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:1577
+#: ../libempathy-gtk/empathy-chat.c:1552
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "ééäèäåéèæã<a href='%s'>åå</a>ã"
 
-#: ../libempathy-gtk/empathy-chat.c:1617
+#: ../libempathy-gtk/empathy-chat.c:1592
 msgid "not capable"
 msgstr "çæ"
 
-#: ../libempathy-gtk/empathy-chat.c:1624
+#: ../libempathy-gtk/empathy-chat.c:1599
 msgid "offline"
 msgstr "éç"
 
-#: ../libempathy-gtk/empathy-chat.c:1627
+#: ../libempathy-gtk/empathy-chat.c:1602
 msgid "invalid contact"
 msgstr "çæçèçä"
 
-#: ../libempathy-gtk/empathy-chat.c:1630
+#: ../libempathy-gtk/empathy-chat.c:1605
 msgid "permission denied"
 msgstr "æéèæç"
 
-#: ../libempathy-gtk/empathy-chat.c:1633
+#: ../libempathy-gtk/empathy-chat.c:1608
 msgid "too long message"
 msgstr "åéçèæ"
 
-#: ../libempathy-gtk/empathy-chat.c:1636
+#: ../libempathy-gtk/empathy-chat.c:1611
 msgid "not implemented"
 msgstr "æåä"
 
-#: ../libempathy-gtk/empathy-chat.c:1640
+#: ../libempathy-gtk/empathy-chat.c:1615
 msgid "unknown"
 msgstr "äæ"
 
-#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
+#: ../libempathy-gtk/empathy-chat.c:1682 ../src/empathy-chat-window.c:940
 msgid "Topic:"
 msgstr "äéï"
 
-#: ../libempathy-gtk/empathy-chat.c:1722
+#: ../libempathy-gtk/empathy-chat.c:1697
 #, c-format
 msgid "Topic set to: %s"
 msgstr "äéèåç: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1724
+#: ../libempathy-gtk/empathy-chat.c:1699
 #, c-format
 msgid "Topic set by %s to: %s"
 msgstr "%s åäéèåçï%s"
 
 #. No need to display this 'event' is no topic can be defined anyway
-#: ../libempathy-gtk/empathy-chat.c:1729
+#: ../libempathy-gtk/empathy-chat.c:1704
 msgid "No topic defined"
 msgstr "åæåçäé"
 
-#: ../libempathy-gtk/empathy-chat.c:2245
+#: ../libempathy-gtk/empathy-chat.c:2220
 msgid "(No Suggestions)"
 msgstr "(ææåè)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2313
+#: ../libempathy-gtk/empathy-chat.c:2288
 #, 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:2350
+#: ../libempathy-gtk/empathy-chat.c:2325
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "ååã%sãè %s åå"
 
-#: ../libempathy-gtk/empathy-chat.c:2420
+#: ../libempathy-gtk/empathy-chat.c:2395
 msgid "Insert Smiley"
 msgstr "æåèæçè"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2438
+#: ../libempathy-gtk/empathy-chat.c:2413
 #: ../libempathy-gtk/empathy-ui-utils.c:1880
 msgid "_Send"
 msgstr "åé(_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2495
+#: ../libempathy-gtk/empathy-chat.c:2470
 msgid "_Spelling Suggestions"
 msgstr "æååè(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2584
+#: ../libempathy-gtk/empathy-chat.c:2559
 msgid "Failed to retrieve recent logs"
 msgstr "çæååæèçæè"
 
-#: ../libempathy-gtk/empathy-chat.c:2723
+#: ../libempathy-gtk/empathy-chat.c:2698
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s åæç"
@@ -1535,12 +1083,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:2730
+#: ../libempathy-gtk/empathy-chat.c:2705
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s è %2$s èåå"
 
-#: ../libempathy-gtk/empathy-chat.c:2733
+#: ../libempathy-gtk/empathy-chat.c:2708
 #, c-format
 msgid "%s was kicked"
 msgstr "%s èèå"
@@ -1548,17 +1096,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:2741
+#: ../libempathy-gtk/empathy-chat.c:2716
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s è %2$s èçéåå"
 
-#: ../libempathy-gtk/empathy-chat.c:2744
+#: ../libempathy-gtk/empathy-chat.c:2719
 #, c-format
 msgid "%s was banned"
 msgstr "%s èèçéåå"
 
-#: ../libempathy-gtk/empathy-chat.c:2748
+#: ../libempathy-gtk/empathy-chat.c:2723
 #, c-format
 msgid "%s has left the room"
 msgstr "%s åçééæèåå"
@@ -1568,17 +1116,17 @@ msgstr "%s åçééæèåå"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2757
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2782
+#: ../libempathy-gtk/empathy-chat.c:2757
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s åçååæèåå"
 
-#: ../libempathy-gtk/empathy-chat.c:2807
+#: ../libempathy-gtk/empathy-chat.c:2782
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s çåèçç %s"
@@ -1586,55 +1134,55 @@ 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:2994
-#: ../src/empathy-streamed-media-window.c:1888
-#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
-#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2590
+#: ../libempathy-gtk/empathy-chat.c:2969 ../src/empathy-event-manager.c:1167
+#: ../src/empathy-call-window.c:1465 ../src/empathy-call-window.c:1515
+#: ../src/empathy-call-window.c:2566
 msgid "Disconnected"
 msgstr "åæç"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3658
+#: ../libempathy-gtk/empathy-chat.c:3633
 msgid "Would you like to store this password?"
 msgstr "äæèååæåçï"
 
-#: ../libempathy-gtk/empathy-chat.c:3664
+#: ../libempathy-gtk/empathy-chat.c:3639
 msgid "Remember"
 msgstr "èä"
 
-#: ../libempathy-gtk/empathy-chat.c:3674
+#: ../libempathy-gtk/empathy-chat.c:3649
 msgid "Not now"
 msgstr "çåäè"
 
-#: ../libempathy-gtk/empathy-chat.c:3718
+#: ../libempathy-gtk/empathy-chat.c:3693
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "éè"
 
-#: ../libempathy-gtk/empathy-chat.c:3722
+#: ../libempathy-gtk/empathy-chat.c:3697
 msgid "Wrong password; please try again:"
 msgstr "åçéèïèåèäæï"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3852
+#: ../libempathy-gtk/empathy-chat.c:3827
 msgid "This room is protected by a password:"
 msgstr "æèåååèåçäèï"
 
-#: ../libempathy-gtk/empathy-chat.c:3879
+#: ../libempathy-gtk/empathy-chat.c:3854
+#: ../src/empathy-new-chatroom-dialog.c:780
 msgid "Join"
 msgstr "åå"
 
-#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300
+#: ../libempathy-gtk/empathy-chat.c:4046 ../src/empathy-event-manager.c:1188
 msgid "Connected"
 msgstr "æåéç"
 
-#: ../libempathy-gtk/empathy-chat.c:4126
+#: ../libempathy-gtk/empathy-chat.c:4101
 msgid "Conversation"
 msgstr "èè"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4131
+#: ../libempathy-gtk/empathy-chat.c:4106
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1659,13 +1207,13 @@ msgstr "åæçææ"
 msgid "Could not block contact"
 msgstr "çæåéèçä"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:610
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:611
 msgid "Edit Blocked Contacts"
 msgstr "çèåéçèçä"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:524
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
 #: ../libempathy-gtk/empathy-individual-widget.c:1474
 #: ../src/empathy-chatrooms-window.ui.h:1
@@ -1695,29 +1243,29 @@ msgstr "éåéç(_O)"
 msgid "%A %B %d %Y"
 msgstr "%Y %B %d %A"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-contact-dialogs.c:325
 #: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "æåèçä"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-contact-dialogs.c:394
 #: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "åé %sï"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-contact-dialogs.c:399
 #: ../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-dialogs.c:405
+#: ../libempathy-gtk/empathy-contact-dialogs.c:404
 #: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "åé(_B)"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:423
+#: ../libempathy-gtk/empathy-contact-dialogs.c:422
 #: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
@@ -1736,190 +1284,190 @@ msgid "_Block User"
 msgstr "åéäçè(_B)"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:517
 msgid "Search contacts"
 msgstr "æåèçä"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:547
 msgid "Search: "
 msgstr "æåï"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "_Add Contact"
 msgstr "ååèçä(_A)"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:623
 msgid "No contacts found"
 msgstr "æäåèçä"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:639
 msgid "Your message introducing yourself:"
 msgstr "äçèæ"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:647
 msgid "Please let me see when you're online. Thanks!"
 msgstr "çääçæèèæçéãæèï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:567
+#: ../libempathy-gtk/empathy-contact-widget.c:566
 #: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "ééï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:747
+#: ../libempathy-gtk/empathy-contact-widget.c:746
 #: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "åå ISO çï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-contact-widget.c:748
 #: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "ååï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-contact-widget.c:750
 #: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "åï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-contact-widget.c:752
 #: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "åï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-contact-widget.c:754
 #: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "ååï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-contact-widget.c:756
 #: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "ééåèï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-contact-widget.c:758
 #: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "èï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-contact-widget.c:760
 #: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "åçï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-contact-widget.c:762
 #: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "æåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-contact-widget.c:764
 #: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "åï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-contact-widget.c:766
 #: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "æåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-contact-widget.c:768
 #: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "æèï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-contact-widget.c:770
 #: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URIï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-contact-widget.c:772
 #: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "æçåççï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-contact-widget.c:774
 #: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "éèï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-contact-widget.c:776
 #: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "åçèå (ç)ï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-contact-widget.c:778
 #: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "æåèå (ç)ï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-contact-widget.c:780
 #: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "éåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-contact-widget.c:782
 #: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "æäï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-contact-widget.c:784
 #: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "çåéåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-contact-widget.c:786
 #: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "äææææï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-contact-widget.c:788
 #: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "çåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-contact-widget.c:790
 #: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "çåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-contact-widget.c:792
 #: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "çåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:846
-#: ../libempathy-gtk/empathy-contact-widget.c:861
+#: ../libempathy-gtk/empathy-contact-widget.c:845
+#: ../libempathy-gtk/empathy-contact-widget.c:860
 #: ../libempathy-gtk/empathy-individual-widget.c:593
 #: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:16
 msgid "Location"
 msgstr "äç"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-contact-widget.c:862
 #: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%sï%s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:914
 #: ../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:997
+#: ../libempathy-gtk/empathy-contact-widget.c:996
 #: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "åååéè"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1053
+#: ../libempathy-gtk/empathy-contact-widget.c:1052
 #: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "çæåååéè"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1444
+#: ../libempathy-gtk/empathy-contact-widget.c:1454
 msgid "Personal Details"
 msgstr "åäçç"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1447
+#: ../libempathy-gtk/empathy-contact-widget.c:1457
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Contact Details"
@@ -2028,27 +1576,26 @@ msgstr "OSï"
 msgid "Version:"
 msgstr "çæï"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:331
+#: ../libempathy-gtk/empathy-groups-widget.c:327
 msgid "Groups"
 msgstr "çç"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:343
+#: ../libempathy-gtk/empathy-groups-widget.c:339
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 msgstr "èéæéåèçäèéçåååççãææäåäéæäåääçççæäéæççã"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:362
+#: ../libempathy-gtk/empathy-groups-widget.c:358
 msgid "_Add Group"
 msgstr "ååçç(_G)"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:397
+#: ../libempathy-gtk/empathy-groups-widget.c:393
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "éå"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:407
-#: ../src/empathy-roster-window.c:1970
+#: ../libempathy-gtk/empathy-groups-widget.c:403
 msgid "Group"
 msgstr "çç"
 
@@ -2074,144 +1621,143 @@ 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:173
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:345
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 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:349
+#: ../libempathy-gtk/empathy-individual-menu.c:348
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1290
 #: ../src/empathy-call-window.ui.h:2
 msgid "Call"
 msgstr "éè"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:414
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "æåéè"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:416
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "åä"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:418
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "äå"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:659
+#: ../libempathy-gtk/empathy-individual-menu.c:658
 msgid "_Block Contact"
 msgstr "åéèçä(_B)"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1018
-#: ../libempathy-gtk/empathy-new-message-dialog.c:319
-#: ../src/empathy-roster-window-menubar.ui.h:16
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:318
 msgid "_Chat"
 msgstr "èå(_C)"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1053
-#: ../libempathy-gtk/empathy-new-message-dialog.c:313
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:312
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1086
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "èééè(_A)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1119
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "èåéè(_V)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1160
-#: ../src/empathy-roster-window-menubar.ui.h:26
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
 msgid "_Previous Conversations"
 msgstr "éåèè(_P)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1189
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
 msgid "Send File"
 msgstr "åéææ"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1219
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
 msgid "Share My Desktop"
 msgstr "åäæçæé"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1245
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
 #: ../libempathy-gtk/empathy-individual-widget.c:1357
 msgid "Favorite"
 msgstr "åå"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1264
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
 msgid "gnome-contacts not installed"
 msgstr "gnome-contacts åæåè"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1267
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
 msgid "Please install gnome-contacts to access contacts details."
 msgstr "èåè gnome-contacts äååèçäççã"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1398
+#: ../libempathy-gtk/empathy-individual-menu.c:1397
 msgid "Infor_mation"
 msgstr "èè(_M)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1447
+#: ../libempathy-gtk/empathy-individual-menu.c:1446
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "çè(_E)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1564
-#: ../src/empathy-chat-window.c:1192
+#. send invitation
+#: ../libempathy-gtk/empathy-individual-menu.c:1562
+#: ../src/empathy-chat-window.c:1211
 msgid "Inviting you to this room"
 msgstr "éèäåéåèåå"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1610
+#: ../libempathy-gtk/empathy-individual-menu.c:1608
 msgid "_Invite to Chat Room"
 msgstr "éèåèåå(_I)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1806
-#: ../src/empathy-roster-window-menubar.ui.h:14
+#: ../libempathy-gtk/empathy-individual-menu.c:1804
 msgid "_Add Contactâ"
 msgstr "ååèçä(_A)â"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2304
+#: ../libempathy-gtk/empathy-individual-view.c:2364
 msgid "Delete and _Block"
 msgstr "åéäåé(_B)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2339
+#: ../libempathy-gtk/empathy-individual-view.c:2399
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "æåæèçéççã%sãï"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2342
+#: ../libempathy-gtk/empathy-individual-view.c:2402
 msgid "Removing group"
 msgstr "æåçéçç"
 
+#: ../libempathy-gtk/empathy-individual-view.c:2470
+msgid "Re_name"
+msgstr "éæåå"
+
 #. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2397
-#: ../libempathy-gtk/empathy-individual-view.c:2601
+#: ../libempathy-gtk/empathy-individual-view.c:2479
+#: ../libempathy-gtk/empathy-individual-view.c:2683
 msgid "_Remove"
 msgstr "çé(_R)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2474
+#: ../libempathy-gtk/empathy-individual-view.c:2556
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "æåæèçéèçäã%sãï"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2483
+#: ../libempathy-gtk/empathy-individual-view.c:2565
 #, 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-view.c:2495
+#: ../libempathy-gtk/empathy-individual-view.c:2577
 msgid "Removing contact"
 msgstr "æåçéèçä"
 
@@ -2254,133 +1800,133 @@ msgstr "æåäæå"
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:620
+#: ../libempathy-gtk/empathy-log-window.c:617
 msgid "History"
 msgstr "æå"
 
-#: ../libempathy-gtk/empathy-log-window.c:675
+#: ../libempathy-gtk/empathy-log-window.c:672
 msgid "Show"
 msgstr "éç"
 
-#: ../libempathy-gtk/empathy-log-window.c:697
+#: ../libempathy-gtk/empathy-log-window.c:694
 msgid "Search"
 msgstr "æå"
 
-#: ../libempathy-gtk/empathy-log-window.c:1148
+#: ../libempathy-gtk/empathy-log-window.c:1145
 #, c-format
 msgid "Chat in %s"
 msgstr "æ %s åèå"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1147
 #, c-format
 msgid "Chat with %s"
 msgstr "è %s èåä"
 
-#: ../libempathy-gtk/empathy-log-window.c:1200
-#: ../libempathy-gtk/empathy-log-window.c:1347
+#: ../libempathy-gtk/empathy-log-window.c:1197
+#: ../libempathy-gtk/empathy-log-window.c:1341
 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:1289
+#: ../libempathy-gtk/empathy-log-window.c:1284
 #, 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:1295
+#: ../libempathy-gtk/empathy-log-window.c:1290
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%sï</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1371
+#: ../libempathy-gtk/empathy-log-window.c:1365
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s ç"
 
-#: ../libempathy-gtk/empathy-log-window.c:1378
+#: ../libempathy-gtk/empathy-log-window.c:1372
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s åé"
 
-#: ../libempathy-gtk/empathy-log-window.c:1386
+#: ../libempathy-gtk/empathy-log-window.c:1380
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "éèæé %sïçææ %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1720
+#: ../libempathy-gtk/empathy-log-window.c:1711
 msgid "Today"
 msgstr "äæ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1724
+#: ../libempathy-gtk/empathy-log-window.c:1715
 msgid "Yesterday"
 msgstr "ææ"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1739
+#: ../libempathy-gtk/empathy-log-window.c:1730
 msgid "%e %B %Y"
 msgstr "%Yå%B%eæ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1827
-#: ../libempathy-gtk/empathy-log-window.c:3487
+#: ../libempathy-gtk/empathy-log-window.c:1834
+#: ../libempathy-gtk/empathy-log-window.c:3457
 msgid "Anytime"
 msgstr "ääæé"
 
-#: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2400
+#: ../libempathy-gtk/empathy-log-window.c:1933
+#: ../libempathy-gtk/empathy-log-window.c:2392
 msgid "Anyone"
 msgstr "ääå"
 
-#: ../libempathy-gtk/empathy-log-window.c:2713
+#: ../libempathy-gtk/empathy-log-window.c:2705
 msgid "Who"
 msgstr "è"
 
-#: ../libempathy-gtk/empathy-log-window.c:2922
+#: ../libempathy-gtk/empathy-log-window.c:2914
 msgid "When"
 msgstr "äæ"
 
-#: ../libempathy-gtk/empathy-log-window.c:3038
+#: ../libempathy-gtk/empathy-log-window.c:3032
 msgid "Anything"
 msgstr "äää"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3034
 msgid "Text chats"
 msgstr "æåèå"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3035
+#: ../src/empathy-preferences.ui.h:3
 msgid "Calls"
 msgstr "éè"
 
-#: ../libempathy-gtk/empathy-log-window.c:3047
+#: ../libempathy-gtk/empathy-log-window.c:3039
 msgid "Incoming calls"
 msgstr "äé"
 
-#: ../libempathy-gtk/empathy-log-window.c:3048
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Outgoing calls"
 msgstr "æå"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3041
 msgid "Missed calls"
 msgstr "ææäé"
 
-#: ../libempathy-gtk/empathy-log-window.c:3071
+#: ../libempathy-gtk/empathy-log-window.c:3061
 msgid "What"
 msgstr "äé"
 
-#: ../libempathy-gtk/empathy-log-window.c:3780
+#: ../libempathy-gtk/empathy-log-window.c:3750
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "äçåèåééåèèçææçéåï"
 
-#: ../libempathy-gtk/empathy-log-window.c:3784
+#: ../libempathy-gtk/empathy-log-window.c:3754
 msgid "Clear All"
 msgstr "æéåé"
 
-#: ../libempathy-gtk/empathy-log-window.c:3791
+#: ../libempathy-gtk/empathy-log-window.c:3761
 msgid "Delete from:"
 msgstr "åéåï"
 
@@ -2389,7 +1935,7 @@ msgid "<span size=\"x-large\">Loading...</span>"
 msgstr "<span size=\"x-large\">æåèå...</span>"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
+#: ../src/empathy-chat-window.ui.h:3 ../src/empathy-preferences.ui.h:4
 msgid "Chat"
 msgstr "èå"
 
@@ -2403,13 +1949,11 @@ msgstr "åäææ"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
 msgid "Video"
 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-roster-window-menubar.ui.h:20
 msgid "_Edit"
 msgstr "çè(_E)"
 
@@ -2421,78 +1965,78 @@ msgstr "ææ(_F)"
 msgid "page 2"
 msgstr "éé 2"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+#: ../libempathy-gtk/empathy-new-message-dialog.c:82
 msgid "The contact is offline"
 msgstr "èçäåçéç"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+#: ../libempathy-gtk/empathy-new-message-dialog.c:84
 msgid "The specified contact is either invalid or unknown"
 msgstr "æåçèçäçæææç"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+#: ../libempathy-gtk/empathy-new-message-dialog.c:86
 msgid "The contact does not support this kind of conversation"
 msgstr "èèçääææééèè"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+#: ../libempathy-gtk/empathy-new-message-dialog.c:88
 msgid "The requested functionality is not implemented for this protocol"
 msgstr "èæçåèåæåæååäåä"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+#: ../libempathy-gtk/empathy-new-message-dialog.c:94
 msgid "Could not start a conversation with the given contact"
 msgstr "çæååèçåèçäçèè"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+#: ../libempathy-gtk/empathy-new-message-dialog.c:96
 msgid "You are banned from this channel"
 msgstr "äèæééçå"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+#: ../libempathy-gtk/empathy-new-message-dialog.c:98
 msgid "This channel is full"
 msgstr "æééåæ"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+#: ../libempathy-gtk/empathy-new-message-dialog.c:100
 msgid "You must be invited to join this channel"
 msgstr "äåéèéèæèååæéé"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+#: ../libempathy-gtk/empathy-new-message-dialog.c:102
 msgid "Can't proceed while disconnected"
 msgstr "æçæçæèç"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+#: ../libempathy-gtk/empathy-new-message-dialog.c:104
 msgid "Permission denied"
 msgstr "èåèæç"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+#: ../libempathy-gtk/empathy-new-message-dialog.c:110
 msgid "There was an error starting the conversation"
 msgstr "ååèèæççéè"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:290
-#: ../libempathy-gtk/empathy-new-call-dialog.c:200
+#: ../libempathy-gtk/empathy-new-message-dialog.c:289
+#: ../libempathy-gtk/empathy-new-call-dialog.c:199
 msgid "Enter a contact identifier or phone number:"
 msgstr "èèåèçäèèèäæéèèçï"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:333
+#: ../libempathy-gtk/empathy-new-message-dialog.c:332
 msgid "New Conversation"
 msgstr "æåèè"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+#: ../libempathy-gtk/empathy-new-call-dialog.c:222
 msgid "_Video Call"
 msgstr "èåéè(_V)"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+#: ../libempathy-gtk/empathy-new-call-dialog.c:232
 msgid "_Audio Call"
 msgstr "èééè(_A)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:243
+#: ../libempathy-gtk/empathy-new-call-dialog.c:242
 msgid "New Call"
 msgstr "æåéè"
 
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:130
 #, c-format
-msgid "Authentification failed for account <b>%s</b>"
+msgid "Authentication failed for account <b>%s</b>"
 msgstr "<b>%s</b> åèéèåæ"
 
 #: ../libempathy-gtk/empathy-base-password-dialog.c:224
@@ -2511,30 +2055,40 @@ msgstr ""
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:167
-#: ../libempathy-gtk/empathy-presence-chooser.c:203
+#: ../libempathy-gtk/empathy-presence-chooser.c:165
+#: ../libempathy-gtk/empathy-presence-chooser.c:201
 msgid "Custom Messageâ"
 msgstr "èéèæâ"
 
+#: ../libempathy-gtk/empathy-presence-chooser.c:218
 #: ../libempathy-gtk/empathy-presence-chooser.c:220
-#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messagesâ"
 msgstr "çèèéèæâ"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:345
+#: ../libempathy-gtk/empathy-presence-chooser.c:342
 msgid "Click to remove this status as a favorite"
 msgstr "æéèåéåçæåååäçé"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:354
+#: ../libempathy-gtk/empathy-presence-chooser.c:351
 msgid "Click to make this status a favorite"
 msgstr "æéèåéåçæèçåå"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:388
+#. Translators: %s is a status message like 'At the pub' for example
+#: ../libempathy-gtk/empathy-presence-chooser.c:385
+#, c-format
+msgid ""
+"<b>Current message: %s</b>\n"
+"<small><i>Press Enter to set the new message or Esc to cancel.</i></small>"
+msgstr ""
+"<b>çåèæï%s</b>\n"
+"<small><i>æä Enter èåæèæïææä Esc åæã</i></small>"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:394
 msgid "Set status"
 msgstr "èåçæ"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1135
+#: ../libempathy-gtk/empathy-presence-chooser.c:1102
 msgid "Custom messagesâ"
 msgstr "èéèæâ"
 
@@ -2910,31 +2464,31 @@ msgstr "éå..."
 msgid "_Select"
 msgstr "éå(_S)"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:201
 msgid "No error message"
 msgstr "ææéèèæ"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:274
 msgid "Instant Message (Empathy)"
 msgstr "åæéè (Empathy)"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:432
 msgid "Don't connect on startup"
 msgstr "ååæäèèåéç"
 
-#: ../src/empathy.c:439
+#: ../src/empathy.c:436
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "ååæäéçèçäæåæääåäåèç"
 
-#: ../src/empathy.c:454
+#: ../src/empathy.c:452
 msgid "- Empathy IM Client"
 msgstr "- Empathy åæéçæç"
 
-#: ../src/empathy.c:641
+#: ../src/empathy.c:628
 msgid "Error contacting the Account Manager"
 msgstr "èçåèçççåæççéè"
 
-#: ../src/empathy.c:643
+#: ../src/empathy.c:630
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2987,78 +2541,76 @@ msgstr ""
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:72
+#: ../src/empathy-accounts-dialog.c:70
 #, 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:76
+#: ../src/empathy-accounts-dialog.c:74
 msgid "Your new account has not been saved yet."
 msgstr "åæååäçæåèã"
 
-#: ../src/empathy-accounts-dialog.c:381
-#: ../src/empathy-streamed-media-window.c:759
-#: ../src/empathy-call-window.c:1289
+#: ../src/empathy-accounts-dialog.c:403 ../src/empathy-call-window.c:1265
 msgid "Connectingâ"
 msgstr "éçäâ"
 
-#: ../src/empathy-accounts-dialog.c:422
+#: ../src/empathy-accounts-dialog.c:444
 #, c-format
 msgid "Offline â %s"
 msgstr "éç â %s"
 
-#: ../src/empathy-accounts-dialog.c:434
+#: ../src/empathy-accounts-dialog.c:456
 #, c-format
 msgid "Disconnected â %s"
 msgstr "åæç â %s"
 
-#: ../src/empathy-accounts-dialog.c:445
+#: ../src/empathy-accounts-dialog.c:467
 msgid "Offline â No Network Connection"
 msgstr "éç â çççéç"
 
-#: ../src/empathy-accounts-dialog.c:452
+#: ../src/empathy-accounts-dialog.c:474
 msgid "Unknown Status"
 msgstr "æçççæ"
 
-#: ../src/empathy-accounts-dialog.c:469
+#: ../src/empathy-accounts-dialog.c:491
 msgid ""
 "This account has been disabled because it relies on an old, unsupported "
 "backend. Please install telepathy-haze and restart your session to migrate "
 "the account."
 msgstr "éåååçåçïåçåéèèèãäååææçåççåãèåè telepathy-haze äéæååäçäæéæäéçåèèæã"
 
-#: ../src/empathy-accounts-dialog.c:479
+#: ../src/empathy-accounts-dialog.c:501
 msgid "Offline â Account Disabled"
 msgstr "éç â åèååç"
 
-#: ../src/empathy-accounts-dialog.c:585
+#: ../src/empathy-accounts-dialog.c:607
 msgid "Edit Connection Parameters"
 msgstr "çèéçåæ"
 
-#: ../src/empathy-accounts-dialog.c:750
+#: ../src/empathy-accounts-dialog.c:770
 msgid "Failed to retrieve your personal information from the server."
 msgstr "çæåäæåæåäçåäèæã"
 
-#: ../src/empathy-accounts-dialog.c:756
+#: ../src/empathy-accounts-dialog.c:776
 msgid "Go online to edit your personal information."
 msgstr "äçäçèäçåäèæã"
 
-#: ../src/empathy-accounts-dialog.c:843
+#: ../src/empathy-accounts-dialog.c:855
 msgid "_Edit Connection Parameters..."
 msgstr "çèéçåæ(_E)..."
 
-#: ../src/empathy-accounts-dialog.c:1339
+#: ../src/empathy-accounts-dialog.c:1351
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "æåæèåäçéèäçéçç %sï"
 
-#: ../src/empathy-accounts-dialog.c:1343
+#: ../src/empathy-accounts-dialog.c:1355
 msgid "This will not remove your account on the server."
 msgstr "éäæçéäæåäçäçåèã"
 
-#: ../src/empathy-accounts-dialog.c:1579
+#: ../src/empathy-accounts-dialog.c:1560
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3066,24 +2618,25 @@ msgstr ""
 "äåååçåäååèïéææææ\n"
 "äæåçææãçåèççï"
 
-#. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1755
-msgid "_Enable"
-msgstr "åç(_E)"
+#. Menu item: to enabled/disable the account
+#: ../src/empathy-accounts-dialog.c:1751
+msgid "_Enabled"
+msgstr "ååç(_E)"
 
-#: ../src/empathy-accounts-dialog.c:1756
-msgid "_Disable"
-msgstr "åç(_D)"
+#. Menu item: Rename
+#: ../src/empathy-accounts-dialog.c:1774
+msgid "Rename"
+msgstr "éæåå"
 
-#: ../src/empathy-accounts-dialog.c:2184
+#: ../src/empathy-accounts-dialog.c:2190
 msgid "_Skip"
 msgstr "çé(_S)"
 
-#: ../src/empathy-accounts-dialog.c:2188
+#: ../src/empathy-accounts-dialog.c:2194
 msgid "_Connect"
 msgstr "éæ(_C)"
 
-#: ../src/empathy-accounts-dialog.c:2365
+#: ../src/empathy-accounts-dialog.c:2373
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3117,270 +2670,93 @@ msgstr "- Empathy èèçæç"
 msgid "Empathy authentication client"
 msgstr "Empathy èèçæç"
 
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
-msgid "- Empathy Audio/Video Client"
-msgstr "- Empathy éèèåçæç"
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:1
+msgid "Audio"
+msgstr "éè"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
-msgid "Empathy Audio/Video Client"
-msgstr "Empathy éèèåçæç"
+#: ../src/empathy-call-window.ui.h:3
+msgid "Decoding Codec:"
+msgstr "èçççèçåï"
 
-#: ../src/empathy-streamed-media-window.c:434
-msgid "Contrast"
-msgstr "åæ"
+#: ../src/empathy-call-window.ui.h:4
+msgid "Disable camera"
+msgstr "åçæåæ"
 
-#: ../src/empathy-streamed-media-window.c:437
-msgid "Brightness"
-msgstr "äå"
+#: ../src/empathy-call-window.ui.h:5
+msgid "Display the dialpad"
+msgstr "éçæèç"
 
-#: ../src/empathy-streamed-media-window.c:440
-msgid "Gamma"
-msgstr "Gamma"
+#: ../src/empathy-call-window.ui.h:6
+msgid "Encoding Codec:"
+msgstr "ççççèçåï"
 
-#: ../src/empathy-streamed-media-window.c:547
-msgid "Volume"
-msgstr "éé"
+#: ../src/empathy-call-window.ui.h:7
+msgid "Hang up"
+msgstr "ææ"
 
-#: ../src/empathy-streamed-media-window.c:1099
-msgid "_Sidebar"
-msgstr "åéæ(_S)"
+#: ../src/empathy-call-window.ui.h:8
+msgid "Hang up current call"
+msgstr "ææçåéè"
 
-#: ../src/empathy-streamed-media-window.c:1119
-msgid "Audio input"
-msgstr "éæèå"
+#: ../src/empathy-call-window.ui.h:9
+msgid "Local Candidate:"
+msgstr "ææåéï"
 
-#: ../src/empathy-streamed-media-window.c:1123
-msgid "Video input"
-msgstr "èåèå"
+#: ../src/empathy-call-window.ui.h:10
+msgid "Maximise me"
+msgstr "åææåå"
 
-#: ../src/empathy-streamed-media-window.c:1131
-msgid "Dialpad"
-msgstr "æèç"
+#: ../src/empathy-call-window.ui.h:11
+msgid "Minimise me"
+msgstr "åææåå"
 
-#: ../src/empathy-streamed-media-window.c:1142
-msgid "Details"
-msgstr "èçèæ"
+#: ../src/empathy-call-window.ui.h:12
+msgid "Remote Candidate:"
+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:1211
-#: ../src/empathy-call-window.c:1889
-#, c-format
-msgid "Call with %s"
-msgstr "è %s éèä"
+#: ../src/empathy-call-window.ui.h:13
+msgid "Send Audio"
+msgstr "åééè"
 
-#: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2133
-msgid "The IP address as seen by the machine"
-msgstr "æåçèç IP äå"
+#: ../src/empathy-call-window.ui.h:14
+msgid "Send Video"
+msgstr "åéèå"
 
-#: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2135
-msgid "The IP address as seen by a server on the Internet"
-msgstr "äèçäçäæåçèç IP äå"
+#: ../src/empathy-call-window.ui.h:15
+msgid "Show dialpad"
+msgstr "éçæèç"
 
-#: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2137
-msgid "The IP address of the peer as seen by the other side"
-msgstr "åäççèçéç IP äå"
+#: ../src/empathy-call-window.ui.h:16
+msgid "Start a video call"
+msgstr "éåèåéè"
 
-#: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2139
-msgid "The IP address of a relay server"
-msgstr "äçäæåç IP äå"
+#: ../src/empathy-call-window.ui.h:17
+msgid "Start an audio call"
+msgstr "éåéèéè"
 
-#: ../src/empathy-streamed-media-window.c:1452
-#: ../src/empathy-call-window.c:2141
-msgid "The IP address of the multicast group"
-msgstr "åéåæççç IP äå"
+#: ../src/empathy-call-window.ui.h:18
+msgid "Swap camera"
+msgstr "äææåæ"
 
-#: ../src/empathy-streamed-media-window.c:1837
-#: ../src/empathy-streamed-media-window.c:1840
-#: ../src/empathy-streamed-media-window.c:1843
-#: ../src/empathy-streamed-media-window.c:1846
-msgctxt "codec"
-msgid "Unknown"
-msgstr "æç"
+#: ../src/empathy-call-window.ui.h:19
+msgid "Toggle audio transmission"
+msgstr "åæéèåæ"
 
-#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2138
-#, c-format
-msgid "Connected â %d:%02dm"
-msgstr "åéç â %d:%02dm"
+#: ../src/empathy-call-window.ui.h:20
+msgid "Toggle video transmission"
+msgstr "åæèååæ"
 
-#: ../src/empathy-streamed-media-window.c:2199
-#: ../src/empathy-call-window.c:2992
-msgid "Technical Details"
-msgstr "æèçç"
-
-#: ../src/empathy-streamed-media-window.c:2237
-#: ../src/empathy-call-window.c:3031
-#, 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:2242
-#: ../src/empathy-call-window.c:3036
-#, 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:2248
-#: ../src/empathy-call-window.c:3042
-#, 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:2254
-#: ../src/empathy-call-window.c:3048
-msgid "There was a failure on the network"
-msgstr "éåççäæéèçç"
-
-#: ../src/empathy-streamed-media-window.c:2258
-#: ../src/empathy-call-window.c:3052
-msgid ""
-"The audio formats necessary for this call are not installed on your computer"
-msgstr "æéèæåèçéèæååæåäçéèäåè"
-
-#: ../src/empathy-streamed-media-window.c:2261
-#: ../src/empathy-call-window.c:3055
-msgid ""
-"The video formats necessary for this call are not installed on your computer"
-msgstr "æéèæåèçèåæååæåäçéèäåè"
-
-#: ../src/empathy-streamed-media-window.c:2271
-#: ../src/empathy-call-window.c:3067
-#, c-format
-msgid ""
-"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
-"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
-"the Help menu."
-msgstr "å Telepathy åääççæéæççæãè<a href=\"%s\">ååéåéè</a>äéäåæåéååçãééãèçäææéççéã"
-
-#: ../src/empathy-streamed-media-window.c:2279
-#: ../src/empathy-call-window.c:3076
-msgid "There was a failure in the call engine"
-msgstr "éèåæåæéèçç"
-
-#: ../src/empathy-streamed-media-window.c:2282
-#: ../src/empathy-call-window.c:3079
-msgid "The end of the stream was reached"
-msgstr "åéäææç"
-
-#: ../src/empathy-streamed-media-window.c:2322
-#: ../src/empathy-call-window.c:3119
-msgid "Can't establish audio stream"
-msgstr "çæåçéèäæ"
-
-#: ../src/empathy-streamed-media-window.c:2332
-#: ../src/empathy-call-window.c:3129
-msgid "Can't establish video stream"
-msgstr "çæåçèåäæ"
-
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
-#: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "éè"
-
-#: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "èçççèçåï"
-
-#: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "åçæåæ"
-
-#: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "éçæèç"
-
-#: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "ççççèçåï"
-
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "ææ"
-
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "ææçåéè"
-
-#: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "ææåéï"
-
-#: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "åææåå"
-
-#: ../src/empathy-call-window.ui.h:11
-msgid "Minimise me"
-msgstr "åææåå"
-
-#: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "éçåéï"
-
-#: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "åééè"
-
-#: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "åéèå"
-
-#: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "éçæèç"
-
-#: ../src/empathy-call-window.ui.h:16
-msgid "Start a video call"
-msgstr "éåèåéè"
-
-#: ../src/empathy-call-window.ui.h:17
-msgid "Start an audio call"
-msgstr "éåéèéè"
-
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "äææåæ"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "åæéèåæ"
-
-#: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "åæèååæ"
-
-#: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2542 ../src/empathy-call-window.c:2543
-#: ../src/empathy-call-window.c:2544 ../src/empathy-call-window.c:2545
-msgid "Unknown"
-msgstr "äæ"
+#: ../src/empathy-call-window.ui.h:21 ../src/empathy-call-window.c:2518
+#: ../src/empathy-call-window.c:2519 ../src/empathy-call-window.c:2520
+#: ../src/empathy-call-window.c:2521
+msgid "Unknown"
+msgstr "äæ"
 
 #: ../src/empathy-call-window.ui.h:23
 msgid "Video call"
 msgstr "èåéè"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
 msgid "_Call"
 msgstr "éè(_C)"
 
@@ -3389,17 +2765,14 @@ msgid "_Camera"
 msgstr "æåæ(_C)"
 
 #: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "_Contents"
 msgstr "åå(_C)"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../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-roster-window-menubar.ui.h:22
 msgid "_Help"
 msgstr "æå(_H)"
 
@@ -3412,23 +2785,21 @@ msgid "_Settings"
 msgstr "èåå(_S)"
 
 #: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-roster-window-menubar.ui.h:29
-#: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "æè(_V)"
 
-#: ../src/empathy-chat-window.c:289
+#: ../src/empathy-chat-window.c:286
 msgid "Close this window?"
 msgstr "èéééåèçï"
 
-#: ../src/empathy-chat-window.c:294
+#: ../src/empathy-chat-window.c:291
 #, c-format
 msgid ""
 "Closing this window will leave %s. You will not receive any further messages "
 "until you rejoin it."
 msgstr "ééæèçæéé %sãäåçæææåäåçèæïééäåæåèã"
 
-#: ../src/empathy-chat-window.c:305
+#: ../src/empathy-chat-window.c:302
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -3438,60 +2809,60 @@ msgid_plural ""
 "further messages until you rejoin them."
 msgstr[0] "ééæèçæéé %u åèååãäåçæææåäåçèæïééäåæåèã"
 
-#: ../src/empathy-chat-window.c:314
+#: ../src/empathy-chat-window.c:311
 #, c-format
 msgid "Leave %s?"
 msgstr "éé %sï"
 
-#: ../src/empathy-chat-window.c:315
+#: ../src/empathy-chat-window.c:312
 msgid ""
 "You will not receive any further messages from this chat room until you "
 "rejoin it."
 msgstr "äåçæææåæèååäåçèæïééäåæåèã"
 
-#: ../src/empathy-chat-window.c:334
+#: ../src/empathy-chat-window.c:331
 msgid "Close window"
 msgstr "ééèç"
 
-#: ../src/empathy-chat-window.c:334
+#: ../src/empathy-chat-window.c:331
 msgid "Leave room"
 msgstr "ééèåå"
 
-#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
+#: ../src/empathy-chat-window.c:660 ../src/empathy-chat-window.c:680
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d åæè)"
 
-#: ../src/empathy-chat-window.c:652
+#: ../src/empathy-chat-window.c:672
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (èåä %u å)"
 
-#: ../src/empathy-chat-window.c:668
+#: ../src/empathy-chat-window.c:688
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (äèåääç %d åæè)"
 
-#: ../src/empathy-chat-window.c:677
+#: ../src/empathy-chat-window.c:697
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (äèææäç %d åæè)"
 
-#: ../src/empathy-chat-window.c:892
+#: ../src/empathy-chat-window.c:912
 msgid "SMS:"
 msgstr "SMSï"
 
-#: ../src/empathy-chat-window.c:902
+#: ../src/empathy-chat-window.c:922
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "æååé %d åèæ"
 
-#: ../src/empathy-chat-window.c:924
+#: ../src/empathy-chat-window.c:944
 msgid "Typing a message."
 msgstr "æåèåèæã"
 
@@ -3571,96 +2942,94 @@ msgstr "èåéç"
 msgid "Manage Favorite Rooms"
 msgstr "ççååçèåå"
 
-#: ../src/empathy-event-manager.c:522
+#: ../src/empathy-event-manager.c:510
 msgid "Incoming video call"
 msgstr "ååçèåéè"
 
-#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
+#: ../src/empathy-event-manager.c:510 ../src/empathy-call-window.c:1482
 msgid "Incoming call"
 msgstr "äé"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:514
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s èèäéèèåéèãäæåèæèï"
 
-#: ../src/empathy-event-manager.c:527
+#: ../src/empathy-event-manager.c:515
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s èèäéèéèãäæåèæèï"
 
-#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
-#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1525
+#: ../src/empathy-event-manager.c:518 ../src/empathy-event-manager.c:915
+#: ../src/empathy-call-window.c:1488
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s çäé"
 
-#: ../src/empathy-event-manager.c:555
+#: ../src/empathy-event-manager.c:543
 msgid "_Reject"
 msgstr "æç(_R)"
 
-#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
+#: ../src/empathy-event-manager.c:551 ../src/empathy-event-manager.c:559
 msgid "_Answer"
 msgstr "æè(_A)"
 
-#: ../src/empathy-event-manager.c:571
+#: ../src/empathy-event-manager.c:559
 msgid "_Answer with video"
 msgstr "äèåæè(_A)"
 
-#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
-#: ../src/empathy-call-window.c:1525
-#, c-format
-msgid "Incoming video call from %s"
-msgstr "äè %s çèåéè"
-
-#: ../src/empathy-event-manager.c:837
+#: ../src/empathy-event-manager.c:714
 msgid "Room invitation"
 msgstr "èååéè"
 
-#: ../src/empathy-event-manager.c:839
+#: ../src/empathy-event-manager.c:716
 #, c-format
 msgid "Invitation to join %s"
 msgstr "éèåå %s"
 
-#: ../src/empathy-event-manager.c:846
+#: ../src/empathy-event-manager.c:723
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s æåéèäåå %s"
 
-#: ../src/empathy-event-manager.c:854
+#: ../src/empathy-event-manager.c:731
 msgid "_Decline"
 msgstr "æç(_D)"
 
-#: ../src/empathy-event-manager.c:859
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:736
 msgid "_Join"
 msgstr "åå(_J)"
 
-#: ../src/empathy-event-manager.c:886
+#: ../src/empathy-event-manager.c:762
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s æéèäåå %s"
 
-#: ../src/empathy-event-manager.c:892
+#: ../src/empathy-event-manager.c:768
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "äèéèåå %s"
 
-#: ../src/empathy-event-manager.c:943
+#: ../src/empathy-event-manager.c:915 ../src/empathy-call-window.c:1488
+#, c-format
+msgid "Incoming video call from %s"
+msgstr "äè %s çèåéè"
+
+#: ../src/empathy-event-manager.c:947
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "æåäè %s çææåè"
 
-#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
+#: ../src/empathy-event-manager.c:983 ../src/empathy-roster-window.c:356
 msgid "Password required"
 msgstr "éèåç"
 
-#: ../src/empathy-event-manager.c:1216
+#: ../src/empathy-event-manager.c:1105
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s æèååæçäæåäççèå"
 
-#: ../src/empathy-event-manager.c:1222
+#: ../src/empathy-event-manager.c:1111
 #, c-format
 msgid ""
 "\n"
@@ -3795,86 +3164,70 @@ msgid "Import Accounts"
 msgstr "åååè"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:316
+#: ../src/empathy-import-widget.c:303
 msgid "Import"
 msgstr "åå"
 
-#: ../src/empathy-import-widget.c:325
+#: ../src/empathy-import-widget.c:312
 msgid "Protocol"
 msgstr "éèåå"
 
-#: ../src/empathy-import-widget.c:349
+#: ../src/empathy-import-widget.c:336
 msgid "Source"
 msgstr "äæ"
 
-#: ../src/empathy-roster-window.c:391
+#: ../src/empathy-roster-window.c:373
 msgid "Provide Password"
 msgstr "æäåç"
 
-#: ../src/empathy-roster-window.c:397
+#: ../src/empathy-roster-window.c:379
 msgid "Disconnect"
 msgstr "æç"
 
-#: ../src/empathy-roster-window.c:657
+#: ../src/empathy-roster-window.c:639
 msgid "You need to setup an account to see contacts here."
 msgstr "äéèèçäååèæèåéèæçèçäã"
 
-#: ../src/empathy-roster-window.c:673
+#: ../src/empathy-roster-window.c:655
 msgid "No match found"
 msgstr "æäåçåéç"
 
-#: ../src/empathy-roster-window.c:783
+#: ../src/empathy-roster-window.c:765
 #, c-format
 msgid "Sorry, %s accounts canât be used until your %s software is updated."
 msgstr "åææï%s åèçæäçïééäç %s èäåææã"
 
-#: ../src/empathy-roster-window.c:849
+#: ../src/empathy-roster-window.c:831
 msgid "Update software..."
 msgstr "ææèä..."
 
-#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+#: ../src/empathy-roster-window.c:837 ../src/empathy-roster-window.c:954
 msgid "Close"
 msgstr "éé"
 
-#: ../src/empathy-roster-window.c:960
+#: ../src/empathy-roster-window.c:942
 msgid "Reconnect"
 msgstr "éæéæ"
 
-#: ../src/empathy-roster-window.c:966
+#: ../src/empathy-roster-window.c:948
 msgid "Edit Account"
 msgstr "çèåè"
 
-#. Translators: this string will be something like:
-#. * Top up My Account ($1.23)..."
-#: ../src/empathy-roster-window.c:1110
-#, c-format
-msgid "Top up %s (%s)..."
-msgstr "åå %s (%s)..."
-
-#: ../src/empathy-roster-window.c:1156
-msgid "Top up account credit"
+#: ../src/empathy-roster-window.c:1128
+msgid "Top up account"
 msgstr "åååèåé"
 
-#. top up button
-#: ../src/empathy-roster-window.c:1228
-msgid "Top Up..."
-msgstr "åå..."
-
-#: ../src/empathy-roster-window.c:1952
-msgid "Contact"
-msgstr "èçä"
-
-#: ../src/empathy-roster-window.c:2150
+#: ../src/empathy-roster-window.c:1813
 msgid "You need to enable one of your accounts to see contacts here."
 msgstr "äéèåçäåäääçåèäæèåéèæçèçäã"
 
 #. translators: argument is an account name
-#: ../src/empathy-roster-window.c:2158
+#: ../src/empathy-roster-window.c:1821
 #, c-format
 msgid "You need to enable %s to see contacts here."
 msgstr "äéèåç %s æèåéèæçèçäã"
 
-#: ../src/empathy-roster-window.c:2460
+#: ../src/empathy-roster-window.c:2154 ../src/empathy-preferences.ui.h:6
 msgid "Contact List"
 msgstr "èçäæå"
 
@@ -3882,103 +3235,19 @@ msgstr "èçäæå"
 msgid "Account settings"
 msgstr "åèèåå"
 
-#: ../src/empathy-roster-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "èçäåå(_M)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "ååéé"
-
-#: ../src/empathy-roster-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "æèçäæåååæ(_L)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "ååååèåå(_F)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "ççåå"
-
-#: ../src/empathy-roster-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "æååå(_O)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:7
-#: ../src/empathy-status-icon.ui.h:1
-msgid "New _Callâ"
-msgstr "æåéè(_C)â"
-
-#: ../src/empathy-roster-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "æåååèåéè(_A)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:9
-msgid "P_references"
-msgstr "ååèå(_R)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "éçåå(_R)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:11
-msgid "Sort by _Name"
-msgstr "ææåçæå(_N)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:12
-msgid "Sort by _Status"
-msgstr "ææçææå(_S)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "åè(_A)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "èåéçèçä"
-
-#: ../src/empathy-roster-window-menubar.ui.h:17
-msgid "_Compact Size"
-msgstr "ççåå(_C)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "ææåè(_F)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:23
-msgid "_Joinâ"
-msgstr "åå(_J)â"
-
-#: ../src/empathy-roster-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversationâ"
-msgstr "æåèè(_N)â"
-
-#: ../src/empathy-roster-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "éçèçä(_O)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:27
-msgid "_Room"
-msgstr "èåå(_R)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:28
-msgid "_Search for Contactsâ"
-msgstr "æåèçä(_S)â"
-
-#: ../src/empathy-new-chatroom-dialog.c:369
+#: ../src/empathy-new-chatroom-dialog.c:194
 msgid "Chat Room"
 msgstr "èåå"
 
-#: ../src/empathy-new-chatroom-dialog.c:385
+#: ../src/empathy-new-chatroom-dialog.c:209
 msgid "Members"
 msgstr "æå"
 
-#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
-#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:637
+#: ../src/empathy-new-chatroom-dialog.c:410
+msgid "Failed to list rooms"
+msgstr "çæååèåå"
+
+#: ../src/empathy-new-chatroom-dialog.c:439
 #, c-format
 msgid ""
 "%s\n"
@@ -3991,23 +3260,19 @@ msgstr ""
 "éèåçï%s\n"
 "æåï%s"
 
-#: ../src/empathy-new-chatroom-dialog.c:639
-#: ../src/empathy-new-chatroom-dialog.c:640
+#: ../src/empathy-new-chatroom-dialog.c:441
+#: ../src/empathy-new-chatroom-dialog.c:442
 msgid "Yes"
 msgstr "æ"
 
-#: ../src/empathy-new-chatroom-dialog.c:639
-#: ../src/empathy-new-chatroom-dialog.c:640
+#: ../src/empathy-new-chatroom-dialog.c:441
+#: ../src/empathy-new-chatroom-dialog.c:442
 msgid "No"
 msgstr "å"
 
-#: ../src/empathy-new-chatroom-dialog.c:668
-msgid "Could not start room listing"
-msgstr "çæéåååèååæå"
-
-#: ../src/empathy-new-chatroom-dialog.c:678
-msgid "Could not stop room listing"
-msgstr "çæåæååèååæå"
+#: ../src/empathy-new-chatroom-dialog.c:782
+msgid "Join Room"
+msgstr "ååèåå"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "Couldn't load room list"
@@ -4021,102 +3286,100 @@ msgstr "åéèèåèååçèåååçæåæåäééäæå
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
-"the current account's server"
-msgstr "èåæèååæåçäæåïæèçèèååäæçååèæåçäæåæççåå"
+"the current account&apos;s server"
+msgstr "èåæèååæåçäæåïæåæèèååäæçååèæåçäæåæççåå"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "ååèåå"
+msgid ""
+"Enter the server which hosts the room, or leave it empty if the room is on "
+"the current account's server"
+msgstr "èåæèååæåçäæåïæèçèèååäæçååèæåçäæåæççåå"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Room List"
 msgstr "èååæå"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Room:"
 msgstr "èåå(_R)ï"
 
-#: ../src/empathy-preferences.c:166
+#: ../src/empathy-preferences.c:146
 msgid "Message received"
 msgstr "èæåæå"
 
-#: ../src/empathy-preferences.c:167
+#: ../src/empathy-preferences.c:147
 msgid "Message sent"
 msgstr "èæåéå"
 
-#: ../src/empathy-preferences.c:168
+#: ../src/empathy-preferences.c:148
 msgid "New conversation"
 msgstr "æåèè"
 
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:149
 msgid "Contact comes online"
 msgstr "èçääç"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:150
 msgid "Contact goes offline"
 msgstr "èçäéç"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:151
 msgid "Account connected"
 msgstr "åèåéç"
 
-#: ../src/empathy-preferences.c:172
+#: ../src/empathy-preferences.c:152
 msgid "Account disconnected"
 msgstr "åèåæç"
 
-#: ../src/empathy-preferences.c:475
+#: ../src/empathy-preferences.c:429
 msgid "Language"
 msgstr "èè"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:726
+#: ../src/empathy-preferences.c:678
 msgid "Juliet"
 msgstr "çèå"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:733
+#: ../src/empathy-preferences.c:685
 msgid "Romeo"
 msgstr "æåä"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:739
+#: ../src/empathy-preferences.c:691
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "çççèèèåïçääèååéï"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:743
+#: ../src/empathy-preferences.c:695
 msgid "Deny thy father and refuse thy name;"
 msgstr "èçäæèääïçäçåæèåã"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:746
+#: ../src/empathy-preferences.c:698
 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:749
+#: ../src/empathy-preferences.c:701
 msgid "And I'll no longer be a Capulet."
 msgstr "ççèäéååïååçïæéäã"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:752
+#: ../src/empathy-preferences.c:704
 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:755
+#: ../src/empathy-preferences.c:707
 msgid "Juliet has disconnected"
 msgstr "çèååæç"
 
-#: ../src/empathy-preferences.c:1159
+#: ../src/empathy-preferences.c:1112
 msgid "Preferences"
 msgstr "ååèå"
 
-#: ../src/empathy-preferences.ui.h:1
-msgid "Appearance"
-msgstr "åè"
-
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:2
 msgid "Behavior"
 msgstr "èç"
 
@@ -4124,19 +3387,19 @@ msgstr "èç"
 msgid "Chat Th_eme:"
 msgstr "èåäæäé(_E):"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:7
 msgid "Disable notifications when _away or busy"
 msgstr "ççæçééæåçæåçéç(_D)"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:8
 msgid "Disable sounds when _away or busy"
 msgstr "ççæçééæåçæåçéæ(_A)"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:9
 msgid "Display incoming events in the notification area"
 msgstr "åéçååéçæåää"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:10
 msgid ""
 "Echo cancellation helps to make your voice sound clearer to the other "
 "person, but may cause problems on some computers. If you or the other person "
@@ -4144,305 +3407,285 @@ msgid ""
 "off and restarting the call."
 msgstr "åéæéåäèäçèéåäääèæææïäåæäéèäåèåèåéãåæéèæäæåääèèæççåéæéæåæïèåèéæåéæéåèïäéæéåéèã"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact comes online"
 msgstr "çèçääçæåçéç"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when a contact goes offline"
 msgstr "çèçäéçæåçéç"
 
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable notifications when the _chat is not focused"
 msgstr "çèåèçååçéæåçéç(_C)"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
 msgid "Enable spell checking for languages:"
 msgstr "çèèåçæåææï"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:15
 msgid "General"
 msgstr "äè"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location sources:"
 msgstr "äçäæï"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:18
 msgid "Log conversations"
 msgstr "çéèè"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:19
 msgid "Notifications"
 msgstr "éç"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:20
 msgid "Play sound for events"
 msgstr "ææääéæ"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:21
 msgid "Privacy"
 msgstr "çé"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:22
 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:22
+#: ../src/empathy-preferences.ui.h:23
 msgid "Show _smileys as images"
 msgstr "åèæçèäåçéç(_S)"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:24
+msgid "Show account balances"
+msgstr "éçåèéé"
+
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "åèååéçèçäæå(_L)"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:26
+msgid "Show offline contacts"
+msgstr "éçéçèçä"
+
+#: ../src/empathy-preferences.ui.h:27
+msgid "Show protocol in avatar"
+msgstr "æåäåçéçåå"
+
+#: ../src/empathy-preferences.ui.h:28
+msgid "Sort contacts by:"
+msgstr "æåèçäææï"
+
+#: ../src/empathy-preferences.ui.h:29
 msgid "Sounds"
 msgstr "éæ"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:30
 msgid "Spell Checking"
 msgstr "æåææ"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:31
 msgid "Start chats in:"
 msgstr "éåèåæï"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:32
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "éèçèèæåååæåäåçåèååçèèã"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:33
 msgid "Themes"
 msgstr "äæäé"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:34
 msgid "Use _echo cancellation to improve call quality"
 msgstr "äçåéæéäæåéèåè(_E)"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:35
 msgid "Variant:"
 msgstr "æåï"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Automatically connect on startup"
 msgstr "ååæèåéç(_A)"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Cellphone"
 msgstr "ææ(_C)"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Enable bubble notifications"
 msgstr "åçææåéç(_E)"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:39
 msgid "_Enable sound notifications"
 msgstr "åçéæéç(_E)"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:40
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:41
 msgid "_Network (IP, Wi-Fi)"
 msgstr "çç (IP, Wi-Fi)(_N)"
 
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:42
 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:39
+#: ../src/empathy-preferences.ui.h:44
 msgid "_Reduce location accuracy"
 msgstr "éääçæçå(_R)"
 
-#: ../src/empathy-preferences.ui.h:40
+#: ../src/empathy-preferences.ui.h:45
+msgid "name"
+msgstr "åç"
+
+#: ../src/empathy-preferences.ui.h:46
 msgid "new _windows"
 msgstr "æèç(_W)"
 
-#: ../src/empathy-preferences.ui.h:41
+#: ../src/empathy-preferences.ui.h:47
 msgid "new ta_bs"
 msgstr "æåé(_B)"
 
+#: ../src/empathy-preferences.ui.h:48
+msgid "status"
+msgstr "çæ"
+
+#: ../src/empathy-status-icon.ui.h:1
+msgid "New _Callâ"
+msgstr "æåéè(_C)â"
+
 #: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "çæ"
 
+#: ../src/empathy-status-icon.ui.h:3
+msgid "_New Conversationâ"
+msgstr "æåèè(_N)â"
+
 #: ../src/empathy-status-icon.ui.h:4
 msgid "_Quit"
 msgstr "çæ(_Q)"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "åææèçääæ"
-
-#: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "æåæéé"
-
-#: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "æåæéå"
-
-#: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "åçæåæääæåéèå"
-
-#: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "åçæåæäéåèå"
-
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "åçæåæääèéåèå"
-
-#: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "éè"
-
-#: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "éæ"
-
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "èå(_I)"
-
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "èåéé"
-
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "èåéå"
-
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "èåéè"
-
-#: ../src/empathy-map-view.c:471
-msgid "Contact Map View"
-msgstr "èçäååæè"
-
-#: ../src/empathy-debug-window.c:1607
+#: ../src/empathy-debug-window.c:1603
 msgid "Save"
 msgstr "åå"
 
-#: ../src/empathy-debug-window.c:1667
+#: ../src/empathy-debug-window.c:1663
 msgid "Pastebin link"
 msgstr "Pastebin éç"
 
-#: ../src/empathy-debug-window.c:1676
+#: ../src/empathy-debug-window.c:1672
 msgid "Pastebin response"
 msgstr "Pastebin åæ"
 
-#: ../src/empathy-debug-window.c:1683
+#: ../src/empathy-debug-window.c:1679
 msgid "Data too large for a single paste. Please save logs to file."
 msgstr "åæåäèääèèæééåãèååçéèææã"
 
-#: ../src/empathy-debug-window.c:1912
+#: ../src/empathy-debug-window.c:1860
 msgid "Debug Window"
 msgstr "åéèç"
 
-#: ../src/empathy-debug-window.c:1970
+#: ../src/empathy-debug-window.c:1920
 msgid "Send to pastebin"
 msgstr "åéè pastebin"
 
-#: ../src/empathy-debug-window.c:2009
+#: ../src/empathy-debug-window.c:1964
 msgid "Pause"
 msgstr "æå"
 
-#: ../src/empathy-debug-window.c:2021
+#: ../src/empathy-debug-window.c:1976
 msgid "Level "
 msgstr "çç"
 
-#: ../src/empathy-debug-window.c:2040
+#: ../src/empathy-debug-window.c:1995
 msgid "Debug"
 msgstr "åé"
 
-#: ../src/empathy-debug-window.c:2045
+#: ../src/empathy-debug-window.c:2000
 msgid "Info"
 msgstr "èè"
 
-#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
+#: ../src/empathy-debug-window.c:2005 ../src/empathy-debug-window.c:2054
 msgid "Message"
 msgstr "èæ"
 
-#: ../src/empathy-debug-window.c:2055
+#: ../src/empathy-debug-window.c:2010
 msgid "Warning"
 msgstr "èå"
 
-#: ../src/empathy-debug-window.c:2060
+#: ../src/empathy-debug-window.c:2015
 msgid "Critical"
 msgstr "åé"
 
-#: ../src/empathy-debug-window.c:2065
+#: ../src/empathy-debug-window.c:2020
 msgid "Error"
 msgstr "éè"
 
-#: ../src/empathy-debug-window.c:2084
+#: ../src/empathy-debug-window.c:2039
 msgid "Time"
 msgstr "æå"
 
-#: ../src/empathy-debug-window.c:2087
+#: ../src/empathy-debug-window.c:2042
 msgid "Domain"
 msgstr "çå"
 
-#: ../src/empathy-debug-window.c:2089
+#: ../src/empathy-debug-window.c:2045
 msgid "Category"
 msgstr "åé"
 
-#: ../src/empathy-debug-window.c:2091
+#: ../src/empathy-debug-window.c:2048
 msgid "Level"
 msgstr "çç"
 
-#: ../src/empathy-debug-window.c:2114
+#: ../src/empathy-debug-window.c:2077
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr "éåçéççççåäææéçåéæååèã"
 
-#: ../src/empathy-invite-participant-dialog.c:202
-#: ../src/empathy-invite-participant-dialog.c:230
+#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:229
 msgid "Invite Participant"
 msgstr "éèåè"
 
-#: ../src/empathy-invite-participant-dialog.c:203
+#: ../src/empathy-invite-participant-dialog.c:202
 msgid "Choose a contact to invite into the conversation:"
 msgstr "éææèéèéåèèçèçäï"
 
-#: ../src/empathy-invite-participant-dialog.c:226
+#: ../src/empathy-invite-participant-dialog.c:225
 msgid "Invite"
 msgstr "éè"
 
-#: ../src/empathy-accounts.c:180
+#: ../src/empathy-accounts.c:184
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "äèéçääåèçïåèäääæ (äïåå) äéé"
 
-#: ../src/empathy-accounts.c:184
+#: ../src/empathy-accounts.c:188
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "äèéçääåèçïééåæãéèçäãåè"
 
-#: ../src/empathy-accounts.c:188
+#: ../src/empathy-accounts.c:192
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr "ååéåæçäçåè (äïgabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:190
+#: ../src/empathy-accounts.c:194
 msgid "<account-id>"
 msgstr "<account-id>"
 
-#: ../src/empathy-accounts.c:195
+#: ../src/empathy-accounts.c:199
 msgid "- Empathy Accounts"
 msgstr "- Empathy åè"
 
-#: ../src/empathy-accounts.c:231
+#: ../src/empathy-accounts.c:242
 msgid "Empathy Accounts"
 msgstr "Empathy åè"
 
@@ -4458,97 +3701,195 @@ msgstr "- Empathy ééå"
 msgid "Empathy Debugger"
 msgstr "Empathy ééçå"
 
-#: ../src/empathy-chat.c:109
+#: ../src/empathy-chat.c:106
 msgid "- Empathy Chat Client"
 msgstr "- Empathy èåçæç"
 
-#: ../src/empathy-notifications-approver.c:189
+#: ../src/empathy-notifications-approver.c:188
 msgid "Respond"
 msgstr "åæ"
 
-#: ../src/empathy-notifications-approver.c:203
-#: ../src/empathy-call-window.c:1529
+#: ../src/empathy-notifications-approver.c:197
+#: ../src/empathy-call-window.c:1492
 msgid "Reject"
 msgstr "æç"
 
-#: ../src/empathy-notifications-approver.c:208
-#: ../src/empathy-notifications-approver.c:213
-#: ../src/empathy-call-window.c:1530
+#: ../src/empathy-notifications-approver.c:202
+#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-call-window.c:1493
 msgid "Answer"
 msgstr "æè"
 
-#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-notifications-approver.c:207
 msgid "Answer with video"
 msgstr "äèåæè"
 
-#: ../src/empathy-notifications-approver.c:221
-#: ../src/empathy-notifications-approver.c:231
+#: ../src/empathy-notifications-approver.c:215
+#: ../src/empathy-notifications-approver.c:225
 msgid "Decline"
 msgstr "æç"
 
-#: ../src/empathy-notifications-approver.c:225
-#: ../src/empathy-notifications-approver.c:236
+#: ../src/empathy-notifications-approver.c:219
+#: ../src/empathy-notifications-approver.c:230
 msgid "Accept"
 msgstr "æå"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:246
+#: ../src/empathy-notifications-approver.c:240
 msgid "Provide"
 msgstr "æä"
 
-#: ../src/empathy-call-observer.c:132
+#: ../src/empathy-call-observer.c:119
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s ååææçäïääæèääéèã"
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1140 ../src/empathy-call-window.c:1162
+#: ../src/empathy-call-window.c:1122 ../src/empathy-call-window.c:1138
 msgid "i"
 msgstr "è"
 
-#: ../src/empathy-call-window.c:2888
+#. translators: Call is a noun and %s is the contact name. This string
+#. * is used in the window title
+#: ../src/empathy-call-window.c:1857
+#, c-format
+msgid "Call with %s"
+msgstr "è %s éèä"
+
+#: ../src/empathy-call-window.c:2109
+msgid "The IP address as seen by the machine"
+msgstr "æåçèç IP äå"
+
+#: ../src/empathy-call-window.c:2111
+msgid "The IP address as seen by a server on the Internet"
+msgstr "äèçäçäæåçèç IP äå"
+
+#: ../src/empathy-call-window.c:2113
+msgid "The IP address of the peer as seen by the other side"
+msgstr "åäççèçéç IP äå"
+
+#: ../src/empathy-call-window.c:2115
+msgid "The IP address of a relay server"
+msgstr "äçäæåç IP äå"
+
+#: ../src/empathy-call-window.c:2117
+msgid "The IP address of the multicast group"
+msgstr "åéåæççç IP äå"
+
+#: ../src/empathy-call-window.c:2864
 msgid "On hold"
 msgstr "äç"
 
-#: ../src/empathy-call-window.c:2891
+#: ../src/empathy-call-window.c:2867
 msgid "Mute"
 msgstr "éé"
 
-#: ../src/empathy-call-window.c:2893
+#: ../src/empathy-call-window.c:2869
 msgid "Duration"
 msgstr "æé"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2896
+#: ../src/empathy-call-window.c:2872
 #, c-format
 msgid "%s â %d:%02dm"
 msgstr "%s â %d:%02dm"
 
-#: ../src/empathy-call-window.c:3166
+#: ../src/empathy-call-window.c:2968
+msgid "Technical Details"
+msgstr "æèçç"
+
+#: ../src/empathy-call-window.c:3007
+#, c-format
+msgid ""
+"%s's software does not understand any of the audio formats supported by your "
+"computer"
+msgstr "%s çèääçèäääéèäæææçéèæå"
+
+#: ../src/empathy-call-window.c:3012
+#, c-format
+msgid ""
+"%s's software does not understand any of the video formats supported by your "
+"computer"
+msgstr "%s çèääçèäääéèäæææçèåæå"
+
+#: ../src/empathy-call-window.c:3018
+#, 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-call-window.c:3024
+msgid "There was a failure on the network"
+msgstr "éåççäæéèçç"
+
+#: ../src/empathy-call-window.c:3028
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
+msgstr "æéèæåèçéèæååæåäçéèäåè"
+
+#: ../src/empathy-call-window.c:3031
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
+msgstr "æéèæåèçèåæååæåäçéèäåè"
+
+#: ../src/empathy-call-window.c:3043
+#, c-format
+msgid ""
+"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
+"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
+"the Help menu."
+msgstr "å Telepathy åääççæéæççæãè<a href=\"%s\">ååéåéè</a>äéäåæåéååçãééãèçäææéççéã"
+
+#: ../src/empathy-call-window.c:3052
+msgid "There was a failure in the call engine"
+msgstr "éèåæåæéèçç"
+
+#: ../src/empathy-call-window.c:3055
+msgid "The end of the stream was reached"
+msgstr "åéäææç"
+
+#: ../src/empathy-call-window.c:3095
+msgid "Can't establish audio stream"
+msgstr "çæåçéèäæ"
+
+#: ../src/empathy-call-window.c:3105
+msgid "Can't establish video stream"
+msgstr "çæåçèåäæ"
+
+#: ../src/empathy-call-window.c:3142
 #, c-format
 msgid "Your current balance is %s."
 msgstr "äçåçééç %sã"
 
-#: ../src/empathy-call-window.c:3170
+#: ../src/empathy-call-window.c:3146
 msgid "Sorry, you donât have enough credit for that call."
 msgstr "åææïäçåéäèäéèèéèã"
 
-#: ../src/empathy-call-window.c:3172
+#: ../src/empathy-call-window.c:3148
 msgid "Top Up"
 msgstr "åå"
 
+#: ../src/empathy-call.c:195
+msgid "- Empathy Audio/Video Client"
+msgstr "- Empathy éèèåçæç"
+
+#: ../src/empathy-call.c:219
+msgid "Empathy Audio/Video Client"
+msgstr "Empathy éèèåçæç"
+
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "æåååå(_M)"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+#: ../libempathy-gtk/empathy-new-account-dialog.c:129
 msgid "What kind of chat account do you have?"
 msgstr "äçèååèæåäçï"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+#: ../libempathy-gtk/empathy-new-account-dialog.c:151
 msgid "Adding new account"
 msgstr "æååè"
 
@@ -4556,19 +3897,550 @@ msgstr "æååè"
 msgid "People nearby"
 msgstr "éèçä"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:149
 msgid ""
 "Empathy can automatically discover and chat with the people connected on the "
 "same network as you. If you want to use this feature, please check that the "
 "details below are correct."
 msgstr "Empathy åäèåæçèääåéçåçåççäçäåïääåäåèåãåæäæäçæåèïèææäåèçèææåæçã"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:180
 msgid ""
 "You can change these details later or disable this feature by choosing <span "
 "style=\"italic\">Edit â Accounts</span> in the Contact List."
 msgstr "äåäçåææéäççïæèçéæãèçäæåãäç <span style=\"italic\">çè â åè</span> åçéååèã"
 
+#~ msgid "Connection managers should be used"
+#~ msgstr "äçéççççå"
+
+#~ msgid ""
+#~ "Whether connectivity managers should be used to automatically disconnect/"
+#~ "reconnect."
+#~ msgstr "æåäçéççççåèåæçæéæéçã"
+
+#~ msgid "Empathy should auto-connect on startup"
+#~ msgstr "Empathy ååæèåéç"
+
+#~ msgid ""
+#~ "Whether Empathy should automatically log into your accounts on startup."
+#~ msgstr "Empathy æåæåååæèåçåæçåèã"
+
+#~ msgid "Empathy should auto-away when idle"
+#~ msgstr "Empathy çéçææèèåèçéé"
+
+#~ msgid ""
+#~ "Whether Empathy should go into away mode automatically if the user is "
+#~ "idle."
+#~ msgstr "Empathy æåæåäçèéçæèååæçééæåã"
+
+#~ msgid "Empathy default download folder"
+#~ msgstr "Empathy éèäèèæå"
+
+#~ msgid "The default folder to save file transfers in."
+#~ msgstr "çäååææåèææææçéèèæåã"
+
+#~ msgid "Magic number used to check if sanity cleaning tasks should be run"
+#~ msgstr "éèèççäæææåæåè sanity æçäæ"
+
+#~ msgid ""
+#~ "empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
+#~ "should be executed or not. Users should not change this key manually."
+#~ msgstr ""
+#~ "empathy-sanity-cleaning.c äçæèçäæææåæèåèæçäæãäçèäæ"
+#~ "èæåææéæééã"
+
+#~ msgid "Whether to show contacts that are offline in the contact list."
+#~ msgstr "æååéçäæåäéçéççéçäã"
+
+#~ msgid "Show avatars"
+#~ msgstr "éçåéè"
+
+#~ msgid ""
+#~ "Whether to show avatars for contacts in the contact list and chat windows."
+#~ msgstr "æååéçäæåèèåèçéçéçäåéèã"
+
+#~ msgid "Show protocols"
+#~ msgstr "éçåå"
+
+#~ msgid "Whether to show protocols for contacts in the contact list."
+#~ msgstr "æåèåèçäæååéçèçääçååã"
+
+#~ msgid "Show Balance in contact list"
+#~ msgstr "æèçäæååéçéé"
+
+#~ msgid "Whether to show account balances in the contact list."
+#~ msgstr "æåèåèçäæååéçåæééã"
+
+#~ msgid "Compact contact list"
+#~ msgstr "ççéçäæå"
+
+#~ msgid "Whether to show the contact list in compact mode."
+#~ msgstr "æåäççæåéçéçäæåã"
+
+#~ msgid "Hide main window"
+#~ msgstr "éèäèç"
+
+#~ msgid "Hide the main window."
+#~ msgstr "éèäèçã"
+
+#~ msgid "Default directory to select an avatar image from"
+#~ msgstr "çäéæåéèåççéèçé"
+
+#~ msgid "The last directory that an avatar image was chosen from."
+#~ msgstr "äæéæåéèåçççéã"
+
+#~ msgid "Open new chats in separate windows"
+#~ msgstr "åååèçéåæçèå"
+
+#~ msgid "Always open a separate chat window for new chats."
+#~ msgstr "æéçæåæçèåéåæçèåèçã"
+
+#~ msgid "Display incoming events in the status area"
+#~ msgstr "åçæååéçæåää"
+
+#~ msgid ""
+#~ "Display incoming events in the status area. If false, present them to the "
+#~ "user immediately."
+#~ msgstr ""
+#~ "åçæååéçæåääãåæäåççèïæåääæçæåççäçèã"
+
+#~ msgid "The position for the chat window side pane"
+#~ msgstr "èåèçåçæçäç"
+
+#~ msgid "The stored position (in pixels) of the chat window side pane."
+#~ msgstr "èåèçåçæçååäç (åäçåç)ã"
+
+#~ msgid "Show contact groups"
+#~ msgstr "éçéçäçç"
+
+#~ msgid "Whether to show groups in the contact list."
+#~ msgstr "æåèåèçäæååéçççã"
+
+#~ msgid "Contact list sort criterion"
+#~ msgstr "éçäæåæåæå"
+
+#~ msgid ""
+#~ "Which criterion to use when sorting the contact list. Default is to sort "
+#~ "by the contact's state with the value \"state\". A value of \"name\" will "
+#~ "sort the contact list by name."
+#~ msgstr ""
+#~ "æåéçäæåæèäçååæåãéèåæäçéçäççæãstateã(çæ) å"
+#~ "äæåãèãnameã(åç) ååæäæåçäæåéçäæåã"
+
+#~ msgid "Use notification sounds"
+#~ msgstr "äçéçéæ"
+
+#~ msgid "Whether to play a sound to notify of events."
+#~ msgstr "æåææéæäéçæääççã"
+
+#~ msgid "Disable sounds when away"
+#~ msgstr "ççæçééæåçéæ"
+
+#~ msgid "Whether to play sound notifications when away or busy."
+#~ msgstr "ççæçééæåçææåææéæéçã"
+
+#~ msgid "Play a sound for incoming messages"
+#~ msgstr "æåèææææéæ"
+
+#~ msgid "Whether to play a sound to notify of incoming messages."
+#~ msgstr "æåææéæäéçææåèæã"
+
+#~ msgid "Play a sound for outgoing messages"
+#~ msgstr "éåèææææéæ"
+
+#~ msgid "Whether to play a sound to notify of outgoing messages."
+#~ msgstr "æåææéæäéçæéåèæã"
+
+#~ msgid "Play a sound for new conversations"
+#~ msgstr "çéåæçèèæææéæ"
+
+#~ msgid "Whether to play a sound to notify of new conversations."
+#~ msgstr "æåææéæäéçæçèèã"
+
+#~ msgid "Play a sound when a contact logs in"
+#~ msgstr "çéçäçåæææéæ"
+
+#~ msgid ""
+#~ "Whether to play a sound to notify of contacts logging into the network."
+#~ msgstr "æåææéæäéçæéçäçåçèã"
+
+#~ msgid "Play a sound when a contact logs out"
+#~ msgstr "çæéçäçåæææéæ"
+
+#~ msgid ""
+#~ "Whether to play a sound to notify of contacts logging out of the network."
+#~ msgstr "æåææéæäéçæéçäçåçèã"
+
+#~ msgid "Play a sound when we log in"
+#~ msgstr "çæåçåæææéæ"
+
+#~ msgid "Whether to play a sound when logging into a network."
+#~ msgstr "ççåæçèææåææéæã"
+
+#~ msgid "Play a sound when we log out"
+#~ msgstr "çæåçåæææéæ"
+
+#~ msgid "Whether to play a sound when logging out of a network."
+#~ msgstr "ççåæçèææåææéæã"
+
+#~ msgid "Enable popup notifications for new messages"
+#~ msgstr "åçæèæçåååéç"
+
+#~ msgid "Whether to show a popup notification when receiving a new message."
+#~ msgstr "çæåæèæææåéçåååéçã"
+
+#~ msgid "Disable popup notifications when away"
+#~ msgstr "ççæçééæåçåååéç"
+
+#~ msgid "Whether to show popup notifications when away or busy."
+#~ msgstr "ççæçééæåçææåéçåååéçã"
+
+#~ msgid "Pop up notifications if the chat isn't focused"
+#~ msgstr "åæèåèçååçéåååéç"
+
+#~ msgid ""
+#~ "Whether to show a popup notification when receiving a new message even if "
+#~ "the chat is already opened, but not focused."
+#~ msgstr ""
+#~ "æåæèæææåéçåååéç (åäåéåèåèçïäææçåçé)ã"
+
+#~ msgid "Pop up notifications when a contact logs in"
+#~ msgstr "çéçäçåæååéç"
+
+#~ msgid "Whether to show a popup notification when a contact goes online."
+#~ msgstr "çéçääçææåéçåååéçã"
+
+#~ msgid "Pop up notifications when a contact logs out"
+#~ msgstr "çéçäçåæååéç"
+
+#~ msgid "Whether to show a popup notification when a contact goes offline."
+#~ msgstr "çéçäéçææåéçåååéçã"
+
+#~ msgid "Use graphical smileys"
+#~ msgstr "äçåçåèæçè"
+
+#~ msgid "Whether to convert smileys into graphical images in conversations."
+#~ msgstr "æååèèäçèæçèèæçåçååã"
+
+#~ msgid "Show contact list in rooms"
+#~ msgstr "åèååéçéçäæå"
+
+#~ msgid "Whether to show the contact list in chat rooms."
+#~ msgstr "æååèååäéçéçäæåã"
+
+#~ msgid "Chat window theme"
+#~ msgstr "èåèçäæäé"
+
+#~ msgid "The theme that is used to display the conversation in chat windows."
+#~ msgstr "çäéçåèåèçäèèçäæäéã"
+
+#~ msgid "Chat window theme variant"
+#~ msgstr "èåèçäæäéæå"
+
+#~ msgid ""
+#~ "The theme variant that is used to display the conversation in chat "
+#~ "windows."
+#~ msgstr "çäåèåèçéçèèçäæäéæåã"
+
+#~ msgid "Path of the Adium theme to use"
+#~ msgstr "èäçç Adium äæäéèå"
+
+#~ msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+#~ msgstr "åæèååäççäéæ Adium æèäçç Adium äæäéèåã"
+
+#~ msgid "Enable WebKit Developer Tools"
+#~ msgstr "åç WebKit éçèåå"
+
+#~ msgid ""
+#~ "Whether WebKit developer tools, such as the Web Inspector, should be "
+#~ "enabled."
+#~ msgstr "æååç WebKit éçèååïäå Web Inspectorã"
+
+#~ msgid "Inform other users when you are typing to them"
+#~ msgstr "çææèåèæçåääçèæéçäå"
+
+#~ msgid ""
+#~ "Whether to send the 'composing' or 'paused' chat states. Does not "
+#~ "currently affect the 'gone' state."
+#~ msgstr ""
+#~ "æåèåéãæåäãæãåäæãçèåçæãèçåæãåééãçæåäåå"
+#~ "éã"
+
+#~ msgid "Use theme for chat rooms"
+#~ msgstr "åèååäçäæäé"
+
+#~ msgid "Whether to use the theme for chat rooms."
+#~ msgstr "æåçèååäçäæäéã"
+
+#~ msgid "Spell checking languages"
+#~ msgstr "æåææçèè"
+
+#~ msgid ""
+#~ "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl"
+#~ "\")."
+#~ msgstr "äéèåéèäçæåææçèèæå (åïã en, fr, nlã)ã"
+
+#~ msgid "Enable spell checker"
+#~ msgstr "åçæåææçå"
+
+#~ msgid ""
+#~ "Whether to check words typed against the languages you want to check with."
+#~ msgstr "æåäæèåçèèææèåæçéåã"
+
+#~ msgid "Nick completed character"
+#~ msgstr "æçèéåå"
+
+#~ msgid ""
+#~ "Character to add after nickname when using nick completion (tab) in group "
+#~ "chat."
+#~ msgstr "åççèåääçæçèé (tab) æèååæçäåçååã"
+
+#~ msgid "Empathy should use the avatar of the contact as the chat window icon"
+#~ msgstr "Empathy èäçéçäçåéèåçèåèçåç"
+
+#~ msgid ""
+#~ "Whether Empathy should use the avatar of the contact as the chat window "
+#~ "icon."
+#~ msgstr "Empathy æåäçéçäåéèåçèåèçåçã"
+
+#~ msgid "Last account selected in Join Room dialog"
+#~ msgstr "äæåãååèååãåèçéåçåè"
+
+#~ msgid "D-Bus object path of the last account selected to join a room."
+#~ msgstr "äæèååèååæéååèç D-Bus çäèåã"
+
+#~ msgid "Camera device"
+#~ msgstr "æåæèç"
+
+#~ msgid "Default camera device to use in video calls, e.g. /dev/video0."
+#~ msgstr "èçæèèéèçéèæåæèçïäï/dev/video0ã"
+
+#~ msgid "Camera position"
+#~ msgstr "æåæäç"
+
+#~ msgid "Position the camera preview should be during a call."
+#~ msgstr "éèææåæéèæèææçäçã"
+
+#~ msgid "Echo cancellation support"
+#~ msgstr "åéæéææ"
+
+#~ msgid "Whether to enable Pulseaudio's echo cancellation filter."
+#~ msgstr "æåèåç Pulseaudio çåéæééæåã"
+
+#~ msgid "Show hint about closing the main window"
+#~ msgstr "ééäèçæéçæç"
+
+#~ msgid ""
+#~ "Whether to show the message dialog about closing the main window with the "
+#~ "'x' button in the title bar."
+#~ msgstr "æååäçæéåçãxãæéééäèçæïéçèæåèçã"
+
+#~ msgid "Empathy can publish the user's location"
+#~ msgstr "Empathy åäçåäçèçäç"
+
+#~ msgid "Whether Empathy can publish the user's location to their contacts."
+#~ msgstr "Empathy æåèåäçèçäççåçäçéçäã"
+
+#~ msgid "Empathy can use the network to guess the location"
+#~ msgstr "Empathy åäåççèäææäç"
+
+#~ msgid "Whether Empathy can use the network to guess the location."
+#~ msgstr "Empathy æåäççèäææäçã"
+
+#~ msgid "Empathy can use the cellular network to guess the location"
+#~ msgstr "Empathy åäåçèåéèçèååèäææäç"
+
+#~ msgid "Whether Empathy can use the cellular network to guess the location."
+#~ msgstr "Empathy æåäçèåéèçèäææäçã"
+
+#~ msgid "Empathy can use the GPS to guess the location"
+#~ msgstr "Empathy åäåç GPS äææäç"
+
+#~ msgid "Whether Empathy can use the GPS to guess the location."
+#~ msgstr "Empathy æåäç GPS äææäçã"
+
+#~ msgid "Empathy should reduce the location's accuracy"
+#~ msgstr "Empathy æéääççæçå"
+
+#~ msgid ""
+#~ "Whether Empathy should reduce the location's accuracy for privacy reasons."
+#~ msgstr "Empathy æååæéççççæääççæçåã"
+
+#~ msgid "_New Conversation..."
+#~ msgstr "æåèè(_N)..."
+
+#~ msgid "New _Call..."
+#~ msgstr "æåéè(_C)..."
+
+#~ msgid "Contacts"
+#~ msgstr "éçä"
+
+#~ msgid "_Add Contacts..."
+#~ msgstr "ååèçä(_A)..."
+
+#~ msgid "_Search for Contacts..."
+#~ msgstr "æåèçä(_S)..."
+
+#~ msgid "_Blocked Contacts"
+#~ msgstr "èåéçèçä"
+
+#~ msgid "_Rooms"
+#~ msgstr "èåå(_R)"
+
+#~ msgid "_Join..."
+#~ msgstr "åå(_J)..."
+
+#~ msgid "Join _Favorites"
+#~ msgstr "ååååèåå(_F)"
+
+#~ msgid "_Manage Favorites"
+#~ msgstr "ççåå(_M)"
+
+#~ msgid "_File Transfers"
+#~ msgstr "ææåè(_F)"
+
+#~ msgid "_Accounts"
+#~ msgstr "åè(_A)"
+
+#~ msgid "P_references"
+#~ msgstr "ååèå(_R)"
+
+#~ msgid "Help"
+#~ msgstr "æå"
+
+#~ msgid "About Empathy"
+#~ msgstr "éæ Empathy"
+
+#~ msgid "â%sâ is not a valid contact ID"
+#~ msgstr "ã%sãäæææçéçä ID"
+
+#~ msgid "_Enable"
+#~ msgstr "åç(_E)"
+
+#~ msgid "_Disable"
+#~ msgstr "åç(_D)"
+
+#~ msgid "Contrast"
+#~ msgstr "åæ"
+
+#~ msgid "Brightness"
+#~ msgstr "äå"
+
+#~ msgid "Gamma"
+#~ msgstr "Gamma"
+
+#~ msgid "Volume"
+#~ msgstr "éé"
+
+#~ msgid "_Sidebar"
+#~ msgstr "åéæ(_S)"
+
+#~ msgid "Audio input"
+#~ msgstr "éæèå"
+
+#~ msgid "Video input"
+#~ msgstr "èèèå"
+
+#~ msgid "Dialpad"
+#~ msgstr "æèç"
+
+#~ msgid "Details"
+#~ msgstr "èçèæ"
+
+#~ msgctxt "codec"
+#~ msgid "Unknown"
+#~ msgstr "æç"
+
+#~ msgid "Connected â %d:%02dm"
+#~ msgstr "åéç â %d:%02dm"
+
+#~ msgid "Top up %s (%s)..."
+#~ msgstr "åå %s (%s)..."
+
+#~ msgid "Top Up..."
+#~ msgstr "åå..."
+
+#~ msgid "Contacts on a _Map"
+#~ msgstr "éçäåå(_M)"
+
+#~ msgid "Credit Balance"
+#~ msgstr "ååéé"
+
+#~ msgid "Find in Contact _List"
+#~ msgstr "æéçäæåååæ(_L)"
+
+#~ msgid "N_ormal Size"
+#~ msgstr "æååå(_O)"
+
+#~ msgid "Normal Size With _Avatars"
+#~ msgstr "æåååèåéè(_A)"
+
+#~ msgid "Show P_rotocols"
+#~ msgstr "éçåå(_R)"
+
+#~ msgid "Sort by _Name"
+#~ msgstr "äåçæå(_N)"
+
+#~ msgid "Sort by _Status"
+#~ msgstr "äçææå(_S)"
+
+#~ msgid "_Compact Size"
+#~ msgstr "ççåå(_C)"
+
+#~ msgid "_Joinâ"
+#~ msgstr "åå(_J)â"
+
+#~ msgid "_Offline Contacts"
+#~ msgstr "éçéçä(_O)"
+
+#~ msgid "Could not start room listing"
+#~ msgstr "çæéåååèååæå"
+
+#~ msgid "Could not stop room listing"
+#~ msgstr "çæåæååèååæå"
+
+#~ msgid "Appearance"
+#~ msgstr "åè"
+
+#~ msgid "Call the contact again"
+#~ msgstr "åææèçääæ"
+
+#~ msgid "Camera Off"
+#~ msgstr "æåæéé"
+
+#~ msgid "Camera On"
+#~ msgstr "æåæéå"
+
+#~ msgid "Disable camera and stop sending video"
+#~ msgstr "åçæåæääæåéèè"
+
+#~ msgid "Enable camera and send video"
+#~ msgstr "åçæåæäéåèè"
+
+#~ msgid "Enable camera but don't send video"
+#~ msgstr "åçæåæääèéåèè"
+
+#~ msgid "Preview"
+#~ msgstr "éè"
+
+#~ msgid "Redial"
+#~ msgstr "éæ"
+
+#~ msgid "V_ideo"
+#~ msgstr "èè(_I)"
+
+#~ msgid "Video Off"
+#~ msgstr "èèéé"
+
+#~ msgid "Video On"
+#~ msgstr "èèéå"
+
+#~ msgid "Video Preview"
+#~ msgstr "èèéè"
+
+#~ msgid "Contact Map View"
+#~ msgstr "éçäååæè"
+
 #~ msgid "%s"
 #~ msgstr "%s"
 
@@ -4714,9 +4586,6 @@ msgstr "äåäçåææéäççïæèçéæãèçäæåã
 #~ msgid "Protocol:"
 #~ msgstr "ååï"
 
-#~ msgid "Show account assistant"
-#~ msgstr "éçåèåç"
-
 #~ msgid "Personal Information"
 #~ msgstr "åäèè"
 
@@ -4840,9 +4709,6 @@ msgstr "äåäçåææéäççïæèçéæãèçäæåã
 #~ msgid "All"
 #~ msgstr "åé"
 
-#~ msgid "_Enabled"
-#~ msgstr "ååç(_E)"
-
 #~ msgid "Date"
 #~ msgstr "ææ"
 
@@ -4917,9 +4783,6 @@ msgstr "äåäçåææéäççïæèçéæãèçäæåã
 #~ msgid "Failed to reconnect this chat"
 #~ msgstr "çæéééåèåæè"
 
-#~ msgid "Failed to join chat room"
-#~ msgstr "ååèåååæ"
-
 #~ msgid "Select a destination"
 #~ msgstr "éåççå"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 3a7aad0..421e66e 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy 3.3.92\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-25 06:40+0800\n"
-"PO-Revision-Date: 2012-03-23 11:21+0800\n"
+"POT-Creation-Date: 2012-05-28 18:13+0800\n"
+"PO-Revision-Date: 2012-05-20 23:18+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
 "Language-Team: Chinese (traditional) <chinese-l10n googlegroups com>\n"
 "Language: zh_TW\n"
@@ -41,684 +41,227 @@ msgstr "ççèæè VoIP åè"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2513
+#: ../src/empathy-accounts-dialog.c:2516
 msgid "Messaging and VoIP Accounts"
 msgstr "èæè VoIP åè"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "æéçæåæçèåéåæçèåèçã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Camera device"
-msgstr "æåæèç"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Camera position"
-msgstr "æåæäç"
-
-#: ../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:5
-msgid "Chat window theme"
-msgstr "èåèçäæäé"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
-msgid "Chat window theme variant"
-msgstr "èåèçäæäéæå"
-
-#: ../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:8
-msgid "Compact contact list"
-msgstr "ççéçäæå"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid "Connection managers should be used"
-msgstr "äçéççççå"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Contact list sort criterion"
-msgstr "éçäæåæåæå"
-
-#: ../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: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:13
-msgid "Default directory to select an avatar image from"
-msgstr "çäéæåéèåççéèçé"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Disable popup notifications when away"
-msgstr "ççæçééæåçåååéç"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable sounds when away"
-msgstr "ççæçééæåçéæ"
-
-#: ../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: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:18
-msgid "Echo cancellation support"
-msgstr "åéæéææ"
-
-#: ../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:20
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy åäåç GPS äææäç"
-
-#: ../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:22
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy åäåççèäææäç"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy default download folder"
-msgstr "Empathy éèäèèæå"
-
-#: ../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:25
-msgid "Empathy should auto-connect on startup"
-msgstr "Empathy ååæèåéç"
-
-#: ../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: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:28
-msgid "Enable WebKit Developer Tools"
-msgstr "åç WebKit éçèåå"
-
-#: ../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:30
-msgid "Enable spell checker"
-msgstr "åçæåææçå"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Hide main window"
-msgstr "éèäèç"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Hide the main window."
-msgstr "éèäèçã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Inform other users when you are typing to them"
-msgstr "çææèåèæçåääçèæéçäå"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Last account selected in Join Room dialog"
-msgstr "äæåãååèååãåèçéåçåè"
-
-#. translators: Automatic tasks which are run once to port/update account settings. Ideally, this shouldn't be exposed to users at all, we just use a gsettings key here as an optimization to only run it only once.
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Magic number used to check if sanity cleaning tasks should be run"
-msgstr "éèèççäæææåæåè sanity æçäæ"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Nick completed character"
-msgstr "æçèéåå"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Open new chats in separate windows"
-msgstr "åååèçéåæçèå"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Path of the Adium theme to use"
-msgstr "èäçç Adium äæäéèå"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-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:41
-msgid "Play a sound for incoming messages"
-msgstr "æåèææææéæ"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound for new conversations"
-msgstr "çéåæçèèæææéæ"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound for outgoing messages"
-msgstr "éåèææææéæ"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when a contact logs in"
-msgstr "çéçäçåæææéæ"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Play a sound when a contact logs out"
-msgstr "çæéçäçåæææéæ"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Play a sound when we log in"
-msgstr "çæåçåæææéæ"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Play a sound when we log out"
-msgstr "çæåçåæææéæ"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "åæèåèçååçéåååéç"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Pop up notifications when a contact logs in"
-msgstr "çéçäçåæååéç"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Pop up notifications when a contact logs out"
-msgstr "çéçäçåæååéç"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Position the camera preview should be during a call."
-msgstr "éèææåæéèæèææçäçã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show Balance in contact list"
-msgstr "æèçäæååéçéé"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show avatars"
-msgstr "éçåéè"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show contact groups"
-msgstr "éçéçäçç"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Show contact list in rooms"
-msgstr "åèååéçéçäæå"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Show hint about closing the main window"
-msgstr "ééäèçæéçæç"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "Show offline contacts"
-msgstr "éçéçéçä"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "Show protocols"
-msgstr "éçåå"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "Spell checking languages"
-msgstr "æåææçèè"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The default folder to save file transfers in."
-msgstr "çäååææåèææææçéèèæåã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The last directory that an avatar image was chosen from."
-msgstr "äæéæåéèåçççéã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid "The position for the chat window side pane"
-msgstr "èåèçåçæçäç"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "èåèçåçæçååäç (åäçåç)ã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "çäéçåèåèçäèèçäæäéã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr "çäåèåèçéçèèçäæäéæåã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Use graphical smileys"
-msgstr "äçåçåèæçè"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Use notification sounds"
-msgstr "äçéçéæ"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Use theme for chat rooms"
-msgstr "åèååäçäæäé"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Empathy æåèåäçèçäççåçäçéçäã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Empathy æåäç GPS äææäçã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Empathy æåäçèåéèçèäææäçã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Empathy æåäççèäææäçã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Empathy æåæåååæèåçåæçåèã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "Empathy æåæåäçèéçæèååæçééæåã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "Empathy æååæéççççæääççæçåã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-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:77
-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:78
-msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr "æåäçéççççåèåæçæéæéçã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr "æåäæèåçèèææèåæçéåã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "æååèèäçèæçèèæçåçååã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "æåèåç Pulseaudio çåéæééæåã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "æåææéæäéçæéçäçåçèã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "æåææéæäéçæéçäçåçèã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound to notify of events."
-msgstr "æåææéæäéçæääççã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "æåææéæäéçææåèæã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "æåææéæäéçæçèèã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "æåææéæäéçæéåèæã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to play a sound when logging into a network."
-msgstr "ççåæçèææåææéæã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to play a sound when logging out of a network."
-msgstr "ççåæçèææåææéæã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to play sound notifications when away or busy."
-msgstr "ççæçééæåçææåææéæéçã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid ""
-"Whether to send the 'composing' or 'paused' chat states. Does not currently "
-"affect the 'gone' state."
-msgstr ""
-"æåèåéãæåäãæãåäæãçèåçæãèçåæãåééãçæåäåå"
-"éã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "çéçäéçææåéçåååéçã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "çéçääçææåéçåååéçã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-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:95
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "çæåæèæææåéçåååéçã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show account balances in the contact list."
-msgstr "æåèåèçäæååéçåæééã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "æååéçäæåèèåèçéçéçäåéèã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "æååéçäæåäéçéççéçäã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to show groups in the contact list."
-msgstr "æåèåèçäæååéçççã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid "Whether to show popup notifications when away or busy."
-msgstr "ççæçééæåçææåéçåååéçã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "æåèåèçäæååéçèçääçååã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
-msgid "Whether to show the contact list in chat rooms."
-msgstr "æååèååäéçéçäæåã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
-msgid "Whether to show the contact list in compact mode."
-msgstr "æåäççæåéçéçäæåã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
-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:105
-msgid "Whether to use the theme for chat rooms."
-msgstr "æåçèååäçäæäéã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
-msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's state with the value \"state\". A value of \"name\" will sort "
-"the contact list by name."
-msgstr ""
-"æåéçäæåæèäçååæåãéèåæäçéçäççæãstateã(çæ) åä"
-"æåãèãnameã(åç) ååæäæåçäæåéçäæåã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:107
-msgid ""
-"empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
-"should be executed or not. Users should not change this key manually."
-msgstr ""
-"empathy-sanity-cleaning.c äçæèçäæææåæèåèæçäæãäçèäæè"
-"æåææéæééã"
-
-#: ../libempathy/empathy-ft-handler.c:738
+#: ../libempathy/empathy-ft-handler.c:737
 msgid "No reason was specified"
 msgstr "æææååå"
 
-#: ../libempathy/empathy-ft-handler.c:741
+#: ../libempathy/empathy-ft-handler.c:740
 msgid "The change in state was requested"
 msgstr "åèæèæçæ"
 
-#: ../libempathy/empathy-ft-handler.c:744
+#: ../libempathy/empathy-ft-handler.c:743
 msgid "You canceled the file transfer"
 msgstr "æååæææåè"
 
-#: ../libempathy/empathy-ft-handler.c:747
+#: ../libempathy/empathy-ft-handler.c:746
 msgid "The other participant canceled the file transfer"
 msgstr "åäçåèèåæäææåè"
 
-#: ../libempathy/empathy-ft-handler.c:750
+#: ../libempathy/empathy-ft-handler.c:749
 msgid "Error while trying to transfer the file"
 msgstr "åèåèæææççéè"
 
-#: ../libempathy/empathy-ft-handler.c:753
+#: ../libempathy/empathy-ft-handler.c:752
 msgid "The other participant is unable to transfer the file"
 msgstr "åäçåèèçæåèèææ"
 
-#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313
+#: ../libempathy/empathy-ft-handler.c:755 ../libempathy/empathy-utils.c:312
 msgid "Unknown reason"
 msgstr "äæåå"
 
-#: ../libempathy/empathy-ft-handler.c:919
+#: ../libempathy/empathy-ft-handler.c:918
 msgid "File transfer completed, but the file was corrupted"
 msgstr "ææåèåçïäæææåææ"
 
-#: ../libempathy/empathy-ft-handler.c:1205
+#: ../libempathy/empathy-ft-handler.c:1204
 msgid "File transfer not supported by remote contact"
 msgstr "éçéçääææææåè"
 
-#: ../libempathy/empathy-ft-handler.c:1261
+#: ../libempathy/empathy-ft-handler.c:1260
 msgid "The selected file is not a regular file"
 msgstr "éåçææäææèçææ"
 
-#: ../libempathy/empathy-ft-handler.c:1270
+#: ../libempathy/empathy-ft-handler.c:1269
 msgid "The selected file is empty"
 msgstr "éåçæææççç"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
+#: ../libempathy/empathy-message.c:407 ../src/empathy-call-observer.c:116
 #, c-format
 msgid "Missed call from %s"
 msgstr "ææ %s çäé"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:419
+#: ../libempathy/empathy-message.c:411
 #, c-format
 msgid "Called %s"
 msgstr "åææ %s"
 
-#: ../libempathy/empathy-message.c:422
+#: ../libempathy/empathy-message.c:414
 #, c-format
 msgid "Call from %s"
 msgstr "%s çäé"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:232
 msgid "Available"
 msgstr "æç"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:234
 msgid "Busy"
 msgstr "åç"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:237
 msgid "Away"
 msgstr "éé"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:239
 msgid "Invisible"
 msgstr "éè"
 
-#: ../libempathy/empathy-utils.c:242
+#: ../libempathy/empathy-utils.c:241
 msgid "Offline"
 msgstr "éç"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:245
+#: ../libempathy/empathy-utils.c:244
 msgctxt "presence"
 msgid "Unknown"
 msgstr "æç"
 
-#: ../libempathy/empathy-utils.c:285
+#: ../libempathy/empathy-utils.c:284
 msgid "No reason specified"
 msgstr "æææååå"
 
-#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
 msgid "Status is set to offline"
 msgstr "çæèçéç"
 
-#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
 #: ../libempathy-gtk/empathy-call-utils.c:47
-#: ../libempathy-gtk/empathy-new-message-dialog.c:81
+#: ../libempathy-gtk/empathy-new-message-dialog.c:80
 msgid "Network error"
 msgstr "çèéè"
 
-#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
 msgid "Authentication failed"
 msgstr "éèåæ"
 
-#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
 msgid "Encryption error"
 msgstr "ååççéè"
 
-#: ../libempathy/empathy-utils.c:295
+#: ../libempathy/empathy-utils.c:294
 msgid "Name in use"
 msgstr "äçäçåç"
 
-#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate not provided"
 msgstr "æææäæè"
 
-#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate untrusted"
 msgstr "æèäèää"
 
-#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
 msgid "Certificate expired"
 msgstr "æèåéæ"
 
-#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
 msgid "Certificate not activated"
 msgstr "æèåæäç"
 
-#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
 msgid "Certificate hostname mismatch"
 msgstr "æèäæåçäç"
 
-#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
 msgid "Certificate fingerprint mismatch"
 msgstr "æèæçæäç"
 
-#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
 msgid "Certificate self-signed"
 msgstr "æèçèæçç"
 
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate error"
 msgstr "æèéè"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:344
 msgid "Encryption is not available"
 msgstr "ååçæäç"
 
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:346
 msgid "Certificate is invalid"
 msgstr "æèçæ"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:348
 msgid "Connection has been refused"
 msgstr "éçéæ"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:350
 msgid "Connection can't be established"
 msgstr "çæåçéç"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:352
 msgid "Connection has been lost"
 msgstr "åååéç"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:354
 msgid "This account is already connected to the server"
 msgstr "éååèåéæèäæå"
 
-#: ../libempathy/empathy-utils.c:357
+#: ../libempathy/empathy-utils.c:356
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "éçåèäççåèæçæéçåä"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:359
 msgid "The account already exists on the server"
 msgstr "èåèåçååæäæåä"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:361
 msgid "Server is currently too busy to handle the connection"
 msgstr "äæåçåéæåçäèæçæèçèéç"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:363
 msgid "Certificate has been revoked"
 msgstr "åæéæè"
 
-#: ../libempathy/empathy-utils.c:366
+#: ../libempathy/empathy-utils.c:365
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "æèäçäååçåçæçæïææåçèçäèå"
 
-#: ../libempathy/empathy-utils.c:369
+#: ../libempathy/empathy-utils.c:368
 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:373
+#: ../libempathy/empathy-utils.c:372
 msgid "Your software is too old"
 msgstr "æçèééè"
 
-#: ../libempathy/empathy-utils.c:375
+#: ../libempathy/empathy-utils.c:374
 msgid "Internal error"
 msgstr "åééè"
 
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:533
 msgid "People Nearby"
 msgstr "éèçä"
 
-#: ../libempathy/empathy-utils.c:539
+#: ../libempathy/empathy-utils.c:538
 msgid "Yahoo! Japan"
 msgstr "Yahoo! ææ"
 
-#: ../libempathy/empathy-utils.c:568
+#: ../libempathy/empathy-utils.c:567
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:569
+#: ../libempathy/empathy-utils.c:568
 msgid "Facebook Chat"
 msgstr "Facebook èå"
 
@@ -781,7 +324,7 @@ msgid "All accounts"
 msgstr "ææåè"
 
 #: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../src/empathy-import-widget.c:336
+#: ../src/empathy-import-widget.c:323
 msgid "Account"
 msgstr "åè"
 
@@ -805,24 +348,24 @@ msgstr "éæå"
 msgid "%s:"
 msgstr "%sï"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget.c:1424
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
 msgid "Username:"
 msgstr "äçèåçï"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1710
+#: ../libempathy-gtk/empathy-account-widget.c:1741
 msgid "A_pply"
 msgstr "åç(_A)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1739
+#: ../libempathy-gtk/empathy-account-widget.c:1770
 msgid "L_og in"
 msgstr "çå(_O)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1812
+#: ../libempathy-gtk/empathy-account-widget.c:1840
 msgid "This account already exists on the server"
 msgstr "æåèåçååéåäæåä"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1816
+#: ../libempathy-gtk/empathy-account-widget.c:1844
 msgid "Create a new account on the server"
 msgstr "åéåäæåäåçæçåè"
 
@@ -831,19 +374,19 @@ msgstr "åéåäæåäåçæçåè"
 #. * 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:2241
+#: ../libempathy-gtk/empathy-account-widget.c:2251
 #, 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:2267
+#: ../libempathy-gtk/empathy-account-widget.c:2277
 #, c-format
 msgid "%s Account"
 msgstr "%s åè"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2271
+#: ../libempathy-gtk/empathy-account-widget.c:2281
 msgid "New account"
 msgstr "æååè"
 
@@ -869,7 +412,7 @@ msgstr "éé"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "Pass_word:"
 msgstr "åç(_W)ï"
@@ -879,7 +422,7 @@ msgstr "åç(_W)ï"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 msgid "Remember Password"
 msgstr "èäåç"
 
@@ -889,7 +432,7 @@ msgstr "èäåç"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 #: ../libempathy-gtk/empathy-base-password-dialog.c:261
 msgid "Remember password"
@@ -921,7 +464,7 @@ msgstr "éæå(_P)ï"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
 msgid "_Server:"
 msgstr "äæå(_S)ï"
 
@@ -965,36 +508,32 @@ msgstr "æç ICQ UIN æï"
 msgid "What is your ICQ password?"
 msgstr "æç ICQ åçæï"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:206
-#: ../libempathy-gtk/empathy-account-widget-sip.c:239
+#: ../libempathy-gtk/empathy-account-widget-sip.c:207
+#: ../libempathy-gtk/empathy-account-widget-sip.c:240
 msgid "Auto"
 msgstr "èå"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:209
+#: ../libempathy-gtk/empathy-account-widget-sip.c:210
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:212
+#: ../libempathy-gtk/empathy-account-widget-sip.c:213
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:215
+#: ../libempathy-gtk/empathy-account-widget-sip.c:216
 msgid "TLS"
 msgstr "TLS"
 
-#. translators: this string is very specific to SIP's internal; maybe
-#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:244
+#: ../libempathy-gtk/empathy-account-widget-sip.c:245
 msgid "Register"
 msgstr "èå"
 
-#. translators: this string is very specific to SIP's internal; maybe
-#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:249
+#: ../libempathy-gtk/empathy-account-widget-sip.c:250
 msgid "Options"
 msgstr "éé"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:252
+#: ../libempathy-gtk/empathy-account-widget-sip.c:253
 msgid "None"
 msgstr "ç"
 
@@ -1209,55 +748,59 @@ msgid "Keep-Alive Options"
 msgstr "äæäæçéé"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+msgid "Local IP Address:"
+msgstr "åå IP äåï"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
 msgid "Loose Routing"
 msgstr "åéèç"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
 msgid "Mechanism:"
 msgstr "æåï"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
 msgid "Miscellaneous Options"
 msgstr "éé"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
 msgid "NAT Traversal Options"
 msgstr "NAT åèéé"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
 msgid "Port:"
 msgstr "éæåï"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
 msgid "Proxy Options"
 msgstr "Proxy éé"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
 msgid "STUN Server:"
 msgstr "STUN äæåï"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 #: ../libempathy-gtk/empathy-contactinfo-utils.c:114
 msgid "Server:"
 msgstr "äæåï"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
 msgid "Transport:"
 msgstr "åééèåï"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "Use this account to call _landlines and mobile phones"
 msgstr "äçéååèäææåèèèåéè(_L)"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP account password?"
 msgstr "æç SIP åèåçæï"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "What is your SIP login ID?"
 msgstr "ææèç SIP çå ID æï"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
 msgid "_Username:"
 msgstr "äçèåç(_U)ï"
 
@@ -1343,62 +886,61 @@ msgstr "æååäææçæéèåè"
 msgid "You don't have enough credit in order to place this call"
 msgstr "æçåéäèäèäèéèã"
 
-#: ../libempathy-gtk/empathy-chat.c:729
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "éåçäèååæ"
 
-#: ../libempathy-gtk/empathy-chat.c:787
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "æèèçäéäèææ"
 
-#: ../libempathy-gtk/empathy-chat.c:793
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "æäèåèèæéåäé"
 
-#: ../libempathy-gtk/empathy-chat.c:992
-#, c-format
-msgid "â%sâ is not a valid contact ID"
-msgstr "ã%sãäæææçéçä ID"
+#: ../libempathy-gtk/empathy-chat.c:968
+msgid "Invalid contact ID"
+msgstr "çæçéçä ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1087
+#: ../libempathy-gtk/empathy-chat.c:1056
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clearïæéçåèèçææèæ"
 
-#: ../libempathy-gtk/empathy-chat.c:1090
+#: ../libempathy-gtk/empathy-chat.c:1059
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <äé>ïèççåèèçäé"
 
-#: ../libempathy-gtk/empathy-chat.c:1093
+#: ../libempathy-gtk/empathy-chat.c:1062
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <èåå ID>ïååæçèåå"
 
-#: ../libempathy-gtk/empathy-chat.c:1096
+#: ../libempathy-gtk/empathy-chat.c:1065
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <èåå ID>ïååæçèåå"
 
-#: ../libempathy-gtk/empathy-chat.c:1100
+#: ../libempathy-gtk/empathy-chat.c:1069
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr "/part [<èåå ID>] [<åå>]ïééèååïéèççåçèåå"
 
-#: ../libempathy-gtk/empathy-chat.c:1104
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <èçä ID> [<èæ>]ïéåçäèå"
 
-#: ../libempathy-gtk/empathy-chat.c:1107
+#: ../libempathy-gtk/empathy-chat.c:1076
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <èçä ID> <èæ>ïéåçäèå"
 
-#: ../libempathy-gtk/empathy-chat.c:1110
+#: ../libempathy-gtk/empathy-chat.c:1079
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <æç>ïèæåçåäæåäçæçæç"
 
-#: ../libempathy-gtk/empathy-chat.c:1113
+#: ../libempathy-gtk/empathy-chat.c:1082
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <èæ>ïéåäå ACTION èæåçåçèèä"
 
-#: ../libempathy-gtk/empathy-chat.c:1116
+#: ../libempathy-gtk/empathy-chat.c:1085
 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 "
@@ -1407,11 +949,11 @@ msgstr ""
 "/say <èæ>ïéå <èæ> åçåçèèäãéçæåéäã/ãééçèæãèää"
 "èïã/say /join æçäååæçèååã"
 
-#: ../libempathy-gtk/empathy-chat.c:1121
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <èçä ID>ïéçèçäççéèè"
 
-#: ../libempathy-gtk/empathy-chat.c:1124
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1419,126 +961,126 @@ msgstr ""
 "/help [<åä>]ïéçææææçæäãåææåçéå <åä> çèïäéçåçç"
 "æã"
 
-#: ../libempathy-gtk/empathy-chat.c:1143
+#: ../libempathy-gtk/empathy-chat.c:1112
 #, c-format
 msgid "Usage: %s"
 msgstr "çæï%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1188
+#: ../libempathy-gtk/empathy-chat.c:1157
 msgid "Unknown command"
 msgstr "æççåä"
 
-#: ../libempathy-gtk/empathy-chat.c:1314
+#: ../libempathy-gtk/empathy-chat.c:1283
 msgid "Unknown command; see /help for the available commands"
 msgstr "æççæäïèåè /help äåååççæä"
 
-#: ../libempathy-gtk/empathy-chat.c:1565
+#: ../libempathy-gtk/empathy-chat.c:1540
 msgid "insufficient balance to send message"
 msgstr "ééäèäåéèæ"
 
-#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
-#: ../libempathy-gtk/empathy-chat.c:1646
+#: ../libempathy-gtk/empathy-chat.c:1544 ../libempathy-gtk/empathy-chat.c:1558
+#: ../libempathy-gtk/empathy-chat.c:1621
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "åéèæã%sãæççéèï%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
-#: ../libempathy-gtk/empathy-chat.c:1650
+#: ../libempathy-gtk/empathy-chat.c:1546 ../libempathy-gtk/empathy-chat.c:1563
+#: ../libempathy-gtk/empathy-chat.c:1625
 #, 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:1577
+#: ../libempathy-gtk/empathy-chat.c:1552
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "ééäèäåéèæã<a href='%s'>åå</a>ã"
 
-#: ../libempathy-gtk/empathy-chat.c:1617
+#: ../libempathy-gtk/empathy-chat.c:1592
 msgid "not capable"
 msgstr "çæ"
 
-#: ../libempathy-gtk/empathy-chat.c:1624
+#: ../libempathy-gtk/empathy-chat.c:1599
 msgid "offline"
 msgstr "éç"
 
-#: ../libempathy-gtk/empathy-chat.c:1627
+#: ../libempathy-gtk/empathy-chat.c:1602
 msgid "invalid contact"
 msgstr "çæçéçä"
 
-#: ../libempathy-gtk/empathy-chat.c:1630
+#: ../libempathy-gtk/empathy-chat.c:1605
 msgid "permission denied"
 msgstr "æéèæç"
 
-#: ../libempathy-gtk/empathy-chat.c:1633
+#: ../libempathy-gtk/empathy-chat.c:1608
 msgid "too long message"
 msgstr "åéçèæ"
 
-#: ../libempathy-gtk/empathy-chat.c:1636
+#: ../libempathy-gtk/empathy-chat.c:1611
 msgid "not implemented"
 msgstr "æåä"
 
-#: ../libempathy-gtk/empathy-chat.c:1640
+#: ../libempathy-gtk/empathy-chat.c:1615
 msgid "unknown"
 msgstr "äæ"
 
-#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
+#: ../libempathy-gtk/empathy-chat.c:1682 ../src/empathy-chat-window.c:940
 msgid "Topic:"
 msgstr "äéï"
 
-#: ../libempathy-gtk/empathy-chat.c:1722
+#: ../libempathy-gtk/empathy-chat.c:1697
 #, c-format
 msgid "Topic set to: %s"
 msgstr "äéèåç: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1724
+#: ../libempathy-gtk/empathy-chat.c:1699
 #, c-format
 msgid "Topic set by %s to: %s"
 msgstr "%s åäéèåçï%s"
 
 #. No need to display this 'event' is no topic can be defined anyway
-#: ../libempathy-gtk/empathy-chat.c:1729
+#: ../libempathy-gtk/empathy-chat.c:1704
 msgid "No topic defined"
 msgstr "åæåçäé"
 
-#: ../libempathy-gtk/empathy-chat.c:2245
+#: ../libempathy-gtk/empathy-chat.c:2220
 msgid "(No Suggestions)"
 msgstr "(ææåè)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2313
+#: ../libempathy-gtk/empathy-chat.c:2288
 #, 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:2350
+#: ../libempathy-gtk/empathy-chat.c:2325
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "ååã%sãè %s åå"
 
-#: ../libempathy-gtk/empathy-chat.c:2420
+#: ../libempathy-gtk/empathy-chat.c:2395
 msgid "Insert Smiley"
 msgstr "æåèæçè"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2438
+#: ../libempathy-gtk/empathy-chat.c:2413
 #: ../libempathy-gtk/empathy-ui-utils.c:1880
 msgid "_Send"
 msgstr "åé(_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2495
+#: ../libempathy-gtk/empathy-chat.c:2470
 msgid "_Spelling Suggestions"
 msgstr "æååè(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2584
+#: ../libempathy-gtk/empathy-chat.c:2559
 msgid "Failed to retrieve recent logs"
 msgstr "çæååæèçæè"
 
-#: ../libempathy-gtk/empathy-chat.c:2723
+#: ../libempathy-gtk/empathy-chat.c:2698
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s åæç"
@@ -1546,12 +1088,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:2730
+#: ../libempathy-gtk/empathy-chat.c:2705
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s è %2$s èåå"
 
-#: ../libempathy-gtk/empathy-chat.c:2733
+#: ../libempathy-gtk/empathy-chat.c:2708
 #, c-format
 msgid "%s was kicked"
 msgstr "%s èèå"
@@ -1559,17 +1101,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:2741
+#: ../libempathy-gtk/empathy-chat.c:2716
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s è %2$s èçéåå"
 
-#: ../libempathy-gtk/empathy-chat.c:2744
+#: ../libempathy-gtk/empathy-chat.c:2719
 #, c-format
 msgid "%s was banned"
 msgstr "%s èèçéåå"
 
-#: ../libempathy-gtk/empathy-chat.c:2748
+#: ../libempathy-gtk/empathy-chat.c:2723
 #, c-format
 msgid "%s has left the room"
 msgstr "%s åçééæèåå"
@@ -1579,17 +1121,17 @@ msgstr "%s åçééæèåå"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2757
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2782
+#: ../libempathy-gtk/empathy-chat.c:2757
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s åçååæèåå"
 
-#: ../libempathy-gtk/empathy-chat.c:2807
+#: ../libempathy-gtk/empathy-chat.c:2782
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s çåèçç %s"
@@ -1597,55 +1139,55 @@ 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:2994
-#: ../src/empathy-streamed-media-window.c:1888
-#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
-#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2590
+#: ../libempathy-gtk/empathy-chat.c:2969 ../src/empathy-event-manager.c:1167
+#: ../src/empathy-call-window.c:1465 ../src/empathy-call-window.c:1515
+#: ../src/empathy-call-window.c:2566
 msgid "Disconnected"
 msgstr "åæç"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3658
+#: ../libempathy-gtk/empathy-chat.c:3633
 msgid "Would you like to store this password?"
 msgstr "ææèååæåçï"
 
-#: ../libempathy-gtk/empathy-chat.c:3664
+#: ../libempathy-gtk/empathy-chat.c:3639
 msgid "Remember"
 msgstr "èä"
 
-#: ../libempathy-gtk/empathy-chat.c:3674
+#: ../libempathy-gtk/empathy-chat.c:3649
 msgid "Not now"
 msgstr "çåäè"
 
-#: ../libempathy-gtk/empathy-chat.c:3718
+#: ../libempathy-gtk/empathy-chat.c:3693
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "éè"
 
-#: ../libempathy-gtk/empathy-chat.c:3722
+#: ../libempathy-gtk/empathy-chat.c:3697
 msgid "Wrong password; please try again:"
 msgstr "åçéèïèåèäæï"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3852
+#: ../libempathy-gtk/empathy-chat.c:3827
 msgid "This room is protected by a password:"
 msgstr "æèåååèåçäèï"
 
-#: ../libempathy-gtk/empathy-chat.c:3879
+#: ../libempathy-gtk/empathy-chat.c:3854
+#: ../src/empathy-new-chatroom-dialog.c:780
 msgid "Join"
 msgstr "åå"
 
-#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300
+#: ../libempathy-gtk/empathy-chat.c:4046 ../src/empathy-event-manager.c:1188
 msgid "Connected"
 msgstr "æåéç"
 
-#: ../libempathy-gtk/empathy-chat.c:4126
+#: ../libempathy-gtk/empathy-chat.c:4101
 msgid "Conversation"
 msgstr "èè"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4131
+#: ../libempathy-gtk/empathy-chat.c:4106
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1670,13 +1212,13 @@ msgstr "åæçææ"
 msgid "Could not block contact"
 msgstr "çæåéèçä"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:610
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:611
 msgid "Edit Blocked Contacts"
 msgstr "çèåéçèçä"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:524
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
 #: ../libempathy-gtk/empathy-individual-widget.c:1474
 #: ../src/empathy-chatrooms-window.ui.h:1
@@ -1706,29 +1248,29 @@ msgstr "éåéç(_O)"
 msgid "%A %B %d %Y"
 msgstr "%Y %B %d %A"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-contact-dialogs.c:325
 #: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "æåéçä"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-contact-dialogs.c:394
 #: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "åé %sï"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-contact-dialogs.c:399
 #: ../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-dialogs.c:405
+#: ../libempathy-gtk/empathy-contact-dialogs.c:404
 #: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "åé(_B)"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:423
+#: ../libempathy-gtk/empathy-contact-dialogs.c:422
 #: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
@@ -1747,190 +1289,190 @@ msgid "_Block User"
 msgstr "åéäçè(_B)"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:517
 msgid "Search contacts"
 msgstr "æåéçä"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:547
 msgid "Search: "
 msgstr "æåï"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "_Add Contact"
 msgstr "ååèçä(_A)"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:623
 msgid "No contacts found"
 msgstr "æäåèçä"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:639
 msgid "Your message introducing yourself:"
 msgstr "æçèæ"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:647
 msgid "Please let me see when you're online. Thanks!"
 msgstr "çæäçæèèæçéãæèï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:567
+#: ../libempathy-gtk/empathy-contact-widget.c:566
 #: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "ééï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:747
+#: ../libempathy-gtk/empathy-contact-widget.c:746
 #: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "åå ISO çï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-contact-widget.c:748
 #: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "ååï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-contact-widget.c:750
 #: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "åï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-contact-widget.c:752
 #: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "åï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-contact-widget.c:754
 #: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "ååï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-contact-widget.c:756
 #: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "ééåèï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-contact-widget.c:758
 #: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "èï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-contact-widget.c:760
 #: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "åçï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-contact-widget.c:762
 #: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "æåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-contact-widget.c:764
 #: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "åï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-contact-widget.c:766
 #: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "æåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-contact-widget.c:768
 #: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "æèï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-contact-widget.c:770
 #: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URIï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-contact-widget.c:772
 #: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "æçåççï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-contact-widget.c:774
 #: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "éèï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-contact-widget.c:776
 #: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "åçèå (åå)ï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-contact-widget.c:778
 #: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "æåèå (åå)ï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-contact-widget.c:780
 #: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "éåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-contact-widget.c:782
 #: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "æäï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-contact-widget.c:784
 #: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "çåéåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-contact-widget.c:786
 #: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "äææææï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-contact-widget.c:788
 #: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "çåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-contact-widget.c:790
 #: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "çåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-contact-widget.c:792
 #: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "çåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:846
-#: ../libempathy-gtk/empathy-contact-widget.c:861
+#: ../libempathy-gtk/empathy-contact-widget.c:845
+#: ../libempathy-gtk/empathy-contact-widget.c:860
 #: ../libempathy-gtk/empathy-individual-widget.c:593
 #: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:16
 msgid "Location"
 msgstr "äç"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-contact-widget.c:862
 #: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%sï%s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:914
 #: ../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:997
+#: ../libempathy-gtk/empathy-contact-widget.c:996
 #: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "åååéè"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1053
+#: ../libempathy-gtk/empathy-contact-widget.c:1052
 #: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "çæåååéè"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1444
+#: ../libempathy-gtk/empathy-contact-widget.c:1454
 msgid "Personal Details"
 msgstr "åäçç"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1447
+#: ../libempathy-gtk/empathy-contact-widget.c:1457
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Contact Details"
@@ -2039,28 +1581,27 @@ msgstr "OSï"
 msgid "Version:"
 msgstr "çæï"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:331
+#: ../libempathy-gtk/empathy-groups-widget.c:327
 msgid "Groups"
 msgstr "çç"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:343
+#: ../libempathy-gtk/empathy-groups-widget.c:339
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 msgstr ""
 "èéæéåéçäèéçåååççãæææåäéæäåääçççæäéæççã"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:362
+#: ../libempathy-gtk/empathy-groups-widget.c:358
 msgid "_Add Group"
 msgstr "ååçç(_G)"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:397
+#: ../libempathy-gtk/empathy-groups-widget.c:393
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "éå"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:407
-#: ../src/empathy-roster-window.c:1970
+#: ../libempathy-gtk/empathy-groups-widget.c:403
 msgid "Group"
 msgstr "çç"
 
@@ -2086,137 +1627,136 @@ 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:173
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:345
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 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:349
+#: ../libempathy-gtk/empathy-individual-menu.c:348
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1290
 #: ../src/empathy-call-window.ui.h:2
 msgid "Call"
 msgstr "éè"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:414
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "èåéè"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:416
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "åä"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:418
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "äå"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:659
+#: ../libempathy-gtk/empathy-individual-menu.c:658
 msgid "_Block Contact"
 msgstr "åéèçä(_B)"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1018
-#: ../libempathy-gtk/empathy-new-message-dialog.c:319
-#: ../src/empathy-roster-window-menubar.ui.h:16
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:318
 msgid "_Chat"
 msgstr "èå(_C)"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1053
-#: ../libempathy-gtk/empathy-new-message-dialog.c:313
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:312
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1086
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "èééè(_A)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1119
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "èèéè(_V)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1160
-#: ../src/empathy-roster-window-menubar.ui.h:26
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
 msgid "_Previous Conversations"
 msgstr "éåèè(_P)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1189
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
 msgid "Send File"
 msgstr "åéææ"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1219
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
 msgid "Share My Desktop"
 msgstr "åäæçæé"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1245
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
 #: ../libempathy-gtk/empathy-individual-widget.c:1357
 msgid "Favorite"
 msgstr "åå"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1264
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
 msgid "gnome-contacts not installed"
 msgstr "gnome-contacts åæåè"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1267
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
 msgid "Please install gnome-contacts to access contacts details."
 msgstr "èåè gnome-contacts äååèçäççã"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1398
+#: ../libempathy-gtk/empathy-individual-menu.c:1397
 msgid "Infor_mation"
 msgstr "èè(_M)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1447
+#: ../libempathy-gtk/empathy-individual-menu.c:1446
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "çè(_E)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1564
-#: ../src/empathy-chat-window.c:1192
+#. send invitation
+#: ../libempathy-gtk/empathy-individual-menu.c:1562
+#: ../src/empathy-chat-window.c:1211
 msgid "Inviting you to this room"
 msgstr "éèæåéåèåå"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1610
+#: ../libempathy-gtk/empathy-individual-menu.c:1608
 msgid "_Invite to Chat Room"
 msgstr "éèåèåå(_I)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1806
-#: ../src/empathy-roster-window-menubar.ui.h:14
+#: ../libempathy-gtk/empathy-individual-menu.c:1804
 msgid "_Add Contactâ"
 msgstr "ååèçä(_A)â"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2304
+#: ../libempathy-gtk/empathy-individual-view.c:2364
 msgid "Delete and _Block"
 msgstr "åéäåé(_B)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2339
+#: ../libempathy-gtk/empathy-individual-view.c:2399
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "æåæèçéççã%sãï"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2342
+#: ../libempathy-gtk/empathy-individual-view.c:2402
 msgid "Removing group"
 msgstr "æåçéçç"
 
+#: ../libempathy-gtk/empathy-individual-view.c:2470
+msgid "Re_name"
+msgstr "éæåå"
+
 #. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2397
-#: ../libempathy-gtk/empathy-individual-view.c:2601
+#: ../libempathy-gtk/empathy-individual-view.c:2479
+#: ../libempathy-gtk/empathy-individual-view.c:2683
 msgid "_Remove"
 msgstr "çé(_R)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2474
+#: ../libempathy-gtk/empathy-individual-view.c:2556
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "æåæèçééçäã%sãï"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2483
+#: ../libempathy-gtk/empathy-individual-view.c:2565
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2225,7 +1765,7 @@ msgstr ""
 "æççæèçééçèçäã%sãåïèææéæçéæææææéçèçççèç"
 "äã"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2495
+#: ../libempathy-gtk/empathy-individual-view.c:2577
 msgid "Removing contact"
 msgstr "æåçééçä"
 
@@ -2268,133 +1808,133 @@ msgstr "æåäæå"
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:620
+#: ../libempathy-gtk/empathy-log-window.c:617
 msgid "History"
 msgstr "æå"
 
-#: ../libempathy-gtk/empathy-log-window.c:675
+#: ../libempathy-gtk/empathy-log-window.c:672
 msgid "Show"
 msgstr "éç"
 
-#: ../libempathy-gtk/empathy-log-window.c:697
+#: ../libempathy-gtk/empathy-log-window.c:694
 msgid "Search"
 msgstr "æå"
 
-#: ../libempathy-gtk/empathy-log-window.c:1148
+#: ../libempathy-gtk/empathy-log-window.c:1145
 #, c-format
 msgid "Chat in %s"
 msgstr "æ %s åèå"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1147
 #, c-format
 msgid "Chat with %s"
 msgstr "è %s èåä"
 
-#: ../libempathy-gtk/empathy-log-window.c:1200
-#: ../libempathy-gtk/empathy-log-window.c:1347
+#: ../libempathy-gtk/empathy-log-window.c:1197
+#: ../libempathy-gtk/empathy-log-window.c:1341
 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:1289
+#: ../libempathy-gtk/empathy-log-window.c:1284
 #, 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:1295
+#: ../libempathy-gtk/empathy-log-window.c:1290
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%sï</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1371
+#: ../libempathy-gtk/empathy-log-window.c:1365
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s ç"
 
-#: ../libempathy-gtk/empathy-log-window.c:1378
+#: ../libempathy-gtk/empathy-log-window.c:1372
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s åé"
 
-#: ../libempathy-gtk/empathy-log-window.c:1386
+#: ../libempathy-gtk/empathy-log-window.c:1380
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "éèæé %sïçææ %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1720
+#: ../libempathy-gtk/empathy-log-window.c:1711
 msgid "Today"
 msgstr "äæ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1724
+#: ../libempathy-gtk/empathy-log-window.c:1715
 msgid "Yesterday"
 msgstr "ææ"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1739
+#: ../libempathy-gtk/empathy-log-window.c:1730
 msgid "%e %B %Y"
 msgstr "%Yå%B%eæ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1827
-#: ../libempathy-gtk/empathy-log-window.c:3487
+#: ../libempathy-gtk/empathy-log-window.c:1834
+#: ../libempathy-gtk/empathy-log-window.c:3457
 msgid "Anytime"
 msgstr "ääæé"
 
-#: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2400
+#: ../libempathy-gtk/empathy-log-window.c:1933
+#: ../libempathy-gtk/empathy-log-window.c:2392
 msgid "Anyone"
 msgstr "ääå"
 
-#: ../libempathy-gtk/empathy-log-window.c:2713
+#: ../libempathy-gtk/empathy-log-window.c:2705
 msgid "Who"
 msgstr "è"
 
-#: ../libempathy-gtk/empathy-log-window.c:2922
+#: ../libempathy-gtk/empathy-log-window.c:2914
 msgid "When"
 msgstr "äæ"
 
-#: ../libempathy-gtk/empathy-log-window.c:3038
+#: ../libempathy-gtk/empathy-log-window.c:3032
 msgid "Anything"
 msgstr "äää"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3034
 msgid "Text chats"
 msgstr "æåèå"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3035
+#: ../src/empathy-preferences.ui.h:3
 msgid "Calls"
 msgstr "éè"
 
-#: ../libempathy-gtk/empathy-log-window.c:3047
+#: ../libempathy-gtk/empathy-log-window.c:3039
 msgid "Incoming calls"
 msgstr "äé"
 
-#: ../libempathy-gtk/empathy-log-window.c:3048
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Outgoing calls"
 msgstr "æå"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3041
 msgid "Missed calls"
 msgstr "ææäé"
 
-#: ../libempathy-gtk/empathy-log-window.c:3071
+#: ../libempathy-gtk/empathy-log-window.c:3061
 msgid "What"
 msgstr "äé"
 
-#: ../libempathy-gtk/empathy-log-window.c:3780
+#: ../libempathy-gtk/empathy-log-window.c:3750
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "æçåèåééåèèçææçéåï"
 
-#: ../libempathy-gtk/empathy-log-window.c:3784
+#: ../libempathy-gtk/empathy-log-window.c:3754
 msgid "Clear All"
 msgstr "æéåé"
 
-#: ../libempathy-gtk/empathy-log-window.c:3791
+#: ../libempathy-gtk/empathy-log-window.c:3761
 msgid "Delete from:"
 msgstr "åéåï"
 
@@ -2403,7 +1943,7 @@ msgid "<span size=\"x-large\">Loading...</span>"
 msgstr "<span size=\"x-large\">æåèå...</span>"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
+#: ../src/empathy-chat-window.ui.h:3 ../src/empathy-preferences.ui.h:4
 msgid "Chat"
 msgstr "èå"
 
@@ -2417,13 +1957,11 @@ msgstr "åäææ"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
 msgid "Video"
 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-roster-window-menubar.ui.h:20
 msgid "_Edit"
 msgstr "çè(_E)"
 
@@ -2435,78 +1973,78 @@ msgstr "ææ(_F)"
 msgid "page 2"
 msgstr "éé 2"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+#: ../libempathy-gtk/empathy-new-message-dialog.c:82
 msgid "The contact is offline"
 msgstr "èçäåçéç"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+#: ../libempathy-gtk/empathy-new-message-dialog.c:84
 msgid "The specified contact is either invalid or unknown"
 msgstr "æåçèçäçæææç"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+#: ../libempathy-gtk/empathy-new-message-dialog.c:86
 msgid "The contact does not support this kind of conversation"
 msgstr "èèçääææééèè"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+#: ../libempathy-gtk/empathy-new-message-dialog.c:88
 msgid "The requested functionality is not implemented for this protocol"
 msgstr "èæçåèåæåæååäåä"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+#: ../libempathy-gtk/empathy-new-message-dialog.c:94
 msgid "Could not start a conversation with the given contact"
 msgstr "çæååèçåèçäçèè"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+#: ../libempathy-gtk/empathy-new-message-dialog.c:96
 msgid "You are banned from this channel"
 msgstr "æèæééçå"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+#: ../libempathy-gtk/empathy-new-message-dialog.c:98
 msgid "This channel is full"
 msgstr "æééåæ"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+#: ../libempathy-gtk/empathy-new-message-dialog.c:100
 msgid "You must be invited to join this channel"
 msgstr "æåéèéèæèååæéé"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+#: ../libempathy-gtk/empathy-new-message-dialog.c:102
 msgid "Can't proceed while disconnected"
 msgstr "æçæçæèç"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+#: ../libempathy-gtk/empathy-new-message-dialog.c:104
 msgid "Permission denied"
 msgstr "èåèæç"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+#: ../libempathy-gtk/empathy-new-message-dialog.c:110
 msgid "There was an error starting the conversation"
 msgstr "ååèèæççéè"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:290
-#: ../libempathy-gtk/empathy-new-call-dialog.c:200
+#: ../libempathy-gtk/empathy-new-message-dialog.c:289
+#: ../libempathy-gtk/empathy-new-call-dialog.c:199
 msgid "Enter a contact identifier or phone number:"
 msgstr "èèåèçäèèèäæéèèçï"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:333
+#: ../libempathy-gtk/empathy-new-message-dialog.c:332
 msgid "New Conversation"
 msgstr "æåèè"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+#: ../libempathy-gtk/empathy-new-call-dialog.c:222
 msgid "_Video Call"
 msgstr "èèéè(_V)"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+#: ../libempathy-gtk/empathy-new-call-dialog.c:232
 msgid "_Audio Call"
 msgstr "èééè(_A)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:243
+#: ../libempathy-gtk/empathy-new-call-dialog.c:242
 msgid "New Call"
 msgstr "æåéè"
 
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:130
 #, c-format
-msgid "Authentification failed for account <b>%s</b>"
+msgid "Authentication failed for account <b>%s</b>"
 msgstr "<b>%s</b> åèéèåæ"
 
 #: ../libempathy-gtk/empathy-base-password-dialog.c:224
@@ -2525,30 +2063,40 @@ msgstr ""
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:167
-#: ../libempathy-gtk/empathy-presence-chooser.c:203
+#: ../libempathy-gtk/empathy-presence-chooser.c:165
+#: ../libempathy-gtk/empathy-presence-chooser.c:201
 msgid "Custom Messageâ"
 msgstr "èèèæâ"
 
+#: ../libempathy-gtk/empathy-presence-chooser.c:218
 #: ../libempathy-gtk/empathy-presence-chooser.c:220
-#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messagesâ"
 msgstr "çèèèèæâ"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:345
+#: ../libempathy-gtk/empathy-presence-chooser.c:342
 msgid "Click to remove this status as a favorite"
 msgstr "æéèåéåçæåååäçé"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:354
+#: ../libempathy-gtk/empathy-presence-chooser.c:351
 msgid "Click to make this status a favorite"
 msgstr "æéèåéåçæèçåå"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:388
+#. Translators: %s is a status message like 'At the pub' for example
+#: ../libempathy-gtk/empathy-presence-chooser.c:385
+#, c-format
+msgid ""
+"<b>Current message: %s</b>\n"
+"<small><i>Press Enter to set the new message or Esc to cancel.</i></small>"
+msgstr ""
+"<b>çåèæï%s</b>\n"
+"<small><i>æä Enter èåæèæïææä Esc åæã</i></small>"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:394
 msgid "Set status"
 msgstr "èåçæ"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1135
+#: ../libempathy-gtk/empathy-presence-chooser.c:1102
 msgid "Custom messagesâ"
 msgstr "èèèæâ"
 
@@ -2924,31 +2472,31 @@ msgstr "éå..."
 msgid "_Select"
 msgstr "éå(_S)"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:201
 msgid "No error message"
 msgstr "ææéèèæ"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:274
 msgid "Instant Message (Empathy)"
 msgstr "åæéè (Empathy)"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:432
 msgid "Don't connect on startup"
 msgstr "ååæäèèåéç"
 
-#: ../src/empathy.c:439
+#: ../src/empathy.c:436
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "ååæäéçéçäæåæääåäåèç"
 
-#: ../src/empathy.c:454
+#: ../src/empathy.c:452
 msgid "- Empathy IM Client"
 msgstr "- Empathy åæéçæç"
 
-#: ../src/empathy.c:641
+#: ../src/empathy.c:628
 msgid "Error contacting the Account Manager"
 msgstr "èçåèçççåæççéè"
 
-#: ../src/empathy.c:643
+#: ../src/empathy.c:630
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3009,42 +2557,40 @@ msgstr ""
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:72
+#: ../src/empathy-accounts-dialog.c:70
 #, 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:76
+#: ../src/empathy-accounts-dialog.c:74
 msgid "Your new account has not been saved yet."
 msgstr "åæååæçæåèã"
 
-#: ../src/empathy-accounts-dialog.c:381
-#: ../src/empathy-streamed-media-window.c:759
-#: ../src/empathy-call-window.c:1289
+#: ../src/empathy-accounts-dialog.c:403 ../src/empathy-call-window.c:1265
 msgid "Connectingâ"
 msgstr "éçäâ"
 
-#: ../src/empathy-accounts-dialog.c:422
+#: ../src/empathy-accounts-dialog.c:444
 #, c-format
 msgid "Offline â %s"
 msgstr "éç â %s"
 
-#: ../src/empathy-accounts-dialog.c:434
+#: ../src/empathy-accounts-dialog.c:456
 #, c-format
 msgid "Disconnected â %s"
 msgstr "åæç â %s"
 
-#: ../src/empathy-accounts-dialog.c:445
+#: ../src/empathy-accounts-dialog.c:467
 msgid "Offline â No Network Connection"
 msgstr "éç â ççèéç"
 
-#: ../src/empathy-accounts-dialog.c:452
+#: ../src/empathy-accounts-dialog.c:474
 msgid "Unknown Status"
 msgstr "æçççæ"
 
-#: ../src/empathy-accounts-dialog.c:469
+#: ../src/empathy-accounts-dialog.c:491
 msgid ""
 "This account has been disabled because it relies on an old, unsupported "
 "backend. Please install telepathy-haze and restart your session to migrate "
@@ -3053,36 +2599,36 @@ msgstr ""
 "éåååçåçïåçåéèèèãäååææçåççåãèåè telepathy-haze "
 "äéæååæçäæéæäéçåèèæã"
 
-#: ../src/empathy-accounts-dialog.c:479
+#: ../src/empathy-accounts-dialog.c:501
 msgid "Offline â Account Disabled"
 msgstr "éç â åèååç"
 
-#: ../src/empathy-accounts-dialog.c:585
+#: ../src/empathy-accounts-dialog.c:607
 msgid "Edit Connection Parameters"
 msgstr "çèéçåæ"
 
-#: ../src/empathy-accounts-dialog.c:750
+#: ../src/empathy-accounts-dialog.c:770
 msgid "Failed to retrieve your personal information from the server."
 msgstr "çæåäæåæåæçåäèèã"
 
-#: ../src/empathy-accounts-dialog.c:756
+#: ../src/empathy-accounts-dialog.c:776
 msgid "Go online to edit your personal information."
 msgstr "äçäçèæçåäèèã"
 
-#: ../src/empathy-accounts-dialog.c:843
+#: ../src/empathy-accounts-dialog.c:855
 msgid "_Edit Connection Parameters..."
 msgstr "çèéçåæ(_E)..."
 
-#: ../src/empathy-accounts-dialog.c:1339
+#: ../src/empathy-accounts-dialog.c:1351
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "æåæèåæçéèäçéçç %sï"
 
-#: ../src/empathy-accounts-dialog.c:1343
+#: ../src/empathy-accounts-dialog.c:1355
 msgid "This will not remove your account on the server."
 msgstr "éäæçéäæåäçæçåèã"
 
-#: ../src/empathy-accounts-dialog.c:1579
+#: ../src/empathy-accounts-dialog.c:1560
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3090,24 +2636,25 @@ msgstr ""
 "æåååçåäååèïéææææ\n"
 "ææåçèæãçåèççï"
 
-#. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1755
-msgid "_Enable"
-msgstr "åç(_E)"
+#. Menu item: to enabled/disable the account
+#: ../src/empathy-accounts-dialog.c:1751
+msgid "_Enabled"
+msgstr "ååç(_E)"
 
-#: ../src/empathy-accounts-dialog.c:1756
-msgid "_Disable"
-msgstr "åç(_D)"
+#. Menu item: Rename
+#: ../src/empathy-accounts-dialog.c:1774
+msgid "Rename"
+msgstr "éæåå"
 
-#: ../src/empathy-accounts-dialog.c:2184
+#: ../src/empathy-accounts-dialog.c:2190
 msgid "_Skip"
 msgstr "çé(_S)"
 
-#: ../src/empathy-accounts-dialog.c:2188
+#: ../src/empathy-accounts-dialog.c:2194
 msgid "_Connect"
 msgstr "éæ(_C)"
 
-#: ../src/empathy-accounts-dialog.c:2365
+#: ../src/empathy-accounts-dialog.c:2373
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3141,272 +2688,93 @@ msgstr "- Empathy èèçæç"
 msgid "Empathy authentication client"
 msgstr "Empathy èèçæç"
 
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
-msgid "- Empathy Audio/Video Client"
-msgstr "- Empathy éèèèçæç"
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:1
+msgid "Audio"
+msgstr "éè"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
-msgid "Empathy Audio/Video Client"
-msgstr "Empathy éèèèçæç"
+#: ../src/empathy-call-window.ui.h:3
+msgid "Decoding Codec:"
+msgstr "èçççèçåï"
 
-#: ../src/empathy-streamed-media-window.c:434
-msgid "Contrast"
-msgstr "åæ"
+#: ../src/empathy-call-window.ui.h:4
+msgid "Disable camera"
+msgstr "åçæåæ"
 
-#: ../src/empathy-streamed-media-window.c:437
-msgid "Brightness"
-msgstr "äå"
+#: ../src/empathy-call-window.ui.h:5
+msgid "Display the dialpad"
+msgstr "éçæèç"
 
-#: ../src/empathy-streamed-media-window.c:440
-msgid "Gamma"
-msgstr "Gamma"
+#: ../src/empathy-call-window.ui.h:6
+msgid "Encoding Codec:"
+msgstr "ççççèçåï"
 
-#: ../src/empathy-streamed-media-window.c:547
-msgid "Volume"
-msgstr "éé"
+#: ../src/empathy-call-window.ui.h:7
+msgid "Hang up"
+msgstr "ææ"
 
-#: ../src/empathy-streamed-media-window.c:1099
-msgid "_Sidebar"
-msgstr "åéæ(_S)"
+#: ../src/empathy-call-window.ui.h:8
+msgid "Hang up current call"
+msgstr "ææçåéè"
 
-#: ../src/empathy-streamed-media-window.c:1119
-msgid "Audio input"
-msgstr "éæèå"
+#: ../src/empathy-call-window.ui.h:9
+msgid "Local Candidate:"
+msgstr "ææåéï"
 
-#: ../src/empathy-streamed-media-window.c:1123
-msgid "Video input"
-msgstr "èèèå"
+#: ../src/empathy-call-window.ui.h:10
+msgid "Maximise me"
+msgstr "åææåå"
 
-#: ../src/empathy-streamed-media-window.c:1131
-msgid "Dialpad"
-msgstr "æèç"
+#: ../src/empathy-call-window.ui.h:11
+msgid "Minimise me"
+msgstr "åææåå"
 
-#: ../src/empathy-streamed-media-window.c:1142
-msgid "Details"
-msgstr "èçèæ"
+#: ../src/empathy-call-window.ui.h:12
+msgid "Remote Candidate:"
+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:1211
-#: ../src/empathy-call-window.c:1889
-#, c-format
-msgid "Call with %s"
-msgstr "è %s éèä"
+#: ../src/empathy-call-window.ui.h:13
+msgid "Send Audio"
+msgstr "åééè"
 
-#: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2133
-msgid "The IP address as seen by the machine"
-msgstr "æåçèç IP äå"
+#: ../src/empathy-call-window.ui.h:14
+msgid "Send Video"
+msgstr "åéèè"
 
-#: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2135
-msgid "The IP address as seen by a server on the Internet"
-msgstr "çéçèäçäæåçèç IP äå"
+#: ../src/empathy-call-window.ui.h:15
+msgid "Show dialpad"
+msgstr "éçæèç"
 
-#: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2137
-msgid "The IP address of the peer as seen by the other side"
-msgstr "åäççèçéç IP äå"
+#: ../src/empathy-call-window.ui.h:16
+msgid "Start a video call"
+msgstr "éåèèéè"
 
-#: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2139
-msgid "The IP address of a relay server"
-msgstr "äçäæåç IP äå"
+#: ../src/empathy-call-window.ui.h:17
+msgid "Start an audio call"
+msgstr "éåéèéè"
 
-#: ../src/empathy-streamed-media-window.c:1452
-#: ../src/empathy-call-window.c:2141
-msgid "The IP address of the multicast group"
-msgstr "åéåæççç IP äå"
+#: ../src/empathy-call-window.ui.h:18
+msgid "Swap camera"
+msgstr "äææåæ"
 
-#: ../src/empathy-streamed-media-window.c:1837
-#: ../src/empathy-streamed-media-window.c:1840
-#: ../src/empathy-streamed-media-window.c:1843
-#: ../src/empathy-streamed-media-window.c:1846
-msgctxt "codec"
-msgid "Unknown"
-msgstr "æç"
+#: ../src/empathy-call-window.ui.h:19
+msgid "Toggle audio transmission"
+msgstr "åæéèåæ"
 
-#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2138
-#, c-format
-msgid "Connected â %d:%02dm"
-msgstr "åéç â %d:%02dm"
+#: ../src/empathy-call-window.ui.h:20
+msgid "Toggle video transmission"
+msgstr "åæèèåæ"
 
-#: ../src/empathy-streamed-media-window.c:2199
-#: ../src/empathy-call-window.c:2992
-msgid "Technical Details"
-msgstr "æèçç"
-
-#: ../src/empathy-streamed-media-window.c:2237
-#: ../src/empathy-call-window.c:3031
-#, 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:2242
-#: ../src/empathy-call-window.c:3036
-#, 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:2248
-#: ../src/empathy-call-window.c:3042
-#, 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:2254
-#: ../src/empathy-call-window.c:3048
-msgid "There was a failure on the network"
-msgstr "éåçèäæéèçç"
-
-#: ../src/empathy-streamed-media-window.c:2258
-#: ../src/empathy-call-window.c:3052
-msgid ""
-"The audio formats necessary for this call are not installed on your computer"
-msgstr "æéèæåèçéèæååæåæçéèäåè"
-
-#: ../src/empathy-streamed-media-window.c:2261
-#: ../src/empathy-call-window.c:3055
-msgid ""
-"The video formats necessary for this call are not installed on your computer"
-msgstr "æéèæåèçèèæååæåæçéèäåè"
-
-#: ../src/empathy-streamed-media-window.c:2271
-#: ../src/empathy-call-window.c:3067
-#, c-format
-msgid ""
-"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
-"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
-"the Help menu."
-msgstr ""
-"å Telepathy åääççæéæççæãè<a href=\"%s\">ååéåéè</a>äéä"
-"åæåéååçãééãèçäææéççéã"
-
-#: ../src/empathy-streamed-media-window.c:2279
-#: ../src/empathy-call-window.c:3076
-msgid "There was a failure in the call engine"
-msgstr "éèåæåæéèçç"
-
-#: ../src/empathy-streamed-media-window.c:2282
-#: ../src/empathy-call-window.c:3079
-msgid "The end of the stream was reached"
-msgstr "åéäææç"
-
-#: ../src/empathy-streamed-media-window.c:2322
-#: ../src/empathy-call-window.c:3119
-msgid "Can't establish audio stream"
-msgstr "çæåçéèäæ"
-
-#: ../src/empathy-streamed-media-window.c:2332
-#: ../src/empathy-call-window.c:3129
-msgid "Can't establish video stream"
-msgstr "çæåçèèäæ"
-
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
-#: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "éè"
-
-#: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "èçççèçåï"
-
-#: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "åçæåæ"
-
-#: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "éçæèç"
-
-#: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "ççççèçåï"
-
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "ææ"
-
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "ææçåéè"
-
-#: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "ææåéï"
-
-#: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "åææåå"
-
-#: ../src/empathy-call-window.ui.h:11
-msgid "Minimise me"
-msgstr "åææåå"
-
-#: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "éçåéï"
-
-#: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "åééè"
-
-#: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "åéèè"
-
-#: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "éçæèç"
-
-#: ../src/empathy-call-window.ui.h:16
-msgid "Start a video call"
-msgstr "éåèèéè"
-
-#: ../src/empathy-call-window.ui.h:17
-msgid "Start an audio call"
-msgstr "éåéèéè"
-
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "äææåæ"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "åæéèåæ"
-
-#: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "åæèèåæ"
-
-#: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2542 ../src/empathy-call-window.c:2543
-#: ../src/empathy-call-window.c:2544 ../src/empathy-call-window.c:2545
-msgid "Unknown"
-msgstr "äæ"
+#: ../src/empathy-call-window.ui.h:21 ../src/empathy-call-window.c:2518
+#: ../src/empathy-call-window.c:2519 ../src/empathy-call-window.c:2520
+#: ../src/empathy-call-window.c:2521
+msgid "Unknown"
+msgstr "äæ"
 
 #: ../src/empathy-call-window.ui.h:23
 msgid "Video call"
 msgstr "èèéè"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
 msgid "_Call"
 msgstr "éè(_C)"
 
@@ -3415,17 +2783,14 @@ msgid "_Camera"
 msgstr "æåæ(_C)"
 
 #: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "_Contents"
 msgstr "åå(_C)"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../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-roster-window-menubar.ui.h:22
 msgid "_Help"
 msgstr "æå(_H)"
 
@@ -3438,23 +2803,21 @@ msgid "_Settings"
 msgstr "èåå(_S)"
 
 #: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-roster-window-menubar.ui.h:29
-#: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "æè(_V)"
 
-#: ../src/empathy-chat-window.c:289
+#: ../src/empathy-chat-window.c:286
 msgid "Close this window?"
 msgstr "èéééåèçï"
 
-#: ../src/empathy-chat-window.c:294
+#: ../src/empathy-chat-window.c:291
 #, c-format
 msgid ""
 "Closing this window will leave %s. You will not receive any further messages "
 "until you rejoin it."
 msgstr "ééæèçæéé %sãæåçæææåäåçèæïééæåæåèã"
 
-#: ../src/empathy-chat-window.c:305
+#: ../src/empathy-chat-window.c:302
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -3465,60 +2828,60 @@ msgid_plural ""
 msgstr[0] ""
 "ééæèçæéé %u åèååãæåçæææåäåçèæïééæåæåèã"
 
-#: ../src/empathy-chat-window.c:314
+#: ../src/empathy-chat-window.c:311
 #, c-format
 msgid "Leave %s?"
 msgstr "éé %sï"
 
-#: ../src/empathy-chat-window.c:315
+#: ../src/empathy-chat-window.c:312
 msgid ""
 "You will not receive any further messages from this chat room until you "
 "rejoin it."
 msgstr "æåçæææåæèååäåçèæïééæåæåèã"
 
-#: ../src/empathy-chat-window.c:334
+#: ../src/empathy-chat-window.c:331
 msgid "Close window"
 msgstr "ééèç"
 
-#: ../src/empathy-chat-window.c:334
+#: ../src/empathy-chat-window.c:331
 msgid "Leave room"
 msgstr "ééèåå"
 
-#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
+#: ../src/empathy-chat-window.c:660 ../src/empathy-chat-window.c:680
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d åæè)"
 
-#: ../src/empathy-chat-window.c:652
+#: ../src/empathy-chat-window.c:672
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (èåä %u å)"
 
-#: ../src/empathy-chat-window.c:668
+#: ../src/empathy-chat-window.c:688
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (äèåääç %d åæè)"
 
-#: ../src/empathy-chat-window.c:677
+#: ../src/empathy-chat-window.c:697
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (äèææäç %d åæè)"
 
-#: ../src/empathy-chat-window.c:892
+#: ../src/empathy-chat-window.c:912
 msgid "SMS:"
 msgstr "SMSï"
 
-#: ../src/empathy-chat-window.c:902
+#: ../src/empathy-chat-window.c:922
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "æååé %d åèæ"
 
-#: ../src/empathy-chat-window.c:924
+#: ../src/empathy-chat-window.c:944
 msgid "Typing a message."
 msgstr "æåèåèæã"
 
@@ -3598,96 +2961,94 @@ msgstr "èåéç"
 msgid "Manage Favorite Rooms"
 msgstr "ççååçèåå"
 
-#: ../src/empathy-event-manager.c:522
+#: ../src/empathy-event-manager.c:510
 msgid "Incoming video call"
 msgstr "ååçèèéè"
 
-#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
+#: ../src/empathy-event-manager.c:510 ../src/empathy-call-window.c:1482
 msgid "Incoming call"
 msgstr "äé"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:514
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s èèæéèèèéèãææåèæèï"
 
-#: ../src/empathy-event-manager.c:527
+#: ../src/empathy-event-manager.c:515
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s èèæéèéèãææåèæèï"
 
-#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
-#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1525
+#: ../src/empathy-event-manager.c:518 ../src/empathy-event-manager.c:915
+#: ../src/empathy-call-window.c:1488
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s çäé"
 
-#: ../src/empathy-event-manager.c:555
+#: ../src/empathy-event-manager.c:543
 msgid "_Reject"
 msgstr "æç(_R)"
 
-#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
+#: ../src/empathy-event-manager.c:551 ../src/empathy-event-manager.c:559
 msgid "_Answer"
 msgstr "æè(_A)"
 
-#: ../src/empathy-event-manager.c:571
+#: ../src/empathy-event-manager.c:559
 msgid "_Answer with video"
 msgstr "äèèæè(_A)"
 
-#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
-#: ../src/empathy-call-window.c:1525
-#, c-format
-msgid "Incoming video call from %s"
-msgstr "äè %s çèèéè"
-
-#: ../src/empathy-event-manager.c:837
+#: ../src/empathy-event-manager.c:714
 msgid "Room invitation"
 msgstr "èååéè"
 
-#: ../src/empathy-event-manager.c:839
+#: ../src/empathy-event-manager.c:716
 #, c-format
 msgid "Invitation to join %s"
 msgstr "éèåå %s"
 
-#: ../src/empathy-event-manager.c:846
+#: ../src/empathy-event-manager.c:723
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s æåéèæåå %s"
 
-#: ../src/empathy-event-manager.c:854
+#: ../src/empathy-event-manager.c:731
 msgid "_Decline"
 msgstr "æç(_D)"
 
-#: ../src/empathy-event-manager.c:859
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:736
 msgid "_Join"
 msgstr "åå(_J)"
 
-#: ../src/empathy-event-manager.c:886
+#: ../src/empathy-event-manager.c:762
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s æéèæåå %s"
 
-#: ../src/empathy-event-manager.c:892
+#: ../src/empathy-event-manager.c:768
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "æèéèåå %s"
 
-#: ../src/empathy-event-manager.c:943
+#: ../src/empathy-event-manager.c:915 ../src/empathy-call-window.c:1488
+#, c-format
+msgid "Incoming video call from %s"
+msgstr "äè %s çèèéè"
+
+#: ../src/empathy-event-manager.c:947
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "æåäè %s çææåè"
 
-#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
+#: ../src/empathy-event-manager.c:983 ../src/empathy-roster-window.c:356
 msgid "Password required"
 msgstr "éèåç"
 
-#: ../src/empathy-event-manager.c:1216
+#: ../src/empathy-event-manager.c:1105
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s æèååæçææåäççèå"
 
-#: ../src/empathy-event-manager.c:1222
+#: ../src/empathy-event-manager.c:1111
 #, c-format
 msgid ""
 "\n"
@@ -3822,86 +3183,70 @@ msgid "Import Accounts"
 msgstr "åååè"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:316
+#: ../src/empathy-import-widget.c:303
 msgid "Import"
 msgstr "åå"
 
-#: ../src/empathy-import-widget.c:325
+#: ../src/empathy-import-widget.c:312
 msgid "Protocol"
 msgstr "éèåå"
 
-#: ../src/empathy-import-widget.c:349
+#: ../src/empathy-import-widget.c:336
 msgid "Source"
 msgstr "äæ"
 
-#: ../src/empathy-roster-window.c:391
+#: ../src/empathy-roster-window.c:373
 msgid "Provide Password"
 msgstr "æäåç"
 
-#: ../src/empathy-roster-window.c:397
+#: ../src/empathy-roster-window.c:379
 msgid "Disconnect"
 msgstr "æç"
 
-#: ../src/empathy-roster-window.c:657
+#: ../src/empathy-roster-window.c:639
 msgid "You need to setup an account to see contacts here."
 msgstr "æéèèçäååèæèåéèæçèçäã"
 
-#: ../src/empathy-roster-window.c:673
+#: ../src/empathy-roster-window.c:655
 msgid "No match found"
 msgstr "æäåçåéç"
 
-#: ../src/empathy-roster-window.c:783
+#: ../src/empathy-roster-window.c:765
 #, c-format
 msgid "Sorry, %s accounts canât be used until your %s software is updated."
 msgstr "åææï%s åèçæäçïééæç %s èéåææã"
 
-#: ../src/empathy-roster-window.c:849
+#: ../src/empathy-roster-window.c:831
 msgid "Update software..."
 msgstr "ææèé..."
 
-#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+#: ../src/empathy-roster-window.c:837 ../src/empathy-roster-window.c:954
 msgid "Close"
 msgstr "éé"
 
-#: ../src/empathy-roster-window.c:960
+#: ../src/empathy-roster-window.c:942
 msgid "Reconnect"
 msgstr "éæéæ"
 
-#: ../src/empathy-roster-window.c:966
+#: ../src/empathy-roster-window.c:948
 msgid "Edit Account"
 msgstr "çèåè"
 
-#. Translators: this string will be something like:
-#. * Top up My Account ($1.23)..."
-#: ../src/empathy-roster-window.c:1110
-#, c-format
-msgid "Top up %s (%s)..."
-msgstr "åå %s (%s)..."
-
-#: ../src/empathy-roster-window.c:1156
-msgid "Top up account credit"
+#: ../src/empathy-roster-window.c:1128
+msgid "Top up account"
 msgstr "åååèåé"
 
-#. top up button
-#: ../src/empathy-roster-window.c:1228
-msgid "Top Up..."
-msgstr "åå..."
-
-#: ../src/empathy-roster-window.c:1952
-msgid "Contact"
-msgstr "éçä"
-
-#: ../src/empathy-roster-window.c:2150
+#: ../src/empathy-roster-window.c:1813
 msgid "You need to enable one of your accounts to see contacts here."
 msgstr "æéèåçæåäääçåèäæèåéèæçèçäã"
 
 #. translators: argument is an account name
-#: ../src/empathy-roster-window.c:2158
+#: ../src/empathy-roster-window.c:1821
 #, c-format
 msgid "You need to enable %s to see contacts here."
 msgstr "æéèåç %s æèåéèæçèçäã"
 
-#: ../src/empathy-roster-window.c:2460
+#: ../src/empathy-roster-window.c:2154 ../src/empathy-preferences.ui.h:6
 msgid "Contact List"
 msgstr "éçäæå"
 
@@ -3909,103 +3254,19 @@ msgstr "éçäæå"
 msgid "Account settings"
 msgstr "åèèåå"
 
-#: ../src/empathy-roster-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "éçäåå(_M)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "ååéé"
-
-#: ../src/empathy-roster-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "æéçäæåååæ(_L)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "ååååèåå(_F)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "ççåå"
-
-#: ../src/empathy-roster-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "æååå(_O)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:7
-#: ../src/empathy-status-icon.ui.h:1
-msgid "New _Callâ"
-msgstr "æåéè(_C)â"
-
-#: ../src/empathy-roster-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "æåååèåéè(_A)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:9
-msgid "P_references"
-msgstr "ååèå(_R)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "éçåå(_R)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:11
-msgid "Sort by _Name"
-msgstr "äåçæå(_N)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:12
-msgid "Sort by _Status"
-msgstr "äçææå(_S)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "åè(_A)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "èåéçèçä"
-
-#: ../src/empathy-roster-window-menubar.ui.h:17
-msgid "_Compact Size"
-msgstr "ççåå(_C)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "ææåè(_F)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:23
-msgid "_Joinâ"
-msgstr "åå(_J)â"
-
-#: ../src/empathy-roster-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversationâ"
-msgstr "æåèè(_N)â"
-
-#: ../src/empathy-roster-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "éçéçä(_O)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:27
-msgid "_Room"
-msgstr "èåå(_R)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:28
-msgid "_Search for Contactsâ"
-msgstr "æåèçä(_S)â"
-
-#: ../src/empathy-new-chatroom-dialog.c:369
+#: ../src/empathy-new-chatroom-dialog.c:194
 msgid "Chat Room"
 msgstr "èåå"
 
-#: ../src/empathy-new-chatroom-dialog.c:385
+#: ../src/empathy-new-chatroom-dialog.c:209
 msgid "Members"
 msgstr "æå"
 
-#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
-#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:637
+#: ../src/empathy-new-chatroom-dialog.c:410
+msgid "Failed to list rooms"
+msgstr "çæååèåå"
+
+#: ../src/empathy-new-chatroom-dialog.c:439
 #, c-format
 msgid ""
 "%s\n"
@@ -4018,23 +3279,19 @@ msgstr ""
 "éèåçï%s\n"
 "æåï%s"
 
-#: ../src/empathy-new-chatroom-dialog.c:639
-#: ../src/empathy-new-chatroom-dialog.c:640
+#: ../src/empathy-new-chatroom-dialog.c:441
+#: ../src/empathy-new-chatroom-dialog.c:442
 msgid "Yes"
 msgstr "æ"
 
-#: ../src/empathy-new-chatroom-dialog.c:639
-#: ../src/empathy-new-chatroom-dialog.c:640
+#: ../src/empathy-new-chatroom-dialog.c:441
+#: ../src/empathy-new-chatroom-dialog.c:442
 msgid "No"
 msgstr "å"
 
-#: ../src/empathy-new-chatroom-dialog.c:668
-msgid "Could not start room listing"
-msgstr "çæéåååèååæå"
-
-#: ../src/empathy-new-chatroom-dialog.c:678
-msgid "Could not stop room listing"
-msgstr "çæåæååèååæå"
+#: ../src/empathy-new-chatroom-dialog.c:782
+msgid "Join Room"
+msgstr "ååèåå"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "Couldn't load room list"
@@ -4048,103 +3305,102 @@ msgstr "åéèèåèååçèåååçæåæåäééäæå
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
-"the current account's server"
+"the current account&apos;s server"
 msgstr ""
-"èåæèååæåçäæåïæèçèèååäæçååèæåçäæåæççåå"
+"èåæèååæåçäæåïæåæèèååäæçååèæåçäæåæççåå"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "ååèåå"
+msgid ""
+"Enter the server which hosts the room, or leave it empty if the room is on "
+"the current account's server"
+msgstr ""
+"èåæèååæåçäæåïæèçèèååäæçååèæåçäæåæççåå"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Room List"
 msgstr "èååæå"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Room:"
 msgstr "èåå(_R)ï"
 
-#: ../src/empathy-preferences.c:166
+#: ../src/empathy-preferences.c:146
 msgid "Message received"
 msgstr "èæåæå"
 
-#: ../src/empathy-preferences.c:167
+#: ../src/empathy-preferences.c:147
 msgid "Message sent"
 msgstr "èæåéå"
 
-#: ../src/empathy-preferences.c:168
+#: ../src/empathy-preferences.c:148
 msgid "New conversation"
 msgstr "æåèè"
 
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:149
 msgid "Contact comes online"
 msgstr "éçääç"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:150
 msgid "Contact goes offline"
 msgstr "éçäéç"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:151
 msgid "Account connected"
 msgstr "åèåéç"
 
-#: ../src/empathy-preferences.c:172
+#: ../src/empathy-preferences.c:152
 msgid "Account disconnected"
 msgstr "åèåæç"
 
-#: ../src/empathy-preferences.c:475
+#: ../src/empathy-preferences.c:429
 msgid "Language"
 msgstr "èè"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:726
+#: ../src/empathy-preferences.c:678
 msgid "Juliet"
 msgstr "çèå"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:733
+#: ../src/empathy-preferences.c:685
 msgid "Romeo"
 msgstr "æåä"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:739
+#: ../src/empathy-preferences.c:691
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "çççèèèåïçääèååéï"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:743
+#: ../src/empathy-preferences.c:695
 msgid "Deny thy father and refuse thy name;"
 msgstr "èçäæèääïçäçåæèåã"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:746
+#: ../src/empathy-preferences.c:698
 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:749
+#: ../src/empathy-preferences.c:701
 msgid "And I'll no longer be a Capulet."
 msgstr "ççèäéååïååçïæéäã"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:752
+#: ../src/empathy-preferences.c:704
 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:755
+#: ../src/empathy-preferences.c:707
 msgid "Juliet has disconnected"
 msgstr "çèååæç"
 
-#: ../src/empathy-preferences.c:1159
+#: ../src/empathy-preferences.c:1112
 msgid "Preferences"
 msgstr "ååèå"
 
-#: ../src/empathy-preferences.ui.h:1
-msgid "Appearance"
-msgstr "åè"
-
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:2
 msgid "Behavior"
 msgstr "èç"
 
@@ -4152,19 +3408,19 @@ msgstr "èç"
 msgid "Chat Th_eme:"
 msgstr "èåäæäé(_E):"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:7
 msgid "Disable notifications when _away or busy"
 msgstr "ççæçééæåçæåçéç(_D)"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:8
 msgid "Disable sounds when _away or busy"
 msgstr "ççæçééæåçæåçéæ(_A)"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:9
 msgid "Display incoming events in the notification area"
 msgstr "åéçååéçæåää"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:10
 msgid ""
 "Echo cancellation helps to make your voice sound clearer to the other "
 "person, but may cause problems on some computers. If you or the other person "
@@ -4175,47 +3431,47 @@ msgstr ""
 "æææåääèèæççåéæéæåæïèèèéæåéæéåèïäéæéåé"
 "èã"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact comes online"
 msgstr "çéçääçæåçéç"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when a contact goes offline"
 msgstr "çéçäéçæåçéç"
 
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable notifications when the _chat is not focused"
 msgstr "çèåèçååçéæåçéç(_C)"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
 msgid "Enable spell checking for languages:"
 msgstr "çèèåçæåææï"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:15
 msgid "General"
 msgstr "äè"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location sources:"
 msgstr "äçäæï"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:18
 msgid "Log conversations"
 msgstr "çéèè"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:19
 msgid "Notifications"
 msgstr "éç"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:20
 msgid "Play sound for events"
 msgstr "ææääéæ"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:21
 msgid "Privacy"
 msgstr "éç"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:22
 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 "
@@ -4224,258 +3480,238 @@ msgstr ""
 "éääçæçåææéäææåçååãæåååæèåéäåïäææäåäèæã"
 "GPS çåææçååæéçåäæã"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:23
 msgid "Show _smileys as images"
 msgstr "åèæçèäåçéç(_S)"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:24
+msgid "Show account balances"
+msgstr "éçåèéé"
+
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "åèååéçéçäæå(_L)"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:26
+msgid "Show offline contacts"
+msgstr "éçéçéçä"
+
+#: ../src/empathy-preferences.ui.h:27
+msgid "Show protocol in avatar"
+msgstr "æåäåçéçåå"
+
+#: ../src/empathy-preferences.ui.h:28
+msgid "Sort contacts by:"
+msgstr "æåéçääï"
+
+#: ../src/empathy-preferences.ui.h:29
 msgid "Sounds"
 msgstr "éæ"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:30
 msgid "Spell Checking"
 msgstr "æåææ"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:31
 msgid "Start chats in:"
 msgstr "éåèåæï"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:32
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "éèçèèæåååæåæåçåèååçèèã"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:33
 msgid "Themes"
 msgstr "äæäé"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:34
 msgid "Use _echo cancellation to improve call quality"
 msgstr "äçåéæéäæåéèåè(_E)"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:35
 msgid "Variant:"
 msgstr "æåï"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Automatically connect on startup"
 msgstr "ååæèåéç(_A)"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Cellphone"
 msgstr "ææ(_C)"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Enable bubble notifications"
 msgstr "åçææåéç(_E)"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:39
 msgid "_Enable sound notifications"
 msgstr "åçéæéç(_E)"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:40
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:41
 msgid "_Network (IP, Wi-Fi)"
 msgstr "çè (IP, Wi-Fi)(_N)"
 
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:42
 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:39
+#: ../src/empathy-preferences.ui.h:44
 msgid "_Reduce location accuracy"
 msgstr "éääçæçå(_R)"
 
-#: ../src/empathy-preferences.ui.h:40
+#: ../src/empathy-preferences.ui.h:45
+msgid "name"
+msgstr "åç"
+
+#: ../src/empathy-preferences.ui.h:46
 msgid "new _windows"
 msgstr "æèç(_W)"
 
-#: ../src/empathy-preferences.ui.h:41
+#: ../src/empathy-preferences.ui.h:47
 msgid "new ta_bs"
 msgstr "æåé(_B)"
 
+#: ../src/empathy-preferences.ui.h:48
+msgid "status"
+msgstr "çæ"
+
+#: ../src/empathy-status-icon.ui.h:1
+msgid "New _Callâ"
+msgstr "æåéè(_C)â"
+
 #: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "çæ"
 
+#: ../src/empathy-status-icon.ui.h:3
+msgid "_New Conversationâ"
+msgstr "æåèè(_N)â"
+
 #: ../src/empathy-status-icon.ui.h:4
 msgid "_Quit"
 msgstr "çæ(_Q)"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "åææèçääæ"
-
-#: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "æåæéé"
-
-#: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "æåæéå"
-
-#: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "åçæåæääæåéèè"
-
-#: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "åçæåæäéåèè"
-
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "åçæåæääèéåèè"
-
-#: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "éè"
-
-#: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "éæ"
-
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "èè(_I)"
-
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "èèéé"
-
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "èèéå"
-
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "èèéè"
-
-#: ../src/empathy-map-view.c:471
-msgid "Contact Map View"
-msgstr "éçäååæè"
-
-#: ../src/empathy-debug-window.c:1607
+#: ../src/empathy-debug-window.c:1603
 msgid "Save"
 msgstr "åå"
 
-#: ../src/empathy-debug-window.c:1667
+#: ../src/empathy-debug-window.c:1663
 msgid "Pastebin link"
 msgstr "Pastebin éç"
 
-#: ../src/empathy-debug-window.c:1676
+#: ../src/empathy-debug-window.c:1672
 msgid "Pastebin response"
 msgstr "Pastebin åæ"
 
-#: ../src/empathy-debug-window.c:1683
+#: ../src/empathy-debug-window.c:1679
 msgid "Data too large for a single paste. Please save logs to file."
 msgstr "åæåäèääèèæééåãèååçéèææã"
 
-#: ../src/empathy-debug-window.c:1912
+#: ../src/empathy-debug-window.c:1860
 msgid "Debug Window"
 msgstr "åéèç"
 
-#: ../src/empathy-debug-window.c:1970
+#: ../src/empathy-debug-window.c:1920
 msgid "Send to pastebin"
 msgstr "åéè pastebin"
 
-#: ../src/empathy-debug-window.c:2009
+#: ../src/empathy-debug-window.c:1964
 msgid "Pause"
 msgstr "æå"
 
-#: ../src/empathy-debug-window.c:2021
+#: ../src/empathy-debug-window.c:1976
 msgid "Level "
 msgstr "çç"
 
-#: ../src/empathy-debug-window.c:2040
+#: ../src/empathy-debug-window.c:1995
 msgid "Debug"
 msgstr "åé"
 
-#: ../src/empathy-debug-window.c:2045
+#: ../src/empathy-debug-window.c:2000
 msgid "Info"
 msgstr "èè"
 
-#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
+#: ../src/empathy-debug-window.c:2005 ../src/empathy-debug-window.c:2054
 msgid "Message"
 msgstr "èæ"
 
-#: ../src/empathy-debug-window.c:2055
+#: ../src/empathy-debug-window.c:2010
 msgid "Warning"
 msgstr "èå"
 
-#: ../src/empathy-debug-window.c:2060
+#: ../src/empathy-debug-window.c:2015
 msgid "Critical"
 msgstr "åé"
 
-#: ../src/empathy-debug-window.c:2065
+#: ../src/empathy-debug-window.c:2020
 msgid "Error"
 msgstr "éè"
 
-#: ../src/empathy-debug-window.c:2084
+#: ../src/empathy-debug-window.c:2039
 msgid "Time"
 msgstr "æå"
 
-#: ../src/empathy-debug-window.c:2087
+#: ../src/empathy-debug-window.c:2042
 msgid "Domain"
 msgstr "çå"
 
-#: ../src/empathy-debug-window.c:2089
+#: ../src/empathy-debug-window.c:2045
 msgid "Category"
 msgstr "åé"
 
-#: ../src/empathy-debug-window.c:2091
+#: ../src/empathy-debug-window.c:2048
 msgid "Level"
 msgstr "çç"
 
-#: ../src/empathy-debug-window.c:2114
+#: ../src/empathy-debug-window.c:2077
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr "éåçéççççåäææéçåéæååèã"
 
-#: ../src/empathy-invite-participant-dialog.c:202
-#: ../src/empathy-invite-participant-dialog.c:230
+#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:229
 msgid "Invite Participant"
 msgstr "éèåè"
 
-#: ../src/empathy-invite-participant-dialog.c:203
+#: ../src/empathy-invite-participant-dialog.c:202
 msgid "Choose a contact to invite into the conversation:"
 msgstr "éææèéèéåèèçèçäï"
 
-#: ../src/empathy-invite-participant-dialog.c:226
+#: ../src/empathy-invite-participant-dialog.c:225
 msgid "Invite"
 msgstr "éè"
 
-#: ../src/empathy-accounts.c:180
+#: ../src/empathy-accounts.c:184
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "äèéçääåèçïåèäääæ (äïåå) äéé"
 
-#: ../src/empathy-accounts.c:184
+#: ../src/empathy-accounts.c:188
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "äèéçääåèçïééåæãéèçäãåè"
 
-#: ../src/empathy-accounts.c:188
+#: ../src/empathy-accounts.c:192
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr "ååéåæçäçåè (äïgabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:190
+#: ../src/empathy-accounts.c:194
 msgid "<account-id>"
 msgstr "<account-id>"
 
-#: ../src/empathy-accounts.c:195
+#: ../src/empathy-accounts.c:199
 msgid "- Empathy Accounts"
 msgstr "- Empathy åè"
 
-#: ../src/empathy-accounts.c:231
+#: ../src/empathy-accounts.c:242
 msgid "Empathy Accounts"
 msgstr "Empathy åè"
 
@@ -4491,97 +3727,197 @@ msgstr "- Empathy ééå"
 msgid "Empathy Debugger"
 msgstr "Empathy ééçå"
 
-#: ../src/empathy-chat.c:109
+#: ../src/empathy-chat.c:106
 msgid "- Empathy Chat Client"
 msgstr "- Empathy èåçæç"
 
-#: ../src/empathy-notifications-approver.c:189
+#: ../src/empathy-notifications-approver.c:188
 msgid "Respond"
 msgstr "åæ"
 
-#: ../src/empathy-notifications-approver.c:203
-#: ../src/empathy-call-window.c:1529
+#: ../src/empathy-notifications-approver.c:197
+#: ../src/empathy-call-window.c:1492
 msgid "Reject"
 msgstr "æç"
 
-#: ../src/empathy-notifications-approver.c:208
-#: ../src/empathy-notifications-approver.c:213
-#: ../src/empathy-call-window.c:1530
+#: ../src/empathy-notifications-approver.c:202
+#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-call-window.c:1493
 msgid "Answer"
 msgstr "æè"
 
-#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-notifications-approver.c:207
 msgid "Answer with video"
 msgstr "äèèæè"
 
-#: ../src/empathy-notifications-approver.c:221
-#: ../src/empathy-notifications-approver.c:231
+#: ../src/empathy-notifications-approver.c:215
+#: ../src/empathy-notifications-approver.c:225
 msgid "Decline"
 msgstr "æç"
 
-#: ../src/empathy-notifications-approver.c:225
-#: ../src/empathy-notifications-approver.c:236
+#: ../src/empathy-notifications-approver.c:219
+#: ../src/empathy-notifications-approver.c:230
 msgid "Accept"
 msgstr "æå"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:246
+#: ../src/empathy-notifications-approver.c:240
 msgid "Provide"
 msgstr "æä"
 
-#: ../src/empathy-call-observer.c:132
+#: ../src/empathy-call-observer.c:119
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s ååææçæïäææèääéèã"
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1140 ../src/empathy-call-window.c:1162
+#: ../src/empathy-call-window.c:1122 ../src/empathy-call-window.c:1138
 msgid "i"
 msgstr "è"
 
-#: ../src/empathy-call-window.c:2888
+#. translators: Call is a noun and %s is the contact name. This string
+#. * is used in the window title
+#: ../src/empathy-call-window.c:1857
+#, c-format
+msgid "Call with %s"
+msgstr "è %s éèä"
+
+#: ../src/empathy-call-window.c:2109
+msgid "The IP address as seen by the machine"
+msgstr "æåçèç IP äå"
+
+#: ../src/empathy-call-window.c:2111
+msgid "The IP address as seen by a server on the Internet"
+msgstr "çéçèäçäæåçèç IP äå"
+
+#: ../src/empathy-call-window.c:2113
+msgid "The IP address of the peer as seen by the other side"
+msgstr "åäççèçéç IP äå"
+
+#: ../src/empathy-call-window.c:2115
+msgid "The IP address of a relay server"
+msgstr "äçäæåç IP äå"
+
+#: ../src/empathy-call-window.c:2117
+msgid "The IP address of the multicast group"
+msgstr "åéåæççç IP äå"
+
+#: ../src/empathy-call-window.c:2864
 msgid "On hold"
 msgstr "äç"
 
-#: ../src/empathy-call-window.c:2891
+#: ../src/empathy-call-window.c:2867
 msgid "Mute"
 msgstr "éé"
 
-#: ../src/empathy-call-window.c:2893
+#: ../src/empathy-call-window.c:2869
 msgid "Duration"
 msgstr "æé"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2896
+#: ../src/empathy-call-window.c:2872
 #, c-format
 msgid "%s â %d:%02dm"
 msgstr "%s â %d:%02dm"
 
-#: ../src/empathy-call-window.c:3166
+#: ../src/empathy-call-window.c:2968
+msgid "Technical Details"
+msgstr "æèçç"
+
+#: ../src/empathy-call-window.c:3007
+#, c-format
+msgid ""
+"%s's software does not understand any of the audio formats supported by your "
+"computer"
+msgstr "%s çèéäçèääæéèäæææçéèæå"
+
+#: ../src/empathy-call-window.c:3012
+#, c-format
+msgid ""
+"%s's software does not understand any of the video formats supported by your "
+"computer"
+msgstr "%s çèéäçèääæéèäæææçèèæå"
+
+#: ../src/empathy-call-window.c:3018
+#, 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-call-window.c:3024
+msgid "There was a failure on the network"
+msgstr "éåçèäæéèçç"
+
+#: ../src/empathy-call-window.c:3028
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
+msgstr "æéèæåèçéèæååæåæçéèäåè"
+
+#: ../src/empathy-call-window.c:3031
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
+msgstr "æéèæåèçèèæååæåæçéèäåè"
+
+#: ../src/empathy-call-window.c:3043
+#, c-format
+msgid ""
+"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
+"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
+"the Help menu."
+msgstr ""
+"å Telepathy åääççæéæççæãè<a href=\"%s\">ååéåéè</a>äéä"
+"åæåéååçãééãèçäææéççéã"
+
+#: ../src/empathy-call-window.c:3052
+msgid "There was a failure in the call engine"
+msgstr "éèåæåæéèçç"
+
+#: ../src/empathy-call-window.c:3055
+msgid "The end of the stream was reached"
+msgstr "åéäææç"
+
+#: ../src/empathy-call-window.c:3095
+msgid "Can't establish audio stream"
+msgstr "çæåçéèäæ"
+
+#: ../src/empathy-call-window.c:3105
+msgid "Can't establish video stream"
+msgstr "çæåçèèäæ"
+
+#: ../src/empathy-call-window.c:3142
 #, c-format
 msgid "Your current balance is %s."
 msgstr "æçåçééç %sã"
 
-#: ../src/empathy-call-window.c:3170
+#: ../src/empathy-call-window.c:3146
 msgid "Sorry, you donât have enough credit for that call."
 msgstr "åææïæçåéäèäéèèéèã"
 
-#: ../src/empathy-call-window.c:3172
+#: ../src/empathy-call-window.c:3148
 msgid "Top Up"
 msgstr "åå"
 
+#: ../src/empathy-call.c:195
+msgid "- Empathy Audio/Video Client"
+msgstr "- Empathy éèèèçæç"
+
+#: ../src/empathy-call.c:219
+msgid "Empathy Audio/Video Client"
+msgstr "Empathy éèèèçæç"
+
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "æåååå(_M)"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+#: ../libempathy-gtk/empathy-new-account-dialog.c:129
 msgid "What kind of chat account do you have?"
 msgstr "æçèååèæåäçï"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+#: ../libempathy-gtk/empathy-new-account-dialog.c:151
 msgid "Adding new account"
 msgstr "æååè"
 
@@ -4589,7 +3925,7 @@ msgstr "æååè"
 msgid "People nearby"
 msgstr "éèçä"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:149
 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 "
@@ -4598,7 +3934,7 @@ msgstr ""
 "Empathy åäèåæçèæäåéçåçåçèäçäåïääåäåèåãåæææ"
 "äçæåèïèææäåèçèææåæçã"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:180
 msgid ""
 "You can change these details later or disable this feature by choosing <span "
 "style=\"italic\">Edit â Accounts</span> in the Contact List."
@@ -4606,6 +3942,537 @@ msgstr ""
 "æåäçåèæéäççïæèçéæãèçäæåãäç <span style=\"italic\">"
 "çè â åè</span> åçéååèã"
 
+#~ msgid "Connection managers should be used"
+#~ msgstr "äçéççççå"
+
+#~ msgid ""
+#~ "Whether connectivity managers should be used to automatically disconnect/"
+#~ "reconnect."
+#~ msgstr "æåäçéççççåèåæçæéæéçã"
+
+#~ msgid "Empathy should auto-connect on startup"
+#~ msgstr "Empathy ååæèåéç"
+
+#~ msgid ""
+#~ "Whether Empathy should automatically log into your accounts on startup."
+#~ msgstr "Empathy æåæåååæèåçåæçåèã"
+
+#~ msgid "Empathy should auto-away when idle"
+#~ msgstr "Empathy çéçææèèåèçéé"
+
+#~ msgid ""
+#~ "Whether Empathy should go into away mode automatically if the user is "
+#~ "idle."
+#~ msgstr "Empathy æåæåäçèéçæèååæçééæåã"
+
+#~ msgid "Empathy default download folder"
+#~ msgstr "Empathy éèäèèæå"
+
+#~ msgid "The default folder to save file transfers in."
+#~ msgstr "çäååææåèææææçéèèæåã"
+
+#~ msgid "Magic number used to check if sanity cleaning tasks should be run"
+#~ msgstr "éèèççäæææåæåè sanity æçäæ"
+
+#~ msgid ""
+#~ "empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
+#~ "should be executed or not. Users should not change this key manually."
+#~ msgstr ""
+#~ "empathy-sanity-cleaning.c äçæèçäæææåæèåèæçäæãäçèäæ"
+#~ "èæåææéæééã"
+
+#~ msgid "Whether to show contacts that are offline in the contact list."
+#~ msgstr "æååéçäæåäéçéççéçäã"
+
+#~ msgid "Show avatars"
+#~ msgstr "éçåéè"
+
+#~ msgid ""
+#~ "Whether to show avatars for contacts in the contact list and chat windows."
+#~ msgstr "æååéçäæåèèåèçéçéçäåéèã"
+
+#~ msgid "Show protocols"
+#~ msgstr "éçåå"
+
+#~ msgid "Whether to show protocols for contacts in the contact list."
+#~ msgstr "æåèåèçäæååéçèçääçååã"
+
+#~ msgid "Show Balance in contact list"
+#~ msgstr "æèçäæååéçéé"
+
+#~ msgid "Whether to show account balances in the contact list."
+#~ msgstr "æåèåèçäæååéçåæééã"
+
+#~ msgid "Compact contact list"
+#~ msgstr "ççéçäæå"
+
+#~ msgid "Whether to show the contact list in compact mode."
+#~ msgstr "æåäççæåéçéçäæåã"
+
+#~ msgid "Hide main window"
+#~ msgstr "éèäèç"
+
+#~ msgid "Hide the main window."
+#~ msgstr "éèäèçã"
+
+#~ msgid "Default directory to select an avatar image from"
+#~ msgstr "çäéæåéèåççéèçé"
+
+#~ msgid "The last directory that an avatar image was chosen from."
+#~ msgstr "äæéæåéèåçççéã"
+
+#~ msgid "Open new chats in separate windows"
+#~ msgstr "åååèçéåæçèå"
+
+#~ msgid "Always open a separate chat window for new chats."
+#~ msgstr "æéçæåæçèåéåæçèåèçã"
+
+#~ msgid "Display incoming events in the status area"
+#~ msgstr "åçæååéçæåää"
+
+#~ msgid ""
+#~ "Display incoming events in the status area. If false, present them to the "
+#~ "user immediately."
+#~ msgstr ""
+#~ "åçæååéçæåääãåæäåççèïæåääæçæåççäçèã"
+
+#~ msgid "The position for the chat window side pane"
+#~ msgstr "èåèçåçæçäç"
+
+#~ msgid "The stored position (in pixels) of the chat window side pane."
+#~ msgstr "èåèçåçæçååäç (åäçåç)ã"
+
+#~ msgid "Show contact groups"
+#~ msgstr "éçéçäçç"
+
+#~ msgid "Whether to show groups in the contact list."
+#~ msgstr "æåèåèçäæååéçççã"
+
+#~ msgid "Contact list sort criterion"
+#~ msgstr "éçäæåæåæå"
+
+#~ msgid ""
+#~ "Which criterion to use when sorting the contact list. Default is to sort "
+#~ "by the contact's state with the value \"state\". A value of \"name\" will "
+#~ "sort the contact list by name."
+#~ msgstr ""
+#~ "æåéçäæåæèäçååæåãéèåæäçéçäççæãstateã(çæ) å"
+#~ "äæåãèãnameã(åç) ååæäæåçäæåéçäæåã"
+
+#~ msgid "Use notification sounds"
+#~ msgstr "äçéçéæ"
+
+#~ msgid "Whether to play a sound to notify of events."
+#~ msgstr "æåææéæäéçæääççã"
+
+#~ msgid "Disable sounds when away"
+#~ msgstr "ççæçééæåçéæ"
+
+#~ msgid "Whether to play sound notifications when away or busy."
+#~ msgstr "ççæçééæåçææåææéæéçã"
+
+#~ msgid "Play a sound for incoming messages"
+#~ msgstr "æåèææææéæ"
+
+#~ msgid "Whether to play a sound to notify of incoming messages."
+#~ msgstr "æåææéæäéçææåèæã"
+
+#~ msgid "Play a sound for outgoing messages"
+#~ msgstr "éåèææææéæ"
+
+#~ msgid "Whether to play a sound to notify of outgoing messages."
+#~ msgstr "æåææéæäéçæéåèæã"
+
+#~ msgid "Play a sound for new conversations"
+#~ msgstr "çéåæçèèæææéæ"
+
+#~ msgid "Whether to play a sound to notify of new conversations."
+#~ msgstr "æåææéæäéçæçèèã"
+
+#~ msgid "Play a sound when a contact logs in"
+#~ msgstr "çéçäçåæææéæ"
+
+#~ msgid ""
+#~ "Whether to play a sound to notify of contacts logging into the network."
+#~ msgstr "æåææéæäéçæéçäçåçèã"
+
+#~ msgid "Play a sound when a contact logs out"
+#~ msgstr "çæéçäçåæææéæ"
+
+#~ msgid ""
+#~ "Whether to play a sound to notify of contacts logging out of the network."
+#~ msgstr "æåææéæäéçæéçäçåçèã"
+
+#~ msgid "Play a sound when we log in"
+#~ msgstr "çæåçåæææéæ"
+
+#~ msgid "Whether to play a sound when logging into a network."
+#~ msgstr "ççåæçèææåææéæã"
+
+#~ msgid "Play a sound when we log out"
+#~ msgstr "çæåçåæææéæ"
+
+#~ msgid "Whether to play a sound when logging out of a network."
+#~ msgstr "ççåæçèææåææéæã"
+
+#~ msgid "Enable popup notifications for new messages"
+#~ msgstr "åçæèæçåååéç"
+
+#~ msgid "Whether to show a popup notification when receiving a new message."
+#~ msgstr "çæåæèæææåéçåååéçã"
+
+#~ msgid "Disable popup notifications when away"
+#~ msgstr "ççæçééæåçåååéç"
+
+#~ msgid "Whether to show popup notifications when away or busy."
+#~ msgstr "ççæçééæåçææåéçåååéçã"
+
+#~ msgid "Pop up notifications if the chat isn't focused"
+#~ msgstr "åæèåèçååçéåååéç"
+
+#~ msgid ""
+#~ "Whether to show a popup notification when receiving a new message even if "
+#~ "the chat is already opened, but not focused."
+#~ msgstr ""
+#~ "æåæèæææåéçåååéç (åäåéåèåèçïäææçåçé)ã"
+
+#~ msgid "Pop up notifications when a contact logs in"
+#~ msgstr "çéçäçåæååéç"
+
+#~ msgid "Whether to show a popup notification when a contact goes online."
+#~ msgstr "çéçääçææåéçåååéçã"
+
+#~ msgid "Pop up notifications when a contact logs out"
+#~ msgstr "çéçäçåæååéç"
+
+#~ msgid "Whether to show a popup notification when a contact goes offline."
+#~ msgstr "çéçäéçææåéçåååéçã"
+
+#~ msgid "Use graphical smileys"
+#~ msgstr "äçåçåèæçè"
+
+#~ msgid "Whether to convert smileys into graphical images in conversations."
+#~ msgstr "æååèèäçèæçèèæçåçååã"
+
+#~ msgid "Show contact list in rooms"
+#~ msgstr "åèååéçéçäæå"
+
+#~ msgid "Whether to show the contact list in chat rooms."
+#~ msgstr "æååèååäéçéçäæåã"
+
+#~ msgid "Chat window theme"
+#~ msgstr "èåèçäæäé"
+
+#~ msgid "The theme that is used to display the conversation in chat windows."
+#~ msgstr "çäéçåèåèçäèèçäæäéã"
+
+#~ msgid "Chat window theme variant"
+#~ msgstr "èåèçäæäéæå"
+
+#~ msgid ""
+#~ "The theme variant that is used to display the conversation in chat "
+#~ "windows."
+#~ msgstr "çäåèåèçéçèèçäæäéæåã"
+
+#~ msgid "Path of the Adium theme to use"
+#~ msgstr "èäçç Adium äæäéèå"
+
+#~ msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+#~ msgstr "åæèååäççäéæ Adium æèäçç Adium äæäéèåã"
+
+#~ msgid "Enable WebKit Developer Tools"
+#~ msgstr "åç WebKit éçèåå"
+
+#~ msgid ""
+#~ "Whether WebKit developer tools, such as the Web Inspector, should be "
+#~ "enabled."
+#~ msgstr "æååç WebKit éçèååïäå Web Inspectorã"
+
+#~ msgid "Inform other users when you are typing to them"
+#~ msgstr "çææèåèæçåääçèæéçäå"
+
+#~ msgid ""
+#~ "Whether to send the 'composing' or 'paused' chat states. Does not "
+#~ "currently affect the 'gone' state."
+#~ msgstr ""
+#~ "æåèåéãæåäãæãåäæãçèåçæãèçåæãåééãçæåäåå"
+#~ "éã"
+
+#~ msgid "Use theme for chat rooms"
+#~ msgstr "åèååäçäæäé"
+
+#~ msgid "Whether to use the theme for chat rooms."
+#~ msgstr "æåçèååäçäæäéã"
+
+#~ msgid "Spell checking languages"
+#~ msgstr "æåææçèè"
+
+#~ msgid ""
+#~ "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl"
+#~ "\")."
+#~ msgstr "äéèåéèäçæåææçèèæå (åïã en, fr, nlã)ã"
+
+#~ msgid "Enable spell checker"
+#~ msgstr "åçæåææçå"
+
+#~ msgid ""
+#~ "Whether to check words typed against the languages you want to check with."
+#~ msgstr "æåäæèåçèèææèåæçéåã"
+
+#~ msgid "Nick completed character"
+#~ msgstr "æçèéåå"
+
+#~ msgid ""
+#~ "Character to add after nickname when using nick completion (tab) in group "
+#~ "chat."
+#~ msgstr "åççèåääçæçèé (tab) æèååæçäåçååã"
+
+#~ msgid "Empathy should use the avatar of the contact as the chat window icon"
+#~ msgstr "Empathy èäçéçäçåéèåçèåèçåç"
+
+#~ msgid ""
+#~ "Whether Empathy should use the avatar of the contact as the chat window "
+#~ "icon."
+#~ msgstr "Empathy æåäçéçäåéèåçèåèçåçã"
+
+#~ msgid "Last account selected in Join Room dialog"
+#~ msgstr "äæåãååèååãåèçéåçåè"
+
+#~ msgid "D-Bus object path of the last account selected to join a room."
+#~ msgstr "äæèååèååæéååèç D-Bus çäèåã"
+
+#~ msgid "Camera device"
+#~ msgstr "æåæèç"
+
+#~ msgid "Default camera device to use in video calls, e.g. /dev/video0."
+#~ msgstr "èçæèèéèçéèæåæèçïäï/dev/video0ã"
+
+#~ msgid "Camera position"
+#~ msgstr "æåæäç"
+
+#~ msgid "Position the camera preview should be during a call."
+#~ msgstr "éèææåæéèæèææçäçã"
+
+#~ msgid "Echo cancellation support"
+#~ msgstr "åéæéææ"
+
+#~ msgid "Whether to enable Pulseaudio's echo cancellation filter."
+#~ msgstr "æåèåç Pulseaudio çåéæééæåã"
+
+#~ msgid "Show hint about closing the main window"
+#~ msgstr "ééäèçæéçæç"
+
+#~ msgid ""
+#~ "Whether to show the message dialog about closing the main window with the "
+#~ "'x' button in the title bar."
+#~ msgstr "æååäçæéåçãxãæéééäèçæïéçèæåèçã"
+
+#~ msgid "Empathy can publish the user's location"
+#~ msgstr "Empathy åäçåäçèçäç"
+
+#~ msgid "Whether Empathy can publish the user's location to their contacts."
+#~ msgstr "Empathy æåèåäçèçäççåçäçéçäã"
+
+#~ msgid "Empathy can use the network to guess the location"
+#~ msgstr "Empathy åäåççèäææäç"
+
+#~ msgid "Whether Empathy can use the network to guess the location."
+#~ msgstr "Empathy æåäççèäææäçã"
+
+#~ msgid "Empathy can use the cellular network to guess the location"
+#~ msgstr "Empathy åäåçèåéèçèååèäææäç"
+
+#~ msgid "Whether Empathy can use the cellular network to guess the location."
+#~ msgstr "Empathy æåäçèåéèçèäææäçã"
+
+#~ msgid "Empathy can use the GPS to guess the location"
+#~ msgstr "Empathy åäåç GPS äææäç"
+
+#~ msgid "Whether Empathy can use the GPS to guess the location."
+#~ msgstr "Empathy æåäç GPS äææäçã"
+
+#~ msgid "Empathy should reduce the location's accuracy"
+#~ msgstr "Empathy æéääççæçå"
+
+#~ msgid ""
+#~ "Whether Empathy should reduce the location's accuracy for privacy reasons."
+#~ msgstr "Empathy æååæéççççæääççæçåã"
+
+#~ msgid "_New Conversation..."
+#~ msgstr "æåèè(_N)..."
+
+#~ msgid "New _Call..."
+#~ msgstr "æåéè(_C)..."
+
+#~ msgid "Contacts"
+#~ msgstr "éçä"
+
+#~ msgid "_Add Contacts..."
+#~ msgstr "ååèçä(_A)..."
+
+#~ msgid "_Search for Contacts..."
+#~ msgstr "æåèçä(_S)..."
+
+#~ msgid "_Blocked Contacts"
+#~ msgstr "èåéçèçä"
+
+#~ msgid "_Rooms"
+#~ msgstr "èåå(_R)"
+
+#~ msgid "_Join..."
+#~ msgstr "åå(_J)..."
+
+#~ msgid "Join _Favorites"
+#~ msgstr "ååååèåå(_F)"
+
+#~ msgid "_Manage Favorites"
+#~ msgstr "ççåå(_M)"
+
+#~ msgid "_File Transfers"
+#~ msgstr "ææåè(_F)"
+
+#~ msgid "_Accounts"
+#~ msgstr "åè(_A)"
+
+#~ msgid "P_references"
+#~ msgstr "ååèå(_R)"
+
+#~ msgid "Help"
+#~ msgstr "æå"
+
+#~ msgid "About Empathy"
+#~ msgstr "éæ Empathy"
+
+#~ msgid "â%sâ is not a valid contact ID"
+#~ msgstr "ã%sãäæææçéçä ID"
+
+#~ msgid "_Enable"
+#~ msgstr "åç(_E)"
+
+#~ msgid "_Disable"
+#~ msgstr "åç(_D)"
+
+#~ msgid "Contrast"
+#~ msgstr "åæ"
+
+#~ msgid "Brightness"
+#~ msgstr "äå"
+
+#~ msgid "Gamma"
+#~ msgstr "Gamma"
+
+#~ msgid "Volume"
+#~ msgstr "éé"
+
+#~ msgid "_Sidebar"
+#~ msgstr "åéæ(_S)"
+
+#~ msgid "Audio input"
+#~ msgstr "éæèå"
+
+#~ msgid "Video input"
+#~ msgstr "èèèå"
+
+#~ msgid "Dialpad"
+#~ msgstr "æèç"
+
+#~ msgid "Details"
+#~ msgstr "èçèæ"
+
+#~ msgctxt "codec"
+#~ msgid "Unknown"
+#~ msgstr "æç"
+
+#~ msgid "Connected â %d:%02dm"
+#~ msgstr "åéç â %d:%02dm"
+
+#~ msgid "Top up %s (%s)..."
+#~ msgstr "åå %s (%s)..."
+
+#~ msgid "Top Up..."
+#~ msgstr "åå..."
+
+#~ msgid "Contacts on a _Map"
+#~ msgstr "éçäåå(_M)"
+
+#~ msgid "Credit Balance"
+#~ msgstr "ååéé"
+
+#~ msgid "Find in Contact _List"
+#~ msgstr "æéçäæåååæ(_L)"
+
+#~ msgid "N_ormal Size"
+#~ msgstr "æååå(_O)"
+
+#~ msgid "Normal Size With _Avatars"
+#~ msgstr "æåååèåéè(_A)"
+
+#~ msgid "Show P_rotocols"
+#~ msgstr "éçåå(_R)"
+
+#~ msgid "Sort by _Name"
+#~ msgstr "äåçæå(_N)"
+
+#~ msgid "Sort by _Status"
+#~ msgstr "äçææå(_S)"
+
+#~ msgid "_Compact Size"
+#~ msgstr "ççåå(_C)"
+
+#~ msgid "_Joinâ"
+#~ msgstr "åå(_J)â"
+
+#~ msgid "_Offline Contacts"
+#~ msgstr "éçéçä(_O)"
+
+#~ msgid "Could not start room listing"
+#~ msgstr "çæéåååèååæå"
+
+#~ msgid "Could not stop room listing"
+#~ msgstr "çæåæååèååæå"
+
+#~ msgid "Appearance"
+#~ msgstr "åè"
+
+#~ msgid "Call the contact again"
+#~ msgstr "åææèçääæ"
+
+#~ msgid "Camera Off"
+#~ msgstr "æåæéé"
+
+#~ msgid "Camera On"
+#~ msgstr "æåæéå"
+
+#~ msgid "Disable camera and stop sending video"
+#~ msgstr "åçæåæääæåéèè"
+
+#~ msgid "Enable camera and send video"
+#~ msgstr "åçæåæäéåèè"
+
+#~ msgid "Enable camera but don't send video"
+#~ msgstr "åçæåæääèéåèè"
+
+#~ msgid "Preview"
+#~ msgstr "éè"
+
+#~ msgid "Redial"
+#~ msgstr "éæ"
+
+#~ msgid "V_ideo"
+#~ msgstr "èè(_I)"
+
+#~ msgid "Video Off"
+#~ msgstr "èèéé"
+
+#~ msgid "Video On"
+#~ msgstr "èèéå"
+
+#~ msgid "Video Preview"
+#~ msgstr "èèéè"
+
+#~ msgid "Contact Map View"
+#~ msgstr "éçäååæè"
+
 #~ msgid "%s"
 #~ msgstr "%s"
 
@@ -4751,9 +4618,6 @@ msgstr ""
 #~ msgid "Protocol:"
 #~ msgstr "ååï"
 
-#~ msgid "Show account assistant"
-#~ msgstr "éçåèåç"
-
 #~ msgid "Personal Information"
 #~ msgstr "åäèè"
 
@@ -4877,9 +4741,6 @@ msgstr ""
 #~ msgid "All"
 #~ msgstr "åé"
 
-#~ msgid "_Enabled"
-#~ msgstr "ååç(_E)"
-
 #~ msgid "Date"
 #~ msgstr "ææ"
 
@@ -4954,9 +4815,6 @@ msgstr ""
 #~ msgid "Failed to reconnect this chat"
 #~ msgstr "çæéééåèåæè"
 
-#~ msgid "Failed to join chat room"
-#~ msgstr "ååèåååæ"
-
 #~ msgid "Select a destination"
 #~ msgstr "éåççå"
 



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