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



commit 04d6f19f37961b2c6b866559eeae7cdad1068e16
Author: Cheng-Chia Tseng <pswo10680 gmail com>
Date:   Sat Jun 30 22:56:24 2012 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 2419 +++++++++++++++++++++++++++++++----------------------------
 po/zh_TW.po | 2441 +++++++++++++++++++++++++++++++----------------------------
 2 files changed, 2553 insertions(+), 2307 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 59ea972..bc66156 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-05-28 18:13+0800\n"
-"PO-Revision-Date: 2012-05-28 18:13+0800\n"
+"POT-Creation-Date: 2012-06-30 22:55+0800\n"
+"PO-Revision-Date: 2012-06-30 22:56+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "Language: zh_TW\n"
@@ -20,30 +20,446 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "äç Google TalkãFacebookãMSN èåäèåæååääåè"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "åæéçæç"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Empathy äèçéè"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "åæéçæç"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "äç Google TalkãFacebookãMSN èåäèåæååääåè"
 
+#. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2523
+msgid "Messaging and VoIP Accounts"
+msgstr "èæè VoIP åè"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
 msgid "Manage Messaging and VoIP accounts"
 msgstr "ççèæè VoIP åè"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2516
-msgid "Messaging and VoIP Accounts"
-msgstr "èæè VoIP åè"
+#: ../data/org.gnome.Empathy.gschema.xml.h:1
+msgid "Connection managers should be used"
+msgstr "äçéççççå"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:2
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr "æåäçéççççåèåæçæéæéçã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:3
+msgid "Empathy should auto-connect on startup"
+msgstr "Empathy ååæèåéç"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:4
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Empathy æåæåååæèåçåäçåèã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:5
+msgid "Empathy should auto-away when idle"
+msgstr "Empathy çéçææèèåèçéé"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:6
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "Empathy æåæåäçèéçæèååæçééæåã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:7
+msgid "Empathy default download folder"
+msgstr "Empathy éèäèèæå"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:8
+msgid "The default folder to save file transfers in."
+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.h:10
+msgid "Magic number used to check if sanity cleaning tasks should be run"
+msgstr "éèèççäæææåæåè sanity æçäæ"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:11
+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 äçæèçäæææåæèåèæçäæãäçèäæèæåææéæåçåã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:12
+#: ../src/empathy-preferences.ui.h:1
+msgid "Show offline contacts"
+msgstr "éçéçèçä"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:13
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "æååèçäæåäéçéççèçäã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:14
+msgid "Show Balance in contact list"
+msgstr "æèçäæååéçéé"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:15
+msgid "Whether to show account balances in the contact list."
+msgstr "æåèåèçäæååéçåæééã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:16
+msgid "Hide main window"
+msgstr "éèäèç"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:17
+msgid "Hide the main window."
+msgstr "éèäèçã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:18
+msgid "Default directory to select an avatar image from"
+msgstr "çäéæåéèåççéèçé"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:19
+msgid "The last directory that an avatar image was chosen from."
+msgstr "äæéæåéèåçççéã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:20
+msgid "Open new chats in separate windows"
+msgstr "åååèçéåæçèå"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:21
+msgid "Always open a separate chat window for new chats."
+msgstr "æéçæåæçèåéåæçèåèçã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:22
+msgid "Display incoming events in the status area"
+msgstr "åçæååéçæåää"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:23
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr "åçæååéçæåääãåæäåççèïæåääæçæåççäçèã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:24
+msgid "The position for the chat window side pane"
+msgstr "èåèçåçæçäç"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:25
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "èåèçåçæçååäç (åäçåç)ã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:26
+msgid "Show contact groups"
+msgstr "éçèçäçç"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:27
+msgid "Whether to show groups in the contact list."
+msgstr "æåèåèçäæååéçççã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:28
+msgid "Use notification sounds"
+msgstr "äçéçéæ"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:29
+msgid "Whether to play a sound to notify of events."
+msgstr "æåææéæäéçæääççã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:30
+msgid "Disable sounds when away"
+msgstr "ççæçééæåçéæ"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:31
+msgid "Whether to play sound notifications when away or busy."
+msgstr "ççæçééæåçææåææéæéçã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:32
+msgid "Play a sound for incoming messages"
+msgstr "æåèææææéæ"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:33
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "æåææéæäéçææåèæã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:34
+msgid "Play a sound for outgoing messages"
+msgstr "éåèææææéæ"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:35
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "æåææéæäéçæéåèæã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:36
+msgid "Play a sound for new conversations"
+msgstr "çéåæçèèæææéæ"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:37
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "æåææéæäéçæçèèã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:38
+msgid "Play a sound when a contact logs in"
+msgstr "çèçäçåæææéæ"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:39
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "æåææéæäéçæèçäçåççã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:40
+msgid "Play a sound when a contact logs out"
+msgstr "çæèçäçåæææéæ"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:41
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "æåææéæäéçæèçäçåççã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:42
+msgid "Play a sound when we log in"
+msgstr "çæåçåæææéæ"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:43
+msgid "Whether to play a sound when logging into a network."
+msgstr "ççåæççææåææéæã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:44
+msgid "Play a sound when we log out"
+msgstr "çæåçåæææéæ"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:45
+msgid "Whether to play a sound when logging out of a network."
+msgstr "ççåæççææåææéæã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:46
+msgid "Enable popup notifications for new messages"
+msgstr "åçæèæçåååéç"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:47
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "çæåæèæææåéçåååéçã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:48
+msgid "Disable popup notifications when away"
+msgstr "ççæçééæåçåååéç"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:49
+msgid "Whether to show popup notifications when away or busy."
+msgstr "ççæçééæåçææåéçåååéçã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:50
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "åæèåèçååçéåååéç"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:51
+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.h:52
+msgid "Pop up notifications when a contact logs in"
+msgstr "çèçäçåæååéç"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:53
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "çèçääçææåéçåååéçã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:54
+msgid "Pop up notifications when a contact logs out"
+msgstr "çèçäçåæååéç"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:55
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "çèçäéçææåéçåååéçã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:56
+msgid "Use graphical smileys"
+msgstr "äçåçåèæçè"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:57
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "æååèèäçèæçèèæçåçååã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:58
+msgid "Show contact list in rooms"
+msgstr "åèååéçèçäæå"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:59
+msgid "Whether to show the contact list in chat rooms."
+msgstr "æååèååäéçèçäæåã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:60
+msgid "Chat window theme"
+msgstr "èåèçäæäé"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:61
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "çäéçåèåèçäèèçäæäéã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:62
+msgid "Chat window theme variant"
+msgstr "èåèçäæäéæå"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:63
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "çäåèåèçéçèèçäæäéæåã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:64
+msgid "Path of the Adium theme to use"
+msgstr "èäçç Adium äæäéèå"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:65
+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.h:66
+msgid "Enable WebKit Developer Tools"
+msgstr "åç WebKit éçèåå"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:67
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "æååç WebKit éçèååïäå Web Inspectorã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:68
+msgid "Inform other users when you are typing to them"
+msgstr "çäæèåèæçåääçèæéçäå"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:69
+msgid ""
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr "æåèåéãæåäãæãåäæãçèåçæãèçåæãåééãçæåäååéã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:70
+msgid "Use theme for chat rooms"
+msgstr "åèååäçäæäé"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:71
+msgid "Whether to use the theme for chat rooms."
+msgstr "æåçèååäçäæäéã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:72
+msgid "Spell checking languages"
+msgstr "æåææçèè"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:73
+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.h:74
+msgid "Enable spell checker"
+msgstr "åçæåææçå"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:75
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr "æåääèåçèèææèåæçéåã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:76
+msgid "Nick completed character"
+msgstr "çåèéåç"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:77
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr "åççèåääççåèé (tab) æèååçåäåçåçã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:78
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Empathy èäçèçäçåéèåçèåèçåç"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:79
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "Empathy æåäçèçäåéèåçèåèçåçã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:80
+msgid "Last account selected in Join Room dialog"
+msgstr "äæåãååèååãåèçéåçåè"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:81
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "äæèååèååæéååèç D-Bus çäèåã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:82
+msgid "Camera device"
+msgstr "æåæèç"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:83
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "èçæèåéèçéèæåæèçïäï/dev/video0ã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:84
+msgid "Camera position"
+msgstr "æåæäç"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:85
+msgid "Position the camera preview should be during a call."
+msgstr "éèææåæéèæèææçäçã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:86
+msgid "Echo cancellation support"
+msgstr "åéæéææ"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:87
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "æåèåç Pulseaudio çåéæééæåã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:88
+msgid "Show hint about closing the main window"
+msgstr "ééäèçæéçæç"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:89
+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.h:90
+msgid "Empathy can publish the user's location"
+msgstr "Empathy åäçåäçèçäç"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:91
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Empathy æåèåäçèçäççåçäçèçäã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:92
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy åäåçççäææäç"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:93
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Empathy æåäçççäææäçã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:94
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy åäåçæåéèççååèäææäç"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:95
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Empathy æåäçæåéèççäææäçã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:96
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy åäåç GPS äææäç"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:97
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Empathy æåäç GPS äææäçã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:98
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy æéääççæçå"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:99
+msgid ""
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "Empathy æååæçéçççæääççæçåã"
 
 #: ../libempathy/empathy-ft-handler.c:737
 msgid "No reason was specified"
@@ -249,19 +665,19 @@ msgstr "äçèäéè"
 msgid "Internal error"
 msgstr "åééè"
 
-#: ../libempathy/empathy-utils.c:533
+#: ../libempathy/empathy-utils.c:503
 msgid "People Nearby"
 msgstr "éèçä"
 
-#: ../libempathy/empathy-utils.c:538
+#: ../libempathy/empathy-utils.c:508
 msgid "Yahoo! Japan"
 msgstr "Yahoo! ææ"
 
-#: ../libempathy/empathy-utils.c:567
+#: ../libempathy/empathy-utils.c:537
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:568
+#: ../libempathy/empathy-utils.c:538
 msgid "Facebook Chat"
 msgstr "Facebook èå"
 
@@ -323,49 +739,56 @@ msgstr "%2$s åèäã%1$sãèååçåç (%3$s)"
 msgid "All accounts"
 msgstr "ææåè"
 
-#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-account-widget.c:680
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
 #: ../src/empathy-import-widget.c:323
 msgid "Account"
 msgstr "åè"
 
-#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget.c:681
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
 msgid "Password"
 msgstr "åç"
 
-#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:511
 msgid "Server"
 msgstr "äæå"
 
-#: ../libempathy-gtk/empathy-account-widget.c:685
+#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:529
 msgid "Port"
 msgstr "éæå"
 
-#: ../libempathy-gtk/empathy-account-widget.c:765
-#: ../libempathy-gtk/empathy-account-widget.c:817
+#: ../libempathy-gtk/empathy-account-widget.c:767
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:822
 #, c-format
 msgid "%s:"
 msgstr "%sï"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1424
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget.c:1434
 msgid "Username:"
 msgstr "äçèåçï"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1741
+#: ../libempathy-gtk/empathy-account-widget.c:1751
 msgid "A_pply"
 msgstr "åç(_A)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1770
+#: ../libempathy-gtk/empathy-account-widget.c:1780
 msgid "L_og in"
 msgstr "çå(_O)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1840
+#: ../libempathy-gtk/empathy-account-widget.c:1850
 msgid "This account already exists on the server"
 msgstr "æåèåçååéåäæåä"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1844
+#: ../libempathy-gtk/empathy-account-widget.c:1854
 msgid "Create a new account on the server"
 msgstr "åéåäæåäåçæçåè"
 
@@ -374,137 +797,133 @@ 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:2251
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 #, 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:2277
+#: ../libempathy-gtk/empathy-account-widget.c:2297
 #, c-format
 msgid "%s Account"
 msgstr "%s åè"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2281
+#: ../libempathy-gtk/empathy-account-widget.c:2301
 msgid "New account"
 msgstr "æååè"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>çäï</b>MyScreenName"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+msgid "Pass_word"
+msgstr "åç(_W)"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "éé"
+msgid "Screen _Name"
+msgstr "èååç(_N)"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>çäï</b>MyScreenName"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "åç(_W)ï"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "èäåç"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-msgid "Remember Password"
-msgstr "èäåç"
+msgid "_Port"
+msgstr "éæå(_P)"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../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"
-msgstr "èäåç"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "èååç(_N)ï"
+msgid "_Server"
+msgstr "äæå(_S)"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "äç AIM åçæï"
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "éé"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "äç AIM èååçæï"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "éæå(_P)ï"
+msgid "What is your AIM password?"
+msgstr "äç AIM åçæï"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Server:"
-msgstr "äæå(_S)ï"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
+msgid "Remember Password"
+msgstr "èäåç"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>çäï</b>username"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
+msgid "Login I_D"
+msgstr "çå I_D"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
-msgid "Login I_D:"
-msgstr "çå I_Dï"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>çäï</b>username"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "äç GroupWise äçè ID æï"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "äç GroupWise åçæï"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
-msgid "<b>Example:</b> 123456789"
-msgstr "<b>çäï</b>123456789"
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN"
+msgstr "ICQ _UIN"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
-msgid "Ch_aracter set:"
-msgstr "åé(_A)ï"
+msgid "<b>Example:</b> 123456789"
+msgstr "<b>çäï</b>123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ _UINï"
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+msgid "Ch_aracter set"
+msgstr "åé(_A)"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "äç ICQ UIN æï"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "äç ICQ åçæï"
 
@@ -538,104 +957,76 @@ msgid "None"
 msgstr "ç"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "çç"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Character set"
+msgstr "åé"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 #: ../src/empathy-accounts-dialog.ui.h:1
 msgid "Addâ"
 msgstr "ååâ"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-msgid "Character set:"
-msgstr "åéï"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "çé"
+
+#. Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+msgid "Up"
+msgstr "åä"
 
 #. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Down"
 msgstr "åä"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+msgid "Servers"
+msgstr "äæå"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
 msgstr "ååæç IRC æåäéèåçïæäèääçåçèïèäèèååçã"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
-msgid "Network"
-msgstr "çç"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
-msgid "Network:"
-msgstr "ççï"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
-msgid "Nickname:"
-msgstr "çåï"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Password:"
-msgstr "åçï"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
-msgid "Quit message:"
-msgstr "ééèæï"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "Real name:"
-msgstr "çåååï"
+msgid "Nickname"
+msgstr "çå"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:4
-#: ../src/empathy-chatrooms-window.ui.h:3
-msgid "Remove"
-msgstr "çé"
+msgid "Quit message"
+msgstr "ééèæ"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
-msgid "Servers"
-msgstr "äæå"
+msgid "Real name"
+msgstr "çååå"
 
-#. Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:16
-msgid "Up"
-msgstr "åä"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15
+msgid "Username"
+msgstr "äçèåç"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
+msgid "Which IRC network?"
+msgstr "åå IRC ççï"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
 msgid "What is your IRC nickname?"
 msgstr "äç IRC çåæï"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:19
-msgid "Which IRC network?"
-msgstr "åå IRC ççï"
-
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user gmail com"
-msgstr "<b>çäï</b>user gmail com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user jabber org"
-msgstr "<b>çäï</b>user jabber org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "èæåå (TLS/SSL)(_Y)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "åç SSL èæéè(_G)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "èèäæåèåå"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "ååæ(_T)ï"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "èæ(_U)ï"
+msgid "What is your Facebook username?"
+msgstr "äç Facebook äçèåçæï"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -646,182 +1037,209 @@ msgstr ""
 "åæäæ facebook.com/<b>badger</b> çèïèèå <b>badger</b>ã\n"
 "åæäéææ Facebook äçèåçïèäç <a href=\"http://www.facebook.com/username/\";>æçé</a> äéçäåã"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "äçèç SS_L"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "äç Facebook åçæï"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "äç Facebook äçèåçæï"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "äç Google ID æï"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user gmail com"
+msgstr "<b>çäï</b>user gmail com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "äç Google åçæï"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user jabber org"
+msgstr "<b>çäï</b>user jabber org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "åç SSL èæéè(_G)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty"
+msgstr "ååæ(_T)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce"
+msgstr "èæ(_U)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "èæåå (TLS/SSL)(_Y)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Override server settings"
+msgstr "èèäæåèåå"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Use old SS_L"
+msgstr "äçèç SS_L"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "äç Jabber ID æï"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "äç Jabber åçæï"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "äæèç Jabber ID æï"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "äç Jabber åçæï"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "äæèç Jabber åçæï"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user hotmail com"
 msgstr "<b>çäï</b>user hotmail com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "äç Windows Live ID æï"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "äç Windows Live åçæï"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
+msgid "Nic_kname"
+msgstr "çå(_K)"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "éåäçäå(_M)ï"
+msgid "_Last Name"
+msgstr "å(_L)"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
-msgid "Nic_kname:"
-msgstr "çå(_K)ï"
+msgid "_First Name"
+msgstr "å(_F)"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
-msgid "_First Name:"
-msgstr "å(_F)ï"
+msgid "_Published Name"
+msgstr "çåçåç(_P)"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
-msgid "_Jabber ID:"
-msgstr "_Jabber IDï"
+msgid "_Jabber ID"
+msgstr "_Jabber ID"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "å(_L)ï"
+msgid "E-_mail address"
+msgstr "éåäçäå(_M)"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "çåçåç(_P)ï"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username"
+msgstr "äçèåç(_U)"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user my sip server"
 msgstr "<b>çäï</b>user my sip server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "èèäçèåçï"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "æççå"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "èåæç STUN äæå"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "äçéååèäææåèèæåéè(_L)"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "åç TLS éè"
+msgid "NAT Traversal Options"
+msgstr "NAT åèéé"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "éé (ç)"
+msgid "Proxy Options"
+msgstr "Proxy éé"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "äæäæçéé"
+msgid "Miscellaneous Options"
+msgstr "éé"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Local IP Address:"
-msgstr "åå IP äåï"
+msgid "STUN Server"
+msgstr "STUN äæå"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Loose Routing"
-msgstr "åéèç"
+msgid "Discover the STUN server automatically"
+msgstr "èåæç STUN äæå"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Mechanism:"
-msgstr "æåï"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "Miscellaneous Options"
-msgstr "éé"
+msgid "Discover Binding"
+msgstr "æççå"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-msgid "NAT Traversal Options"
-msgstr "NAT åèéé"
+msgid "Keep-Alive Options"
+msgstr "äæäæçéé"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+msgid "Mechanism"
+msgstr "æå"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Port:"
-msgstr "éæåï"
+msgid "Interval (seconds)"
+msgstr "éé (ç)"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Proxy Options"
-msgstr "Proxy éé"
+msgid "Authentication username"
+msgstr "èèäçèåç"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-msgid "STUN Server:"
-msgstr "STUN äæåï"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport"
+msgstr "åè"
 
-#: ../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:18
+msgid "Loose Routing"
+msgstr "åéèç"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Transport:"
-msgstr "åééèåï"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+msgid "Ignore TLS Errors"
+msgstr "åç TLS éè"
 
-#: ../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:21
+msgid "Local IP Address"
+msgstr "åå IP äå"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP login ID?"
+msgstr "äæèç SIP çå ID æï"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "What is your SIP account password?"
 msgstr "äç SIP åèåçæï"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "What is your SIP login ID?"
-msgstr "äæèç SIP çå ID æï"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "åç(_W)ï"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
-msgid "_Username:"
-msgstr "äçèåç(_U)ï"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo I_Dï"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "åçæèèèååéè(_G)"
 
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "èååæåååèè(_R)ï"
+
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "What is your Yahoo! ID?"
-msgstr "äç Yahoo! ID æï"
+msgid "Ch_aracter set:"
+msgstr "åé(_A)ï"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "What is your Yahoo! password?"
-msgstr "äç Yahoo! åçæï"
+msgid "_Port:"
+msgstr "éæå(_P)ï"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Yahoo I_Dï"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
+msgid "What is your Yahoo! ID?"
+msgstr "äç Yahoo! ID æï"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "èååæåååèè(_R)ï"
+msgid "What is your Yahoo! password?"
+msgstr "äç Yahoo! åçæï"
 
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
@@ -1020,7 +1438,7 @@ msgstr "æåä"
 msgid "unknown"
 msgstr "äæ"
 
-#: ../libempathy-gtk/empathy-chat.c:1682 ../src/empathy-chat-window.c:940
+#: ../libempathy-gtk/empathy-chat.c:1682 ../src/empathy-chat-window.c:942
 msgid "Topic:"
 msgstr "äéï"
 
@@ -1071,11 +1489,11 @@ msgstr "åé(_S)"
 msgid "_Spelling Suggestions"
 msgstr "æååè(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2559
+#: ../libempathy-gtk/empathy-chat.c:2576
 msgid "Failed to retrieve recent logs"
 msgstr "çæååæèçæè"
 
-#: ../libempathy-gtk/empathy-chat.c:2698
+#: ../libempathy-gtk/empathy-chat.c:2720
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s åæç"
@@ -1083,12 +1501,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:2705
+#: ../libempathy-gtk/empathy-chat.c:2727
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s è %2$s èåå"
 
-#: ../libempathy-gtk/empathy-chat.c:2708
+#: ../libempathy-gtk/empathy-chat.c:2730
 #, c-format
 msgid "%s was kicked"
 msgstr "%s èèå"
@@ -1096,17 +1514,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:2716
+#: ../libempathy-gtk/empathy-chat.c:2738
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s è %2$s èçéåå"
 
-#: ../libempathy-gtk/empathy-chat.c:2719
+#: ../libempathy-gtk/empathy-chat.c:2741
 #, c-format
 msgid "%s was banned"
 msgstr "%s èèçéåå"
 
-#: ../libempathy-gtk/empathy-chat.c:2723
+#: ../libempathy-gtk/empathy-chat.c:2745
 #, c-format
 msgid "%s has left the room"
 msgstr "%s åçééæèåå"
@@ -1116,17 +1534,17 @@ msgstr "%s åçééæèåå"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2732
+#: ../libempathy-gtk/empathy-chat.c:2754
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2757
+#: ../libempathy-gtk/empathy-chat.c:2779
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s åçååæèåå"
 
-#: ../libempathy-gtk/empathy-chat.c:2782
+#: ../libempathy-gtk/empathy-chat.c:2804
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s çåèçç %s"
@@ -1134,55 +1552,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: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
+#: ../libempathy-gtk/empathy-chat.c:2991 ../src/empathy-event-manager.c:1167
+#: ../src/empathy-call-window.c:1468 ../src/empathy-call-window.c:1518
+#: ../src/empathy-call-window.c:2571
 msgid "Disconnected"
 msgstr "åæç"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3633
+#: ../libempathy-gtk/empathy-chat.c:3666
 msgid "Would you like to store this password?"
 msgstr "äæèååæåçï"
 
-#: ../libempathy-gtk/empathy-chat.c:3639
+#: ../libempathy-gtk/empathy-chat.c:3672
 msgid "Remember"
 msgstr "èä"
 
-#: ../libempathy-gtk/empathy-chat.c:3649
+#: ../libempathy-gtk/empathy-chat.c:3682
 msgid "Not now"
 msgstr "çåäè"
 
-#: ../libempathy-gtk/empathy-chat.c:3693
+#: ../libempathy-gtk/empathy-chat.c:3726
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "éè"
 
-#: ../libempathy-gtk/empathy-chat.c:3697
+#: ../libempathy-gtk/empathy-chat.c:3730
 msgid "Wrong password; please try again:"
 msgstr "åçéèïèåèäæï"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3827
+#: ../libempathy-gtk/empathy-chat.c:3860
 msgid "This room is protected by a password:"
 msgstr "æèåååèåçäèï"
 
-#: ../libempathy-gtk/empathy-chat.c:3854
+#: ../libempathy-gtk/empathy-chat.c:3887
 #: ../src/empathy-new-chatroom-dialog.c:780
 msgid "Join"
 msgstr "åå"
 
-#: ../libempathy-gtk/empathy-chat.c:4046 ../src/empathy-event-manager.c:1188
+#: ../libempathy-gtk/empathy-chat.c:4079 ../src/empathy-event-manager.c:1188
 msgid "Connected"
 msgstr "æåéç"
 
-#: ../libempathy-gtk/empathy-chat.c:4101
+#: ../libempathy-gtk/empathy-chat.c:4134
 msgid "Conversation"
 msgstr "èè"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4106
+#: ../libempathy-gtk/empathy-chat.c:4139
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1214,10 +1632,9 @@ msgstr "çèåéçèçä"
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
 #: ../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
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
 msgstr "åèï"
 
@@ -1272,17 +1689,17 @@ msgid_plural "_Report these contacts as abusive"
 msgstr[0] "ååéäèçäæçåè(_R)"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "çååæå(_L)"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "èéèæ"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "åéäçè(_B)"
 
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "çååæå(_L)"
+
 #. Title
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:517
 msgid "Search contacts"
@@ -1308,168 +1725,168 @@ msgstr "äçèæ"
 msgid "Please let me see when you're online. Thanks!"
 msgstr "çääçæèèæçéãæèï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:566
+#: ../libempathy-gtk/empathy-contact-widget.c:560
 #: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "ééï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:746
+#: ../libempathy-gtk/empathy-contact-widget.c:738
 #: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "åå ISO çï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:748
+#: ../libempathy-gtk/empathy-contact-widget.c:740
 #: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "ååï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:750
+#: ../libempathy-gtk/empathy-contact-widget.c:742
 #: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "åï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:752
+#: ../libempathy-gtk/empathy-contact-widget.c:744
 #: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "åï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:754
+#: ../libempathy-gtk/empathy-contact-widget.c:746
 #: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "ååï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:756
+#: ../libempathy-gtk/empathy-contact-widget.c:748
 #: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "ééåèï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:758
+#: ../libempathy-gtk/empathy-contact-widget.c:750
 #: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "èï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:760
+#: ../libempathy-gtk/empathy-contact-widget.c:752
 #: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "åçï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:762
+#: ../libempathy-gtk/empathy-contact-widget.c:754
 #: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "æåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:764
+#: ../libempathy-gtk/empathy-contact-widget.c:756
 #: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "åï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:766
+#: ../libempathy-gtk/empathy-contact-widget.c:758
 #: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "æåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:768
+#: ../libempathy-gtk/empathy-contact-widget.c:760
 #: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "æèï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:770
+#: ../libempathy-gtk/empathy-contact-widget.c:762
 #: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URIï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:772
+#: ../libempathy-gtk/empathy-contact-widget.c:764
 #: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "æçåççï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:774
+#: ../libempathy-gtk/empathy-contact-widget.c:766
 #: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "éèï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:776
+#: ../libempathy-gtk/empathy-contact-widget.c:768
 #: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "åçèå (ç)ï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:778
+#: ../libempathy-gtk/empathy-contact-widget.c:770
 #: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "æåèå (ç)ï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:780
+#: ../libempathy-gtk/empathy-contact-widget.c:772
 #: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "éåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:782
+#: ../libempathy-gtk/empathy-contact-widget.c:774
 #: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "æäï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:784
+#: ../libempathy-gtk/empathy-contact-widget.c:776
 #: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "çåéåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:786
+#: ../libempathy-gtk/empathy-contact-widget.c:778
 #: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "äææææï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:788
+#: ../libempathy-gtk/empathy-contact-widget.c:780
 #: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "çåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:790
+#: ../libempathy-gtk/empathy-contact-widget.c:782
 #: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "çåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:792
+#: ../libempathy-gtk/empathy-contact-widget.c:784
 #: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "çåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:845
-#: ../libempathy-gtk/empathy-contact-widget.c:860
+#: ../libempathy-gtk/empathy-contact-widget.c:837
+#: ../libempathy-gtk/empathy-contact-widget.c:852
 #: ../libempathy-gtk/empathy-individual-widget.c:593
 #: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:39
 msgid "Location"
 msgstr "äç"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:862
+#: ../libempathy-gtk/empathy-contact-widget.c:854
 #: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%sï%s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:914
+#: ../libempathy-gtk/empathy-contact-widget.c:906
 #: ../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:996
+#: ../libempathy-gtk/empathy-contact-widget.c:988
 #: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "åååéè"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1052
+#: ../libempathy-gtk/empathy-contact-widget.c:1044
 #: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "çæåååéè"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1454
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
 msgid "Personal Details"
 msgstr "åäçç"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1457
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Contact Details"
 msgstr "èçäèçèæ"
 
@@ -1500,6 +1917,10 @@ msgstr "çæ"
 msgid "Last seen:"
 msgstr "äæçèï"
 
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "äæåï"
+
 #: ../libempathy-gtk/empathy-contactinfo-utils.c:115
 msgid "Connected from:"
 msgstr "åéæåï"
@@ -1538,43 +1959,39 @@ msgstr "éé"
 msgid "parcel"
 msgstr "åè"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>äç</b> æ (date)\t"
-
-#. Alias
+#. Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1293
-msgid "Alias:"
-msgstr "ååï"
+msgid "Identifier"
+msgstr "èåèå"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "çæçèè"
+msgid "Alias"
+msgstr "åå"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "çæçï"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Information requestedâ"
+msgstr "èèåèæâ"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>äç</b> æ (date)\t"
 
-#. Identifier to connect to Instant Messaging network
-#. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1502
-msgid "Identifier:"
-msgstr "èåèåï"
+msgid "Client Information"
+msgstr "çæçèè"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
-msgid "Information requestedâ"
-msgstr "èèåèæâ"
+msgid "OS"
+msgstr "OS"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:10
-msgid "OS:"
-msgstr "OSï"
+msgid "Version"
+msgstr "çæ"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:11
-msgid "Version:"
-msgstr "çæï"
+msgid "Client"
+msgstr "çæç"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:327
 msgid "Groups"
@@ -1621,145 +2038,155 @@ 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:172
+#: ../libempathy-gtk/empathy-individual-menu.c:174
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:344
+#: ../libempathy-gtk/empathy-individual-menu.c:349
 msgid "Select account to use to place the call"
 msgstr "éåèçäæçéèçåè"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:348
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:353
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "éè"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:413
+#: ../libempathy-gtk/empathy-individual-menu.c:418
 msgid "Mobile"
 msgstr "æåéè"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:415
+#: ../libempathy-gtk/empathy-individual-menu.c:420
 msgid "Work"
 msgstr "åä"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:417
+#: ../libempathy-gtk/empathy-individual-menu.c:422
 msgid "HOME"
 msgstr "äå"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:658
+#: ../libempathy-gtk/empathy-individual-menu.c:663
 msgid "_Block Contact"
 msgstr "åéèçä(_B)"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:719
+msgid "Delete and _Block"
+msgstr "åéäåé(_B)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:781
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "æåæèçéèçäã%sãï"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:790
+#, 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-menu.c:801
+msgid "Removing contact"
+msgstr "æåçéèçä"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:865
+#: ../libempathy-gtk/empathy-individual-view.c:2454
+msgid "_Remove"
+msgstr "çé(_R)"
+
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-individual-menu.c:1228
 #: ../libempathy-gtk/empathy-new-message-dialog.c:318
 msgid "_Chat"
 msgstr "èå(_C)"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
 #: ../libempathy-gtk/empathy-new-message-dialog.c:312
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1085
+#: ../libempathy-gtk/empathy-individual-menu.c:1296
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "èééè(_A)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1118
+#: ../libempathy-gtk/empathy-individual-menu.c:1329
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "èåéè(_V)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../libempathy-gtk/empathy-individual-menu.c:1370
+#: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "_Previous Conversations"
 msgstr "éåèè(_P)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1188
+#: ../libempathy-gtk/empathy-individual-menu.c:1399
 msgid "Send File"
 msgstr "åéææ"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1218
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgid "Share My Desktop"
 msgstr "åäæçæé"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-menu.c:1455
 #: ../libempathy-gtk/empathy-individual-widget.c:1357
 msgid "Favorite"
 msgstr "åå"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1263
+#: ../libempathy-gtk/empathy-individual-menu.c:1474
 msgid "gnome-contacts not installed"
 msgstr "gnome-contacts åæåè"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1266
+#: ../libempathy-gtk/empathy-individual-menu.c:1477
 msgid "Please install gnome-contacts to access contacts details."
 msgstr "èåè gnome-contacts äååèçäççã"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1397
+#: ../libempathy-gtk/empathy-individual-menu.c:1608
 msgid "Infor_mation"
 msgstr "èè(_M)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1446
+#: ../libempathy-gtk/empathy-individual-menu.c:1657
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "çè(_E)"
 
 #. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1562
-#: ../src/empathy-chat-window.c:1211
+#: ../libempathy-gtk/empathy-individual-menu.c:1773
+#: ../src/empathy-chat-window.c:1213
 msgid "Inviting you to this room"
 msgstr "éèäåéåèåå"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1608
+#: ../libempathy-gtk/empathy-individual-menu.c:1819
 msgid "_Invite to Chat Room"
 msgstr "éèåèåå(_I)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1804
+#: ../libempathy-gtk/empathy-individual-menu.c:2015
 msgid "_Add Contactâ"
 msgstr "ååèçä(_A)â"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2364
-msgid "Delete and _Block"
-msgstr "åéäåé(_B)"
-
-#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2374
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "æåæèçéççã%sãï"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2402
+#: ../libempathy-gtk/empathy-individual-view.c:2377
 msgid "Removing group"
 msgstr "æåçéçç"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2470
+#: ../libempathy-gtk/empathy-individual-view.c:2445
 msgid "Re_name"
 msgstr "éæåå"
 
-#. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2479
-#: ../libempathy-gtk/empathy-individual-view.c:2683
-msgid "_Remove"
-msgstr "çé(_R)"
-
-#: ../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: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ãåïèææéæçéæææææéçèçççèçäã"
+#. Alias
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "ååï"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2577
-msgid "Removing contact"
-msgstr "æåçéèçä"
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
+msgid "Identifier:"
+msgstr "èåèåï"
 
 #: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
@@ -1771,7 +2198,7 @@ msgstr[0] "éçèççåå %u äèçä"
 msgid "<b>Location</b> at (date)"
 msgstr "<b>äç</b> æ (ææ)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "åææææåéèåæäç"
 
@@ -1898,7 +2325,7 @@ msgid "Text chats"
 msgstr "æåèå"
 
 #: ../libempathy-gtk/empathy-log-window.c:3035
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:29
 msgid "Calls"
 msgstr "éè"
 
@@ -1931,40 +2358,40 @@ msgid "Delete from:"
 msgstr "åéåï"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">æåèå...</span>"
+msgid "_File"
+msgstr "ææ(_F)"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3 ../src/empathy-preferences.ui.h:4
-msgid "Chat"
-msgstr "èå"
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+msgid "_Edit"
+msgstr "çè(_E)"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "åéæææå..."
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "åäææ"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-msgid "Video"
-msgstr "èå"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19 ../src/empathy-preferences.ui.h:11
+msgid "Chat"
+msgstr "èå"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-msgid "_Edit"
-msgstr "çè(_E)"
+#: ../src/empathy-call-window.ui.h:24
+msgid "Video"
+msgstr "èå"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "ææ(_F)"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "éé 2"
 
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">æåèå...</span>"
+
 #: ../libempathy-gtk/empathy-new-message-dialog.c:82
 msgid "The contact is offline"
 msgstr "èçäåçéç"
@@ -2096,7 +2523,7 @@ msgstr "èéèæâ"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:588
+#: ../libempathy-gtk/empathy-protocol-chooser.c:597
 #, c-format
 msgid "New %s account"
 msgstr "æå %s åè"
@@ -2106,20 +2533,20 @@ msgid "Find:"
 msgstr "åæï"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "æåååå(_C)"
+msgid "_Previous"
+msgstr "ääå(_P)"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "æäåèå"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "ääå(_N)"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "æåååå(_C)"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "ääå(_P)"
+msgid "Phrase not found"
+msgstr "æäåèå"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2165,12 +2592,12 @@ msgstr "èééèçæ"
 msgid "Edit Custom Messages"
 msgstr "çèèéèæ"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1051
+#: ../libempathy-gtk/empathy-theme-adium.c:1056
 #, c-format
 msgid "Message edited at %s"
 msgstr "èæçèæ %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1757
+#: ../libempathy-gtk/empathy-theme-adium.c:1776
 msgid "Normal"
 msgstr "äè"
 
@@ -2464,11 +2891,11 @@ msgstr "éå..."
 msgid "_Select"
 msgstr "éå(_S)"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:201
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:225
 msgid "No error message"
 msgstr "ææéèèæ"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:274
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:298
 msgid "Instant Message (Empathy)"
 msgstr "åæéè (Empathy)"
 
@@ -2552,7 +2979,7 @@ msgstr "æèäç %s åèçéçäæåæååã"
 msgid "Your new account has not been saved yet."
 msgstr "åæååäçæåèã"
 
-#: ../src/empathy-accounts-dialog.c:403 ../src/empathy-call-window.c:1265
+#: ../src/empathy-accounts-dialog.c:403 ../src/empathy-call-window.c:1268
 msgid "Connectingâ"
 msgstr "éçäâ"
 
@@ -2597,20 +3024,20 @@ msgstr "çæåäæåæåäçåäèæã"
 msgid "Go online to edit your personal information."
 msgstr "äçäçèäçåäèæã"
 
-#: ../src/empathy-accounts-dialog.c:855
+#: ../src/empathy-accounts-dialog.c:862
 msgid "_Edit Connection Parameters..."
 msgstr "çèéçåæ(_E)..."
 
-#: ../src/empathy-accounts-dialog.c:1351
+#: ../src/empathy-accounts-dialog.c:1358
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "æåæèåäçéèäçéçç %sï"
 
-#: ../src/empathy-accounts-dialog.c:1355
+#: ../src/empathy-accounts-dialog.c:1362
 msgid "This will not remove your account on the server."
 msgstr "éäæçéäæåäçäçåèã"
 
-#: ../src/empathy-accounts-dialog.c:1560
+#: ../src/empathy-accounts-dialog.c:1567
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2619,24 +3046,24 @@ msgstr ""
 "äæåçææãçåèççï"
 
 #. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1751
+#: ../src/empathy-accounts-dialog.c:1758
 msgid "_Enabled"
 msgstr "ååç(_E)"
 
 #. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1774
+#: ../src/empathy-accounts-dialog.c:1781
 msgid "Rename"
 msgstr "éæåå"
 
-#: ../src/empathy-accounts-dialog.c:2190
+#: ../src/empathy-accounts-dialog.c:2197
 msgid "_Skip"
 msgstr "çé(_S)"
 
-#: ../src/empathy-accounts-dialog.c:2194
+#: ../src/empathy-accounts-dialog.c:2201
 msgid "_Connect"
 msgstr "éæ(_C)"
 
-#: ../src/empathy-accounts-dialog.c:2373
+#: ../src/empathy-accounts-dialog.c:2380
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2644,14 +3071,14 @@ msgstr ""
 "äååéééåèçïéææææ\n"
 "äæåçææãçåèççï"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
+msgid "_Importâ"
+msgstr "åå(_I)â"
+
+#: ../src/empathy-accounts-dialog.ui.h:4
 msgid "Loading account information"
 msgstr "æåèååèèè"
 
-#: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol backends installed"
-msgstr "åæåèéèåååççå"
-
 #: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
@@ -2659,8 +3086,8 @@ msgid ""
 msgstr "èååæçåèïäåéååèæåæçåçéèåååççåã"
 
 #: ../src/empathy-accounts-dialog.ui.h:6
-msgid "_Importâ"
-msgstr "åå(_I)â"
+msgid "No protocol backends installed"
+msgstr "åæåèéèåååççå"
 
 #: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
@@ -2670,136 +3097,128 @@ msgstr "- Empathy èèçæç"
 msgid "Empathy authentication client"
 msgstr "Empathy èèçæç"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:1
-msgid "Audio"
-msgstr "éè"
+#: ../src/empathy-call-window.ui.h:1
+msgid "_Call"
+msgstr "éè(_C)"
 
 #: ../src/empathy-call-window.ui.h:3
-msgid "Decoding Codec:"
-msgstr "èçççèçåï"
+msgid "_Microphone"
+msgstr "éåé(_M)"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "åçæåæ"
+msgid "_Camera"
+msgstr "æåæ(_C)"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "éçæèç"
+msgid "_Settings"
+msgstr "èåå(_S)"
 
 #: ../src/empathy-call-window.ui.h:6
-msgid "Encoding Codec:"
-msgstr "ççççèçåï"
+msgid "_View"
+msgstr "æè(_V)"
 
-#: ../src/empathy-call-window.ui.h:7
-msgid "Hang up"
-msgstr "ææ"
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+msgid "_Help"
+msgstr "æå(_H)"
 
-#: ../src/empathy-call-window.ui.h:8
-msgid "Hang up current call"
-msgstr "ææçåéè"
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+msgid "_Contents"
+msgstr "åå(_C)"
 
 #: ../src/empathy-call-window.ui.h:9
-msgid "Local Candidate:"
-msgstr "ææåéï"
+msgid "_Debug"
+msgstr "åé(_D)"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "åææåå"
+msgid "Swap camera"
+msgstr "äææåæ"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "åææåå"
 
 #: ../src/empathy-call-window.ui.h:12
-msgid "Remote Candidate:"
-msgstr "éçåéï"
+msgid "Maximise me"
+msgstr "åææåå"
 
 #: ../src/empathy-call-window.ui.h:13
-msgid "Send Audio"
-msgstr "åééè"
+msgid "Disable camera"
+msgstr "åçæåæ"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "åéèå"
+msgid "Hang up"
+msgstr "ææ"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "éçæèç"
+msgid "Hang up current call"
+msgstr "ææçåéè"
 
 #: ../src/empathy-call-window.ui.h:16
-msgid "Start a video call"
-msgstr "éåèåéè"
+msgid "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 "äææåæ"
+msgid "Start a video call"
+msgstr "éåèåéè"
 
 #: ../src/empathy-call-window.ui.h:19
-msgid "Toggle audio transmission"
-msgstr "åæéèåæ"
+msgid "Start an audio call"
+msgstr "éåéèéè"
 
 #: ../src/empathy-call-window.ui.h:20
+msgid "Show dialpad"
+msgstr "éçæèç"
+
+#: ../src/empathy-call-window.ui.h:21
+msgid "Display the dialpad"
+msgstr "éçæèç"
+
+#: ../src/empathy-call-window.ui.h:22
 msgid "Toggle video transmission"
 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
-msgid "_Call"
-msgstr "éè(_C)"
+msgid "Toggle audio transmission"
+msgstr "åæéèåæ"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "æåæ(_C)"
+msgid "Encoding Codec:"
+msgstr "ççççèçåï"
 
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-msgid "_Contents"
-msgstr "åå(_C)"
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-call-window.c:2523
+#: ../src/empathy-call-window.c:2524 ../src/empathy-call-window.c:2525
+#: ../src/empathy-call-window.c:2526
+msgid "Unknown"
+msgstr "äæ"
 
 #: ../src/empathy-call-window.ui.h:27
-msgid "_Debug"
-msgstr "åé(_D)"
-
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-msgid "_Help"
-msgstr "æå(_H)"
+msgid "Decoding Codec:"
+msgstr "èçççèçåï"
 
-#: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "éåé(_M)"
+#: ../src/empathy-call-window.ui.h:28
+msgid "Remote Candidate:"
+msgstr "éçåéï"
 
-#: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "èåå(_S)"
+#: ../src/empathy-call-window.ui.h:29
+msgid "Local Candidate:"
+msgstr "ææåéï"
 
-#: ../src/empathy-call-window.ui.h:32
-msgid "_View"
-msgstr "æè(_V)"
+#: ../src/empathy-call-window.ui.h:30 ../src/empathy-preferences.ui.h:28
+msgid "Audio"
+msgstr "éè"
 
-#: ../src/empathy-chat-window.c:286
+#: ../src/empathy-chat-window.c:288
 msgid "Close this window?"
 msgstr "èéééåèçï"
 
-#: ../src/empathy-chat-window.c:291
+#: ../src/empathy-chat-window.c:293
 #, 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:302
+#: ../src/empathy-chat-window.c:304
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -2809,122 +3228,122 @@ msgid_plural ""
 "further messages until you rejoin them."
 msgstr[0] "ééæèçæéé %u åèååãäåçæææåäåçèæïééäåæåèã"
 
-#: ../src/empathy-chat-window.c:311
+#: ../src/empathy-chat-window.c:313
 #, c-format
 msgid "Leave %s?"
 msgstr "éé %sï"
 
-#: ../src/empathy-chat-window.c:312
+#: ../src/empathy-chat-window.c:314
 msgid ""
 "You will not receive any further messages from this chat room until you "
 "rejoin it."
 msgstr "äåçæææåæèååäåçèæïééäåæåèã"
 
-#: ../src/empathy-chat-window.c:331
+#: ../src/empathy-chat-window.c:333
 msgid "Close window"
 msgstr "ééèç"
 
-#: ../src/empathy-chat-window.c:331
+#: ../src/empathy-chat-window.c:333
 msgid "Leave room"
 msgstr "ééèåå"
 
-#: ../src/empathy-chat-window.c:660 ../src/empathy-chat-window.c:680
+#: ../src/empathy-chat-window.c:662 ../src/empathy-chat-window.c:682
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d åæè)"
 
-#: ../src/empathy-chat-window.c:672
+#: ../src/empathy-chat-window.c:674
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (èåä %u å)"
 
-#: ../src/empathy-chat-window.c:688
+#: ../src/empathy-chat-window.c:690
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (äèåääç %d åæè)"
 
-#: ../src/empathy-chat-window.c:697
+#: ../src/empathy-chat-window.c:699
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (äèææäç %d åæè)"
 
-#: ../src/empathy-chat-window.c:912
+#: ../src/empathy-chat-window.c:914
 msgid "SMS:"
 msgstr "SMSï"
 
-#: ../src/empathy-chat-window.c:922
+#: ../src/empathy-chat-window.c:924
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "æååé %d åèæ"
 
-#: ../src/empathy-chat-window.c:944
+#: ../src/empathy-chat-window.c:946
 msgid "Typing a message."
 msgstr "æåèåèæã"
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "æé(_L)"
+msgid "_Conversation"
+msgstr "èè(_C)"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "èçä(_O)"
+msgid "C_lear"
+msgstr "æé(_L)"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "æåèæçè(_S)"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "ååçèåå(_F)"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participantâ"
-msgstr "éèåè(_P)â"
+msgid "Notify for All Messages"
+msgstr "ææèæééç"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "ååéåç(_L)"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "éçèçäæå(_S)"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "ååéåç(_R)"
+msgid "Invite _Participantâ"
+msgstr "éèåè(_P)â"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "ææèæééç"
+msgid "C_ontact"
+msgstr "èçä(_O)"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "èè(_C)"
+msgid "_Tabs"
+msgstr "åé(_T)"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "åéåé(_D)"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "ååçèåå(_F)"
+msgid "_Previous Tab"
+msgstr "äååé(_P)"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "äååé(_N)"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "äååé(_P)"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "ååééçåé(_U)"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "éçèçäæå(_S)"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "ååéåç(_L)"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "åé(_T)"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "ååéåç(_R)"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "ååééçåé(_U)"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "åéåé(_D)"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -2938,7 +3357,7 @@ msgstr "èåå"
 msgid "Auto-Connect"
 msgstr "èåéç"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "ççååçèåå"
 
@@ -2946,7 +3365,7 @@ msgstr "ççååçèåå"
 msgid "Incoming video call"
 msgstr "ååçèåéè"
 
-#: ../src/empathy-event-manager.c:510 ../src/empathy-call-window.c:1482
+#: ../src/empathy-event-manager.c:510 ../src/empathy-call-window.c:1485
 msgid "Incoming call"
 msgstr "äé"
 
@@ -2961,7 +3380,7 @@ msgid "%s is calling you. Do you want to answer?"
 msgstr "%s èèäéèéèãäæåèæèï"
 
 #: ../src/empathy-event-manager.c:518 ../src/empathy-event-manager.c:915
-#: ../src/empathy-call-window.c:1488
+#: ../src/empathy-call-window.c:1491
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s çäé"
@@ -3010,7 +3429,7 @@ msgstr "%s æéèäåå %s"
 msgid "You have been invited to join %s"
 msgstr "äèéèåå %s"
 
-#: ../src/empathy-event-manager.c:915 ../src/empathy-call-window.c:1488
+#: ../src/empathy-event-manager.c:915 ../src/empathy-call-window.c:1491
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "äè %s çèåéè"
@@ -3020,7 +3439,7 @@ msgstr "äè %s çèåéè"
 msgid "Incoming file transfer from %s"
 msgstr "æåäè %s çææåè"
 
-#: ../src/empathy-event-manager.c:983 ../src/empathy-roster-window.c:356
+#: ../src/empathy-event-manager.c:983 ../src/empathy-roster-window.c:223
 msgid "Password required"
 msgstr "éèåç"
 
@@ -3176,58 +3595,58 @@ msgstr "éèåå"
 msgid "Source"
 msgstr "äæ"
 
-#: ../src/empathy-roster-window.c:373
+#: ../src/empathy-roster-window.c:240
 msgid "Provide Password"
 msgstr "æäåç"
 
-#: ../src/empathy-roster-window.c:379
+#: ../src/empathy-roster-window.c:246
 msgid "Disconnect"
 msgstr "æç"
 
-#: ../src/empathy-roster-window.c:639
+#: ../src/empathy-roster-window.c:417
 msgid "You need to setup an account to see contacts here."
 msgstr "äéèèçäååèæèåéèæçèçäã"
 
-#: ../src/empathy-roster-window.c:655
-msgid "No match found"
-msgstr "æäåçåéç"
-
-#: ../src/empathy-roster-window.c:765
+#: ../src/empathy-roster-window.c:504
 #, c-format
 msgid "Sorry, %s accounts canât be used until your %s software is updated."
 msgstr "åææï%s åèçæäçïééäç %s èäåææã"
 
-#: ../src/empathy-roster-window.c:831
+#: ../src/empathy-roster-window.c:570
 msgid "Update software..."
 msgstr "ææèä..."
 
-#: ../src/empathy-roster-window.c:837 ../src/empathy-roster-window.c:954
+#: ../src/empathy-roster-window.c:576 ../src/empathy-roster-window.c:693
 msgid "Close"
 msgstr "éé"
 
-#: ../src/empathy-roster-window.c:942
+#: ../src/empathy-roster-window.c:681
 msgid "Reconnect"
 msgstr "éæéæ"
 
-#: ../src/empathy-roster-window.c:948
+#: ../src/empathy-roster-window.c:687
 msgid "Edit Account"
 msgstr "çèåè"
 
-#: ../src/empathy-roster-window.c:1128
+#: ../src/empathy-roster-window.c:867
 msgid "Top up account"
 msgstr "åååèåé"
 
-#: ../src/empathy-roster-window.c:1813
+#: ../src/empathy-roster-window.c:1529
 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:1821
+#: ../src/empathy-roster-window.c:1537
 #, c-format
 msgid "You need to enable %s to see contacts here."
 msgstr "äéèåç %s æèåéèæçèçäã"
 
-#: ../src/empathy-roster-window.c:2154 ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-roster-window.c:1901
+msgid "No match found"
+msgstr "æäåçåéç"
+
+#: ../src/empathy-roster-window.c:2132 ../src/empathy-preferences.ui.h:4
 msgid "Contact List"
 msgstr "èçäæå"
 
@@ -3235,6 +3654,71 @@ msgstr "èçäæå"
 msgid "Account settings"
 msgstr "åèèåå"
 
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_New Conversation..."
+msgstr "æåèè(_N)..."
+
+#: ../src/empathy-roster-window-menubar.ui.h:2
+msgid "New _Call..."
+msgstr "æåéè(_C)..."
+
+#: ../src/empathy-roster-window-menubar.ui.h:3
+msgid "Contacts"
+msgstr "èçä"
+
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Add Contacts..."
+msgstr "ååèçä(_A)..."
+
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Search for Contacts..."
+msgstr "æåèçä(_S)..."
+
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Blocked Contacts"
+msgstr "èåéçèçä"
+
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_Rooms"
+msgstr "èåå(_R)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Join..."
+msgstr "åå(_J)..."
+
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Join _Favorites"
+msgstr "ååååèåå(_F)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "_Manage Favorites"
+msgstr "ççåå(_M)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_File Transfers"
+msgstr "ææåè(_F)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "åè(_A)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "P_references"
+msgstr "ååèå(_R)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:15
+msgid "Help"
+msgstr "æå"
+
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "About Empathy"
+msgstr "éæ Empathy"
+
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-status-icon.ui.h:5
+msgid "_Quit"
+msgstr "çæ(_Q)"
+
 #: ../src/empathy-new-chatroom-dialog.c:194
 msgid "Chat Room"
 msgstr "èåå"
@@ -3274,305 +3758,289 @@ msgstr "å"
 msgid "Join Room"
 msgstr "ååèåå"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "çæèåèååæå"
-
-#: ../src/empathy-new-chatroom-dialog.ui.h:3
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid ""
 "Enter the room name to join here or click on one or more rooms in the list."
 msgstr "åéèèåèååçèåååçæåæåäééäæååèååã"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:4
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
+msgid "_Room:"
+msgstr "èåå(_R)ï"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account&apos;s server"
 msgstr "èåæèååæåçäæåïæåæèèååäæçååèæåçäæåæççåå"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
+#: ../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 "èåæèååæåçäæåïæèçèèååäæçååèæåçäæåæççåå"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
-msgid "Room List"
-msgstr "èååæå"
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
+msgid "_Server:"
+msgstr "äæå(_S)ï"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
-msgid "_Room:"
-msgstr "èåå(_R)ï"
+msgid "Couldn't load room list"
+msgstr "çæèåèååæå"
 
-#: ../src/empathy-preferences.c:146
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Room List"
+msgstr "èååæå"
+
+#: ../src/empathy-preferences.c:145
 msgid "Message received"
 msgstr "èæåæå"
 
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:146
 msgid "Message sent"
 msgstr "èæåéå"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:147
 msgid "New conversation"
 msgstr "æåèè"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:148
 msgid "Contact comes online"
 msgstr "èçääç"
 
-#: ../src/empathy-preferences.c:150
+#: ../src/empathy-preferences.c:149
 msgid "Contact goes offline"
 msgstr "èçäéç"
 
-#: ../src/empathy-preferences.c:151
+#: ../src/empathy-preferences.c:150
 msgid "Account connected"
 msgstr "åèåéç"
 
-#: ../src/empathy-preferences.c:152
+#: ../src/empathy-preferences.c:151
 msgid "Account disconnected"
 msgstr "åèåæç"
 
-#: ../src/empathy-preferences.c:429
+#: ../src/empathy-preferences.c:388
 msgid "Language"
 msgstr "èè"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:678
+#: ../src/empathy-preferences.c:637
 msgid "Juliet"
 msgstr "çèå"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:685
+#: ../src/empathy-preferences.c:644
 msgid "Romeo"
 msgstr "æåä"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:691
+#: ../src/empathy-preferences.c:650
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "çççèèèåïçääèååéï"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:695
+#: ../src/empathy-preferences.c:654
 msgid "Deny thy father and refuse thy name;"
 msgstr "èçäæèääïçäçåæèåã"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:698
+#: ../src/empathy-preferences.c:657
 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:701
+#: ../src/empathy-preferences.c:660
 msgid "And I'll no longer be a Capulet."
 msgstr "ççèäéååïååçïæéäã"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:704
+#: ../src/empathy-preferences.c:663
 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:707
+#: ../src/empathy-preferences.c:666
 msgid "Juliet has disconnected"
 msgstr "çèååæç"
 
-#: ../src/empathy-preferences.c:1112
+#: ../src/empathy-preferences.c:1070
 msgid "Preferences"
 msgstr "ååèå"
 
 #: ../src/empathy-preferences.ui.h:2
-msgid "Behavior"
-msgstr "èç"
+msgid "Show groups"
+msgstr "éççç"
+
+#: ../src/empathy-preferences.ui.h:3
+msgid "Show account balances"
+msgstr "éçåèéé"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "èåäæäé(_E):"
+msgid "Start chats in:"
+msgstr "éåèåæï"
+
+#: ../src/empathy-preferences.ui.h:6
+msgid "new ta_bs"
+msgstr "æåé(_B)"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable notifications when _away or busy"
-msgstr "ççæçééæåçæåçéç(_D)"
+msgid "new _windows"
+msgstr "æèç(_W)"
 
 #: ../src/empathy-preferences.ui.h:8
-msgid "Disable sounds when _away or busy"
-msgstr "ççæçééæåçæåçéæ(_A)"
+msgid "Show _smileys as images"
+msgstr "åèæçèäåçéç(_S)"
 
 #: ../src/empathy-preferences.ui.h:9
-msgid "Display incoming events in the notification area"
-msgstr "åéçååéçæåää"
+msgid "Show contact _list in rooms"
+msgstr "åèååéçèçäæå(_L)"
 
 #: ../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 "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr "åéæéåäèäçèéåäääèæææïäåæäéèäåèåèåéãåæéèæäæåääèèæççåéæéæåæïèåèéæåéæéåèïäéæéåéèã"
-
-#: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact comes online"
-msgstr "çèçääçæåçéç"
+msgid "Log conversations"
+msgstr "çéèè"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when a contact goes offline"
-msgstr "çèçäéçæåçéç"
+msgid "Display incoming events in the notification area"
+msgstr "åéçååéçæåää"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable notifications when the _chat is not focused"
-msgstr "çèåèçååçéæåçéç(_C)"
+msgid "_Automatically connect on startup"
+msgstr "ååæèåéç(_A)"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "Enable spell checking for languages:"
-msgstr "çèèåçæåææï"
+msgid "Behavior"
+msgstr "èç"
 
 #: ../src/empathy-preferences.ui.h:15
 msgid "General"
 msgstr "äè"
 
+#: ../src/empathy-preferences.ui.h:16
+msgid "_Enable bubble notifications"
+msgstr "åçææåéç(_E)"
+
 #: ../src/empathy-preferences.ui.h:17
-msgid "Location sources:"
-msgstr "äçäæï"
+msgid "Disable notifications when _away or busy"
+msgstr "ççæçééæåçæåçéç(_D)"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Log conversations"
-msgstr "çéèè"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "çèåèçååçéæåçéç(_C)"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Notifications"
-msgstr "éç"
+msgid "Enable notifications when a contact comes online"
+msgstr "çèçääçæåçéç"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Play sound for events"
-msgstr "ææääéæ"
+msgid "Enable notifications when a contact goes offline"
+msgstr "çèçäéçæåçéç"
 
 #: ../src/empathy-preferences.ui.h:21
-msgid "Privacy"
-msgstr "çé"
+msgid "Notifications"
+msgstr "éç"
 
-#: ../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
+msgid "_Enable sound notifications"
+msgstr "åçéæéç(_E)"
 
 #: ../src/empathy-preferences.ui.h:23
-msgid "Show _smileys as images"
-msgstr "åèæçèäåçéç(_S)"
+msgid "Disable sounds when _away or busy"
+msgstr "ççæçééæåçæåçéæ(_A)"
 
 #: ../src/empathy-preferences.ui.h:24
-msgid "Show account balances"
-msgstr "éçåèéé"
+msgid "Play sound for events"
+msgstr "ææääéæ"
 
 #: ../src/empathy-preferences.ui.h:25
-msgid "Show contact _list in rooms"
-msgstr "åèååéçèçäæå(_L)"
+msgid "Sounds"
+msgstr "éæ"
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "Show offline contacts"
-msgstr "éçéçèçä"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "äçåéæéäæåéèåè(_E)"
 
 #: ../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 "éæ"
+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 "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr "åéæéåäèäçèéåäääèæææïäåæäéèäåèåèåéãåæéèæäæåääèèæççåéæéæåæïèåèéæåéæéåèïäéæéåéèã"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "Spell Checking"
-msgstr "æåææ"
+msgid "_Publish location to my contacts"
+msgstr "åæçèçäåéäç(_P)"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "Start chats in:"
-msgstr "éåèåæï"
-
-#: ../src/empathy-preferences.ui.h:32
 msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr "éèçèèæåååæåäåçåèååçèèã"
+"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 çåææçååæéçåäæã"
 
+#. 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:33
-msgid "Themes"
-msgstr "äæäé"
+msgid "_Reduce location accuracy"
+msgstr "éääçæçå(_R)"
 
 #: ../src/empathy-preferences.ui.h:34
-msgid "Use _echo cancellation to improve call quality"
-msgstr "äçåéæéäæåéèåè(_E)"
+msgid "Privacy"
+msgstr "çé"
 
 #: ../src/empathy-preferences.ui.h:35
-msgid "Variant:"
-msgstr "æåï"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Automatically connect on startup"
-msgstr "ååæèåéç(_A)"
-
-#: ../src/empathy-preferences.ui.h:37
 msgid "_Cellphone"
 msgstr "ææ(_C)"
 
-#: ../src/empathy-preferences.ui.h:38
-msgid "_Enable bubble notifications"
-msgstr "åçææåéç(_E)"
+#: ../src/empathy-preferences.ui.h:37
+msgid "_Network (IP, Wi-Fi)"
+msgstr "çç (IP, Wi-Fi)(_N)"
 
-#: ../src/empathy-preferences.ui.h:39
-msgid "_Enable sound notifications"
-msgstr "åçéæéç(_E)"
+#: ../src/empathy-preferences.ui.h:38
+msgid "Location sources:"
+msgstr "äçäæï"
 
 #: ../src/empathy-preferences.ui.h:40
-msgid "_GPS"
-msgstr "_GPS"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr "éèçèèæåååæåäåçåèååçèèã"
 
 #: ../src/empathy-preferences.ui.h:41
-msgid "_Network (IP, Wi-Fi)"
-msgstr "çç (IP, Wi-Fi)(_N)"
+msgid "Enable spell checking for languages:"
+msgstr "çèèåçæåææï"
 
 #: ../src/empathy-preferences.ui.h:42
-msgid "_Publish location to my contacts"
-msgstr "åæçèçäåéäç(_P)"
+msgid "Spell Checking"
+msgstr "æåææ"
+
+#: ../src/empathy-preferences.ui.h:43
+msgid "Chat Th_eme:"
+msgstr "èåäæäé(_E):"
 
-#. 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:44
-msgid "_Reduce location accuracy"
-msgstr "éääçæçå(_R)"
+msgid "Variant:"
+msgstr "æåï"
 
 #: ../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:47
-msgid "new ta_bs"
-msgstr "æåé(_B)"
+msgid "Themes"
+msgstr "äæäé"
 
-#: ../src/empathy-preferences.ui.h:48
-msgid "status"
-msgstr "çæ"
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversationâ"
+msgstr "æåèè(_N)â"
 
-#: ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-status-icon.ui.h:3
 msgid "New _Callâ"
 msgstr "æåéè(_C)â"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-status-icon.ui.h:4
 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-debug-window.c:1603
 msgid "Save"
 msgstr "åå"
@@ -3710,13 +4178,13 @@ msgid "Respond"
 msgstr "åæ"
 
 #: ../src/empathy-notifications-approver.c:197
-#: ../src/empathy-call-window.c:1492
+#: ../src/empathy-call-window.c:1495
 msgid "Reject"
 msgstr "æç"
 
 #: ../src/empathy-notifications-approver.c:202
 #: ../src/empathy-notifications-approver.c:207
-#: ../src/empathy-call-window.c:1493
+#: ../src/empathy-call-window.c:1496
 msgid "Answer"
 msgstr "æè"
 
@@ -3748,95 +4216,95 @@ msgstr "%s ååææçäïääæèääéèã"
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1122 ../src/empathy-call-window.c:1138
+#: ../src/empathy-call-window.c:1125 ../src/empathy-call-window.c:1141
 msgid "i"
 msgstr "è"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1857
+#: ../src/empathy-call-window.c:1862
 #, c-format
 msgid "Call with %s"
 msgstr "è %s éèä"
 
-#: ../src/empathy-call-window.c:2109
+#: ../src/empathy-call-window.c:2114
 msgid "The IP address as seen by the machine"
 msgstr "æåçèç IP äå"
 
-#: ../src/empathy-call-window.c:2111
+#: ../src/empathy-call-window.c:2116
 msgid "The IP address as seen by a server on the Internet"
 msgstr "äèçäçäæåçèç IP äå"
 
-#: ../src/empathy-call-window.c:2113
+#: ../src/empathy-call-window.c:2118
 msgid "The IP address of the peer as seen by the other side"
 msgstr "åäççèçéç IP äå"
 
-#: ../src/empathy-call-window.c:2115
+#: ../src/empathy-call-window.c:2120
 msgid "The IP address of a relay server"
 msgstr "äçäæåç IP äå"
 
-#: ../src/empathy-call-window.c:2117
+#: ../src/empathy-call-window.c:2122
 msgid "The IP address of the multicast group"
 msgstr "åéåæççç IP äå"
 
-#: ../src/empathy-call-window.c:2864
+#: ../src/empathy-call-window.c:2869
 msgid "On hold"
 msgstr "äç"
 
-#: ../src/empathy-call-window.c:2867
+#: ../src/empathy-call-window.c:2871
 msgid "Mute"
 msgstr "éé"
 
-#: ../src/empathy-call-window.c:2869
+#: ../src/empathy-call-window.c:2873
 msgid "Duration"
 msgstr "æé"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2872
+#: ../src/empathy-call-window.c:2876
 #, c-format
 msgid "%s â %d:%02dm"
 msgstr "%s â %d:%02dm"
 
-#: ../src/empathy-call-window.c:2968
+#: ../src/empathy-call-window.c:2972
 msgid "Technical Details"
 msgstr "æèçç"
 
-#: ../src/empathy-call-window.c:3007
+#: ../src/empathy-call-window.c:3011
 #, 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
+#: ../src/empathy-call-window.c:3016
 #, 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
+#: ../src/empathy-call-window.c:3022
 #, 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
+#: ../src/empathy-call-window.c:3028
 msgid "There was a failure on the network"
 msgstr "éåççäæéèçç"
 
-#: ../src/empathy-call-window.c:3028
+#: ../src/empathy-call-window.c:3032
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "æéèæåèçéèæååæåäçéèäåè"
 
-#: ../src/empathy-call-window.c:3031
+#: ../src/empathy-call-window.c:3035
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "æéèæåèçèåæååæåäçéèäåè"
 
-#: ../src/empathy-call-window.c:3043
+#: ../src/empathy-call-window.c:3047
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3844,32 +4312,32 @@ msgid ""
 "the Help menu."
 msgstr "å Telepathy åääççæéæççæãè<a href=\"%s\">ååéåéè</a>äéäåæåéååçãééãèçäææéççéã"
 
-#: ../src/empathy-call-window.c:3052
+#: ../src/empathy-call-window.c:3056
 msgid "There was a failure in the call engine"
 msgstr "éèåæåæéèçç"
 
-#: ../src/empathy-call-window.c:3055
+#: ../src/empathy-call-window.c:3059
 msgid "The end of the stream was reached"
 msgstr "åéäææç"
 
-#: ../src/empathy-call-window.c:3095
+#: ../src/empathy-call-window.c:3099
 msgid "Can't establish audio stream"
 msgstr "çæåçéèäæ"
 
-#: ../src/empathy-call-window.c:3105
+#: ../src/empathy-call-window.c:3109
 msgid "Can't establish video stream"
 msgstr "çæåçèåäæ"
 
-#: ../src/empathy-call-window.c:3142
+#: ../src/empathy-call-window.c:3146
 #, c-format
 msgid "Your current balance is %s."
 msgstr "äçåçééç %sã"
 
-#: ../src/empathy-call-window.c:3146
+#: ../src/empathy-call-window.c:3150
 msgid "Sorry, you donât have enough credit for that call."
 msgstr "åææïäçåéäèäéèèéèã"
 
-#: ../src/empathy-call-window.c:3148
+#: ../src/empathy-call-window.c:3152
 msgid "Top Up"
 msgstr "åå"
 
@@ -3893,64 +4361,49 @@ msgstr "äçèååèæåäçï"
 msgid "Adding new account"
 msgstr "æååè"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
-msgid "People nearby"
-msgstr "éèçä"
-
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:149
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81
 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:180
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:98
+msgid "People nearby"
+msgstr "éèçä"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:113
 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 "Network:"
+#~ msgstr "çèï"
 
-#~ msgid ""
-#~ "Whether Empathy should automatically log into your accounts on startup."
-#~ msgstr "Empathy æåæåååæèåçåæçåèã"
+#~ msgid "Password:"
+#~ msgstr "åçï"
 
-#~ msgid "Empathy should auto-away when idle"
-#~ msgstr "Empathy çéçææèèåèçéé"
+#~ msgid "Port:"
+#~ msgstr "éæåï"
 
-#~ msgid ""
-#~ "Whether Empathy should go into away mode automatically if the user is "
-#~ "idle."
-#~ msgstr "Empathy æåæåäçèéçæèååæçééæåã"
+#~ msgid "Send Audio"
+#~ msgstr "åééè"
 
-#~ msgid "Empathy default download folder"
-#~ msgstr "Empathy éèäèèæå"
+#~ msgid "Send Video"
+#~ msgstr "åéèè"
 
-#~ msgid "The default folder to save file transfers in."
-#~ msgstr "çäååææåèææææçéèèæåã"
+#~ msgid "Show protocol in avatar"
+#~ msgstr "æåäåçéçåå"
 
-#~ msgid "Magic number used to check if sanity cleaning tasks should be run"
-#~ msgstr "éèèççäæææåæåè sanity æçäæ"
+#~ msgid "Sort contacts by:"
+#~ msgstr "æåéçääï"
 
-#~ 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 "name"
+#~ msgstr "åç"
 
-#~ msgid "Whether to show contacts that are offline in the contact list."
-#~ msgstr "æååéçäæåäéçéççéçäã"
+#~ msgid "status"
+#~ msgstr "çæ"
 
 #~ msgid "Show avatars"
 #~ msgstr "éçåéè"
@@ -3965,57 +4418,12 @@ 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 "éçäæåæåæå"
 
@@ -4027,290 +4435,6 @@ 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"
 
@@ -4441,9 +4565,6 @@ msgstr "äåäçåææéäççïæèçéæãèçäæåã
 #~ msgid "Contact Map View"
 #~ msgstr "éçäååæè"
 
-#~ msgid "%s"
-#~ msgstr "%s"
-
 #~ msgid "Select contacts to link"
 #~ msgstr "éåèéççéçä"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 421e66e..2594993 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-05-28 18:13+0800\n"
-"PO-Revision-Date: 2012-05-20 23:18+0800\n"
+"POT-Creation-Date: 2012-06-30 22:55+0800\n"
+"PO-Revision-Date: 2012-06-30 13:03+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
 "Language-Team: Chinese (traditional) <chinese-l10n googlegroups com>\n"
 "Language: zh_TW\n"
@@ -20,30 +20,450 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "äç Google TalkãFacebookãMSN èåäèåæååääåè"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "åæéçæç"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Empathy çéçèéè"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "åæéçæç"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "äç Google TalkãFacebookãMSN èåäèåæååääåè"
 
+#. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2523
+msgid "Messaging and VoIP Accounts"
+msgstr "èæè VoIP åè"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
 msgid "Manage Messaging and VoIP accounts"
 msgstr "ççèæè VoIP åè"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2516
-msgid "Messaging and VoIP Accounts"
-msgstr "èæè VoIP åè"
+#: ../data/org.gnome.Empathy.gschema.xml.h:1
+msgid "Connection managers should be used"
+msgstr "äçéççççå"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:2
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr "æåäçéççççåèåæçæéæéçã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:3
+msgid "Empathy should auto-connect on startup"
+msgstr "Empathy ååæèåéç"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:4
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Empathy æåæåååæèåçåæçåèã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:5
+msgid "Empathy should auto-away when idle"
+msgstr "Empathy çéçææèèåèçéé"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:6
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "Empathy æåæåäçèéçæèååæçééæåã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:7
+msgid "Empathy default download folder"
+msgstr "Empathy éèäèèæå"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:8
+msgid "The default folder to save file transfers in."
+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.h:10
+msgid "Magic number used to check if sanity cleaning tasks should be run"
+msgstr "éèèççäæææåæåè sanity æçäæ"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:11
+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 äçæèçäæææåæèåèæçäæãäçèäæè"
+"æåææéæééã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:12
+#: ../src/empathy-preferences.ui.h:1
+msgid "Show offline contacts"
+msgstr "éçéçéçä"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:13
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "æååéçäæåäéçéççéçäã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:14
+msgid "Show Balance in contact list"
+msgstr "æèçäæååéçéé"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:15
+msgid "Whether to show account balances in the contact list."
+msgstr "æåèåèçäæååéçåæééã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:16
+msgid "Hide main window"
+msgstr "éèäèç"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:17
+msgid "Hide the main window."
+msgstr "éèäèçã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:18
+msgid "Default directory to select an avatar image from"
+msgstr "çäéæåéèåççéèçé"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:19
+msgid "The last directory that an avatar image was chosen from."
+msgstr "äæéæåéèåçççéã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:20
+msgid "Open new chats in separate windows"
+msgstr "åååèçéåæçèå"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:21
+msgid "Always open a separate chat window for new chats."
+msgstr "æéçæåæçèåéåæçèåèçã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:22
+msgid "Display incoming events in the status area"
+msgstr "åçæååéçæåää"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:23
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr "åçæååéçæåääãåæäåççèïæåääæçæåççäçèã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:24
+msgid "The position for the chat window side pane"
+msgstr "èåèçåçæçäç"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:25
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "èåèçåçæçååäç (åäçåç)ã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:26
+msgid "Show contact groups"
+msgstr "éçéçäçç"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:27
+msgid "Whether to show groups in the contact list."
+msgstr "æåèåèçäæååéçççã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:28
+msgid "Use notification sounds"
+msgstr "äçéçéæ"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:29
+msgid "Whether to play a sound to notify of events."
+msgstr "æåææéæäéçæääççã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:30
+msgid "Disable sounds when away"
+msgstr "ççæçééæåçéæ"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:31
+msgid "Whether to play sound notifications when away or busy."
+msgstr "ççæçééæåçææåææéæéçã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:32
+msgid "Play a sound for incoming messages"
+msgstr "æåèææææéæ"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:33
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "æåææéæäéçææåèæã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:34
+msgid "Play a sound for outgoing messages"
+msgstr "éåèææææéæ"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:35
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "æåææéæäéçæéåèæã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:36
+msgid "Play a sound for new conversations"
+msgstr "çéåæçèèæææéæ"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:37
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "æåææéæäéçæçèèã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:38
+msgid "Play a sound when a contact logs in"
+msgstr "çéçäçåæææéæ"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:39
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "æåææéæäéçæéçäçåçèã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:40
+msgid "Play a sound when a contact logs out"
+msgstr "çæéçäçåæææéæ"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:41
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "æåææéæäéçæéçäçåçèã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:42
+msgid "Play a sound when we log in"
+msgstr "çæåçåæææéæ"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:43
+msgid "Whether to play a sound when logging into a network."
+msgstr "ççåæçèææåææéæã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:44
+msgid "Play a sound when we log out"
+msgstr "çæåçåæææéæ"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:45
+msgid "Whether to play a sound when logging out of a network."
+msgstr "ççåæçèææåææéæã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:46
+msgid "Enable popup notifications for new messages"
+msgstr "åçæèæçåååéç"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:47
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "çæåæèæææåéçåååéçã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:48
+msgid "Disable popup notifications when away"
+msgstr "ççæçééæåçåååéç"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:49
+msgid "Whether to show popup notifications when away or busy."
+msgstr "ççæçééæåçææåéçåååéçã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:50
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "åæèåèçååçéåååéç"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:51
+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.h:52
+msgid "Pop up notifications when a contact logs in"
+msgstr "çéçäçåæååéç"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:53
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "çéçääçææåéçåååéçã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:54
+msgid "Pop up notifications when a contact logs out"
+msgstr "çéçäçåæååéç"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:55
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "çéçäéçææåéçåååéçã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:56
+msgid "Use graphical smileys"
+msgstr "äçåçåèæçè"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:57
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "æååèèäçèæçèèæçåçååã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:58
+msgid "Show contact list in rooms"
+msgstr "åèååéçéçäæå"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:59
+msgid "Whether to show the contact list in chat rooms."
+msgstr "æååèååäéçéçäæåã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:60
+msgid "Chat window theme"
+msgstr "èåèçäæäé"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:61
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "çäéçåèåèçäèèçäæäéã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:62
+msgid "Chat window theme variant"
+msgstr "èåèçäæäéæå"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:63
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "çäåèåèçéçèèçäæäéæåã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:64
+msgid "Path of the Adium theme to use"
+msgstr "èäçç Adium äæäéèå"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:65
+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.h:66
+msgid "Enable WebKit Developer Tools"
+msgstr "åç WebKit éçèåå"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:67
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "æååç WebKit éçèååïäå Web Inspectorã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:68
+msgid "Inform other users when you are typing to them"
+msgstr "çææèåèæçåääçèæéçäå"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:69
+msgid ""
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr ""
+"æåèåéãæåäãæãåäæãçèåçæãèçåæãåééãçæåäåå"
+"éã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:70
+msgid "Use theme for chat rooms"
+msgstr "åèååäçäæäé"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:71
+msgid "Whether to use the theme for chat rooms."
+msgstr "æåçèååäçäæäéã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:72
+msgid "Spell checking languages"
+msgstr "æåææçèè"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:73
+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.h:74
+msgid "Enable spell checker"
+msgstr "åçæåææçå"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:75
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr "æåäæèåçèèææèåæçéåã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:76
+msgid "Nick completed character"
+msgstr "æçèéåå"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:77
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr "åççèåääçæçèé (tab) æèååæçäåçååã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:78
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Empathy èäçéçäçåéèåçèåèçåç"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:79
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "Empathy æåäçéçäåéèåçèåèçåçã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:80
+msgid "Last account selected in Join Room dialog"
+msgstr "äæåãååèååãåèçéåçåè"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:81
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "äæèååèååæéååèç D-Bus çäèåã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:82
+msgid "Camera device"
+msgstr "æåæèç"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:83
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "èçæèèéèçéèæåæèçïäï/dev/video0ã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:84
+msgid "Camera position"
+msgstr "æåæäç"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:85
+msgid "Position the camera preview should be during a call."
+msgstr "éèææåæéèæèææçäçã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:86
+msgid "Echo cancellation support"
+msgstr "åéæéææ"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:87
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "æåèåç Pulseaudio çåéæééæåã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:88
+msgid "Show hint about closing the main window"
+msgstr "ééäèçæéçæç"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:89
+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.h:90
+msgid "Empathy can publish the user's location"
+msgstr "Empathy åäçåäçèçäç"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:91
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Empathy æåèåäçèçäççåçäçéçäã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:92
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy åäåççèäææäç"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:93
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Empathy æåäççèäææäçã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:94
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy åäåçèåéèçèååèäææäç"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:95
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Empathy æåäçèåéèçèäææäçã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:96
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy åäåç GPS äææäç"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:97
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Empathy æåäç GPS äææäçã"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:98
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy æéääççæçå"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:99
+msgid ""
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "Empathy æååæéççççæääççæçåã"
 
 #: ../libempathy/empathy-ft-handler.c:737
 msgid "No reason was specified"
@@ -249,19 +669,19 @@ msgstr "æçèééè"
 msgid "Internal error"
 msgstr "åééè"
 
-#: ../libempathy/empathy-utils.c:533
+#: ../libempathy/empathy-utils.c:503
 msgid "People Nearby"
 msgstr "éèçä"
 
-#: ../libempathy/empathy-utils.c:538
+#: ../libempathy/empathy-utils.c:508
 msgid "Yahoo! Japan"
 msgstr "Yahoo! ææ"
 
-#: ../libempathy/empathy-utils.c:567
+#: ../libempathy/empathy-utils.c:537
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:568
+#: ../libempathy/empathy-utils.c:538
 msgid "Facebook Chat"
 msgstr "Facebook èå"
 
@@ -323,49 +743,56 @@ msgstr "%2$s åèäã%1$sãèååçåç (%3$s)"
 msgid "All accounts"
 msgstr "ææåè"
 
-#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-account-widget.c:680
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
 #: ../src/empathy-import-widget.c:323
 msgid "Account"
 msgstr "åè"
 
-#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget.c:681
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
 msgid "Password"
 msgstr "åç"
 
-#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:511
 msgid "Server"
 msgstr "äæå"
 
-#: ../libempathy-gtk/empathy-account-widget.c:685
+#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:529
 msgid "Port"
 msgstr "éæå"
 
-#: ../libempathy-gtk/empathy-account-widget.c:765
-#: ../libempathy-gtk/empathy-account-widget.c:817
+#: ../libempathy-gtk/empathy-account-widget.c:767
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:822
 #, c-format
 msgid "%s:"
 msgstr "%sï"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1424
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget.c:1434
 msgid "Username:"
 msgstr "äçèåçï"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1741
+#: ../libempathy-gtk/empathy-account-widget.c:1751
 msgid "A_pply"
 msgstr "åç(_A)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1770
+#: ../libempathy-gtk/empathy-account-widget.c:1780
 msgid "L_og in"
 msgstr "çå(_O)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1840
+#: ../libempathy-gtk/empathy-account-widget.c:1850
 msgid "This account already exists on the server"
 msgstr "æåèåçååéåäæåä"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1844
+#: ../libempathy-gtk/empathy-account-widget.c:1854
 msgid "Create a new account on the server"
 msgstr "åéåäæåäåçæçåè"
 
@@ -374,137 +801,133 @@ 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:2251
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 #, 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:2277
+#: ../libempathy-gtk/empathy-account-widget.c:2297
 #, c-format
 msgid "%s Account"
 msgstr "%s åè"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2281
+#: ../libempathy-gtk/empathy-account-widget.c:2301
 msgid "New account"
 msgstr "æååè"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>çäï</b>MyScreenName"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+msgid "Pass_word"
+msgstr "åç(_W)"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "éé"
+msgid "Screen _Name"
+msgstr "èååç(_N)"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>çäï</b>MyScreenName"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "åç(_W)ï"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "èäåç"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-msgid "Remember Password"
-msgstr "èäåç"
+msgid "_Port"
+msgstr "éæå(_P)"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../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"
-msgstr "èäåç"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "èååç(_N)ï"
+msgid "_Server"
+msgstr "äæå(_S)"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "æç AIM åçæï"
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "éé"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "æç AIM èååçæï"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "éæå(_P)ï"
+msgid "What is your AIM password?"
+msgstr "æç AIM åçæï"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Server:"
-msgstr "äæå(_S)ï"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
+msgid "Remember Password"
+msgstr "èäåç"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>çäï</b>username"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
+msgid "Login I_D"
+msgstr "çå I_D"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
-msgid "Login I_D:"
-msgstr "çå I_Dï"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>çäï</b>username"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "æç GroupWise äçè ID æï"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "æç GroupWise åçæï"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
-msgid "<b>Example:</b> 123456789"
-msgstr "<b>çäï</b>123456789"
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN"
+msgstr "ICQ _UIN"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
-msgid "Ch_aracter set:"
-msgstr "åé(_A)ï"
+msgid "<b>Example:</b> 123456789"
+msgstr "<b>çäï</b>123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ _UINï"
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+msgid "Ch_aracter set"
+msgstr "åé(_A)"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "æç ICQ UIN æï"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "æç ICQ åçæï"
 
@@ -535,107 +958,79 @@ msgstr "éé"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.c:253
 msgid "None"
-msgstr "ç"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:1
-msgid "Addâ"
-msgstr "ååâ"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-msgid "Character set:"
-msgstr "åéï"
-
-#. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Down"
-msgstr "åä"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
-msgid ""
-"Most IRC servers don't need a password, so if you're not sure, don't enter a "
-"password."
-msgstr "ååæç IRC æåäéèåçïæäèæäçåçèïèäèèååçã"
+msgstr "ç"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 msgid "Network"
 msgstr "çè"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
-msgid "Network:"
-msgstr "çèï"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
-msgid "Nickname:"
-msgstr "æçï"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Password:"
-msgstr "åçï"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
-msgid "Quit message:"
-msgstr "ééèæï"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Character set"
+msgstr "åé"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "Real name:"
-msgstr "çåååï"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Addâ"
+msgstr "ååâ"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "çé"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
-msgid "Servers"
-msgstr "äæå"
-
 #. Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Up"
 msgstr "åä"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
-msgid "What is your IRC nickname?"
-msgstr "æç IRC æçæï"
+#. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+msgid "Down"
+msgstr "åä"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:19
-msgid "Which IRC network?"
-msgstr "åå IRC çèï"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+msgid "Servers"
+msgstr "äæå"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user gmail com"
-msgstr "<b>çäï</b>user gmail com"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr "ååæç IRC æåäéèåçïæäèæäçåçèïèäèèååçã"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user jabber org"
-msgstr "<b>çäï</b>user jabber org"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+msgid "Nickname"
+msgstr "æç"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "èæåå (TLS/SSL)(_Y)"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "Quit message"
+msgstr "ééèæ"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "åç SSL æèéè(_G)"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
+msgid "Real name"
+msgstr "çååå"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "èèäæåèåå"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15
+msgid "Username"
+msgstr "äçèåç"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "ååæ(_T)ï"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
+msgid "Which IRC network?"
+msgstr "åå IRC çèï"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "èæ(_U)ï"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
+msgid "What is your IRC nickname?"
+msgstr "æç IRC æçæï"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "æç Facebook äçèåçæï"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -647,182 +1042,209 @@ msgstr ""
 "åææéææ Facebook äçèåçïèäç <a href=\"http://www.facebook.com/";
 "username/\">æçé</a> äéçäåã"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "äçèç SS_L"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "æç Facebook åçæï"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "æç Facebook äçèåçæï"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "æç Google ID æï"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user gmail com"
+msgstr "<b>çäï</b>user gmail com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "æç Google åçæï"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user jabber org"
+msgstr "<b>çäï</b>user jabber org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "åç SSL æèéè(_G)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty"
+msgstr "ååæ(_T)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce"
+msgstr "èæ(_U)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "èæåå (TLS/SSL)(_Y)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Override server settings"
+msgstr "èèäæåèåå"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Use old SS_L"
+msgstr "äçèç SS_L"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "æç Jabber ID æï"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "æç Jabber åçæï"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "ææèç Jabber ID æï"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "æç Jabber åçæï"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "ææèç Jabber åçæï"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user hotmail com"
 msgstr "<b>çäï</b>user hotmail com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "æç Windows Live ID æï"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "æç Windows Live åçæï"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
+msgid "Nic_kname"
+msgstr "æç(_K)"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "éåäçäå(_M)ï"
+msgid "_Last Name"
+msgstr "å(_L)"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
-msgid "Nic_kname:"
-msgstr "æç(_K)ï"
+msgid "_First Name"
+msgstr "å(_F)"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
-msgid "_First Name:"
-msgstr "å(_F)ï"
+msgid "_Published Name"
+msgstr "çåçåç(_P)"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
-msgid "_Jabber ID:"
-msgstr "_Jabber IDï"
+msgid "_Jabber ID"
+msgstr "_Jabber ID"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "å(_L)ï"
+msgid "E-_mail address"
+msgstr "éåäçäå(_M)"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "çåçåç(_P)ï"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username"
+msgstr "äçèåç(_U)"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user my sip server"
 msgstr "<b>çäï</b>user my sip server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "èèäçèåçï"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "æççå"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "èåæç STUN äæå"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "äçéååèäææåèèèåéè(_L)"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "åç TLS éè"
+msgid "NAT Traversal Options"
+msgstr "NAT åèéé"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "éé (ç)"
+msgid "Proxy Options"
+msgstr "Proxy éé"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "äæäæçéé"
+msgid "Miscellaneous Options"
+msgstr "éé"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Local IP Address:"
-msgstr "åå IP äåï"
+msgid "STUN Server"
+msgstr "STUN äæå"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Loose Routing"
-msgstr "åéèç"
+msgid "Discover the STUN server automatically"
+msgstr "èåæç STUN äæå"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Mechanism:"
-msgstr "æåï"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "Miscellaneous Options"
-msgstr "éé"
+msgid "Discover Binding"
+msgstr "æççå"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-msgid "NAT Traversal Options"
-msgstr "NAT åèéé"
+msgid "Keep-Alive Options"
+msgstr "äæäæçéé"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+msgid "Mechanism"
+msgstr "æå"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Port:"
-msgstr "éæåï"
+msgid "Interval (seconds)"
+msgstr "éé (ç)"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Proxy Options"
-msgstr "Proxy éé"
+msgid "Authentication username"
+msgstr "èèäçèåç"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-msgid "STUN Server:"
-msgstr "STUN äæåï"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport"
+msgstr "åè"
 
-#: ../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:18
+msgid "Loose Routing"
+msgstr "åéèç"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Transport:"
-msgstr "åééèåï"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+msgid "Ignore TLS Errors"
+msgstr "åç TLS éè"
 
-#: ../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:21
+msgid "Local IP Address"
+msgstr "åå IP äå"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP login ID?"
+msgstr "ææèç SIP çå ID æï"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "What is your SIP account password?"
 msgstr "æç SIP åèåçæï"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "What is your SIP login ID?"
-msgstr "ææèç SIP çå ID æï"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "åç(_W)ï"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
-msgid "_Username:"
-msgstr "äçèåç(_U)ï"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo I_Dï"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "åçæèèèååéè(_G)"
 
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "èååæåååèè(_R)ï"
+
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "What is your Yahoo! ID?"
-msgstr "æç Yahoo! ID æï"
+msgid "Ch_aracter set:"
+msgstr "åé(_A)ï"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "What is your Yahoo! password?"
-msgstr "æç Yahoo! åçæï"
+msgid "_Port:"
+msgstr "éæå(_P)ï"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Yahoo I_Dï"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
+msgid "What is your Yahoo! ID?"
+msgstr "æç Yahoo! ID æï"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "èååæåååèè(_R)ï"
+msgid "What is your Yahoo! password?"
+msgstr "æç Yahoo! åçæï"
 
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
@@ -1025,7 +1447,7 @@ msgstr "æåä"
 msgid "unknown"
 msgstr "äæ"
 
-#: ../libempathy-gtk/empathy-chat.c:1682 ../src/empathy-chat-window.c:940
+#: ../libempathy-gtk/empathy-chat.c:1682 ../src/empathy-chat-window.c:942
 msgid "Topic:"
 msgstr "äéï"
 
@@ -1076,11 +1498,11 @@ msgstr "åé(_S)"
 msgid "_Spelling Suggestions"
 msgstr "æååè(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2559
+#: ../libempathy-gtk/empathy-chat.c:2576
 msgid "Failed to retrieve recent logs"
 msgstr "çæååæèçæè"
 
-#: ../libempathy-gtk/empathy-chat.c:2698
+#: ../libempathy-gtk/empathy-chat.c:2720
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s åæç"
@@ -1088,12 +1510,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:2705
+#: ../libempathy-gtk/empathy-chat.c:2727
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s è %2$s èåå"
 
-#: ../libempathy-gtk/empathy-chat.c:2708
+#: ../libempathy-gtk/empathy-chat.c:2730
 #, c-format
 msgid "%s was kicked"
 msgstr "%s èèå"
@@ -1101,17 +1523,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:2716
+#: ../libempathy-gtk/empathy-chat.c:2738
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s è %2$s èçéåå"
 
-#: ../libempathy-gtk/empathy-chat.c:2719
+#: ../libempathy-gtk/empathy-chat.c:2741
 #, c-format
 msgid "%s was banned"
 msgstr "%s èèçéåå"
 
-#: ../libempathy-gtk/empathy-chat.c:2723
+#: ../libempathy-gtk/empathy-chat.c:2745
 #, c-format
 msgid "%s has left the room"
 msgstr "%s åçééæèåå"
@@ -1121,17 +1543,17 @@ msgstr "%s åçééæèåå"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2732
+#: ../libempathy-gtk/empathy-chat.c:2754
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2757
+#: ../libempathy-gtk/empathy-chat.c:2779
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s åçååæèåå"
 
-#: ../libempathy-gtk/empathy-chat.c:2782
+#: ../libempathy-gtk/empathy-chat.c:2804
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s çåèçç %s"
@@ -1139,55 +1561,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: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
+#: ../libempathy-gtk/empathy-chat.c:2991 ../src/empathy-event-manager.c:1167
+#: ../src/empathy-call-window.c:1468 ../src/empathy-call-window.c:1518
+#: ../src/empathy-call-window.c:2571
 msgid "Disconnected"
 msgstr "åæç"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3633
+#: ../libempathy-gtk/empathy-chat.c:3666
 msgid "Would you like to store this password?"
 msgstr "ææèååæåçï"
 
-#: ../libempathy-gtk/empathy-chat.c:3639
+#: ../libempathy-gtk/empathy-chat.c:3672
 msgid "Remember"
 msgstr "èä"
 
-#: ../libempathy-gtk/empathy-chat.c:3649
+#: ../libempathy-gtk/empathy-chat.c:3682
 msgid "Not now"
 msgstr "çåäè"
 
-#: ../libempathy-gtk/empathy-chat.c:3693
+#: ../libempathy-gtk/empathy-chat.c:3726
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "éè"
 
-#: ../libempathy-gtk/empathy-chat.c:3697
+#: ../libempathy-gtk/empathy-chat.c:3730
 msgid "Wrong password; please try again:"
 msgstr "åçéèïèåèäæï"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3827
+#: ../libempathy-gtk/empathy-chat.c:3860
 msgid "This room is protected by a password:"
 msgstr "æèåååèåçäèï"
 
-#: ../libempathy-gtk/empathy-chat.c:3854
+#: ../libempathy-gtk/empathy-chat.c:3887
 #: ../src/empathy-new-chatroom-dialog.c:780
 msgid "Join"
 msgstr "åå"
 
-#: ../libempathy-gtk/empathy-chat.c:4046 ../src/empathy-event-manager.c:1188
+#: ../libempathy-gtk/empathy-chat.c:4079 ../src/empathy-event-manager.c:1188
 msgid "Connected"
 msgstr "æåéç"
 
-#: ../libempathy-gtk/empathy-chat.c:4101
+#: ../libempathy-gtk/empathy-chat.c:4134
 msgid "Conversation"
 msgstr "èè"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4106
+#: ../libempathy-gtk/empathy-chat.c:4139
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1219,10 +1641,9 @@ msgstr "çèåéçèçä"
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
 #: ../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
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
 msgstr "åèï"
 
@@ -1277,17 +1698,17 @@ msgid_plural "_Report these contacts as abusive"
 msgstr[0] "ååéäèçäæçåè(_R)"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "çååæå(_L)"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "èéèæ"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "åéäçè(_B)"
 
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "çååæå(_L)"
+
 #. Title
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:517
 msgid "Search contacts"
@@ -1313,168 +1734,168 @@ msgstr "æçèæ"
 msgid "Please let me see when you're online. Thanks!"
 msgstr "çæäçæèèæçéãæèï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:566
+#: ../libempathy-gtk/empathy-contact-widget.c:560
 #: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "ééï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:746
+#: ../libempathy-gtk/empathy-contact-widget.c:738
 #: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "åå ISO çï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:748
+#: ../libempathy-gtk/empathy-contact-widget.c:740
 #: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "ååï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:750
+#: ../libempathy-gtk/empathy-contact-widget.c:742
 #: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "åï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:752
+#: ../libempathy-gtk/empathy-contact-widget.c:744
 #: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "åï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:754
+#: ../libempathy-gtk/empathy-contact-widget.c:746
 #: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "ååï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:756
+#: ../libempathy-gtk/empathy-contact-widget.c:748
 #: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "ééåèï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:758
+#: ../libempathy-gtk/empathy-contact-widget.c:750
 #: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "èï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:760
+#: ../libempathy-gtk/empathy-contact-widget.c:752
 #: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "åçï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:762
+#: ../libempathy-gtk/empathy-contact-widget.c:754
 #: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "æåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:764
+#: ../libempathy-gtk/empathy-contact-widget.c:756
 #: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "åï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:766
+#: ../libempathy-gtk/empathy-contact-widget.c:758
 #: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "æåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:768
+#: ../libempathy-gtk/empathy-contact-widget.c:760
 #: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "æèï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:770
+#: ../libempathy-gtk/empathy-contact-widget.c:762
 #: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URIï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:772
+#: ../libempathy-gtk/empathy-contact-widget.c:764
 #: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "æçåççï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:774
+#: ../libempathy-gtk/empathy-contact-widget.c:766
 #: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "éèï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:776
+#: ../libempathy-gtk/empathy-contact-widget.c:768
 #: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "åçèå (åå)ï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:778
+#: ../libempathy-gtk/empathy-contact-widget.c:770
 #: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "æåèå (åå)ï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:780
+#: ../libempathy-gtk/empathy-contact-widget.c:772
 #: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "éåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:782
+#: ../libempathy-gtk/empathy-contact-widget.c:774
 #: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "æäï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:784
+#: ../libempathy-gtk/empathy-contact-widget.c:776
 #: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "çåéåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:786
+#: ../libempathy-gtk/empathy-contact-widget.c:778
 #: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "äææææï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:788
+#: ../libempathy-gtk/empathy-contact-widget.c:780
 #: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "çåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:790
+#: ../libempathy-gtk/empathy-contact-widget.c:782
 #: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "çåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:792
+#: ../libempathy-gtk/empathy-contact-widget.c:784
 #: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "çåï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:845
-#: ../libempathy-gtk/empathy-contact-widget.c:860
+#: ../libempathy-gtk/empathy-contact-widget.c:837
+#: ../libempathy-gtk/empathy-contact-widget.c:852
 #: ../libempathy-gtk/empathy-individual-widget.c:593
 #: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:39
 msgid "Location"
 msgstr "äç"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:862
+#: ../libempathy-gtk/empathy-contact-widget.c:854
 #: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%sï%s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:914
+#: ../libempathy-gtk/empathy-contact-widget.c:906
 #: ../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:996
+#: ../libempathy-gtk/empathy-contact-widget.c:988
 #: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "åååéè"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1052
+#: ../libempathy-gtk/empathy-contact-widget.c:1044
 #: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "çæåååéè"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1454
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
 msgid "Personal Details"
 msgstr "åäçç"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1457
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Contact Details"
 msgstr "éçäèçèæ"
 
@@ -1505,6 +1926,10 @@ msgstr "çæ"
 msgid "Last seen:"
 msgstr "äæçèï"
 
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "äæåï"
+
 #: ../libempathy-gtk/empathy-contactinfo-utils.c:115
 msgid "Connected from:"
 msgstr "åéæåï"
@@ -1543,43 +1968,39 @@ msgstr "éé"
 msgid "parcel"
 msgstr "åè"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>äç</b> æ (date)\t"
-
-#. Alias
+#. Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1293
-msgid "Alias:"
-msgstr "ååï"
+msgid "Identifier"
+msgstr "èåèå"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "çæçèè"
+msgid "Alias"
+msgstr "åå"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "çæçï"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Information requestedâ"
+msgstr "èèåèæâ"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>äç</b> æ (date)\t"
 
-#. Identifier to connect to Instant Messaging network
-#. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1502
-msgid "Identifier:"
-msgstr "èåèåï"
+msgid "Client Information"
+msgstr "çæçèè"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
-msgid "Information requestedâ"
-msgstr "èèåèæâ"
+msgid "OS"
+msgstr "OS"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:10
-msgid "OS:"
-msgstr "OSï"
+msgid "Version"
+msgstr "çæ"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:11
-msgid "Version:"
-msgstr "çæï"
+msgid "Client"
+msgstr "çæç"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:327
 msgid "Groups"
@@ -1627,147 +2048,157 @@ 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:172
+#: ../libempathy-gtk/empathy-individual-menu.c:174
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:344
+#: ../libempathy-gtk/empathy-individual-menu.c:349
 msgid "Select account to use to place the call"
 msgstr "éåèçäæçéèçåè"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:348
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:353
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "éè"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:413
+#: ../libempathy-gtk/empathy-individual-menu.c:418
 msgid "Mobile"
 msgstr "èåéè"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:415
+#: ../libempathy-gtk/empathy-individual-menu.c:420
 msgid "Work"
 msgstr "åä"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:417
+#: ../libempathy-gtk/empathy-individual-menu.c:422
 msgid "HOME"
 msgstr "äå"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:658
+#: ../libempathy-gtk/empathy-individual-menu.c:663
 msgid "_Block Contact"
 msgstr "åéèçä(_B)"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:719
+msgid "Delete and _Block"
+msgstr "åéäåé(_B)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:781
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "æåæèçééçäã%sãï"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:790
+#, 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-menu.c:801
+msgid "Removing contact"
+msgstr "æåçééçä"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:865
+#: ../libempathy-gtk/empathy-individual-view.c:2454
+msgid "_Remove"
+msgstr "çé(_R)"
+
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-individual-menu.c:1228
 #: ../libempathy-gtk/empathy-new-message-dialog.c:318
 msgid "_Chat"
 msgstr "èå(_C)"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
 #: ../libempathy-gtk/empathy-new-message-dialog.c:312
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1085
+#: ../libempathy-gtk/empathy-individual-menu.c:1296
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "èééè(_A)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1118
+#: ../libempathy-gtk/empathy-individual-menu.c:1329
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "èèéè(_V)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../libempathy-gtk/empathy-individual-menu.c:1370
+#: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "_Previous Conversations"
 msgstr "éåèè(_P)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1188
+#: ../libempathy-gtk/empathy-individual-menu.c:1399
 msgid "Send File"
 msgstr "åéææ"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1218
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgid "Share My Desktop"
 msgstr "åäæçæé"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-menu.c:1455
 #: ../libempathy-gtk/empathy-individual-widget.c:1357
 msgid "Favorite"
 msgstr "åå"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1263
+#: ../libempathy-gtk/empathy-individual-menu.c:1474
 msgid "gnome-contacts not installed"
 msgstr "gnome-contacts åæåè"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1266
+#: ../libempathy-gtk/empathy-individual-menu.c:1477
 msgid "Please install gnome-contacts to access contacts details."
 msgstr "èåè gnome-contacts äååèçäççã"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1397
+#: ../libempathy-gtk/empathy-individual-menu.c:1608
 msgid "Infor_mation"
 msgstr "èè(_M)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1446
+#: ../libempathy-gtk/empathy-individual-menu.c:1657
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "çè(_E)"
 
 #. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1562
-#: ../src/empathy-chat-window.c:1211
+#: ../libempathy-gtk/empathy-individual-menu.c:1773
+#: ../src/empathy-chat-window.c:1213
 msgid "Inviting you to this room"
 msgstr "éèæåéåèåå"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1608
+#: ../libempathy-gtk/empathy-individual-menu.c:1819
 msgid "_Invite to Chat Room"
 msgstr "éèåèåå(_I)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1804
+#: ../libempathy-gtk/empathy-individual-menu.c:2015
 msgid "_Add Contactâ"
 msgstr "ååèçä(_A)â"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2364
-msgid "Delete and _Block"
-msgstr "åéäåé(_B)"
-
-#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2374
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "æåæèçéççã%sãï"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2402
+#: ../libempathy-gtk/empathy-individual-view.c:2377
 msgid "Removing group"
 msgstr "æåçéçç"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2470
+#: ../libempathy-gtk/empathy-individual-view.c:2445
 msgid "Re_name"
 msgstr "éæåå"
 
-#. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2479
-#: ../libempathy-gtk/empathy-individual-view.c:2683
-msgid "_Remove"
-msgstr "çé(_R)"
-
-#: ../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: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ãåïèææéæçéæææææéçèçççèç"
-"äã"
+#. Alias
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "ååï"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2577
-msgid "Removing contact"
-msgstr "æåçééçä"
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
+msgid "Identifier:"
+msgstr "èåèåï"
 
 #: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
@@ -1779,7 +2210,7 @@ msgstr[0] "éçèççåå %u äèçä"
 msgid "<b>Location</b> at (date)"
 msgstr "<b>äç</b> æ (ææ)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "åæææèåèçäç"
 
@@ -1906,7 +2337,7 @@ msgid "Text chats"
 msgstr "æåèå"
 
 #: ../libempathy-gtk/empathy-log-window.c:3035
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:29
 msgid "Calls"
 msgstr "éè"
 
@@ -1939,40 +2370,40 @@ msgid "Delete from:"
 msgstr "åéåï"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">æåèå...</span>"
+msgid "_File"
+msgstr "ææ(_F)"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3 ../src/empathy-preferences.ui.h:4
-msgid "Chat"
-msgstr "èå"
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+msgid "_Edit"
+msgstr "çè(_E)"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "åéæææå..."
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "åäææ"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-msgid "Video"
-msgstr "èè"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19 ../src/empathy-preferences.ui.h:11
+msgid "Chat"
+msgstr "èå"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-msgid "_Edit"
-msgstr "çè(_E)"
+#: ../src/empathy-call-window.ui.h:24
+msgid "Video"
+msgstr "èè"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "ææ(_F)"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "éé 2"
 
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">æåèå...</span>"
+
 #: ../libempathy-gtk/empathy-new-message-dialog.c:82
 msgid "The contact is offline"
 msgstr "èçäåçéç"
@@ -2104,7 +2535,7 @@ msgstr "èèèæâ"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:588
+#: ../libempathy-gtk/empathy-protocol-chooser.c:597
 #, c-format
 msgid "New %s account"
 msgstr "æå %s åè"
@@ -2114,20 +2545,20 @@ msgid "Find:"
 msgstr "åæï"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "æåååå(_C)"
+msgid "_Previous"
+msgstr "ääå(_P)"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "æäåèå"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "ääå(_N)"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "æåååå(_C)"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "ääå(_P)"
+msgid "Phrase not found"
+msgstr "æäåèå"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2173,12 +2604,12 @@ msgstr "èééèçæ"
 msgid "Edit Custom Messages"
 msgstr "çèèèèæ"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1051
+#: ../libempathy-gtk/empathy-theme-adium.c:1056
 #, c-format
 msgid "Message edited at %s"
 msgstr "èæçèæ %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1757
+#: ../libempathy-gtk/empathy-theme-adium.c:1776
 msgid "Normal"
 msgstr "äè"
 
@@ -2472,11 +2903,11 @@ msgstr "éå..."
 msgid "_Select"
 msgstr "éå(_S)"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:201
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:225
 msgid "No error message"
 msgstr "ææéèèæ"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:274
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:298
 msgid "Instant Message (Empathy)"
 msgstr "åæéè (Empathy)"
 
@@ -2568,7 +2999,7 @@ msgstr "æèæç %s åèçéçäæåæååã"
 msgid "Your new account has not been saved yet."
 msgstr "åæååæçæåèã"
 
-#: ../src/empathy-accounts-dialog.c:403 ../src/empathy-call-window.c:1265
+#: ../src/empathy-accounts-dialog.c:403 ../src/empathy-call-window.c:1268
 msgid "Connectingâ"
 msgstr "éçäâ"
 
@@ -2615,20 +3046,20 @@ msgstr "çæåäæåæåæçåäèèã"
 msgid "Go online to edit your personal information."
 msgstr "äçäçèæçåäèèã"
 
-#: ../src/empathy-accounts-dialog.c:855
+#: ../src/empathy-accounts-dialog.c:862
 msgid "_Edit Connection Parameters..."
 msgstr "çèéçåæ(_E)..."
 
-#: ../src/empathy-accounts-dialog.c:1351
+#: ../src/empathy-accounts-dialog.c:1358
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "æåæèåæçéèäçéçç %sï"
 
-#: ../src/empathy-accounts-dialog.c:1355
+#: ../src/empathy-accounts-dialog.c:1362
 msgid "This will not remove your account on the server."
 msgstr "éäæçéäæåäçæçåèã"
 
-#: ../src/empathy-accounts-dialog.c:1560
+#: ../src/empathy-accounts-dialog.c:1567
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2637,24 +3068,24 @@ msgstr ""
 "ææåçèæãçåèççï"
 
 #. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1751
+#: ../src/empathy-accounts-dialog.c:1758
 msgid "_Enabled"
 msgstr "ååç(_E)"
 
 #. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1774
+#: ../src/empathy-accounts-dialog.c:1781
 msgid "Rename"
 msgstr "éæåå"
 
-#: ../src/empathy-accounts-dialog.c:2190
+#: ../src/empathy-accounts-dialog.c:2197
 msgid "_Skip"
 msgstr "çé(_S)"
 
-#: ../src/empathy-accounts-dialog.c:2194
+#: ../src/empathy-accounts-dialog.c:2201
 msgid "_Connect"
 msgstr "éæ(_C)"
 
-#: ../src/empathy-accounts-dialog.c:2373
+#: ../src/empathy-accounts-dialog.c:2380
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2662,14 +3093,14 @@ msgstr ""
 "æååéééåèçïéææææ\n"
 "ææåçèæãçåèççï"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
+msgid "_Importâ"
+msgstr "åå(_I)â"
+
+#: ../src/empathy-accounts-dialog.ui.h:4
 msgid "Loading account information"
 msgstr "æåèååèèè"
 
-#: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol backends installed"
-msgstr "åæåèéèåååççå"
-
 #: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
@@ -2677,8 +3108,8 @@ msgid ""
 msgstr "èååæçåèïæåéååèæåæçåçéèåååççåã"
 
 #: ../src/empathy-accounts-dialog.ui.h:6
-msgid "_Importâ"
-msgstr "åå(_I)â"
+msgid "No protocol backends installed"
+msgstr "åæåèéèåååççå"
 
 #: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
@@ -2688,136 +3119,128 @@ msgstr "- Empathy èèçæç"
 msgid "Empathy authentication client"
 msgstr "Empathy èèçæç"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:1
-msgid "Audio"
-msgstr "éè"
+#: ../src/empathy-call-window.ui.h:1
+msgid "_Call"
+msgstr "éè(_C)"
 
 #: ../src/empathy-call-window.ui.h:3
-msgid "Decoding Codec:"
-msgstr "èçççèçåï"
+msgid "_Microphone"
+msgstr "éåé(_M)"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "åçæåæ"
+msgid "_Camera"
+msgstr "æåæ(_C)"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "éçæèç"
+msgid "_Settings"
+msgstr "èåå(_S)"
 
 #: ../src/empathy-call-window.ui.h:6
-msgid "Encoding Codec:"
-msgstr "ççççèçåï"
+msgid "_View"
+msgstr "æè(_V)"
 
-#: ../src/empathy-call-window.ui.h:7
-msgid "Hang up"
-msgstr "ææ"
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+msgid "_Help"
+msgstr "æå(_H)"
 
-#: ../src/empathy-call-window.ui.h:8
-msgid "Hang up current call"
-msgstr "ææçåéè"
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+msgid "_Contents"
+msgstr "åå(_C)"
 
 #: ../src/empathy-call-window.ui.h:9
-msgid "Local Candidate:"
-msgstr "ææåéï"
+msgid "_Debug"
+msgstr "åé(_D)"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "åææåå"
+msgid "Swap camera"
+msgstr "äææåæ"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "åææåå"
 
 #: ../src/empathy-call-window.ui.h:12
-msgid "Remote Candidate:"
-msgstr "éçåéï"
+msgid "Maximise me"
+msgstr "åææåå"
 
 #: ../src/empathy-call-window.ui.h:13
-msgid "Send Audio"
-msgstr "åééè"
+msgid "Disable camera"
+msgstr "åçæåæ"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "åéèè"
+msgid "Hang up"
+msgstr "ææ"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "éçæèç"
+msgid "Hang up current call"
+msgstr "ææçåéè"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "èèéè"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "éåèèéè"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "éåéèéè"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "äææåæ"
+#: ../src/empathy-call-window.ui.h:20
+msgid "Show dialpad"
+msgstr "éçæèç"
 
-#: ../src/empathy-call-window.ui.h:19
-msgid "Toggle audio transmission"
-msgstr "åæéèåæ"
+#: ../src/empathy-call-window.ui.h:21
+msgid "Display the dialpad"
+msgstr "éçæèç"
 
-#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:22
 msgid "Toggle video transmission"
 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
-msgid "_Call"
-msgstr "éè(_C)"
+msgid "Toggle audio transmission"
+msgstr "åæéèåæ"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "æåæ(_C)"
+msgid "Encoding Codec:"
+msgstr "ççççèçåï"
 
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-msgid "_Contents"
-msgstr "åå(_C)"
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-call-window.c:2523
+#: ../src/empathy-call-window.c:2524 ../src/empathy-call-window.c:2525
+#: ../src/empathy-call-window.c:2526
+msgid "Unknown"
+msgstr "äæ"
 
 #: ../src/empathy-call-window.ui.h:27
-msgid "_Debug"
-msgstr "åé(_D)"
-
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-msgid "_Help"
-msgstr "æå(_H)"
+msgid "Decoding Codec:"
+msgstr "èçççèçåï"
 
-#: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "éåé(_M)"
+#: ../src/empathy-call-window.ui.h:28
+msgid "Remote Candidate:"
+msgstr "éçåéï"
 
-#: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "èåå(_S)"
+#: ../src/empathy-call-window.ui.h:29
+msgid "Local Candidate:"
+msgstr "ææåéï"
 
-#: ../src/empathy-call-window.ui.h:32
-msgid "_View"
-msgstr "æè(_V)"
+#: ../src/empathy-call-window.ui.h:30 ../src/empathy-preferences.ui.h:28
+msgid "Audio"
+msgstr "éè"
 
-#: ../src/empathy-chat-window.c:286
+#: ../src/empathy-chat-window.c:288
 msgid "Close this window?"
 msgstr "èéééåèçï"
 
-#: ../src/empathy-chat-window.c:291
+#: ../src/empathy-chat-window.c:293
 #, 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:302
+#: ../src/empathy-chat-window.c:304
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -2828,122 +3251,122 @@ msgid_plural ""
 msgstr[0] ""
 "ééæèçæéé %u åèååãæåçæææåäåçèæïééæåæåèã"
 
-#: ../src/empathy-chat-window.c:311
+#: ../src/empathy-chat-window.c:313
 #, c-format
 msgid "Leave %s?"
 msgstr "éé %sï"
 
-#: ../src/empathy-chat-window.c:312
+#: ../src/empathy-chat-window.c:314
 msgid ""
 "You will not receive any further messages from this chat room until you "
 "rejoin it."
 msgstr "æåçæææåæèååäåçèæïééæåæåèã"
 
-#: ../src/empathy-chat-window.c:331
+#: ../src/empathy-chat-window.c:333
 msgid "Close window"
 msgstr "ééèç"
 
-#: ../src/empathy-chat-window.c:331
+#: ../src/empathy-chat-window.c:333
 msgid "Leave room"
 msgstr "ééèåå"
 
-#: ../src/empathy-chat-window.c:660 ../src/empathy-chat-window.c:680
+#: ../src/empathy-chat-window.c:662 ../src/empathy-chat-window.c:682
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d åæè)"
 
-#: ../src/empathy-chat-window.c:672
+#: ../src/empathy-chat-window.c:674
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (èåä %u å)"
 
-#: ../src/empathy-chat-window.c:688
+#: ../src/empathy-chat-window.c:690
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (äèåääç %d åæè)"
 
-#: ../src/empathy-chat-window.c:697
+#: ../src/empathy-chat-window.c:699
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (äèææäç %d åæè)"
 
-#: ../src/empathy-chat-window.c:912
+#: ../src/empathy-chat-window.c:914
 msgid "SMS:"
 msgstr "SMSï"
 
-#: ../src/empathy-chat-window.c:922
+#: ../src/empathy-chat-window.c:924
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "æååé %d åèæ"
 
-#: ../src/empathy-chat-window.c:944
+#: ../src/empathy-chat-window.c:946
 msgid "Typing a message."
 msgstr "æåèåèæã"
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "æé(_L)"
+msgid "_Conversation"
+msgstr "èè(_C)"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "éçä(_O)"
+msgid "C_lear"
+msgstr "æé(_L)"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "æåèæçè(_S)"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "ååçèåå(_F)"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participantâ"
-msgstr "éèåè(_P)â"
+msgid "Notify for All Messages"
+msgstr "ææèæééç"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "ååéåç(_L)"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "éçéçäæå(_S)"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "ååéåç(_R)"
+msgid "Invite _Participantâ"
+msgstr "éèåè(_P)â"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "ææèæééç"
+msgid "C_ontact"
+msgstr "éçä(_O)"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "èè(_C)"
+msgid "_Tabs"
+msgstr "åé(_T)"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "åéåé(_D)"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "ååçèåå(_F)"
+msgid "_Previous Tab"
+msgstr "äååé(_P)"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "äååé(_N)"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "äååé(_P)"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "ååééçåé(_U)"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "éçéçäæå(_S)"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "ååéåç(_L)"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "åé(_T)"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "ååéåç(_R)"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "ååééçåé(_U)"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "åéåé(_D)"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -2957,7 +3380,7 @@ msgstr "èåå"
 msgid "Auto-Connect"
 msgstr "èåéç"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "ççååçèåå"
 
@@ -2965,7 +3388,7 @@ msgstr "ççååçèåå"
 msgid "Incoming video call"
 msgstr "ååçèèéè"
 
-#: ../src/empathy-event-manager.c:510 ../src/empathy-call-window.c:1482
+#: ../src/empathy-event-manager.c:510 ../src/empathy-call-window.c:1485
 msgid "Incoming call"
 msgstr "äé"
 
@@ -2980,7 +3403,7 @@ msgid "%s is calling you. Do you want to answer?"
 msgstr "%s èèæéèéèãææåèæèï"
 
 #: ../src/empathy-event-manager.c:518 ../src/empathy-event-manager.c:915
-#: ../src/empathy-call-window.c:1488
+#: ../src/empathy-call-window.c:1491
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s çäé"
@@ -3029,7 +3452,7 @@ msgstr "%s æéèæåå %s"
 msgid "You have been invited to join %s"
 msgstr "æèéèåå %s"
 
-#: ../src/empathy-event-manager.c:915 ../src/empathy-call-window.c:1488
+#: ../src/empathy-event-manager.c:915 ../src/empathy-call-window.c:1491
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "äè %s çèèéè"
@@ -3039,7 +3462,7 @@ msgstr "äè %s çèèéè"
 msgid "Incoming file transfer from %s"
 msgstr "æåäè %s çææåè"
 
-#: ../src/empathy-event-manager.c:983 ../src/empathy-roster-window.c:356
+#: ../src/empathy-event-manager.c:983 ../src/empathy-roster-window.c:223
 msgid "Password required"
 msgstr "éèåç"
 
@@ -3195,58 +3618,58 @@ msgstr "éèåå"
 msgid "Source"
 msgstr "äæ"
 
-#: ../src/empathy-roster-window.c:373
+#: ../src/empathy-roster-window.c:240
 msgid "Provide Password"
 msgstr "æäåç"
 
-#: ../src/empathy-roster-window.c:379
+#: ../src/empathy-roster-window.c:246
 msgid "Disconnect"
 msgstr "æç"
 
-#: ../src/empathy-roster-window.c:639
+#: ../src/empathy-roster-window.c:417
 msgid "You need to setup an account to see contacts here."
 msgstr "æéèèçäååèæèåéèæçèçäã"
 
-#: ../src/empathy-roster-window.c:655
-msgid "No match found"
-msgstr "æäåçåéç"
-
-#: ../src/empathy-roster-window.c:765
+#: ../src/empathy-roster-window.c:504
 #, c-format
 msgid "Sorry, %s accounts canât be used until your %s software is updated."
 msgstr "åææï%s åèçæäçïééæç %s èéåææã"
 
-#: ../src/empathy-roster-window.c:831
+#: ../src/empathy-roster-window.c:570
 msgid "Update software..."
 msgstr "ææèé..."
 
-#: ../src/empathy-roster-window.c:837 ../src/empathy-roster-window.c:954
+#: ../src/empathy-roster-window.c:576 ../src/empathy-roster-window.c:693
 msgid "Close"
 msgstr "éé"
 
-#: ../src/empathy-roster-window.c:942
+#: ../src/empathy-roster-window.c:681
 msgid "Reconnect"
 msgstr "éæéæ"
 
-#: ../src/empathy-roster-window.c:948
+#: ../src/empathy-roster-window.c:687
 msgid "Edit Account"
 msgstr "çèåè"
 
-#: ../src/empathy-roster-window.c:1128
+#: ../src/empathy-roster-window.c:867
 msgid "Top up account"
 msgstr "åååèåé"
 
-#: ../src/empathy-roster-window.c:1813
+#: ../src/empathy-roster-window.c:1529
 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:1821
+#: ../src/empathy-roster-window.c:1537
 #, c-format
 msgid "You need to enable %s to see contacts here."
 msgstr "æéèåç %s æèåéèæçèçäã"
 
-#: ../src/empathy-roster-window.c:2154 ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-roster-window.c:1901
+msgid "No match found"
+msgstr "æäåçåéç"
+
+#: ../src/empathy-roster-window.c:2132 ../src/empathy-preferences.ui.h:4
 msgid "Contact List"
 msgstr "éçäæå"
 
@@ -3254,6 +3677,71 @@ msgstr "éçäæå"
 msgid "Account settings"
 msgstr "åèèåå"
 
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_New Conversation..."
+msgstr "æåèè(_N)..."
+
+#: ../src/empathy-roster-window-menubar.ui.h:2
+msgid "New _Call..."
+msgstr "æåéè(_C)..."
+
+#: ../src/empathy-roster-window-menubar.ui.h:3
+msgid "Contacts"
+msgstr "éçä"
+
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Add Contacts..."
+msgstr "ååèçä(_A)..."
+
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Search for Contacts..."
+msgstr "æåèçä(_S)..."
+
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Blocked Contacts"
+msgstr "èåéçèçä"
+
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_Rooms"
+msgstr "èåå(_R)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Join..."
+msgstr "åå(_J)..."
+
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Join _Favorites"
+msgstr "ååååèåå(_F)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "_Manage Favorites"
+msgstr "ççåå(_M)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_File Transfers"
+msgstr "ææåè(_F)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "åè(_A)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "P_references"
+msgstr "ååèå(_R)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:15
+msgid "Help"
+msgstr "æå"
+
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "About Empathy"
+msgstr "éæ Empathy"
+
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-status-icon.ui.h:5
+msgid "_Quit"
+msgstr "çæ(_Q)"
+
 #: ../src/empathy-new-chatroom-dialog.c:194
 msgid "Chat Room"
 msgstr "èåå"
@@ -3293,312 +3781,296 @@ msgstr "å"
 msgid "Join Room"
 msgstr "ååèåå"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "çæèåèååæå"
-
-#: ../src/empathy-new-chatroom-dialog.ui.h:3
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid ""
 "Enter the room name to join here or click on one or more rooms in the list."
 msgstr "åéèèåèååçèåååçæåæåäééäæååèååã"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:4
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
+msgid "_Room:"
+msgstr "èåå(_R)ï"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account&apos;s server"
 msgstr ""
 "èåæèååæåçäæåïæåæèèååäæçååèæåçäæåæççåå"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
+#: ../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 ""
 "èåæèååæåçäæåïæèçèèååäæçååèæåçäæåæççåå"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
-msgid "Room List"
-msgstr "èååæå"
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
+msgid "_Server:"
+msgstr "äæå(_S)ï"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
-msgid "_Room:"
-msgstr "èåå(_R)ï"
+msgid "Couldn't load room list"
+msgstr "çæèåèååæå"
 
-#: ../src/empathy-preferences.c:146
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Room List"
+msgstr "èååæå"
+
+#: ../src/empathy-preferences.c:145
 msgid "Message received"
 msgstr "èæåæå"
 
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:146
 msgid "Message sent"
 msgstr "èæåéå"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:147
 msgid "New conversation"
 msgstr "æåèè"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:148
 msgid "Contact comes online"
 msgstr "éçääç"
 
-#: ../src/empathy-preferences.c:150
+#: ../src/empathy-preferences.c:149
 msgid "Contact goes offline"
 msgstr "éçäéç"
 
-#: ../src/empathy-preferences.c:151
+#: ../src/empathy-preferences.c:150
 msgid "Account connected"
 msgstr "åèåéç"
 
-#: ../src/empathy-preferences.c:152
+#: ../src/empathy-preferences.c:151
 msgid "Account disconnected"
 msgstr "åèåæç"
 
-#: ../src/empathy-preferences.c:429
+#: ../src/empathy-preferences.c:388
 msgid "Language"
 msgstr "èè"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:678
+#: ../src/empathy-preferences.c:637
 msgid "Juliet"
 msgstr "çèå"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:685
+#: ../src/empathy-preferences.c:644
 msgid "Romeo"
 msgstr "æåä"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:691
+#: ../src/empathy-preferences.c:650
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "çççèèèåïçääèååéï"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:695
+#: ../src/empathy-preferences.c:654
 msgid "Deny thy father and refuse thy name;"
 msgstr "èçäæèääïçäçåæèåã"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:698
+#: ../src/empathy-preferences.c:657
 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:701
+#: ../src/empathy-preferences.c:660
 msgid "And I'll no longer be a Capulet."
 msgstr "ççèäéååïååçïæéäã"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:704
+#: ../src/empathy-preferences.c:663
 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:707
+#: ../src/empathy-preferences.c:666
 msgid "Juliet has disconnected"
 msgstr "çèååæç"
 
-#: ../src/empathy-preferences.c:1112
+#: ../src/empathy-preferences.c:1070
 msgid "Preferences"
 msgstr "ååèå"
 
 #: ../src/empathy-preferences.ui.h:2
-msgid "Behavior"
-msgstr "èç"
+msgid "Show groups"
+msgstr "éççç"
+
+#: ../src/empathy-preferences.ui.h:3
+msgid "Show account balances"
+msgstr "éçåèéé"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "èåäæäé(_E):"
+msgid "Start chats in:"
+msgstr "éåèåæï"
+
+#: ../src/empathy-preferences.ui.h:6
+msgid "new ta_bs"
+msgstr "æåé(_B)"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable notifications when _away or busy"
-msgstr "ççæçééæåçæåçéç(_D)"
+msgid "new _windows"
+msgstr "æèç(_W)"
 
 #: ../src/empathy-preferences.ui.h:8
-msgid "Disable sounds when _away or busy"
-msgstr "ççæçééæåçæåçéæ(_A)"
+msgid "Show _smileys as images"
+msgstr "åèæçèäåçéç(_S)"
 
 #: ../src/empathy-preferences.ui.h:9
-msgid "Display incoming events in the notification area"
-msgstr "åéçååéçæåää"
+msgid "Show contact _list in rooms"
+msgstr "åèååéçéçäæå(_L)"
 
 #: ../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 "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"åéæéåäèæçèéåäääèæææïäåæäéèäåèåèåéãåæéè"
-"æææåääèèæççåéæéæåæïèèèéæåéæéåèïäéæéåé"
-"èã"
-
-#: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact comes online"
-msgstr "çéçääçæåçéç"
+msgid "Log conversations"
+msgstr "çéèè"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when a contact goes offline"
-msgstr "çéçäéçæåçéç"
+msgid "Display incoming events in the notification area"
+msgstr "åéçååéçæåää"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable notifications when the _chat is not focused"
-msgstr "çèåèçååçéæåçéç(_C)"
+msgid "_Automatically connect on startup"
+msgstr "ååæèåéç(_A)"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "Enable spell checking for languages:"
-msgstr "çèèåçæåææï"
+msgid "Behavior"
+msgstr "èç"
 
 #: ../src/empathy-preferences.ui.h:15
 msgid "General"
 msgstr "äè"
 
+#: ../src/empathy-preferences.ui.h:16
+msgid "_Enable bubble notifications"
+msgstr "åçææåéç(_E)"
+
 #: ../src/empathy-preferences.ui.h:17
-msgid "Location sources:"
-msgstr "äçäæï"
+msgid "Disable notifications when _away or busy"
+msgstr "ççæçééæåçæåçéç(_D)"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Log conversations"
-msgstr "çéèè"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "çèåèçååçéæåçéç(_C)"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Notifications"
-msgstr "éç"
+msgid "Enable notifications when a contact comes online"
+msgstr "çéçääçæåçéç"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Play sound for events"
-msgstr "ææääéæ"
+msgid "Enable notifications when a contact goes offline"
+msgstr "çéçäéçæåçéç"
 
 #: ../src/empathy-preferences.ui.h:21
-msgid "Privacy"
-msgstr "éç"
+msgid "Notifications"
+msgstr "éç"
 
 #: ../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 çåææçååæéçåäæã"
+msgid "_Enable sound notifications"
+msgstr "åçéæéç(_E)"
 
 #: ../src/empathy-preferences.ui.h:23
-msgid "Show _smileys as images"
-msgstr "åèæçèäåçéç(_S)"
+msgid "Disable sounds when _away or busy"
+msgstr "ççæçééæåçæåçéæ(_A)"
 
 #: ../src/empathy-preferences.ui.h:24
-msgid "Show account balances"
-msgstr "éçåèéé"
+msgid "Play sound for events"
+msgstr "ææääéæ"
 
 #: ../src/empathy-preferences.ui.h:25
-msgid "Show contact _list in rooms"
-msgstr "åèååéçéçäæå(_L)"
+msgid "Sounds"
+msgstr "éæ"
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "Show offline contacts"
-msgstr "éçéçéçä"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "äçåéæéäæåéèåè(_E)"
 
 #: ../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 "éæ"
+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 "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"åéæéåäèæçèéåäääèæææïäåæäéèäåèåèåéãåæéè"
+"æææåääèèæççåéæéæåæïèèèéæåéæéåèïäéæéåé"
+"èã"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "Spell Checking"
-msgstr "æåææ"
+msgid "_Publish location to my contacts"
+msgstr "åæçéçäåéäç(_P)"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "Start chats in:"
-msgstr "éåèåæï"
-
-#: ../src/empathy-preferences.ui.h:32
 msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr "éèçèèæåååæåæåçåèååçèèã"
+"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 çåææçååæéçåäæã"
 
+#. 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:33
-msgid "Themes"
-msgstr "äæäé"
+msgid "_Reduce location accuracy"
+msgstr "éääçæçå(_R)"
 
 #: ../src/empathy-preferences.ui.h:34
-msgid "Use _echo cancellation to improve call quality"
-msgstr "äçåéæéäæåéèåè(_E)"
+msgid "Privacy"
+msgstr "éç"
 
 #: ../src/empathy-preferences.ui.h:35
-msgid "Variant:"
-msgstr "æåï"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Automatically connect on startup"
-msgstr "ååæèåéç(_A)"
-
-#: ../src/empathy-preferences.ui.h:37
 msgid "_Cellphone"
 msgstr "ææ(_C)"
 
-#: ../src/empathy-preferences.ui.h:38
-msgid "_Enable bubble notifications"
-msgstr "åçææåéç(_E)"
+#: ../src/empathy-preferences.ui.h:37
+msgid "_Network (IP, Wi-Fi)"
+msgstr "çè (IP, Wi-Fi)(_N)"
 
-#: ../src/empathy-preferences.ui.h:39
-msgid "_Enable sound notifications"
-msgstr "åçéæéç(_E)"
+#: ../src/empathy-preferences.ui.h:38
+msgid "Location sources:"
+msgstr "äçäæï"
 
 #: ../src/empathy-preferences.ui.h:40
-msgid "_GPS"
-msgstr "_GPS"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr "éèçèèæåååæåæåçåèååçèèã"
 
 #: ../src/empathy-preferences.ui.h:41
-msgid "_Network (IP, Wi-Fi)"
-msgstr "çè (IP, Wi-Fi)(_N)"
+msgid "Enable spell checking for languages:"
+msgstr "çèèåçæåææï"
 
 #: ../src/empathy-preferences.ui.h:42
-msgid "_Publish location to my contacts"
-msgstr "åæçéçäåéäç(_P)"
+msgid "Spell Checking"
+msgstr "æåææ"
+
+#: ../src/empathy-preferences.ui.h:43
+msgid "Chat Th_eme:"
+msgstr "èåäæäé(_E):"
 
-#. 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:44
-msgid "_Reduce location accuracy"
-msgstr "éääçæçå(_R)"
+msgid "Variant:"
+msgstr "æåï"
 
 #: ../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:47
-msgid "new ta_bs"
-msgstr "æåé(_B)"
+msgid "Themes"
+msgstr "äæäé"
 
-#: ../src/empathy-preferences.ui.h:48
-msgid "status"
-msgstr "çæ"
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversationâ"
+msgstr "æåèè(_N)â"
 
-#: ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-status-icon.ui.h:3
 msgid "New _Callâ"
 msgstr "æåéè(_C)â"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-status-icon.ui.h:4
 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-debug-window.c:1603
 msgid "Save"
 msgstr "åå"
@@ -3736,13 +4208,13 @@ msgid "Respond"
 msgstr "åæ"
 
 #: ../src/empathy-notifications-approver.c:197
-#: ../src/empathy-call-window.c:1492
+#: ../src/empathy-call-window.c:1495
 msgid "Reject"
 msgstr "æç"
 
 #: ../src/empathy-notifications-approver.c:202
 #: ../src/empathy-notifications-approver.c:207
-#: ../src/empathy-call-window.c:1493
+#: ../src/empathy-call-window.c:1496
 msgid "Answer"
 msgstr "æè"
 
@@ -3774,95 +4246,95 @@ msgstr "%s ååææçæïäææèääéèã"
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1122 ../src/empathy-call-window.c:1138
+#: ../src/empathy-call-window.c:1125 ../src/empathy-call-window.c:1141
 msgid "i"
 msgstr "è"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1857
+#: ../src/empathy-call-window.c:1862
 #, c-format
 msgid "Call with %s"
 msgstr "è %s éèä"
 
-#: ../src/empathy-call-window.c:2109
+#: ../src/empathy-call-window.c:2114
 msgid "The IP address as seen by the machine"
 msgstr "æåçèç IP äå"
 
-#: ../src/empathy-call-window.c:2111
+#: ../src/empathy-call-window.c:2116
 msgid "The IP address as seen by a server on the Internet"
 msgstr "çéçèäçäæåçèç IP äå"
 
-#: ../src/empathy-call-window.c:2113
+#: ../src/empathy-call-window.c:2118
 msgid "The IP address of the peer as seen by the other side"
 msgstr "åäççèçéç IP äå"
 
-#: ../src/empathy-call-window.c:2115
+#: ../src/empathy-call-window.c:2120
 msgid "The IP address of a relay server"
 msgstr "äçäæåç IP äå"
 
-#: ../src/empathy-call-window.c:2117
+#: ../src/empathy-call-window.c:2122
 msgid "The IP address of the multicast group"
 msgstr "åéåæççç IP äå"
 
-#: ../src/empathy-call-window.c:2864
+#: ../src/empathy-call-window.c:2869
 msgid "On hold"
 msgstr "äç"
 
-#: ../src/empathy-call-window.c:2867
+#: ../src/empathy-call-window.c:2871
 msgid "Mute"
 msgstr "éé"
 
-#: ../src/empathy-call-window.c:2869
+#: ../src/empathy-call-window.c:2873
 msgid "Duration"
 msgstr "æé"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2872
+#: ../src/empathy-call-window.c:2876
 #, c-format
 msgid "%s â %d:%02dm"
 msgstr "%s â %d:%02dm"
 
-#: ../src/empathy-call-window.c:2968
+#: ../src/empathy-call-window.c:2972
 msgid "Technical Details"
 msgstr "æèçç"
 
-#: ../src/empathy-call-window.c:3007
+#: ../src/empathy-call-window.c:3011
 #, 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
+#: ../src/empathy-call-window.c:3016
 #, 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
+#: ../src/empathy-call-window.c:3022
 #, 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
+#: ../src/empathy-call-window.c:3028
 msgid "There was a failure on the network"
 msgstr "éåçèäæéèçç"
 
-#: ../src/empathy-call-window.c:3028
+#: ../src/empathy-call-window.c:3032
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "æéèæåèçéèæååæåæçéèäåè"
 
-#: ../src/empathy-call-window.c:3031
+#: ../src/empathy-call-window.c:3035
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "æéèæåèçèèæååæåæçéèäåè"
 
-#: ../src/empathy-call-window.c:3043
+#: ../src/empathy-call-window.c:3047
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3872,32 +4344,32 @@ msgstr ""
 "å Telepathy åääççæéæççæãè<a href=\"%s\">ååéåéè</a>äéä"
 "åæåéååçãééãèçäææéççéã"
 
-#: ../src/empathy-call-window.c:3052
+#: ../src/empathy-call-window.c:3056
 msgid "There was a failure in the call engine"
 msgstr "éèåæåæéèçç"
 
-#: ../src/empathy-call-window.c:3055
+#: ../src/empathy-call-window.c:3059
 msgid "The end of the stream was reached"
 msgstr "åéäææç"
 
-#: ../src/empathy-call-window.c:3095
+#: ../src/empathy-call-window.c:3099
 msgid "Can't establish audio stream"
 msgstr "çæåçéèäæ"
 
-#: ../src/empathy-call-window.c:3105
+#: ../src/empathy-call-window.c:3109
 msgid "Can't establish video stream"
 msgstr "çæåçèèäæ"
 
-#: ../src/empathy-call-window.c:3142
+#: ../src/empathy-call-window.c:3146
 #, c-format
 msgid "Your current balance is %s."
 msgstr "æçåçééç %sã"
 
-#: ../src/empathy-call-window.c:3146
+#: ../src/empathy-call-window.c:3150
 msgid "Sorry, you donât have enough credit for that call."
 msgstr "åææïæçåéäèäéèèéèã"
 
-#: ../src/empathy-call-window.c:3148
+#: ../src/empathy-call-window.c:3152
 msgid "Top Up"
 msgstr "åå"
 
@@ -3921,11 +4393,7 @@ msgstr "æçèååèæåäçï"
 msgid "Adding new account"
 msgstr "æååè"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
-msgid "People nearby"
-msgstr "éèçä"
-
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:149
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81
 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 "
@@ -3934,7 +4402,11 @@ msgstr ""
 "Empathy åäèåæçèæäåéçåçåçèäçäåïääåäåèåãåæææ"
 "äçæåèïèææäåèçèææåæçã"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:180
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:98
+msgid "People nearby"
+msgstr "éèçä"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:113
 msgid ""
 "You can change these details later or disable this feature by choosing <span "
 "style=\"italic\">Edit â Accounts</span> in the Contact List."
@@ -3942,47 +4414,32 @@ 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 "Network:"
+#~ msgstr "çèï"
 
-#~ msgid ""
-#~ "Whether Empathy should automatically log into your accounts on startup."
-#~ msgstr "Empathy æåæåååæèåçåæçåèã"
+#~ msgid "Password:"
+#~ msgstr "åçï"
 
-#~ msgid "Empathy should auto-away when idle"
-#~ msgstr "Empathy çéçææèèåèçéé"
+#~ msgid "Port:"
+#~ msgstr "éæåï"
 
-#~ msgid ""
-#~ "Whether Empathy should go into away mode automatically if the user is "
-#~ "idle."
-#~ msgstr "Empathy æåæåäçèéçæèååæçééæåã"
+#~ msgid "Send Audio"
+#~ msgstr "åééè"
 
-#~ msgid "Empathy default download folder"
-#~ msgstr "Empathy éèäèèæå"
+#~ msgid "Send Video"
+#~ msgstr "åéèè"
 
-#~ msgid "The default folder to save file transfers in."
-#~ msgstr "çäååææåèææææçéèèæåã"
+#~ msgid "Show protocol in avatar"
+#~ msgstr "æåäåçéçåå"
 
-#~ msgid "Magic number used to check if sanity cleaning tasks should be run"
-#~ msgstr "éèèççäæææåæåè sanity æçäæ"
+#~ msgid "Sort contacts by:"
+#~ msgstr "æåéçääï"
 
-#~ 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 "name"
+#~ msgstr "åç"
 
-#~ msgid "Whether to show contacts that are offline in the contact list."
-#~ msgstr "æååéçäæåäéçéççéçäã"
+#~ msgid "status"
+#~ msgstr "çæ"
 
 #~ msgid "Show avatars"
 #~ msgstr "éçåéè"
@@ -3997,57 +4454,12 @@ 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 "éçäæåæåæå"
 
@@ -4059,290 +4471,6 @@ 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"
 
@@ -4473,9 +4601,6 @@ msgstr ""
 #~ msgid "Contact Map View"
 #~ msgstr "éçäååæè"
 
-#~ msgid "%s"
-#~ msgstr "%s"
-
 #~ msgid "Select contacts to link"
 #~ msgstr "éåèéççéçä"
 



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