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



commit d3b83e5c737e8c700db880434a9a529dbfd20c8d
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Mon Aug 27 18:19:36 2012 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 2631 +++++++++++++++++++++++++++++------------------------------
 po/zh_TW.po | 2637 +++++++++++++++++++++++++++++------------------------------
 2 files changed, 2617 insertions(+), 2651 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index bc66156..092095e 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-06-30 22:55+0800\n"
-"PO-Revision-Date: 2012-06-30 22:56+0800\n"
+"POT-Creation-Date: 2012-08-27 18:19+0800\n"
+"PO-Revision-Date: 2012-08-27 18:19+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "Language: zh_TW\n"
@@ -35,16 +35,6 @@ msgstr "Empathy äèçéè"
 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 åè"
-
 #: ../data/org.gnome.Empathy.gschema.xml.h:1
 msgid "Connection managers should be used"
 msgstr "äçéççççå"
@@ -311,8 +301,10 @@ 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 äæäéèåã"
+msgid ""
+"Path of the Adium theme to use if the theme used for chat is Adium. "
+"Deprecated."
+msgstr "åæèåççäéæ Adium ææèäçç Adium äæäéèåãåæçã"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:66
 msgid "Enable WebKit Developer Tools"
@@ -505,6 +497,20 @@ msgstr "éåçææäææèçææ"
 msgid "The selected file is empty"
 msgstr "éåçæææççç"
 
+#: ../libempathy/empathy-keyring.c:75
+msgid "Password not found"
+msgstr "æäååç"
+
+#: ../libempathy/empathy-keyring.c:202
+#, c-format
+msgid "IM account password for %s (%s)"
+msgstr "%s çåæéåèåç (%s)"
+
+#: ../libempathy/empathy-keyring.c:237
+#, c-format
+msgid "Password for chatroom '%s' on account %s (%s)"
+msgstr "%2$s åèäã%1$sãèååçåç (%3$s)"
+
 #: ../libempathy/empathy-message.c:407 ../src/empathy-call-observer.c:116
 #, c-format
 msgid "Missed call from %s"
@@ -521,6 +527,46 @@ msgstr "åææ %s"
 msgid "Call from %s"
 msgstr "%s çäé"
 
+#: ../libempathy/empathy-time.c:90
+#, c-format
+msgid "%d second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "%d çå"
+
+#: ../libempathy/empathy-time.c:96
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "%d åéäå"
+
+#: ../libempathy/empathy-time.c:102
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "%d åæäå"
+
+#: ../libempathy/empathy-time.c:108
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d åäå"
+
+#: ../libempathy/empathy-time.c:114
+#, c-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "%d éå"
+
+#: ../libempathy/empathy-time.c:120
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "%d åæäå"
+
+#: ../libempathy/empathy-time.c:142
+msgid "in the future"
+msgstr "æä"
+
 #: ../libempathy/empathy-utils.c:232
 msgid "Available"
 msgstr "æç"
@@ -681,138 +727,10 @@ msgstr "Google Talk"
 msgid "Facebook Chat"
 msgstr "Facebook èå"
 
-#: ../libempathy/empathy-time.c:90
-#, c-format
-msgid "%d second ago"
-msgid_plural "%d seconds ago"
-msgstr[0] "%d çå"
-
-#: ../libempathy/empathy-time.c:96
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d åéäå"
-
-#: ../libempathy/empathy-time.c:102
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d åæäå"
-
-#: ../libempathy/empathy-time.c:108
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d åäå"
-
-#: ../libempathy/empathy-time.c:114
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "%d éå"
-
-#: ../libempathy/empathy-time.c:120
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "%d åæäå"
-
-#: ../libempathy/empathy-time.c:142
-msgid "in the future"
-msgstr "æä"
-
-#: ../libempathy/empathy-keyring.c:75
-msgid "Password not found"
-msgstr "æäååç"
-
-#: ../libempathy/empathy-keyring.c:218
-#, c-format
-msgid "IM account password for %s (%s)"
-msgstr "%s çåæéåèåç (%s)"
-
-#: ../libempathy/empathy-keyring.c:253
-#, c-format
-msgid "Password for chatroom '%s' on account %s (%s)"
-msgstr "%2$s åèäã%1$sãèååçåç (%3$s)"
-
 #: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "ææåè"
 
-#: ../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:681
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "Password"
-msgstr "åç"
-
-#: ../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: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: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:1434
-msgid "Username:"
-msgstr "äçèåçï"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1751
-msgid "A_pply"
-msgstr "åç(_A)"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1780
-msgid "L_og in"
-msgstr "çå(_O)"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1850
-msgid "This account already exists on the server"
-msgstr "æåèåçååéåäæåä"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1854
-msgid "Create a new account on the server"
-msgstr "åéåäæåäåçæçåè"
-
-#. To translators: The first parameter is the login id and the
-#. * second one is the network. The resulting string will be something
-#. * like: "MyUserName on freenode".
-#. * You should reverse the order of these arguments if the
-#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c: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:2297
-#, c-format
-msgid "%s Account"
-msgstr "%s åè"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2301
-msgid "New account"
-msgstr "æååè"
-
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
@@ -864,8 +782,8 @@ msgstr "äæå(_S)"
 #: ../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-msn.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
 msgid "Advanced"
@@ -888,6 +806,80 @@ msgstr "äç AIM åçæï"
 msgid "Remember Password"
 msgstr "èäåç"
 
+#: ../libempathy-gtk/empathy-account-widget.c:678
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../src/empathy-import-widget.c:323
+msgid "Account"
+msgstr "åè"
+
+#: ../libempathy-gtk/empathy-account-widget.c:679
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
+msgid "Password"
+msgstr "åç"
+
+#: ../libempathy-gtk/empathy-account-widget.c:680
+#: ../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:681
+#: ../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
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:820
+#, c-format
+msgid "%s:"
+msgstr "%sï"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1432
+msgid "Username:"
+msgstr "äçèåçï"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1749
+msgid "A_pply"
+msgstr "åç(_A)"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1778
+msgid "L_og in"
+msgstr "çå(_O)"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1848
+msgid "This account already exists on the server"
+msgstr "æåèåçååéåäæåä"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1852
+msgid "Create a new account on the server"
+msgstr "åéåäæåäåçæçåè"
+
+#. To translators: The first parameter is the login id and the
+#. * second one is the network. The resulting string will be something
+#. * like: "MyUserName on freenode".
+#. * You should reverse the order of these arguments if the
+#. * server should come before the login id in your locale.
+#: ../libempathy-gtk/empathy-account-widget.c:2269
+#, 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:2295
+#, c-format
+msgid "%s Account"
+msgstr "%s åè"
+
+#: ../libempathy-gtk/empathy-account-widget.c:2299
+msgid "New account"
+msgstr "æååè"
+
 #: ../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
@@ -927,47 +919,18 @@ msgstr "äç ICQ UIN æï"
 msgid "What is your ICQ password?"
 msgstr "äç ICQ åçæï"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:207
-#: ../libempathy-gtk/empathy-account-widget-sip.c:240
-msgid "Auto"
-msgstr "èå"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "çç"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:210
-msgid "UDP"
-msgstr "UDP"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Character set"
+msgstr "åé"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:213
-msgid "TCP"
-msgstr "TCP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
-msgid "TLS"
-msgstr "TLS"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:245
-msgid "Register"
-msgstr "èå"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:250
-msgid "Options"
-msgstr "éé"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:253
-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
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Addâ"
+msgstr "ååâ"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
@@ -1097,18 +1060,6 @@ msgstr "äç Jabber åçæï"
 msgid "What is your desired Jabber password?"
 msgstr "äæèç Jabber åçæï"
 
-#: ../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:8
-msgid "What is your Windows Live ID?"
-msgstr "äç Windows Live ID æï"
-
-#: ../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)"
@@ -1133,6 +1084,47 @@ msgstr "_Jabber ID"
 msgid "E-_mail address"
 msgstr "éåäçäå(_M)"
 
+#: ../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:8
+msgid "What is your Windows Live ID?"
+msgstr "äç Windows Live ID æï"
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
+msgid "What is your Windows Live password?"
+msgstr "äç Windows Live åçæï"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:207
+#: ../libempathy-gtk/empathy-account-widget-sip.c:240
+msgid "Auto"
+msgstr "èå"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:210
+msgid "UDP"
+msgstr "UDP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:213
+msgid "TCP"
+msgstr "TCP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+msgid "TLS"
+msgstr "TLS"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:245
+msgid "Register"
+msgstr "èå"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:250
+msgid "Options"
+msgstr "éé"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:253
+msgid "None"
+msgstr "ç"
+
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
 msgid "_Username"
 msgstr "äçèåç(_U)"
@@ -1241,36 +1233,36 @@ msgstr "äç Yahoo! ID æï"
 msgid "What is your Yahoo! password?"
 msgstr "äç Yahoo! åçæï"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:471
-#: ../libempathy-gtk/empathy-avatar-chooser.c:556
+#: ../libempathy-gtk/empathy-avatar-chooser.c:545
+#: ../libempathy-gtk/empathy-avatar-chooser.c:630
 msgid "Couldn't convert image"
 msgstr "çæèæåç"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:472
+#: ../libempathy-gtk/empathy-avatar-chooser.c:546
 msgid "None of the accepted image formats are supported on your system"
 msgstr "äçççäææææåæåçåçæå"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+#: ../libempathy-gtk/empathy-avatar-chooser.c:906
 msgid "Couldn't save picture to file"
 msgstr "çæååçååèææ"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:939
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1030
 msgid "Select Your Avatar Image"
 msgstr "éæäçåéèåç"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:947
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
 msgid "Take a picture..."
 msgstr "æéåç..."
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:960
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
 msgid "No Image"
 msgstr "ææåç"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
 msgid "Images"
 msgstr "åç"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
 msgid "All Files"
 msgstr "ææææ"
 
@@ -1278,6 +1270,34 @@ msgstr "ææææ"
 msgid "Click to enlarge"
 msgstr "èæéèæå"
 
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentication failed for account <b>%s</b>"
+msgstr "<b>%s</b> åèéèåæ"
+
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
+#: ../libempathy-gtk/empathy-chat.c:3725
+msgid "Retry"
+msgstr "éè"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+"èåäåèçåç\n"
+"<b>%s</b>"
+
+#: ../libempathy-gtk/empathy-calendar-button.c:66
+msgid "Select..."
+msgstr "éå..."
+
+#: ../libempathy-gtk/empathy-calendar-button.c:154
+msgid "_Select"
+msgstr "éå(_S)"
+
 #: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
@@ -1319,181 +1339,181 @@ msgstr "ääèåèææéåäé"
 msgid "Invalid contact ID"
 msgstr "çæçèçä ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1056
+#: ../libempathy-gtk/empathy-chat.c:1055
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clearïæéçåèèçææèæ"
 
-#: ../libempathy-gtk/empathy-chat.c:1059
+#: ../libempathy-gtk/empathy-chat.c:1058
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <äé>ïèççåèèçäé"
 
-#: ../libempathy-gtk/empathy-chat.c:1062
+#: ../libempathy-gtk/empathy-chat.c:1061
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <èåå ID>ïååæçèåå"
 
-#: ../libempathy-gtk/empathy-chat.c:1065
+#: ../libempathy-gtk/empathy-chat.c:1064
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <èåå ID>ïååæçèåå"
 
-#: ../libempathy-gtk/empathy-chat.c:1069
+#: ../libempathy-gtk/empathy-chat.c:1068
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr "/part [<èåå ID>] [<åå>]ïééèååïéèççåçèåå"
 
-#: ../libempathy-gtk/empathy-chat.c:1073
+#: ../libempathy-gtk/empathy-chat.c:1072
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <èçä ID> [<èæ>]ïéåçäèå"
 
-#: ../libempathy-gtk/empathy-chat.c:1076
+#: ../libempathy-gtk/empathy-chat.c:1075
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <èçä ID> <èæ>ïéåçäèå"
 
-#: ../libempathy-gtk/empathy-chat.c:1079
+#: ../libempathy-gtk/empathy-chat.c:1078
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <çå>ïææåçåäæåäçäççå"
 
-#: ../libempathy-gtk/empathy-chat.c:1082
+#: ../libempathy-gtk/empathy-chat.c:1081
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <èæ>ïéåäå ACTION èæåçåçèèä"
 
-#: ../libempathy-gtk/empathy-chat.c:1085
+#: ../libempathy-gtk/empathy-chat.c:1084
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
 msgstr "/say <èæ>ïéå <èæ> åçåçèèäãéçæåéäã/ãééçèæãèääèïã/say /join æçäååæçèååã"
 
-#: ../libempathy-gtk/empathy-chat.c:1090
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <èçä ID>ïéçèçäççéèè"
 
-#: ../libempathy-gtk/empathy-chat.c:1093
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr "/help [<åä>]ïéçææææçæäãåææåçéå <åä> çèïäéçåççæã"
 
-#: ../libempathy-gtk/empathy-chat.c:1112
+#: ../libempathy-gtk/empathy-chat.c:1111
 #, c-format
 msgid "Usage: %s"
 msgstr "çæï%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1157
+#: ../libempathy-gtk/empathy-chat.c:1156
 msgid "Unknown command"
 msgstr "æççåä"
 
-#: ../libempathy-gtk/empathy-chat.c:1283
+#: ../libempathy-gtk/empathy-chat.c:1282
 msgid "Unknown command; see /help for the available commands"
 msgstr "æççæäïèåè /help äåååççæä"
 
-#: ../libempathy-gtk/empathy-chat.c:1540
+#: ../libempathy-gtk/empathy-chat.c:1539
 msgid "insufficient balance to send message"
 msgstr "ééäèäåéèæ"
 
-#: ../libempathy-gtk/empathy-chat.c:1544 ../libempathy-gtk/empathy-chat.c:1558
-#: ../libempathy-gtk/empathy-chat.c:1621
+#: ../libempathy-gtk/empathy-chat.c:1543 ../libempathy-gtk/empathy-chat.c:1557
+#: ../libempathy-gtk/empathy-chat.c:1620
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "åéèæã%sãæççéèï%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1546 ../libempathy-gtk/empathy-chat.c:1563
-#: ../libempathy-gtk/empathy-chat.c:1625
+#: ../libempathy-gtk/empathy-chat.c:1545 ../libempathy-gtk/empathy-chat.c:1562
+#: ../libempathy-gtk/empathy-chat.c:1624
 #, c-format
 msgid "Error sending message: %s"
 msgstr "åéèææççéèï%s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1552
+#: ../libempathy-gtk/empathy-chat.c:1551
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "ééäèäåéèæã<a href='%s'>åå</a>ã"
 
-#: ../libempathy-gtk/empathy-chat.c:1592
+#: ../libempathy-gtk/empathy-chat.c:1591
 msgid "not capable"
 msgstr "çæ"
 
-#: ../libempathy-gtk/empathy-chat.c:1599
+#: ../libempathy-gtk/empathy-chat.c:1598
 msgid "offline"
 msgstr "éç"
 
-#: ../libempathy-gtk/empathy-chat.c:1602
+#: ../libempathy-gtk/empathy-chat.c:1601
 msgid "invalid contact"
 msgstr "çæçèçä"
 
-#: ../libempathy-gtk/empathy-chat.c:1605
+#: ../libempathy-gtk/empathy-chat.c:1604
 msgid "permission denied"
 msgstr "æéèæç"
 
-#: ../libempathy-gtk/empathy-chat.c:1608
+#: ../libempathy-gtk/empathy-chat.c:1607
 msgid "too long message"
 msgstr "åéçèæ"
 
-#: ../libempathy-gtk/empathy-chat.c:1611
+#: ../libempathy-gtk/empathy-chat.c:1610
 msgid "not implemented"
 msgstr "æåä"
 
-#: ../libempathy-gtk/empathy-chat.c:1615
+#: ../libempathy-gtk/empathy-chat.c:1614
 msgid "unknown"
 msgstr "äæ"
 
-#: ../libempathy-gtk/empathy-chat.c:1682 ../src/empathy-chat-window.c:942
+#: ../libempathy-gtk/empathy-chat.c:1681 ../src/empathy-chat-window.c:969
 msgid "Topic:"
 msgstr "äéï"
 
-#: ../libempathy-gtk/empathy-chat.c:1697
+#: ../libempathy-gtk/empathy-chat.c:1696
 #, c-format
 msgid "Topic set to: %s"
 msgstr "äéèåç: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1699
+#: ../libempathy-gtk/empathy-chat.c:1698
 #, c-format
 msgid "Topic set by %s to: %s"
 msgstr "%s åäéèåçï%s"
 
 #. No need to display this 'event' is no topic can be defined anyway
-#: ../libempathy-gtk/empathy-chat.c:1704
+#: ../libempathy-gtk/empathy-chat.c:1703
 msgid "No topic defined"
 msgstr "åæåçäé"
 
-#: ../libempathy-gtk/empathy-chat.c:2220
+#: ../libempathy-gtk/empathy-chat.c:2219
 msgid "(No Suggestions)"
 msgstr "(ææåè)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2288
+#: ../libempathy-gtk/empathy-chat.c:2287
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "ååã%sãèåå"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2325
+#: ../libempathy-gtk/empathy-chat.c:2324
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "ååã%sãè %s åå"
 
-#: ../libempathy-gtk/empathy-chat.c:2395
+#: ../libempathy-gtk/empathy-chat.c:2394
 msgid "Insert Smiley"
 msgstr "æåèæçè"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2413
-#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#: ../libempathy-gtk/empathy-chat.c:2412
+#: ../libempathy-gtk/empathy-ui-utils.c:1180
 msgid "_Send"
 msgstr "åé(_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2470
+#: ../libempathy-gtk/empathy-chat.c:2469
 msgid "_Spelling Suggestions"
 msgstr "æååè(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2576
+#: ../libempathy-gtk/empathy-chat.c:2575
 msgid "Failed to retrieve recent logs"
 msgstr "çæååæèçæè"
 
-#: ../libempathy-gtk/empathy-chat.c:2720
+#: ../libempathy-gtk/empathy-chat.c:2719
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s åæç"
@@ -1501,12 +1521,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:2727
+#: ../libempathy-gtk/empathy-chat.c:2726
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s è %2$s èåå"
 
-#: ../libempathy-gtk/empathy-chat.c:2730
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%s was kicked"
 msgstr "%s èèå"
@@ -1514,17 +1534,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:2738
+#: ../libempathy-gtk/empathy-chat.c:2737
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s è %2$s èçéåå"
 
-#: ../libempathy-gtk/empathy-chat.c:2741
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%s was banned"
 msgstr "%s èèçéåå"
 
-#: ../libempathy-gtk/empathy-chat.c:2745
+#: ../libempathy-gtk/empathy-chat.c:2744
 #, c-format
 msgid "%s has left the room"
 msgstr "%s åçééæèåå"
@@ -1534,17 +1554,17 @@ msgstr "%s åçééæèåå"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2754
+#: ../libempathy-gtk/empathy-chat.c:2753
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2779
+#: ../libempathy-gtk/empathy-chat.c:2778
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s åçååæèåå"
 
-#: ../libempathy-gtk/empathy-chat.c:2804
+#: ../libempathy-gtk/empathy-chat.c:2803
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s çåèçç %s"
@@ -1552,55 +1572,50 @@ 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: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
+#: ../libempathy-gtk/empathy-chat.c:2990 ../src/empathy-call-window.c:1468
+#: ../src/empathy-call-window.c:1518 ../src/empathy-call-window.c:2571
+#: ../src/empathy-event-manager.c:1176
 msgid "Disconnected"
 msgstr "åæç"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3666
+#: ../libempathy-gtk/empathy-chat.c:3665
 msgid "Would you like to store this password?"
 msgstr "äæèååæåçï"
 
-#: ../libempathy-gtk/empathy-chat.c:3672
+#: ../libempathy-gtk/empathy-chat.c:3671
 msgid "Remember"
 msgstr "èä"
 
-#: ../libempathy-gtk/empathy-chat.c:3682
+#: ../libempathy-gtk/empathy-chat.c:3681
 msgid "Not now"
 msgstr "çåäè"
 
-#: ../libempathy-gtk/empathy-chat.c:3726
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
-msgid "Retry"
-msgstr "éè"
-
-#: ../libempathy-gtk/empathy-chat.c:3730
+#: ../libempathy-gtk/empathy-chat.c:3729
 msgid "Wrong password; please try again:"
 msgstr "åçéèïèåèäæï"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3860
+#: ../libempathy-gtk/empathy-chat.c:3859
 msgid "This room is protected by a password:"
 msgstr "æèåååèåçäèï"
 
-#: ../libempathy-gtk/empathy-chat.c:3887
+#: ../libempathy-gtk/empathy-chat.c:3886
 #: ../src/empathy-new-chatroom-dialog.c:780
 msgid "Join"
 msgstr "åå"
 
-#: ../libempathy-gtk/empathy-chat.c:4079 ../src/empathy-event-manager.c:1188
+#: ../libempathy-gtk/empathy-chat.c:4078 ../src/empathy-event-manager.c:1197
 msgid "Connected"
 msgstr "æåéç"
 
-#: ../libempathy-gtk/empathy-chat.c:4134
+#: ../libempathy-gtk/empathy-chat.c:4133
 msgid "Conversation"
 msgstr "èè"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4139
+#: ../libempathy-gtk/empathy-chat.c:4138
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1631,8 +1646,8 @@ msgstr "çèåéçèçä"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:524
-#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
+#: ../libempathy-gtk/empathy-individual-widget.c:1485
 #: ../src/empathy-chatrooms-window.ui.h:2
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
@@ -1642,348 +1657,144 @@ msgstr "åèï"
 msgid "Blocked Contacts"
 msgstr "èåéçèçä"
 
-#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:322
-#: ../libempathy-gtk/empathy-webkit-utils.c:277
-msgid "_Copy Link Address"
-msgstr "èèéçäå(_C)"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "åå"
 
-#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:329
-#: ../libempathy-gtk/empathy-webkit-utils.c:284
-msgid "_Open Link"
-msgstr "éåéç(_O)"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "éèèç"
 
-#. Translators: timestamp displayed between conversations in
-#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:417
-msgid "%A %B %d %Y"
-msgstr "%Y %B %d %A"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "éåäçäå"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:325
-#: ../libempathy-gtk/empathy-individual-dialogs.c:118
-msgid "New Contact"
-msgstr "æåèçä"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "çç"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:394
-#: ../libempathy-gtk/empathy-individual-dialogs.c:197
-#, c-format
-msgid "Block %s?"
-msgstr "åé %sï"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "çæ"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:399
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
-#, c-format
-msgid "Are you sure you want to block '%s' from contacting you again?"
-msgstr "äçåæèåéã%sãèäçæåèäèçåï"
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+msgid "Last seen:"
+msgstr "äæçèï"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:404
-#: ../libempathy-gtk/empathy-individual-dialogs.c:274
-msgid "_Block"
-msgstr "åé(_B)"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "äæåï"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:422
-#: ../libempathy-gtk/empathy-individual-dialogs.c:283
-msgid "_Report this contact as abusive"
-msgid_plural "_Report these contacts as abusive"
-msgstr[0] "ååéäèçäæçåè(_R)"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "åéæåï"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Subscription Request"
-msgstr "èéèæ"
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
+msgid "Away message:"
+msgstr "ééèæï"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "åä"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "äå"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
-msgid "_Block User"
-msgstr "åéäçè(_B)"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "èå"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "èé"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "åå"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "éé"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
-msgid "Decide _Later"
-msgstr "çååæå(_L)"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "åè"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:517
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
 msgid "Search contacts"
 msgstr "æåèçä"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:547
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
 msgid "Search: "
 msgstr "æåï"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
 msgid "_Add Contact"
 msgstr "ååèçä(_A)"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:623
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
 msgid "No contacts found"
 msgstr "æäåèçä"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:639
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
 msgid "Your message introducing yourself:"
 msgstr "äçèæ"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:647
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:652
 msgid "Please let me see when you're online. Thanks!"
 msgstr "çääçæèèæçéãæèï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:560
-#: ../libempathy-gtk/empathy-individual-widget.c:304
-msgid "Channels:"
-msgstr "ééï"
-
-#: ../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:170
+#: ../libempathy-gtk/empathy-individual-widget.c:900
+msgid "Save Avatar"
+msgstr "åååéè"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:740
-#: ../libempathy-gtk/empathy-individual-widget.c:457
-msgid "Country:"
-msgstr "ååï"
+#: ../libempathy-gtk/empathy-contact-widget.c:226
+#: ../libempathy-gtk/empathy-individual-widget.c:958
+msgid "Unable to save avatar"
+msgstr "çæåååéè"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:742
-#: ../libempathy-gtk/empathy-individual-widget.c:459
-msgid "State:"
-msgstr "åï"
+#. Identifier to connect to Instant Messaging network
+#. Setup id label
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-user-info.c:444
+msgid "Identifier"
+msgstr "èåèå"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:744
-#: ../libempathy-gtk/empathy-individual-widget.c:461
-msgid "City:"
-msgstr "åï"
+#. Setup nickname entry
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-user-info.c:449
+msgid "Alias"
+msgstr "åå"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:746
-#: ../libempathy-gtk/empathy-individual-widget.c:463
-msgid "Area:"
-msgstr "ååï"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "èçäèçèæ"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:748
-#: ../libempathy-gtk/empathy-individual-widget.c:465
-msgid "Postal Code:"
-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.c:750
-#: ../libempathy-gtk/empathy-individual-widget.c:467
-msgid "Street:"
-msgstr "èï"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>äç</b> æ (date)\t"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:752
-#: ../libempathy-gtk/empathy-individual-widget.c:469
-msgid "Building:"
-msgstr "åçï"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "çæçèè"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:754
-#: ../libempathy-gtk/empathy-individual-widget.c:471
-msgid "Floor:"
-msgstr "æåï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:756
-#: ../libempathy-gtk/empathy-individual-widget.c:473
-msgid "Room:"
-msgstr "åï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:758
-#: ../libempathy-gtk/empathy-individual-widget.c:475
-msgid "Text:"
-msgstr "æåï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:760
-#: ../libempathy-gtk/empathy-individual-widget.c:477
-msgid "Description:"
-msgstr "æèï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:479
-msgid "URI:"
-msgstr "URIï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:764
-#: ../libempathy-gtk/empathy-individual-widget.c:481
-msgid "Accuracy Level:"
-msgstr "æçåççï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:766
-#: ../libempathy-gtk/empathy-individual-widget.c:483
-msgid "Error:"
-msgstr "éèï"
-
-#: ../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:770
-#: ../libempathy-gtk/empathy-individual-widget.c:487
-msgid "Horizontal Error (meters):"
-msgstr "æåèå (ç)ï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:772
-#: ../libempathy-gtk/empathy-individual-widget.c:489
-msgid "Speed:"
-msgstr "éåï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:774
-#: ../libempathy-gtk/empathy-individual-widget.c:491
-msgid "Bearing:"
-msgstr "æäï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:776
-#: ../libempathy-gtk/empathy-individual-widget.c:493
-msgid "Climb Speed:"
-msgstr "çåéåï"
-
-#: ../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:780
-#: ../libempathy-gtk/empathy-individual-widget.c:497
-msgid "Longitude:"
-msgstr "çåï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:782
-#: ../libempathy-gtk/empathy-individual-widget.c:499
-msgid "Latitude:"
-msgstr "çåï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:784
-#: ../libempathy-gtk/empathy-individual-widget.c:501
-msgid "Altitude:"
-msgstr "çåï"
-
-#: ../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:39
-msgid "Location"
-msgstr "äç"
-
-#. translators: format is "Location, $date"
-#: ../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: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:988
-#: ../libempathy-gtk/empathy-individual-widget.c:900
-msgid "Save Avatar"
-msgstr "åååéè"
-
-#: ../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:1446
-msgid "Personal Details"
-msgstr "åäçç"
-
-#: ../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 "èçäèçèæ"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
-msgid "Full name"
-msgstr "åå"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
-msgid "Phone number"
-msgstr "éèèç"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
-msgid "E-mail address"
-msgstr "éåäçäå"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
-msgid "Website"
-msgstr "çç"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
-msgid "Birthday"
-msgstr "çæ"
-
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
-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 "åéæåï"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
-msgid "Away message:"
-msgstr "ééèæï"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
-msgid "work"
-msgstr "åä"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
-msgid "home"
-msgstr "äå"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
-msgid "mobile"
-msgstr "èå"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
-msgid "voice"
-msgstr "èé"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
-msgid "preferred"
-msgstr "åå"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
-msgid "postal"
-msgstr "éé"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
-msgid "parcel"
-msgstr "åè"
-
-#. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-msgid "Identifier"
-msgstr "èåèå"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Alias"
-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"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-msgid "Client Information"
-msgstr "çæçèè"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-msgid "OS"
-msgstr "OS"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+msgid "OS"
+msgstr "OS"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version"
@@ -2016,152 +1827,180 @@ msgstr "éå"
 msgid "Group"
 msgstr "çç"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:257
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+msgid "New Contact"
+msgstr "æåèçä"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:193
+#: ../libempathy-gtk/empathy-subscription-dialog.c:121
+#, c-format
+msgid "Block %s?"
+msgstr "åé %sï"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:248
+#: ../libempathy-gtk/empathy-subscription-dialog.c:125
+#, c-format
+msgid "Are you sure you want to block '%s' from contacting you again?"
+msgstr "äçåæèåéã%sãèäçæåèäèçåï"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:253
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "äåèåèååèåéï"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:264
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "äåèåèåçæèåéï"
 
+#: ../libempathy-gtk/empathy-individual-dialogs.c:270
+#: ../libempathy-gtk/empathy-subscription-dialog.c:130
+#: ../libempathy-gtk/empathy-subscription-dialog.c:275
+msgid "_Block"
+msgstr "åé(_B)"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:279
+#: ../libempathy-gtk/empathy-subscription-dialog.c:150
+msgid "_Report this contact as abusive"
+msgid_plural "_Report these contacts as abusive"
+msgstr[0] "ååéäèçäæçåè(_R)"
+
 #: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
 msgid "Edit Contact Information"
 msgstr "çèèçäèè"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:293
 msgid "Linked Contacts"
 msgstr "éçèçç"
 
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:332
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts åæåè"
+
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:335
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "èåè gnome-contacts äååèçäççã"
+
 #. 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:174
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:349
+#: ../libempathy-gtk/empathy-individual-menu.c:347
 msgid "Select account to use to place the call"
 msgstr "éåèçäæçéèçåè"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:353
+#: ../libempathy-gtk/empathy-individual-menu.c:351
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "éè"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:418
+#: ../libempathy-gtk/empathy-individual-menu.c:416
 msgid "Mobile"
 msgstr "æåéè"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:420
+#: ../libempathy-gtk/empathy-individual-menu.c:418
 msgid "Work"
 msgstr "åä"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:422
+#: ../libempathy-gtk/empathy-individual-menu.c:420
 msgid "HOME"
 msgstr "äå"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:663
+#: ../libempathy-gtk/empathy-individual-menu.c:661
 msgid "_Block Contact"
 msgstr "åéèçä(_B)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:719
+#: ../libempathy-gtk/empathy-individual-menu.c:717
 msgid "Delete and _Block"
 msgstr "åéäåé(_B)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:781
+#: ../libempathy-gtk/empathy-individual-menu.c:779
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "æåæèçéèçäã%sãï"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:790
+#: ../libempathy-gtk/empathy-individual-menu.c:788
 #, 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
+#: ../libempathy-gtk/empathy-individual-menu.c:799
 msgid "Removing contact"
 msgstr "æåçéèçä"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:865
+#: ../libempathy-gtk/empathy-individual-menu.c:863
 #: ../libempathy-gtk/empathy-individual-view.c:2454
 msgid "_Remove"
 msgstr "çé(_R)"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1228
+#: ../libempathy-gtk/empathy-individual-menu.c:1226
 #: ../libempathy-gtk/empathy-new-message-dialog.c:318
 msgid "_Chat"
 msgstr "èå(_C)"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1263
+#: ../libempathy-gtk/empathy-individual-menu.c:1261
 #: ../libempathy-gtk/empathy-new-message-dialog.c:312
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1296
+#: ../libempathy-gtk/empathy-individual-menu.c:1294
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "èééè(_A)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1329
+#: ../libempathy-gtk/empathy-individual-menu.c:1327
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "èåéè(_V)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1370
+#: ../libempathy-gtk/empathy-individual-menu.c:1368
 #: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "_Previous Conversations"
 msgstr "éåèè(_P)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1399
+#: ../libempathy-gtk/empathy-individual-menu.c:1397
 msgid "Send File"
 msgstr "åéææ"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1429
+#: ../libempathy-gtk/empathy-individual-menu.c:1427
 msgid "Share My Desktop"
 msgstr "åäæçæé"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1455
-#: ../libempathy-gtk/empathy-individual-widget.c:1357
+#: ../libempathy-gtk/empathy-individual-menu.c:1453
+#: ../libempathy-gtk/empathy-individual-widget.c:1368
 msgid "Favorite"
 msgstr "åå"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1474
-msgid "gnome-contacts not installed"
-msgstr "gnome-contacts åæåè"
-
-#: ../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:1608
+#: ../libempathy-gtk/empathy-individual-menu.c:1482
 msgid "Infor_mation"
 msgstr "èè(_M)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1657
+#: ../libempathy-gtk/empathy-individual-menu.c:1531
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "çè(_E)"
 
 #. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1773
-#: ../src/empathy-chat-window.c:1213
+#: ../libempathy-gtk/empathy-individual-menu.c:1647
+#: ../src/empathy-chat-window.c:1235
 msgid "Inviting you to this room"
 msgstr "éèäåéåèåå"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1819
+#: ../libempathy-gtk/empathy-individual-menu.c:1693
 msgid "_Invite to Chat Room"
 msgstr "éèåèåå(_I)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:2015
+#: ../libempathy-gtk/empathy-individual-menu.c:1889
 msgid "_Add Contactâ"
 msgstr "ååèçä(_A)â"
 
@@ -2178,33 +2017,149 @@ msgstr "æåçéçç"
 msgid "Re_name"
 msgstr "éæåå"
 
-#. Alias
-#: ../libempathy-gtk/empathy-individual-widget.c:1293
-msgid "Alias:"
-msgstr "ååï"
+#: ../libempathy-gtk/empathy-individual-widget.c:304
+msgid "Channels:"
+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:455
+msgid "Country ISO Code:"
+msgstr "åå ISO çï"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1641
-#, c-format
-msgid "Linked contact containing %u contact"
-msgid_plural "Linked contacts containing %u contacts"
-msgstr[0] "éçèççåå %u äèçä"
+#: ../libempathy-gtk/empathy-individual-widget.c:457
+msgid "Country:"
+msgstr "ååï"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
-msgid "<b>Location</b> at (date)"
-msgstr "<b>äç</b> æ (ææ)"
+#: ../libempathy-gtk/empathy-individual-widget.c:459
+msgid "State:"
+msgstr "åï"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Online from a phone or mobile device"
-msgstr "åææææåéèåæäç"
+#: ../libempathy-gtk/empathy-individual-widget.c:461
+msgid "City:"
+msgstr "åï"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
-msgid "New Network"
-msgstr "æåçç"
+#: ../libempathy-gtk/empathy-individual-widget.c:463
+msgid "Area:"
+msgstr "ååï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:465
+msgid "Postal Code:"
+msgstr "ééåèï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:467
+msgid "Street:"
+msgstr "èï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:469
+msgid "Building:"
+msgstr "åçï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:471
+msgid "Floor:"
+msgstr "æåï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:473
+msgid "Room:"
+msgstr "åï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:475
+msgid "Text:"
+msgstr "æåï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:477
+msgid "Description:"
+msgstr "æèï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:479
+msgid "URI:"
+msgstr "URIï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:481
+msgid "Accuracy Level:"
+msgstr "æçåççï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:483
+msgid "Error:"
+msgstr "éèï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:485
+msgid "Vertical Error (meters):"
+msgstr "åçèå (ç)ï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:487
+msgid "Horizontal Error (meters):"
+msgstr "æåèå (ç)ï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:489
+msgid "Speed:"
+msgstr "éåï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:491
+msgid "Bearing:"
+msgstr "æäï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:493
+msgid "Climb Speed:"
+msgstr "çåéåï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:495
+msgid "Last Updated on:"
+msgstr "äææææï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:497
+msgid "Longitude:"
+msgstr "çåï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:499
+msgid "Latitude:"
+msgstr "çåï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:501
+msgid "Altitude:"
+msgstr "çåï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:39
+msgid "Location"
+msgstr "äç"
+
+#. translators: format is "Location, $date"
+#: ../libempathy-gtk/empathy-individual-widget.c:610
+#, c-format
+msgid "%s, %s"
+msgstr "%sï%s"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:659
+msgid "%B %e, %Y at %R UTC"
+msgstr "%Y %B %e æ %R UTC"
+
+#. Alias
+#: ../libempathy-gtk/empathy-individual-widget.c:1304
+msgid "Alias:"
+msgstr "ååï"
+
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-individual-widget.c:1513
+msgid "Identifier:"
+msgstr "èåèåï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#, c-format
+msgid "Linked contact containing %u contact"
+msgid_plural "Linked contacts containing %u contacts"
+msgstr[0] "éçèççåå %u äèçä"
+
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
+msgid "<b>Location</b> at (date)"
+msgstr "<b>äç</b> æ (ææ)"
+
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+msgid "Online from a phone or mobile device"
+msgstr "åææææåéèåæäç"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
+msgid "New Network"
+msgstr "æåçç"
 
 #: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
@@ -2227,133 +2182,150 @@ msgstr "æåäæå"
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:617
+#: ../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: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> åçéååèã"
+
+#: ../libempathy-gtk/empathy-log-window.c:622
 msgid "History"
 msgstr "æå"
 
-#: ../libempathy-gtk/empathy-log-window.c:672
+#: ../libempathy-gtk/empathy-log-window.c:677
 msgid "Show"
 msgstr "éç"
 
-#: ../libempathy-gtk/empathy-log-window.c:694
+#: ../libempathy-gtk/empathy-log-window.c:699
 msgid "Search"
 msgstr "æå"
 
-#: ../libempathy-gtk/empathy-log-window.c:1145
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat in %s"
 msgstr "æ %s åèå"
 
-#: ../libempathy-gtk/empathy-log-window.c:1147
+#: ../libempathy-gtk/empathy-log-window.c:1152
 #, c-format
 msgid "Chat with %s"
 msgstr "è %s èåä"
 
-#: ../libempathy-gtk/empathy-log-window.c:1197
-#: ../libempathy-gtk/empathy-log-window.c:1341
+#: ../libempathy-gtk/empathy-log-window.c:1202
+#: ../libempathy-gtk/empathy-log-window.c:1346
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%Y %B %d %A"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1284
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1290
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%sï</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1365
+#: ../libempathy-gtk/empathy-log-window.c:1370
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s ç"
 
-#: ../libempathy-gtk/empathy-log-window.c:1372
+#: ../libempathy-gtk/empathy-log-window.c:1377
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s åé"
 
-#: ../libempathy-gtk/empathy-log-window.c:1380
+#: ../libempathy-gtk/empathy-log-window.c:1385
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "éèæé %sïçææ %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1711
+#: ../libempathy-gtk/empathy-log-window.c:1716
 msgid "Today"
 msgstr "äæ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1715
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Yesterday"
 msgstr "ææ"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1730
+#: ../libempathy-gtk/empathy-log-window.c:1735
 msgid "%e %B %Y"
 msgstr "%Yå%B%eæ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1834
-#: ../libempathy-gtk/empathy-log-window.c:3457
+#: ../libempathy-gtk/empathy-log-window.c:1839
+#: ../libempathy-gtk/empathy-log-window.c:3462
 msgid "Anytime"
 msgstr "ääæé"
 
-#: ../libempathy-gtk/empathy-log-window.c:1933
-#: ../libempathy-gtk/empathy-log-window.c:2392
+#: ../libempathy-gtk/empathy-log-window.c:1938
+#: ../libempathy-gtk/empathy-log-window.c:2397
 msgid "Anyone"
 msgstr "ääå"
 
-#: ../libempathy-gtk/empathy-log-window.c:2705
+#: ../libempathy-gtk/empathy-log-window.c:2710
 msgid "Who"
 msgstr "è"
 
-#: ../libempathy-gtk/empathy-log-window.c:2914
+#: ../libempathy-gtk/empathy-log-window.c:2919
 msgid "When"
 msgstr "äæ"
 
-#: ../libempathy-gtk/empathy-log-window.c:3032
+#: ../libempathy-gtk/empathy-log-window.c:3037
 msgid "Anything"
 msgstr "äää"
 
-#: ../libempathy-gtk/empathy-log-window.c:3034
+#: ../libempathy-gtk/empathy-log-window.c:3039
 msgid "Text chats"
 msgstr "æåèå"
 
-#: ../libempathy-gtk/empathy-log-window.c:3035
+#: ../libempathy-gtk/empathy-log-window.c:3040
 #: ../src/empathy-preferences.ui.h:29
 msgid "Calls"
 msgstr "éè"
 
-#: ../libempathy-gtk/empathy-log-window.c:3039
+#: ../libempathy-gtk/empathy-log-window.c:3044
 msgid "Incoming calls"
 msgstr "äé"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3045
 msgid "Outgoing calls"
 msgstr "æå"
 
-#: ../libempathy-gtk/empathy-log-window.c:3041
+#: ../libempathy-gtk/empathy-log-window.c:3046
 msgid "Missed calls"
 msgstr "ææäé"
 
-#: ../libempathy-gtk/empathy-log-window.c:3061
+#: ../libempathy-gtk/empathy-log-window.c:3066
 msgid "What"
 msgstr "äé"
 
-#: ../libempathy-gtk/empathy-log-window.c:3750
+#: ../libempathy-gtk/empathy-log-window.c:3755
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "äçåèåééåèèçææçéåï"
 
-#: ../libempathy-gtk/empathy-log-window.c:3754
+#: ../libempathy-gtk/empathy-log-window.c:3759
 msgid "Clear All"
 msgstr "æéåé"
 
-#: ../libempathy-gtk/empathy-log-window.c:3761
+#: ../libempathy-gtk/empathy-log-window.c:3766
 msgid "Delete from:"
 msgstr "åéåï"
 
@@ -2392,6 +2364,34 @@ msgstr "éé 2"
 msgid "<span size=\"x-large\">Loading...</span>"
 msgstr "<span size=\"x-large\">æåèå...</span>"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:129
+msgid "What kind of chat account do you have?"
+msgstr "äçèååèæåäçï"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:151
+msgid "Adding new account"
+msgstr "æååè"
+
+#: ../libempathy-gtk/empathy-new-call-dialog.c:199
+#: ../libempathy-gtk/empathy-new-message-dialog.c:289
+msgid "Enter a contact identifier or phone number:"
+msgstr "èèåèçäèèèäæéèèçï"
+
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:222
+msgid "_Video Call"
+msgstr "èåéè(_V)"
+
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:232
+msgid "_Audio Call"
+msgstr "èééè(_A)"
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+msgid "New Call"
+msgstr "æåéè"
+
 #: ../libempathy-gtk/empathy-new-message-dialog.c:82
 msgid "The contact is offline"
 msgstr "èçäåçéç"
@@ -2436,46 +2436,11 @@ msgstr "èåèæç"
 msgid "There was an error starting the conversation"
 msgstr "ååèèæççéè"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:289
-#: ../libempathy-gtk/empathy-new-call-dialog.c:199
-msgid "Enter a contact identifier or phone number:"
-msgstr "èèåèçäèèèäæéèèçï"
-
 #. Tweak the dialog
 #: ../libempathy-gtk/empathy-new-message-dialog.c:332
 msgid "New Conversation"
 msgstr "æåèè"
 
-#. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:222
-msgid "_Video Call"
-msgstr "èåéè(_V)"
-
-#. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:232
-msgid "_Audio Call"
-msgstr "èééè(_A)"
-
-#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:242
-msgid "New Call"
-msgstr "æåéè"
-
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
-#, c-format
-msgid "Authentication failed for account <b>%s</b>"
-msgstr "<b>%s</b> åèéèåæ"
-
-#: ../libempathy-gtk/empathy-base-password-dialog.c:224
-#: ../libempathy-gtk/empathy-password-dialog.c:134
-#, c-format
-msgid ""
-"Enter your password for account\n"
-"<b>%s</b>"
-msgstr ""
-"èåäåèçåç\n"
-"<b>%s</b>"
-
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
@@ -2523,11 +2488,15 @@ msgstr "èéèæâ"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:597
+#: ../libempathy-gtk/empathy-protocol-chooser.c:610
 #, c-format
 msgid "New %s account"
 msgstr "æå %s åè"
 
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "æåååå(_M)"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
 msgstr "åæï"
@@ -2592,31 +2561,34 @@ msgstr "èééèçæ"
 msgid "Edit Custom Messages"
 msgstr "çèèéèæ"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1056
+#: ../libempathy-gtk/empathy-subscription-dialog.c:234
+msgid "Subscription Request"
+msgstr "èéèæ"
+
+#: ../libempathy-gtk/empathy-subscription-dialog.c:240
+#: ../src/empathy-event-manager.c:1114
+#, c-format
+msgid "%s would like permission to see when you are online"
+msgstr "%s æèååæçäæåäççèå"
+
+#: ../libempathy-gtk/empathy-subscription-dialog.c:281
+#: ../src/empathy-event-manager.c:731
+msgid "_Decline"
+msgstr "æç(_D)"
+
+#: ../libempathy-gtk/empathy-subscription-dialog.c:282
+msgid "_Accept"
+msgstr "æå(_A)"
+
+#: ../libempathy-gtk/empathy-theme-adium.c:1126
 #, c-format
 msgid "Message edited at %s"
 msgstr "èæçèæ %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1776
+#: ../libempathy-gtk/empathy-theme-adium.c:1843
 msgid "Normal"
 msgstr "äè"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
-msgid "Classic"
-msgstr "åå"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:71
-msgid "Simple"
-msgstr "çæ"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:72
-msgid "Clean"
-msgstr "æç"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:73
-msgid "Blue"
-msgstr "èè"
-
 #: ../libempathy-gtk/empathy-tls-dialog.c:150
 msgid "The identity provided by the chat server cannot be verified."
 msgstr "èåäæåææäçèåèåçæéééèã"
@@ -2692,30 +2664,48 @@ msgstr "èèäæéæääæäéçäç"
 msgid "Certificate Details"
 msgstr "èæèçèæ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1754
+#: ../libempathy-gtk/empathy-ui-utils.c:1050
 msgid "Unable to open URI"
 msgstr "çæéå URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1174
 msgid "Select a file"
 msgstr "éæäåææ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1947
+#: ../libempathy-gtk/empathy-ui-utils.c:1248
 msgid "Insufficient free space to save file"
 msgstr "çéäèäååææ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1256
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 msgstr "éè %s ççéäååæææïäåæ %s åçãèéæåääçã"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1999
+#: ../libempathy-gtk/empathy-ui-utils.c:1302
 #, c-format
 msgid "Incoming file from %s"
 msgstr "æåäè %s çææ"
 
+#: ../libempathy-gtk/empathy-user-info.c:384
+msgid "Go online to edit your personal information."
+msgstr "äçäçèäçåäèæã"
+
+#: ../libempathy-gtk/empathy-user-info.c:464
+msgid "<b>Personal Details</b>"
+msgstr "<b>åäèçèæ</b>"
+
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-webkit-utils.c:278
+msgid "_Copy Link Address"
+msgstr "èèéçäå(_C)"
+
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-webkit-utils.c:285
+msgid "_Open Link"
+msgstr "éåéç(_O)"
+
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
 msgstr "çåçååèè"
@@ -2883,50 +2873,14 @@ msgstr "èæèç"
 msgid "Vietnamese"
 msgstr "èåæ"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:66
-msgid "Select..."
-msgstr "éå..."
-
-#: ../libempathy-gtk/empathy-calendar-button.c:154
-msgid "_Select"
-msgstr "éå(_S)"
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:225
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
 msgid "No error message"
 msgstr "ææéèèæ"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:298
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304
 msgid "Instant Message (Empathy)"
 msgstr "åæéè (Empathy)"
 
-#: ../src/empathy.c:432
-msgid "Don't connect on startup"
-msgstr "ååæäèèåéç"
-
-#: ../src/empathy.c:436
-msgid "Don't display the contact list or any other dialogs on startup"
-msgstr "ååæäéçèçäæåæääåäåèç"
-
-#: ../src/empathy.c:452
-msgid "- Empathy IM Client"
-msgstr "- Empathy åæéçæç"
-
-#: ../src/empathy.c:628
-msgid "Error contacting the Account Manager"
-msgstr "èçåèçççåæççéè"
-
-#: ../src/empathy.c:630
-#, c-format
-msgid ""
-"There was an error while trying to connect to the Telepathy Account Manager. "
-"The error was:\n"
-"\n"
-"%s"
-msgstr ""
-"åèéæè Telepathy åèçççåæççéèãéèçï\n"
-"\n"
-"%s"
-
 #: ../src/empathy-about-dialog.c:81
 msgid ""
 "Empathy is free software; you can redistribute it and/or modify it under the "
@@ -2966,6 +2920,31 @@ msgstr ""
 "Craig Jeffares <cjeffares novell com>, 2004\n"
 "Joe Man <trmetal yahoo com hk>, 2001"
 
+#: ../src/empathy-accounts.c:184
+msgid "Don't display any dialogs; do any work (eg, importing) and exit"
+msgstr "äèéçääåèçïåèäääæ (äïåå) äéé"
+
+#: ../src/empathy-accounts.c:188
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr "äèéçääåèçïééåæãéèçäãåè"
+
+#: ../src/empathy-accounts.c:192
+msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
+msgstr "ååéåæçäçåè (äïgabble/jabber/foo_40example_2eorg0)"
+
+#: ../src/empathy-accounts.c:194
+msgid "<account-id>"
+msgstr "<account-id>"
+
+#: ../src/empathy-accounts.c:199
+msgid "- Empathy Accounts"
+msgstr "- Empathy åè"
+
+#: ../src/empathy-accounts.c:242
+msgid "Empathy Accounts"
+msgstr "Empathy åè"
+
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
 #: ../src/empathy-accounts-dialog.c:70
@@ -2979,65 +2958,57 @@ msgstr "æèäç %s åèçéçäæåæååã"
 msgid "Your new account has not been saved yet."
 msgstr "åæååäçæåèã"
 
-#: ../src/empathy-accounts-dialog.c:403 ../src/empathy-call-window.c:1268
+#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1268
 msgid "Connectingâ"
 msgstr "éçäâ"
 
-#: ../src/empathy-accounts-dialog.c:444
+#: ../src/empathy-accounts-dialog.c:445
 #, c-format
 msgid "Offline â %s"
 msgstr "éç â %s"
 
-#: ../src/empathy-accounts-dialog.c:456
+#: ../src/empathy-accounts-dialog.c:457
 #, c-format
 msgid "Disconnected â %s"
 msgstr "åæç â %s"
 
-#: ../src/empathy-accounts-dialog.c:467
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline â No Network Connection"
 msgstr "éç â çççéç"
 
-#: ../src/empathy-accounts-dialog.c:474
+#: ../src/empathy-accounts-dialog.c:475
 msgid "Unknown Status"
 msgstr "æçççæ"
 
-#: ../src/empathy-accounts-dialog.c:491
+#: ../src/empathy-accounts-dialog.c:492
 msgid ""
 "This account has been disabled because it relies on an old, unsupported "
 "backend. Please install telepathy-haze and restart your session to migrate "
 "the account."
 msgstr "éåååçåçïåçåéèèèãäååææçåççåãèåè telepathy-haze äéæååäçäæéæäéçåèèæã"
 
-#: ../src/empathy-accounts-dialog.c:501
+#: ../src/empathy-accounts-dialog.c:502
 msgid "Offline â Account Disabled"
 msgstr "éç â åèååç"
 
-#: ../src/empathy-accounts-dialog.c:607
+#: ../src/empathy-accounts-dialog.c:608
 msgid "Edit Connection Parameters"
 msgstr "çèéçåæ"
 
-#: ../src/empathy-accounts-dialog.c:770
-msgid "Failed to retrieve your personal information from the server."
-msgstr "çæåäæåæåäçåäèæã"
-
-#: ../src/empathy-accounts-dialog.c:776
-msgid "Go online to edit your personal information."
-msgstr "äçäçèäçåäèæã"
-
-#: ../src/empathy-accounts-dialog.c:862
+#: ../src/empathy-accounts-dialog.c:733
 msgid "_Edit Connection Parameters..."
 msgstr "çèéçåæ(_E)..."
 
-#: ../src/empathy-accounts-dialog.c:1358
+#: ../src/empathy-accounts-dialog.c:1235
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "æåæèåäçéèäçéçç %sï"
 
-#: ../src/empathy-accounts-dialog.c:1362
+#: ../src/empathy-accounts-dialog.c:1239
 msgid "This will not remove your account on the server."
 msgstr "éäæçéäæåäçäçåèã"
 
-#: ../src/empathy-accounts-dialog.c:1567
+#: ../src/empathy-accounts-dialog.c:1444
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3046,24 +3017,24 @@ msgstr ""
 "äæåçææãçåèççï"
 
 #. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1758
+#: ../src/empathy-accounts-dialog.c:1635
 msgid "_Enabled"
 msgstr "ååç(_E)"
 
 #. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1781
+#: ../src/empathy-accounts-dialog.c:1658
 msgid "Rename"
 msgstr "éæåå"
 
-#: ../src/empathy-accounts-dialog.c:2197
+#: ../src/empathy-accounts-dialog.c:2074
 msgid "_Skip"
 msgstr "çé(_S)"
 
-#: ../src/empathy-accounts-dialog.c:2201
+#: ../src/empathy-accounts-dialog.c:2078
 msgid "_Connect"
 msgstr "éæ(_C)"
 
-#: ../src/empathy-accounts-dialog.c:2380
+#: ../src/empathy-accounts-dialog.c:2257
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3071,6 +3042,11 @@ msgstr ""
 "äååéééåèçïéææææ\n"
 "äæåçææãçåèççï"
 
+#. Tweak the dialog
+#: ../src/empathy-accounts-dialog.c:2400
+msgid "Messaging and VoIP Accounts"
+msgstr "èæè VoIP åè"
+
 #: ../src/empathy-accounts-dialog.ui.h:3
 msgid "_Importâ"
 msgstr "åå(_I)â"
@@ -3093,9 +3069,209 @@ msgstr "åæåèéèåååççå"
 msgid " - Empathy authentication client"
 msgstr "- Empathy èèçæç"
 
-#: ../src/empathy-auth-client.c:304
-msgid "Empathy authentication client"
-msgstr "Empathy èèçæç"
+#: ../src/empathy-auth-client.c:304
+msgid "Empathy authentication client"
+msgstr "Empathy èèçæç"
+
+#: ../src/empathy.c:432
+msgid "Don't connect on startup"
+msgstr "ååæäèèåéç"
+
+#: ../src/empathy.c:436
+msgid "Don't display the contact list or any other dialogs on startup"
+msgstr "ååæäéçèçäæåæääåäåèç"
+
+#: ../src/empathy.c:452
+msgid "- Empathy IM Client"
+msgstr "- Empathy åæéçæç"
+
+#: ../src/empathy.c:628
+msgid "Error contacting the Account Manager"
+msgstr "èçåèçççåæççéè"
+
+#: ../src/empathy.c:630
+#, c-format
+msgid ""
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
+"\n"
+"%s"
+msgstr ""
+"åèéæè Telepathy åèçççåæççéèãéèçï\n"
+"\n"
+"%s"
+
+#: ../src/empathy-call.c:195
+msgid "- Empathy Audio/Video Client"
+msgstr "- Empathy éèèåçæç"
+
+#: ../src/empathy-call.c:219
+msgid "Empathy Audio/Video Client"
+msgstr "Empathy éèèåçæç"
+
+#: ../src/empathy-call-observer.c:119
+#, c-format
+msgid "%s just tried to call you, but you were in another call."
+msgstr "%s ååææçäïääæèääéèã"
+
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1125 ../src/empathy-call-window.c:1141
+msgid "i"
+msgstr "è"
+
+#: ../src/empathy-call-window.c:1485 ../src/empathy-event-manager.c:510
+msgid "Incoming call"
+msgstr "äé"
+
+#: ../src/empathy-call-window.c:1491 ../src/empathy-event-manager.c:915
+#, c-format
+msgid "Incoming video call from %s"
+msgstr "äè %s çèåéè"
+
+#: ../src/empathy-call-window.c:1491 ../src/empathy-event-manager.c:518
+#: ../src/empathy-event-manager.c:915
+#, c-format
+msgid "Incoming call from %s"
+msgstr "%s çäé"
+
+#: ../src/empathy-call-window.c:1495
+#: ../src/empathy-notifications-approver.c:197
+msgid "Reject"
+msgstr "æç"
+
+#: ../src/empathy-call-window.c:1496
+#: ../src/empathy-notifications-approver.c:202
+#: ../src/empathy-notifications-approver.c:207
+msgid "Answer"
+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:1862
+#, c-format
+msgid "Call with %s"
+msgstr "è %s éèä"
+
+#: ../src/empathy-call-window.c:2114
+msgid "The IP address as seen by the machine"
+msgstr "æåçèç IP äå"
+
+#: ../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:2118
+msgid "The IP address of the peer as seen by the other side"
+msgstr "åäççèçéç IP äå"
+
+#: ../src/empathy-call-window.c:2120
+msgid "The IP address of a relay server"
+msgstr "äçäæåç IP äå"
+
+#: ../src/empathy-call-window.c:2122
+msgid "The IP address of the multicast group"
+msgstr "åéåæççç IP äå"
+
+#: ../src/empathy-call-window.c:2523 ../src/empathy-call-window.c:2524
+#: ../src/empathy-call-window.c:2525 ../src/empathy-call-window.c:2526
+#: ../src/empathy-call-window.ui.h:26
+msgid "Unknown"
+msgstr "äæ"
+
+#: ../src/empathy-call-window.c:2869
+msgid "On hold"
+msgstr "äç"
+
+#: ../src/empathy-call-window.c:2871
+msgid "Mute"
+msgstr "éé"
+
+#: ../src/empathy-call-window.c:2873
+msgid "Duration"
+msgstr "æé"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2876
+#, c-format
+msgid "%s â %d:%02dm"
+msgstr "%s â %d:%02dm"
+
+#: ../src/empathy-call-window.c:2972
+msgid "Technical Details"
+msgstr "æèçç"
+
+#: ../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: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: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:3028
+msgid "There was a failure on the network"
+msgstr "éåççäæéèçç"
+
+#: ../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:3035
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
+msgstr "æéèæåèçèåæååæåäçéèäåè"
+
+#: ../src/empathy-call-window.c:3047
+#, c-format
+msgid ""
+"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
+"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
+"the Help menu."
+msgstr "å Telepathy åääççæéæççæãè<a href=\"%s\">ååéåéè</a>äéäåæåéååçãééãèçäææéççéã"
+
+#: ../src/empathy-call-window.c:3056
+msgid "There was a failure in the call engine"
+msgstr "éèåæåæéèçç"
+
+#: ../src/empathy-call-window.c:3059
+msgid "The end of the stream was reached"
+msgstr "åéäææç"
+
+#: ../src/empathy-call-window.c:3099
+msgid "Can't establish audio stream"
+msgstr "çæåçéèäæ"
+
+#: ../src/empathy-call-window.c:3109
+msgid "Can't establish video stream"
+msgstr "çæåçèåäæ"
+
+#: ../src/empathy-call-window.c:3146
+#, c-format
+msgid "Your current balance is %s."
+msgstr "äçåçééç %sã"
+
+#: ../src/empathy-call-window.c:3150
+msgid "Sorry, you donât have enough credit for that call."
+msgstr "åææïäçåéäèäéèèéèã"
+
+#: ../src/empathy-call-window.c:3152
+msgid "Top Up"
+msgstr "åå"
 
 #: ../src/empathy-call-window.ui.h:1
 msgid "_Call"
@@ -3185,12 +3361,6 @@ msgstr "åæéèåæ"
 msgid "Encoding Codec:"
 msgstr "ççççèçåï"
 
-#: ../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 "Decoding Codec:"
 msgstr "èçççèçåï"
@@ -3207,18 +3377,38 @@ msgstr "ææåéï"
 msgid "Audio"
 msgstr "éè"
 
-#: ../src/empathy-chat-window.c:288
+#: ../src/empathy-chat.c:106
+msgid "- Empathy Chat Client"
+msgstr "- Empathy èåçæç"
+
+#: ../src/empathy-chatrooms-window.c:251
+msgid "Name"
+msgstr "åç"
+
+#: ../src/empathy-chatrooms-window.c:269
+msgid "Room"
+msgstr "èåå"
+
+#: ../src/empathy-chatrooms-window.c:277
+msgid "Auto-Connect"
+msgstr "èåéç"
+
+#: ../src/empathy-chatrooms-window.ui.h:1
+msgid "Manage Favorite Rooms"
+msgstr "ççååçèåå"
+
+#: ../src/empathy-chat-window.c:282
 msgid "Close this window?"
 msgstr "èéééåèçï"
 
-#: ../src/empathy-chat-window.c:293
+#: ../src/empathy-chat-window.c:288
 #, 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:304
+#: ../src/empathy-chat-window.c:301
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -3228,7 +3418,7 @@ msgid_plural ""
 "further messages until you rejoin them."
 msgstr[0] "ééæèçæéé %u åèååãäåçæææåäåçèæïééäåæåèã"
 
-#: ../src/empathy-chat-window.c:313
+#: ../src/empathy-chat-window.c:312
 #, c-format
 msgid "Leave %s?"
 msgstr "éé %sï"
@@ -3247,41 +3437,41 @@ msgstr "ééèç"
 msgid "Leave room"
 msgstr "ééèåå"
 
-#: ../src/empathy-chat-window.c:662 ../src/empathy-chat-window.c:682
+#: ../src/empathy-chat-window.c:667 ../src/empathy-chat-window.c:690
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d åæè)"
 
-#: ../src/empathy-chat-window.c:674
+#: ../src/empathy-chat-window.c:682
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (èåä %u å)"
 
-#: ../src/empathy-chat-window.c:690
+#: ../src/empathy-chat-window.c:698
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (äèåääç %d åæè)"
 
-#: ../src/empathy-chat-window.c:699
+#: ../src/empathy-chat-window.c:707
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (äèææäç %d åæè)"
 
-#: ../src/empathy-chat-window.c:914
+#: ../src/empathy-chat-window.c:944
 msgid "SMS:"
 msgstr "SMSï"
 
-#: ../src/empathy-chat-window.c:924
+#: ../src/empathy-chat-window.c:952
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "æååé %d åèæ"
 
-#: ../src/empathy-chat-window.c:946
+#: ../src/empathy-chat-window.c:972
 msgid "Typing a message."
 msgstr "æåèåèæã"
 
@@ -3345,30 +3535,100 @@ msgstr "ååéåç(_R)"
 msgid "_Detach Tab"
 msgstr "åéåé(_D)"
 
-#: ../src/empathy-chatrooms-window.c:251
-msgid "Name"
-msgstr "åç"
+#: ../src/empathy-debugger.c:69
+msgid "Show a particular service"
+msgstr "éççåæå"
 
-#: ../src/empathy-chatrooms-window.c:269
-msgid "Room"
-msgstr "èåå"
+#: ../src/empathy-debugger.c:74
+msgid "- Empathy Debugger"
+msgstr "- Empathy ééå"
 
-#: ../src/empathy-chatrooms-window.c:277
-msgid "Auto-Connect"
-msgstr "èåéç"
+#: ../src/empathy-debugger.c:113
+msgid "Empathy Debugger"
+msgstr "Empathy ééçå"
 
-#: ../src/empathy-chatrooms-window.ui.h:1
-msgid "Manage Favorite Rooms"
-msgstr "ççååçèåå"
+#: ../src/empathy-debug-window.c:1603
+msgid "Save"
+msgstr "åå"
+
+#: ../src/empathy-debug-window.c:1663
+msgid "Pastebin link"
+msgstr "Pastebin éç"
+
+#: ../src/empathy-debug-window.c:1672
+msgid "Pastebin response"
+msgstr "Pastebin åæ"
+
+#: ../src/empathy-debug-window.c:1679
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "åæåäèääèèæééåãèååçéèææã"
+
+#: ../src/empathy-debug-window.c:1860
+msgid "Debug Window"
+msgstr "åéèç"
+
+#: ../src/empathy-debug-window.c:1920
+msgid "Send to pastebin"
+msgstr "åéè pastebin"
+
+#: ../src/empathy-debug-window.c:1964
+msgid "Pause"
+msgstr "æå"
+
+#: ../src/empathy-debug-window.c:1976
+msgid "Level "
+msgstr "çç"
+
+#: ../src/empathy-debug-window.c:1995
+msgid "Debug"
+msgstr "åé"
+
+#: ../src/empathy-debug-window.c:2000
+msgid "Info"
+msgstr "èè"
+
+#: ../src/empathy-debug-window.c:2005 ../src/empathy-debug-window.c:2054
+msgid "Message"
+msgstr "èæ"
+
+#: ../src/empathy-debug-window.c:2010
+msgid "Warning"
+msgstr "èå"
+
+#: ../src/empathy-debug-window.c:2015
+msgid "Critical"
+msgstr "åé"
+
+#: ../src/empathy-debug-window.c:2020
+msgid "Error"
+msgstr "éè"
+
+#: ../src/empathy-debug-window.c:2039
+msgid "Time"
+msgstr "æå"
+
+#: ../src/empathy-debug-window.c:2042
+msgid "Domain"
+msgstr "çå"
+
+#: ../src/empathy-debug-window.c:2045
+msgid "Category"
+msgstr "åé"
+
+#: ../src/empathy-debug-window.c:2048
+msgid "Level"
+msgstr "çç"
+
+#: ../src/empathy-debug-window.c:2077
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr "éåçéççççåäææéçåéæååèã"
 
 #: ../src/empathy-event-manager.c:510
 msgid "Incoming video call"
 msgstr "ååçèåéè"
 
-#: ../src/empathy-event-manager.c:510 ../src/empathy-call-window.c:1485
-msgid "Incoming call"
-msgstr "äé"
-
 #: ../src/empathy-event-manager.c:514
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
@@ -3379,12 +3639,6 @@ msgstr "%s èèäéèèåéèãäæåèæèï"
 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:1491
-#, c-format
-msgid "Incoming call from %s"
-msgstr "%s çäé"
-
 #: ../src/empathy-event-manager.c:543
 msgid "_Reject"
 msgstr "æç(_R)"
@@ -3411,10 +3665,6 @@ msgstr "éèåå %s"
 msgid "%s is inviting you to join %s"
 msgstr "%s æåéèäåå %s"
 
-#: ../src/empathy-event-manager.c:731
-msgid "_Decline"
-msgstr "æç(_D)"
-
 #: ../src/empathy-event-manager.c:736
 msgid "_Join"
 msgstr "åå(_J)"
@@ -3429,26 +3679,16 @@ msgstr "%s æéèäåå %s"
 msgid "You have been invited to join %s"
 msgstr "äèéèåå %s"
 
-#: ../src/empathy-event-manager.c:915 ../src/empathy-call-window.c:1491
-#, c-format
-msgid "Incoming video call from %s"
-msgstr "äè %s çèåéè"
-
 #: ../src/empathy-event-manager.c:947
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "æåäè %s çææåè"
 
-#: ../src/empathy-event-manager.c:983 ../src/empathy-roster-window.c:223
+#: ../src/empathy-event-manager.c:983 ../src/empathy-roster-window.c:224
 msgid "Password required"
 msgstr "éèåç"
 
-#: ../src/empathy-event-manager.c:1105
-#, c-format
-msgid "%s would like permission to see when you are online"
-msgstr "%s æèååæçäæåäççèå"
-
-#: ../src/empathy-event-manager.c:1111
+#: ../src/empathy-event-manager.c:1120
 #, c-format
 msgid ""
 "\n"
@@ -3552,172 +3792,61 @@ msgstr "æåèçã%sãéæå"
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1037
-msgid "File"
-msgstr "ææ"
-
-#: ../src/empathy-ft-manager.c:1059
-msgid "Remaining"
-msgstr "åé"
-
-#: ../src/empathy-ft-manager.ui.h:1
-msgid "File Transfers"
-msgstr "ææåè"
-
-#: ../src/empathy-ft-manager.ui.h:2
-msgid "Remove completed, canceled and failed file transfers from the list"
-msgstr "åæåäçéååæãååæååæçææåè"
-
-#: ../src/empathy-import-dialog.c:76
-msgid "_Import"
-msgstr "åå(_I)"
-
-#: ../src/empathy-import-dialog.c:88
-msgid ""
-"No accounts to import could be found. Empathy currently only supports "
-"importing accounts from Pidgin."
-msgstr "æäååååçåèãEmpathy çååææå Pidgin åååèã"
-
-#: ../src/empathy-import-dialog.c:209
-msgid "Import Accounts"
-msgstr "åååè"
-
-#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:303
-msgid "Import"
-msgstr "åå"
-
-#: ../src/empathy-import-widget.c:312
-msgid "Protocol"
-msgstr "éèåå"
-
-#: ../src/empathy-import-widget.c:336
-msgid "Source"
-msgstr "äæ"
-
-#: ../src/empathy-roster-window.c:240
-msgid "Provide Password"
-msgstr "æäåç"
-
-#: ../src/empathy-roster-window.c:246
-msgid "Disconnect"
-msgstr "æç"
-
-#: ../src/empathy-roster-window.c:417
-msgid "You need to setup an account to see contacts here."
-msgstr "äéèèçäååèæèåéèæçèçäã"
-
-#: ../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:570
-msgid "Update software..."
-msgstr "ææèä..."
-
-#: ../src/empathy-roster-window.c:576 ../src/empathy-roster-window.c:693
-msgid "Close"
-msgstr "éé"
-
-#: ../src/empathy-roster-window.c:681
-msgid "Reconnect"
-msgstr "éæéæ"
-
-#: ../src/empathy-roster-window.c:687
-msgid "Edit Account"
-msgstr "çèåè"
-
-#: ../src/empathy-roster-window.c:867
-msgid "Top up account"
-msgstr "åååèåé"
-
-#: ../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:1537
-#, c-format
-msgid "You need to enable %s to see contacts here."
-msgstr "äéèåç %s æèåéèæçèçäã"
-
-#: ../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 "èçäæå"
-
-#: ../src/empathy-roster-window.ui.h:1
-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-ft-manager.c:1037
+msgid "File"
+msgstr "ææ"
 
-#: ../src/empathy-roster-window-menubar.ui.h:5
-msgid "_Search for Contacts..."
-msgstr "æåèçä(_S)..."
+#: ../src/empathy-ft-manager.c:1059
+msgid "Remaining"
+msgstr "åé"
 
-#: ../src/empathy-roster-window-menubar.ui.h:6
-msgid "_Blocked Contacts"
-msgstr "èåéçèçä"
+#: ../src/empathy-ft-manager.ui.h:1
+msgid "File Transfers"
+msgstr "ææåè"
 
-#: ../src/empathy-roster-window-menubar.ui.h:7
-msgid "_Rooms"
-msgstr "èåå(_R)"
+#: ../src/empathy-ft-manager.ui.h:2
+msgid "Remove completed, canceled and failed file transfers from the list"
+msgstr "åæåäçéååæãååæååæçææåè"
 
-#: ../src/empathy-roster-window-menubar.ui.h:8
-msgid "_Join..."
-msgstr "åå(_J)..."
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "åå(_I)"
 
-#: ../src/empathy-roster-window-menubar.ui.h:9
-msgid "Join _Favorites"
-msgstr "ååååèåå(_F)"
+#: ../src/empathy-import-dialog.c:88
+msgid ""
+"No accounts to import could be found. Empathy currently only supports "
+"importing accounts from Pidgin."
+msgstr "æäååååçåèãEmpathy çååææå Pidgin åååèã"
 
-#: ../src/empathy-roster-window-menubar.ui.h:10
-msgid "_Manage Favorites"
-msgstr "ççåå(_M)"
+#: ../src/empathy-import-dialog.c:209
+msgid "Import Accounts"
+msgstr "åååè"
 
-#: ../src/empathy-roster-window-menubar.ui.h:12
-msgid "_File Transfers"
-msgstr "ææåè(_F)"
+#. Translators: this is the header of a treeview column
+#: ../src/empathy-import-widget.c:303
+msgid "Import"
+msgstr "åå"
 
-#: ../src/empathy-roster-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "åè(_A)"
+#: ../src/empathy-import-widget.c:312
+msgid "Protocol"
+msgstr "éèåå"
 
-#: ../src/empathy-roster-window-menubar.ui.h:14
-msgid "P_references"
-msgstr "ååèå(_R)"
+#: ../src/empathy-import-widget.c:336
+msgid "Source"
+msgstr "äæ"
 
-#: ../src/empathy-roster-window-menubar.ui.h:15
-msgid "Help"
-msgstr "æå"
+#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:229
+msgid "Invite Participant"
+msgstr "éèåè"
 
-#: ../src/empathy-roster-window-menubar.ui.h:16
-msgid "About Empathy"
-msgstr "éæ Empathy"
+#: ../src/empathy-invite-participant-dialog.c:202
+msgid "Choose a contact to invite into the conversation:"
+msgstr "éææèéèéåèèçèçäï"
 
-#: ../src/empathy-roster-window-menubar.ui.h:17
-#: ../src/empathy-status-icon.ui.h:5
-msgid "_Quit"
-msgstr "çæ(_Q)"
+#: ../src/empathy-invite-participant-dialog.c:225
+msgid "Invite"
+msgstr "éè"
 
 #: ../src/empathy-new-chatroom-dialog.c:194
 msgid "Chat Room"
@@ -3754,7 +3883,7 @@ msgstr "æ"
 msgid "No"
 msgstr "å"
 
-#: ../src/empathy-new-chatroom-dialog.c:782
+#: ../src/empathy-new-chatroom-dialog.c:784
 msgid "Join Room"
 msgstr "ååèåå"
 
@@ -3791,79 +3920,104 @@ msgstr "çæèåèååæå"
 msgid "Room List"
 msgstr "èååæå"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-notifications-approver.c:188
+msgid "Respond"
+msgstr "åæ"
+
+#: ../src/empathy-notifications-approver.c:207
+msgid "Answer with video"
+msgstr "äèåæè"
+
+#: ../src/empathy-notifications-approver.c:215
+#: ../src/empathy-notifications-approver.c:225
+msgid "Decline"
+msgstr "æç"
+
+#: ../src/empathy-notifications-approver.c:219
+#: ../src/empathy-notifications-approver.c:230
+msgid "Accept"
+msgstr "æå"
+
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
+#: ../src/empathy-notifications-approver.c:240
+msgid "Provide"
+msgstr "æä"
+
+#: ../src/empathy-preferences.c:144
 msgid "Message received"
 msgstr "èæåæå"
 
-#: ../src/empathy-preferences.c:146
+#: ../src/empathy-preferences.c:145
 msgid "Message sent"
 msgstr "èæåéå"
 
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:146
 msgid "New conversation"
 msgstr "æåèè"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:147
 msgid "Contact comes online"
 msgstr "èçääç"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:148
 msgid "Contact goes offline"
 msgstr "èçäéç"
 
-#: ../src/empathy-preferences.c:150
+#: ../src/empathy-preferences.c:149
 msgid "Account connected"
 msgstr "åèåéç"
 
-#: ../src/empathy-preferences.c:151
+#: ../src/empathy-preferences.c:150
 msgid "Account disconnected"
 msgstr "åèåæç"
 
-#: ../src/empathy-preferences.c:388
+#: ../src/empathy-preferences.c:387
 msgid "Language"
 msgstr "èè"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:637
+#: ../src/empathy-preferences.c:638
 msgid "Juliet"
 msgstr "çèå"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:644
+#: ../src/empathy-preferences.c:645
 msgid "Romeo"
 msgstr "æåä"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:650
+#: ../src/empathy-preferences.c:651
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "çççèèèåïçääèååéï"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:654
+#: ../src/empathy-preferences.c:655
 msgid "Deny thy father and refuse thy name;"
 msgstr "èçäæèääïçäçåæèåã"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:657
+#: ../src/empathy-preferences.c:658
 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:660
+#: ../src/empathy-preferences.c:661
 msgid "And I'll no longer be a Capulet."
 msgstr "ççèäéååïååçïæéäã"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:663
+#: ../src/empathy-preferences.c:664
 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:666
+#: ../src/empathy-preferences.c:667
 msgid "Juliet has disconnected"
 msgstr "çèååæç"
 
-#: ../src/empathy-preferences.c:1070
+#: ../src/empathy-preferences.c:1033
 msgid "Preferences"
 msgstr "ååèå"
 
@@ -3875,6 +4029,10 @@ msgstr "éççç"
 msgid "Show account balances"
 msgstr "éçåèéé"
 
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2141
+msgid "Contact List"
+msgstr "èçäæå"
+
 #: ../src/empathy-preferences.ui.h:5
 msgid "Start chats in:"
 msgstr "éåèåæï"
@@ -4029,354 +4187,182 @@ msgstr "æåï"
 msgid "Themes"
 msgstr "äæäé"
 
-#: ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversationâ"
-msgstr "æåèè(_N)â"
-
-#: ../src/empathy-status-icon.ui.h:3
-msgid "New _Callâ"
-msgstr "æåéè(_C)â"
-
-#: ../src/empathy-status-icon.ui.h:4
-msgid "Status"
-msgstr "çæ"
-
-#: ../src/empathy-debug-window.c:1603
-msgid "Save"
-msgstr "åå"
-
-#: ../src/empathy-debug-window.c:1663
-msgid "Pastebin link"
-msgstr "Pastebin éç"
-
-#: ../src/empathy-debug-window.c:1672
-msgid "Pastebin response"
-msgstr "Pastebin åæ"
-
-#: ../src/empathy-debug-window.c:1679
-msgid "Data too large for a single paste. Please save logs to file."
-msgstr "åæåäèääèèæééåãèååçéèææã"
-
-#: ../src/empathy-debug-window.c:1860
-msgid "Debug Window"
-msgstr "åéèç"
-
-#: ../src/empathy-debug-window.c:1920
-msgid "Send to pastebin"
-msgstr "åéè pastebin"
-
-#: ../src/empathy-debug-window.c:1964
-msgid "Pause"
-msgstr "æå"
-
-#: ../src/empathy-debug-window.c:1976
-msgid "Level "
-msgstr "çç"
-
-#: ../src/empathy-debug-window.c:1995
-msgid "Debug"
-msgstr "åé"
-
-#: ../src/empathy-debug-window.c:2000
-msgid "Info"
-msgstr "èè"
-
-#: ../src/empathy-debug-window.c:2005 ../src/empathy-debug-window.c:2054
-msgid "Message"
-msgstr "èæ"
-
-#: ../src/empathy-debug-window.c:2010
-msgid "Warning"
-msgstr "èå"
-
-#: ../src/empathy-debug-window.c:2015
-msgid "Critical"
-msgstr "åé"
-
-#: ../src/empathy-debug-window.c:2020
-msgid "Error"
-msgstr "éè"
-
-#: ../src/empathy-debug-window.c:2039
-msgid "Time"
-msgstr "æå"
-
-#: ../src/empathy-debug-window.c:2042
-msgid "Domain"
-msgstr "çå"
-
-#: ../src/empathy-debug-window.c:2045
-msgid "Category"
-msgstr "åé"
-
-#: ../src/empathy-debug-window.c:2048
-msgid "Level"
-msgstr "çç"
-
-#: ../src/empathy-debug-window.c:2077
-msgid ""
-"The selected connection manager does not support the remote debugging "
-"extension."
-msgstr "éåçéççççåäææéçåéæååèã"
-
-#: ../src/empathy-invite-participant-dialog.c:201
-#: ../src/empathy-invite-participant-dialog.c:229
-msgid "Invite Participant"
-msgstr "éèåè"
-
-#: ../src/empathy-invite-participant-dialog.c:202
-msgid "Choose a contact to invite into the conversation:"
-msgstr "éææèéèéåèèçèçäï"
-
-#: ../src/empathy-invite-participant-dialog.c:225
-msgid "Invite"
-msgstr "éè"
-
-#: ../src/empathy-accounts.c:184
-msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr "äèéçääåèçïåèäääæ (äïåå) äéé"
-
-#: ../src/empathy-accounts.c:188
-msgid ""
-"Don't display any dialogs unless there are only \"People Nearby\" accounts"
-msgstr "äèéçääåèçïééåæãéèçäãåè"
-
-#: ../src/empathy-accounts.c:192
-msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr "ååéåæçäçåè (äïgabble/jabber/foo_40example_2eorg0)"
-
-#: ../src/empathy-accounts.c:194
-msgid "<account-id>"
-msgstr "<account-id>"
-
-#: ../src/empathy-accounts.c:199
-msgid "- Empathy Accounts"
-msgstr "- Empathy åè"
-
-#: ../src/empathy-accounts.c:242
-msgid "Empathy Accounts"
-msgstr "Empathy åè"
-
-#: ../src/empathy-debugger.c:69
-msgid "Show a particular service"
-msgstr "éççåæå"
-
-#: ../src/empathy-debugger.c:74
-msgid "- Empathy Debugger"
-msgstr "- Empathy ééå"
+#: ../src/empathy-roster-window.c:241
+msgid "Provide Password"
+msgstr "æäåç"
 
-#: ../src/empathy-debugger.c:113
-msgid "Empathy Debugger"
-msgstr "Empathy ééçå"
+#: ../src/empathy-roster-window.c:247
+msgid "Disconnect"
+msgstr "æç"
 
-#: ../src/empathy-chat.c:106
-msgid "- Empathy Chat Client"
-msgstr "- Empathy èåçæç"
+#: ../src/empathy-roster-window.c:418
+msgid "You need to setup an account to see contacts here."
+msgstr "äéèèçäååèæèåéèæçèçäã"
 
-#: ../src/empathy-notifications-approver.c:188
-msgid "Respond"
-msgstr "åæ"
+#: ../src/empathy-roster-window.c:505
+#, c-format
+msgid "Sorry, %s accounts canât be used until your %s software is updated."
+msgstr "åææï%s åèçæäçïééäç %s èäåææã"
 
-#: ../src/empathy-notifications-approver.c:197
-#: ../src/empathy-call-window.c:1495
-msgid "Reject"
-msgstr "æç"
+#: ../src/empathy-roster-window.c:571
+msgid "Update software..."
+msgstr "ææèä..."
 
-#: ../src/empathy-notifications-approver.c:202
-#: ../src/empathy-notifications-approver.c:207
-#: ../src/empathy-call-window.c:1496
-msgid "Answer"
-msgstr "æè"
+#: ../src/empathy-roster-window.c:577 ../src/empathy-roster-window.c:694
+msgid "Close"
+msgstr "éé"
 
-#: ../src/empathy-notifications-approver.c:207
-msgid "Answer with video"
-msgstr "äèåæè"
+#: ../src/empathy-roster-window.c:682
+msgid "Reconnect"
+msgstr "éæéæ"
 
-#: ../src/empathy-notifications-approver.c:215
-#: ../src/empathy-notifications-approver.c:225
-msgid "Decline"
-msgstr "æç"
+#: ../src/empathy-roster-window.c:688
+msgid "Edit Account"
+msgstr "çèåè"
 
-#: ../src/empathy-notifications-approver.c:219
-#: ../src/empathy-notifications-approver.c:230
-msgid "Accept"
-msgstr "æå"
+#: ../src/empathy-roster-window.c:868
+msgid "Top up account"
+msgstr "åååèåé"
 
-#. translators: the 'Provide' button is displayed in a notification
-#. * bubble when Empathy is asking for an account password; clicking on it
-#. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:240
-msgid "Provide"
-msgstr "æä"
+#: ../src/empathy-roster-window.c:1530
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "äéèåçäåäääçåèäæèåéèæçèçäã"
 
-#: ../src/empathy-call-observer.c:119
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:1538
 #, c-format
-msgid "%s just tried to call you, but you were in another call."
-msgstr "%s ååææçäïääæèääéèã"
+msgid "You need to enable %s to see contacts here."
+msgstr "äéèåç %s æèåéèæçèçäã"
 
-#. Translators: this is an "Info" label. It should be as short
-#. * as possible.
-#: ../src/empathy-call-window.c:1125 ../src/empathy-call-window.c:1141
-msgid "i"
-msgstr "è"
+#: ../src/empathy-roster-window.c:1595
+msgid "No match found"
+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:1862
-#, c-format
-msgid "Call with %s"
-msgstr "è %s éèä"
+#: ../src/empathy-roster-window.c:1599
+msgid "No online contacts"
+msgstr "çäçèçä"
 
-#: ../src/empathy-call-window.c:2114
-msgid "The IP address as seen by the machine"
-msgstr "æåçèç IP äå"
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_New Conversation..."
+msgstr "æåèè(_N)..."
 
-#: ../src/empathy-call-window.c:2116
-msgid "The IP address as seen by a server on the Internet"
-msgstr "äèçäçäæåçèç IP äå"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+msgid "New _Call..."
+msgstr "æåéè(_C)..."
 
-#: ../src/empathy-call-window.c:2118
-msgid "The IP address of the peer as seen by the other side"
-msgstr "åäççèçéç IP äå"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+msgid "Contacts"
+msgstr "èçä"
 
-#: ../src/empathy-call-window.c:2120
-msgid "The IP address of a relay server"
-msgstr "äçäæåç IP äå"
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Add Contacts..."
+msgstr "ååèçä(_A)..."
 
-#: ../src/empathy-call-window.c:2122
-msgid "The IP address of the multicast group"
-msgstr "åéåæççç IP äå"
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Search for Contacts..."
+msgstr "æåèçä(_S)..."
 
-#: ../src/empathy-call-window.c:2869
-msgid "On hold"
-msgstr "äç"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Blocked Contacts"
+msgstr "èåéçèçä"
 
-#: ../src/empathy-call-window.c:2871
-msgid "Mute"
-msgstr "éé"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_Rooms"
+msgstr "èåå(_R)"
 
-#: ../src/empathy-call-window.c:2873
-msgid "Duration"
-msgstr "æé"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Join..."
+msgstr "åå(_J)..."
 
-#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2876
-#, c-format
-msgid "%s â %d:%02dm"
-msgstr "%s â %d:%02dm"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Join _Favorites"
+msgstr "ååååèåå(_F)"
 
-#: ../src/empathy-call-window.c:2972
-msgid "Technical Details"
-msgstr "æèçç"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "_Manage Favorites"
+msgstr "ççåå(_M)"
 
-#: ../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-roster-window-menubar.ui.h:12
+msgid "_File Transfers"
+msgstr "ææåè(_F)"
 
-#: ../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-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "åè(_A)"
 
-#: ../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-roster-window-menubar.ui.h:14
+msgid "P_references"
+msgstr "ååèå(_R)"
 
-#: ../src/empathy-call-window.c:3028
-msgid "There was a failure on the network"
-msgstr "éåççäæéèçç"
+#: ../src/empathy-roster-window-menubar.ui.h:15
+msgid "Help"
+msgstr "æå"
 
-#: ../src/empathy-call-window.c:3032
-msgid ""
-"The audio formats necessary for this call are not installed on your computer"
-msgstr "æéèæåèçéèæååæåäçéèäåè"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "About Empathy"
+msgstr "éæ Empathy"
 
-#: ../src/empathy-call-window.c:3035
-msgid ""
-"The video formats necessary for this call are not installed on your computer"
-msgstr "æéèæåèçèåæååæåäçéèäåè"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-status-icon.ui.h:5
+msgid "_Quit"
+msgstr "çæ(_Q)"
 
-#: ../src/empathy-call-window.c:3047
-#, c-format
-msgid ""
-"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
-"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
-"the Help menu."
-msgstr "å Telepathy åääççæéæççæãè<a href=\"%s\">ååéåéè</a>äéäåæåéååçãééãèçäææéççéã"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "åèèåå"
 
-#: ../src/empathy-call-window.c:3056
-msgid "There was a failure in the call engine"
-msgstr "éèåæåæéèçç"
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversationâ"
+msgstr "æåèè(_N)â"
 
-#: ../src/empathy-call-window.c:3059
-msgid "The end of the stream was reached"
-msgstr "åéäææç"
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Callâ"
+msgstr "æåéè(_C)â"
 
-#: ../src/empathy-call-window.c:3099
-msgid "Can't establish audio stream"
-msgstr "çæåçéèäæ"
+#: ../src/empathy-status-icon.ui.h:4
+msgid "Status"
+msgstr "çæ"
 
-#: ../src/empathy-call-window.c:3109
-msgid "Can't establish video stream"
-msgstr "çæåçèåäæ"
+#: ../ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-widget.c:179
+#: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126
+msgid "Done"
+msgstr "åæ"
 
-#: ../src/empathy-call-window.c:3146
-#, c-format
-msgid "Your current balance is %s."
-msgstr "äçåçééç %sã"
+#: ../ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-widget.c:210
+msgid "Please enter your account details"
+msgstr "èèåäçåèèçèæ"
 
-#: ../src/empathy-call-window.c:3150
-msgid "Sorry, you donât have enough credit for that call."
-msgstr "åææïäçåéäèäéèèéèã"
+#: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:160
+#, c-format
+msgid "Edit %s account options"
+msgstr "çè %s åèéé"
 
-#: ../src/empathy-call-window.c:3152
-msgid "Top Up"
-msgstr "åå"
+#~ msgid "Manage Messaging and VoIP accounts"
+#~ msgstr "ççèæè VoIP åè"
 
-#: ../src/empathy-call.c:195
-msgid "- Empathy Audio/Video Client"
-msgstr "- Empathy éèèåçæç"
+#~ msgid "%A %B %d %Y"
+#~ msgstr "%Y %B %d %A"
 
-#: ../src/empathy-call.c:219
-msgid "Empathy Audio/Video Client"
-msgstr "Empathy éèèåçæç"
+#~ msgid "_Block User"
+#~ msgstr "åéäçè(_B)"
 
-#: ../libempathy-gtk/empathy-search-bar.c:243
-msgid "_Match case"
-msgstr "æåååå(_M)"
+#~ msgid "Decide _Later"
+#~ msgstr "çååæå(_L)"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:129
-msgid "What kind of chat account do you have?"
-msgstr "äçèååèæåäçï"
+#~ msgid "Classic"
+#~ msgstr "åå"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:151
-msgid "Adding new account"
-msgstr "æååè"
+#~ msgid "Simple"
+#~ msgstr "çæ"
 
-#: ../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 åäèåæçèääåéçåçåççäçäåïääåäåèåãåæäæäçæåèïèææäåèçèææåæçã"
+#~ msgid "Clean"
+#~ msgstr "æç"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:98
-msgid "People nearby"
-msgstr "éèçä"
+#~ msgid "Blue"
+#~ 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 "Failed to retrieve your personal information from the server."
+#~ msgstr "çæåäæåæåæçåäèèã"
 
 #~ msgid "Network:"
 #~ msgstr "çèï"
@@ -4633,9 +4619,6 @@ msgstr "äåäçåææéäççïæèçéæãèçäæåã
 #~ msgid "Do you have any other chat accounts you want to set up?"
 #~ msgstr "æéæèèååäçèååèåï"
 
-#~ msgid "Enter your account details"
-#~ msgstr "èèåæçåèèçèæ"
-
 #~ msgid "What kind of chat account do you want to create?"
 #~ msgstr "ææèåçäçèååèï"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 2594993..c73a487 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-06-30 22:55+0800\n"
-"PO-Revision-Date: 2012-06-30 13:03+0800\n"
+"POT-Creation-Date: 2012-08-27 18:19+0800\n"
+"PO-Revision-Date: 2012-08-25 18:57+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
 "Language-Team: Chinese (traditional) <chinese-l10n googlegroups com>\n"
 "Language: zh_TW\n"
@@ -35,16 +35,6 @@ msgstr "Empathy çéçèéè"
 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 åè"
-
 #: ../data/org.gnome.Empathy.gschema.xml.h:1
 msgid "Connection managers should be used"
 msgstr "äçéççççå"
@@ -313,8 +303,10 @@ 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 äæäéèåã"
+msgid ""
+"Path of the Adium theme to use if the theme used for chat is Adium. "
+"Deprecated."
+msgstr "åæèåççäéæ Adium ææèäçç Adium äæäéèåãåæçã"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:66
 msgid "Enable WebKit Developer Tools"
@@ -509,6 +501,20 @@ msgstr "éåçææäææèçææ"
 msgid "The selected file is empty"
 msgstr "éåçæææççç"
 
+#: ../libempathy/empathy-keyring.c:75
+msgid "Password not found"
+msgstr "æäååç"
+
+#: ../libempathy/empathy-keyring.c:202
+#, c-format
+msgid "IM account password for %s (%s)"
+msgstr "%s çåæéåèåç (%s)"
+
+#: ../libempathy/empathy-keyring.c:237
+#, c-format
+msgid "Password for chatroom '%s' on account %s (%s)"
+msgstr "%2$s åèäã%1$sãèååçåç (%3$s)"
+
 #: ../libempathy/empathy-message.c:407 ../src/empathy-call-observer.c:116
 #, c-format
 msgid "Missed call from %s"
@@ -525,6 +531,46 @@ msgstr "åææ %s"
 msgid "Call from %s"
 msgstr "%s çäé"
 
+#: ../libempathy/empathy-time.c:90
+#, c-format
+msgid "%d second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "%d çå"
+
+#: ../libempathy/empathy-time.c:96
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "%d åéäå"
+
+#: ../libempathy/empathy-time.c:102
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "%d åæäå"
+
+#: ../libempathy/empathy-time.c:108
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d åäå"
+
+#: ../libempathy/empathy-time.c:114
+#, c-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "%d éå"
+
+#: ../libempathy/empathy-time.c:120
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "%d åæäå"
+
+#: ../libempathy/empathy-time.c:142
+msgid "in the future"
+msgstr "æä"
+
 #: ../libempathy/empathy-utils.c:232
 msgid "Available"
 msgstr "æç"
@@ -685,138 +731,10 @@ msgstr "Google Talk"
 msgid "Facebook Chat"
 msgstr "Facebook èå"
 
-#: ../libempathy/empathy-time.c:90
-#, c-format
-msgid "%d second ago"
-msgid_plural "%d seconds ago"
-msgstr[0] "%d çå"
-
-#: ../libempathy/empathy-time.c:96
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d åéäå"
-
-#: ../libempathy/empathy-time.c:102
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d åæäå"
-
-#: ../libempathy/empathy-time.c:108
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d åäå"
-
-#: ../libempathy/empathy-time.c:114
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "%d éå"
-
-#: ../libempathy/empathy-time.c:120
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "%d åæäå"
-
-#: ../libempathy/empathy-time.c:142
-msgid "in the future"
-msgstr "æä"
-
-#: ../libempathy/empathy-keyring.c:75
-msgid "Password not found"
-msgstr "æäååç"
-
-#: ../libempathy/empathy-keyring.c:218
-#, c-format
-msgid "IM account password for %s (%s)"
-msgstr "%s çåæéåèåç (%s)"
-
-#: ../libempathy/empathy-keyring.c:253
-#, c-format
-msgid "Password for chatroom '%s' on account %s (%s)"
-msgstr "%2$s åèäã%1$sãèååçåç (%3$s)"
-
 #: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "ææåè"
 
-#: ../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:681
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "Password"
-msgstr "åç"
-
-#: ../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: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: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:1434
-msgid "Username:"
-msgstr "äçèåçï"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1751
-msgid "A_pply"
-msgstr "åç(_A)"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1780
-msgid "L_og in"
-msgstr "çå(_O)"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1850
-msgid "This account already exists on the server"
-msgstr "æåèåçååéåäæåä"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1854
-msgid "Create a new account on the server"
-msgstr "åéåäæåäåçæçåè"
-
-#. To translators: The first parameter is the login id and the
-#. * second one is the network. The resulting string will be something
-#. * like: "MyUserName on freenode".
-#. * You should reverse the order of these arguments if the
-#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c: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:2297
-#, c-format
-msgid "%s Account"
-msgstr "%s åè"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2301
-msgid "New account"
-msgstr "æååè"
-
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
@@ -868,8 +786,8 @@ msgstr "äæå(_S)"
 #: ../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-msn.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
 msgid "Advanced"
@@ -892,6 +810,80 @@ msgstr "æç AIM åçæï"
 msgid "Remember Password"
 msgstr "èäåç"
 
+#: ../libempathy-gtk/empathy-account-widget.c:678
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../src/empathy-import-widget.c:323
+msgid "Account"
+msgstr "åè"
+
+#: ../libempathy-gtk/empathy-account-widget.c:679
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
+msgid "Password"
+msgstr "åç"
+
+#: ../libempathy-gtk/empathy-account-widget.c:680
+#: ../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:681
+#: ../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
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:820
+#, c-format
+msgid "%s:"
+msgstr "%sï"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1432
+msgid "Username:"
+msgstr "äçèåçï"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1749
+msgid "A_pply"
+msgstr "åç(_A)"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1778
+msgid "L_og in"
+msgstr "çå(_O)"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1848
+msgid "This account already exists on the server"
+msgstr "æåèåçååéåäæåä"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1852
+msgid "Create a new account on the server"
+msgstr "åéåäæåäåçæçåè"
+
+#. To translators: The first parameter is the login id and the
+#. * second one is the network. The resulting string will be something
+#. * like: "MyUserName on freenode".
+#. * You should reverse the order of these arguments if the
+#. * server should come before the login id in your locale.
+#: ../libempathy-gtk/empathy-account-widget.c:2269
+#, 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:2295
+#, c-format
+msgid "%s Account"
+msgstr "%s åè"
+
+#: ../libempathy-gtk/empathy-account-widget.c:2299
+msgid "New account"
+msgstr "æååè"
+
 #: ../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
@@ -931,47 +923,18 @@ msgstr "æç ICQ UIN æï"
 msgid "What is your ICQ password?"
 msgstr "æç ICQ åçæï"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:207
-#: ../libempathy-gtk/empathy-account-widget-sip.c:240
-msgid "Auto"
-msgstr "èå"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "çè"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:210
-msgid "UDP"
-msgstr "UDP"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Character set"
+msgstr "åé"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:213
-msgid "TCP"
-msgstr "TCP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
-msgid "TLS"
-msgstr "TLS"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:245
-msgid "Register"
-msgstr "èå"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:250
-msgid "Options"
-msgstr "éé"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:253
-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
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Addâ"
+msgstr "ååâ"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
@@ -1102,18 +1065,6 @@ msgstr "æç Jabber åçæï"
 msgid "What is your desired Jabber password?"
 msgstr "ææèç Jabber åçæï"
 
-#: ../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:8
-msgid "What is your Windows Live ID?"
-msgstr "æç Windows Live ID æï"
-
-#: ../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)"
@@ -1138,6 +1089,47 @@ msgstr "_Jabber ID"
 msgid "E-_mail address"
 msgstr "éåäçäå(_M)"
 
+#: ../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:8
+msgid "What is your Windows Live ID?"
+msgstr "æç Windows Live ID æï"
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
+msgid "What is your Windows Live password?"
+msgstr "æç Windows Live åçæï"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:207
+#: ../libempathy-gtk/empathy-account-widget-sip.c:240
+msgid "Auto"
+msgstr "èå"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:210
+msgid "UDP"
+msgstr "UDP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:213
+msgid "TCP"
+msgstr "TCP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+msgid "TLS"
+msgstr "TLS"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:245
+msgid "Register"
+msgstr "èå"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:250
+msgid "Options"
+msgstr "éé"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:253
+msgid "None"
+msgstr "ç"
+
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
 msgid "_Username"
 msgstr "äçèåç(_U)"
@@ -1246,36 +1238,36 @@ msgstr "æç Yahoo! ID æï"
 msgid "What is your Yahoo! password?"
 msgstr "æç Yahoo! åçæï"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:471
-#: ../libempathy-gtk/empathy-avatar-chooser.c:556
+#: ../libempathy-gtk/empathy-avatar-chooser.c:545
+#: ../libempathy-gtk/empathy-avatar-chooser.c:630
 msgid "Couldn't convert image"
 msgstr "çæèæåç"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:472
+#: ../libempathy-gtk/empathy-avatar-chooser.c:546
 msgid "None of the accepted image formats are supported on your system"
 msgstr "æçççäææææåæåçåçæå"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+#: ../libempathy-gtk/empathy-avatar-chooser.c:906
 msgid "Couldn't save picture to file"
 msgstr "çæååçååèææ"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:939
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1030
 msgid "Select Your Avatar Image"
 msgstr "éææçåéèåç"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:947
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
 msgid "Take a picture..."
 msgstr "æéåç..."
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:960
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
 msgid "No Image"
 msgstr "ææåç"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
 msgid "Images"
 msgstr "åç"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
 msgid "All Files"
 msgstr "ææææ"
 
@@ -1283,6 +1275,34 @@ msgstr "ææææ"
 msgid "Click to enlarge"
 msgstr "èæéèæå"
 
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentication failed for account <b>%s</b>"
+msgstr "<b>%s</b> åèéèåæ"
+
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
+#: ../libempathy-gtk/empathy-chat.c:3725
+msgid "Retry"
+msgstr "éè"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+"èåæåèçåç\n"
+"<b>%s</b>"
+
+#: ../libempathy-gtk/empathy-calendar-button.c:66
+msgid "Select..."
+msgstr "éå..."
+
+#: ../libempathy-gtk/empathy-calendar-button.c:154
+msgid "_Select"
+msgstr "éå(_S)"
+
 #: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
@@ -1324,45 +1344,45 @@ msgstr "æäèåèèæéåäé"
 msgid "Invalid contact ID"
 msgstr "çæçéçä ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1056
+#: ../libempathy-gtk/empathy-chat.c:1055
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clearïæéçåèèçææèæ"
 
-#: ../libempathy-gtk/empathy-chat.c:1059
+#: ../libempathy-gtk/empathy-chat.c:1058
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <äé>ïèççåèèçäé"
 
-#: ../libempathy-gtk/empathy-chat.c:1062
+#: ../libempathy-gtk/empathy-chat.c:1061
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <èåå ID>ïååæçèåå"
 
-#: ../libempathy-gtk/empathy-chat.c:1065
+#: ../libempathy-gtk/empathy-chat.c:1064
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <èåå ID>ïååæçèåå"
 
-#: ../libempathy-gtk/empathy-chat.c:1069
+#: ../libempathy-gtk/empathy-chat.c:1068
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr "/part [<èåå ID>] [<åå>]ïééèååïéèççåçèåå"
 
-#: ../libempathy-gtk/empathy-chat.c:1073
+#: ../libempathy-gtk/empathy-chat.c:1072
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <èçä ID> [<èæ>]ïéåçäèå"
 
-#: ../libempathy-gtk/empathy-chat.c:1076
+#: ../libempathy-gtk/empathy-chat.c:1075
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <èçä ID> <èæ>ïéåçäèå"
 
-#: ../libempathy-gtk/empathy-chat.c:1079
+#: ../libempathy-gtk/empathy-chat.c:1078
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <æç>ïèæåçåäæåäçæçæç"
 
-#: ../libempathy-gtk/empathy-chat.c:1082
+#: ../libempathy-gtk/empathy-chat.c:1081
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <èæ>ïéåäå ACTION èæåçåçèèä"
 
-#: ../libempathy-gtk/empathy-chat.c:1085
+#: ../libempathy-gtk/empathy-chat.c:1084
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1371,11 +1391,11 @@ msgstr ""
 "/say <èæ>ïéå <èæ> åçåçèèäãéçæåéäã/ãééçèæãèää"
 "èïã/say /join æçäååæçèååã"
 
-#: ../libempathy-gtk/empathy-chat.c:1090
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <èçä ID>ïéçèçäççéèè"
 
-#: ../libempathy-gtk/empathy-chat.c:1093
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1383,126 +1403,126 @@ msgstr ""
 "/help [<åä>]ïéçææææçæäãåææåçéå <åä> çèïäéçåçç"
 "æã"
 
-#: ../libempathy-gtk/empathy-chat.c:1112
+#: ../libempathy-gtk/empathy-chat.c:1111
 #, c-format
 msgid "Usage: %s"
 msgstr "çæï%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1157
+#: ../libempathy-gtk/empathy-chat.c:1156
 msgid "Unknown command"
 msgstr "æççåä"
 
-#: ../libempathy-gtk/empathy-chat.c:1283
+#: ../libempathy-gtk/empathy-chat.c:1282
 msgid "Unknown command; see /help for the available commands"
 msgstr "æççæäïèåè /help äåååççæä"
 
-#: ../libempathy-gtk/empathy-chat.c:1540
+#: ../libempathy-gtk/empathy-chat.c:1539
 msgid "insufficient balance to send message"
 msgstr "ééäèäåéèæ"
 
-#: ../libempathy-gtk/empathy-chat.c:1544 ../libempathy-gtk/empathy-chat.c:1558
-#: ../libempathy-gtk/empathy-chat.c:1621
+#: ../libempathy-gtk/empathy-chat.c:1543 ../libempathy-gtk/empathy-chat.c:1557
+#: ../libempathy-gtk/empathy-chat.c:1620
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "åéèæã%sãæççéèï%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1546 ../libempathy-gtk/empathy-chat.c:1563
-#: ../libempathy-gtk/empathy-chat.c:1625
+#: ../libempathy-gtk/empathy-chat.c:1545 ../libempathy-gtk/empathy-chat.c:1562
+#: ../libempathy-gtk/empathy-chat.c:1624
 #, c-format
 msgid "Error sending message: %s"
 msgstr "åéèææççéèï%s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1552
+#: ../libempathy-gtk/empathy-chat.c:1551
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "ééäèäåéèæã<a href='%s'>åå</a>ã"
 
-#: ../libempathy-gtk/empathy-chat.c:1592
+#: ../libempathy-gtk/empathy-chat.c:1591
 msgid "not capable"
 msgstr "çæ"
 
-#: ../libempathy-gtk/empathy-chat.c:1599
+#: ../libempathy-gtk/empathy-chat.c:1598
 msgid "offline"
 msgstr "éç"
 
-#: ../libempathy-gtk/empathy-chat.c:1602
+#: ../libempathy-gtk/empathy-chat.c:1601
 msgid "invalid contact"
 msgstr "çæçéçä"
 
-#: ../libempathy-gtk/empathy-chat.c:1605
+#: ../libempathy-gtk/empathy-chat.c:1604
 msgid "permission denied"
 msgstr "æéèæç"
 
-#: ../libempathy-gtk/empathy-chat.c:1608
+#: ../libempathy-gtk/empathy-chat.c:1607
 msgid "too long message"
 msgstr "åéçèæ"
 
-#: ../libempathy-gtk/empathy-chat.c:1611
+#: ../libempathy-gtk/empathy-chat.c:1610
 msgid "not implemented"
 msgstr "æåä"
 
-#: ../libempathy-gtk/empathy-chat.c:1615
+#: ../libempathy-gtk/empathy-chat.c:1614
 msgid "unknown"
 msgstr "äæ"
 
-#: ../libempathy-gtk/empathy-chat.c:1682 ../src/empathy-chat-window.c:942
+#: ../libempathy-gtk/empathy-chat.c:1681 ../src/empathy-chat-window.c:969
 msgid "Topic:"
 msgstr "äéï"
 
-#: ../libempathy-gtk/empathy-chat.c:1697
+#: ../libempathy-gtk/empathy-chat.c:1696
 #, c-format
 msgid "Topic set to: %s"
 msgstr "äéèåç: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1699
+#: ../libempathy-gtk/empathy-chat.c:1698
 #, c-format
 msgid "Topic set by %s to: %s"
 msgstr "%s åäéèåçï%s"
 
 #. No need to display this 'event' is no topic can be defined anyway
-#: ../libempathy-gtk/empathy-chat.c:1704
+#: ../libempathy-gtk/empathy-chat.c:1703
 msgid "No topic defined"
 msgstr "åæåçäé"
 
-#: ../libempathy-gtk/empathy-chat.c:2220
+#: ../libempathy-gtk/empathy-chat.c:2219
 msgid "(No Suggestions)"
 msgstr "(ææåè)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2288
+#: ../libempathy-gtk/empathy-chat.c:2287
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "ååã%sãèåå"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2325
+#: ../libempathy-gtk/empathy-chat.c:2324
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "ååã%sãè %s åå"
 
-#: ../libempathy-gtk/empathy-chat.c:2395
+#: ../libempathy-gtk/empathy-chat.c:2394
 msgid "Insert Smiley"
 msgstr "æåèæçè"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2413
-#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#: ../libempathy-gtk/empathy-chat.c:2412
+#: ../libempathy-gtk/empathy-ui-utils.c:1180
 msgid "_Send"
 msgstr "åé(_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2470
+#: ../libempathy-gtk/empathy-chat.c:2469
 msgid "_Spelling Suggestions"
 msgstr "æååè(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2576
+#: ../libempathy-gtk/empathy-chat.c:2575
 msgid "Failed to retrieve recent logs"
 msgstr "çæååæèçæè"
 
-#: ../libempathy-gtk/empathy-chat.c:2720
+#: ../libempathy-gtk/empathy-chat.c:2719
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s åæç"
@@ -1510,12 +1530,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:2727
+#: ../libempathy-gtk/empathy-chat.c:2726
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s è %2$s èåå"
 
-#: ../libempathy-gtk/empathy-chat.c:2730
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%s was kicked"
 msgstr "%s èèå"
@@ -1523,17 +1543,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:2738
+#: ../libempathy-gtk/empathy-chat.c:2737
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s è %2$s èçéåå"
 
-#: ../libempathy-gtk/empathy-chat.c:2741
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%s was banned"
 msgstr "%s èèçéåå"
 
-#: ../libempathy-gtk/empathy-chat.c:2745
+#: ../libempathy-gtk/empathy-chat.c:2744
 #, c-format
 msgid "%s has left the room"
 msgstr "%s åçééæèåå"
@@ -1543,17 +1563,17 @@ msgstr "%s åçééæèåå"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2754
+#: ../libempathy-gtk/empathy-chat.c:2753
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2779
+#: ../libempathy-gtk/empathy-chat.c:2778
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s åçååæèåå"
 
-#: ../libempathy-gtk/empathy-chat.c:2804
+#: ../libempathy-gtk/empathy-chat.c:2803
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s çåèçç %s"
@@ -1561,55 +1581,50 @@ 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: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
+#: ../libempathy-gtk/empathy-chat.c:2990 ../src/empathy-call-window.c:1468
+#: ../src/empathy-call-window.c:1518 ../src/empathy-call-window.c:2571
+#: ../src/empathy-event-manager.c:1176
 msgid "Disconnected"
 msgstr "åæç"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3666
+#: ../libempathy-gtk/empathy-chat.c:3665
 msgid "Would you like to store this password?"
 msgstr "ææèååæåçï"
 
-#: ../libempathy-gtk/empathy-chat.c:3672
+#: ../libempathy-gtk/empathy-chat.c:3671
 msgid "Remember"
 msgstr "èä"
 
-#: ../libempathy-gtk/empathy-chat.c:3682
+#: ../libempathy-gtk/empathy-chat.c:3681
 msgid "Not now"
 msgstr "çåäè"
 
-#: ../libempathy-gtk/empathy-chat.c:3726
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
-msgid "Retry"
-msgstr "éè"
-
-#: ../libempathy-gtk/empathy-chat.c:3730
+#: ../libempathy-gtk/empathy-chat.c:3729
 msgid "Wrong password; please try again:"
 msgstr "åçéèïèåèäæï"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3860
+#: ../libempathy-gtk/empathy-chat.c:3859
 msgid "This room is protected by a password:"
 msgstr "æèåååèåçäèï"
 
-#: ../libempathy-gtk/empathy-chat.c:3887
+#: ../libempathy-gtk/empathy-chat.c:3886
 #: ../src/empathy-new-chatroom-dialog.c:780
 msgid "Join"
 msgstr "åå"
 
-#: ../libempathy-gtk/empathy-chat.c:4079 ../src/empathy-event-manager.c:1188
+#: ../libempathy-gtk/empathy-chat.c:4078 ../src/empathy-event-manager.c:1197
 msgid "Connected"
 msgstr "æåéç"
 
-#: ../libempathy-gtk/empathy-chat.c:4134
+#: ../libempathy-gtk/empathy-chat.c:4133
 msgid "Conversation"
 msgstr "èè"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4139
+#: ../libempathy-gtk/empathy-chat.c:4138
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1640,8 +1655,8 @@ msgstr "çèåéçèçä"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:524
-#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
+#: ../libempathy-gtk/empathy-individual-widget.c:1485
 #: ../src/empathy-chatrooms-window.ui.h:2
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
@@ -1651,348 +1666,144 @@ msgstr "åèï"
 msgid "Blocked Contacts"
 msgstr "èåéçèçä"
 
-#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:322
-#: ../libempathy-gtk/empathy-webkit-utils.c:277
-msgid "_Copy Link Address"
-msgstr "èèéçäå(_C)"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "åå"
 
-#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:329
-#: ../libempathy-gtk/empathy-webkit-utils.c:284
-msgid "_Open Link"
-msgstr "éåéç(_O)"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "éèèç"
 
-#. Translators: timestamp displayed between conversations in
-#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:417
-msgid "%A %B %d %Y"
-msgstr "%Y %B %d %A"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "éåäçäå"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:325
-#: ../libempathy-gtk/empathy-individual-dialogs.c:118
-msgid "New Contact"
-msgstr "æåéçä"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "çç"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:394
-#: ../libempathy-gtk/empathy-individual-dialogs.c:197
-#, c-format
-msgid "Block %s?"
-msgstr "åé %sï"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "çæ"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:399
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
-#, c-format
-msgid "Are you sure you want to block '%s' from contacting you again?"
-msgstr "æçåæèåéã%sãèäçæåèæèçåï"
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+msgid "Last seen:"
+msgstr "äæçèï"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:404
-#: ../libempathy-gtk/empathy-individual-dialogs.c:274
-msgid "_Block"
-msgstr "åé(_B)"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "äæåï"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:422
-#: ../libempathy-gtk/empathy-individual-dialogs.c:283
-msgid "_Report this contact as abusive"
-msgid_plural "_Report these contacts as abusive"
-msgstr[0] "ååéäèçäæçåè(_R)"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "åéæåï"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Subscription Request"
-msgstr "èéèæ"
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
+msgid "Away message:"
+msgstr "ééèæï"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "åä"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "äå"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
-msgid "_Block User"
-msgstr "åéäçè(_B)"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "èå"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "èé"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "åå"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "éé"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
-msgid "Decide _Later"
-msgstr "çååæå(_L)"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "åè"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:517
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
 msgid "Search contacts"
 msgstr "æåéçä"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:547
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
 msgid "Search: "
 msgstr "æåï"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
 msgid "_Add Contact"
 msgstr "ååèçä(_A)"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:623
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
 msgid "No contacts found"
 msgstr "æäåèçä"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:639
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
 msgid "Your message introducing yourself:"
 msgstr "æçèæ"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:647
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:652
 msgid "Please let me see when you're online. Thanks!"
 msgstr "çæäçæèèæçéãæèï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:560
-#: ../libempathy-gtk/empathy-individual-widget.c:304
-msgid "Channels:"
-msgstr "ééï"
-
-#: ../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:170
+#: ../libempathy-gtk/empathy-individual-widget.c:900
+msgid "Save Avatar"
+msgstr "åååéè"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:740
-#: ../libempathy-gtk/empathy-individual-widget.c:457
-msgid "Country:"
-msgstr "ååï"
+#: ../libempathy-gtk/empathy-contact-widget.c:226
+#: ../libempathy-gtk/empathy-individual-widget.c:958
+msgid "Unable to save avatar"
+msgstr "çæåååéè"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:742
-#: ../libempathy-gtk/empathy-individual-widget.c:459
-msgid "State:"
-msgstr "åï"
+#. Identifier to connect to Instant Messaging network
+#. Setup id label
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-user-info.c:444
+msgid "Identifier"
+msgstr "èåèå"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:744
-#: ../libempathy-gtk/empathy-individual-widget.c:461
-msgid "City:"
-msgstr "åï"
+#. Setup nickname entry
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-user-info.c:449
+msgid "Alias"
+msgstr "åå"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:746
-#: ../libempathy-gtk/empathy-individual-widget.c:463
-msgid "Area:"
-msgstr "ååï"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "éçäèçèæ"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:748
-#: ../libempathy-gtk/empathy-individual-widget.c:465
-msgid "Postal Code:"
-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.c:750
-#: ../libempathy-gtk/empathy-individual-widget.c:467
-msgid "Street:"
-msgstr "èï"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>äç</b> æ (date)\t"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:752
-#: ../libempathy-gtk/empathy-individual-widget.c:469
-msgid "Building:"
-msgstr "åçï"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "çæçèè"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:754
-#: ../libempathy-gtk/empathy-individual-widget.c:471
-msgid "Floor:"
-msgstr "æåï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:756
-#: ../libempathy-gtk/empathy-individual-widget.c:473
-msgid "Room:"
-msgstr "åï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:758
-#: ../libempathy-gtk/empathy-individual-widget.c:475
-msgid "Text:"
-msgstr "æåï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:760
-#: ../libempathy-gtk/empathy-individual-widget.c:477
-msgid "Description:"
-msgstr "æèï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:479
-msgid "URI:"
-msgstr "URIï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:764
-#: ../libempathy-gtk/empathy-individual-widget.c:481
-msgid "Accuracy Level:"
-msgstr "æçåççï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:766
-#: ../libempathy-gtk/empathy-individual-widget.c:483
-msgid "Error:"
-msgstr "éèï"
-
-#: ../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:770
-#: ../libempathy-gtk/empathy-individual-widget.c:487
-msgid "Horizontal Error (meters):"
-msgstr "æåèå (åå)ï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:772
-#: ../libempathy-gtk/empathy-individual-widget.c:489
-msgid "Speed:"
-msgstr "éåï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:774
-#: ../libempathy-gtk/empathy-individual-widget.c:491
-msgid "Bearing:"
-msgstr "æäï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:776
-#: ../libempathy-gtk/empathy-individual-widget.c:493
-msgid "Climb Speed:"
-msgstr "çåéåï"
-
-#: ../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:780
-#: ../libempathy-gtk/empathy-individual-widget.c:497
-msgid "Longitude:"
-msgstr "çåï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:782
-#: ../libempathy-gtk/empathy-individual-widget.c:499
-msgid "Latitude:"
-msgstr "çåï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:784
-#: ../libempathy-gtk/empathy-individual-widget.c:501
-msgid "Altitude:"
-msgstr "çåï"
-
-#: ../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:39
-msgid "Location"
-msgstr "äç"
-
-#. translators: format is "Location, $date"
-#: ../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: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:988
-#: ../libempathy-gtk/empathy-individual-widget.c:900
-msgid "Save Avatar"
-msgstr "åååéè"
-
-#: ../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:1446
-msgid "Personal Details"
-msgstr "åäçç"
-
-#: ../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 "éçäèçèæ"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
-msgid "Full name"
-msgstr "åå"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
-msgid "Phone number"
-msgstr "éèèç"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
-msgid "E-mail address"
-msgstr "éåäçäå"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
-msgid "Website"
-msgstr "çç"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
-msgid "Birthday"
-msgstr "çæ"
-
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
-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 "åéæåï"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
-msgid "Away message:"
-msgstr "ééèæï"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
-msgid "work"
-msgstr "åä"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
-msgid "home"
-msgstr "äå"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
-msgid "mobile"
-msgstr "èå"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
-msgid "voice"
-msgstr "èé"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
-msgid "preferred"
-msgstr "åå"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
-msgid "postal"
-msgstr "éé"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
-msgid "parcel"
-msgstr "åè"
-
-#. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-msgid "Identifier"
-msgstr "èåèå"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Alias"
-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"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-msgid "Client Information"
-msgstr "çæçèè"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-msgid "OS"
-msgstr "OS"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+msgid "OS"
+msgstr "OS"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version"
@@ -2026,69 +1837,105 @@ msgstr "éå"
 msgid "Group"
 msgstr "çç"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:257
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+msgid "New Contact"
+msgstr "æåéçä"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:193
+#: ../libempathy-gtk/empathy-subscription-dialog.c:121
+#, c-format
+msgid "Block %s?"
+msgstr "åé %sï"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:248
+#: ../libempathy-gtk/empathy-subscription-dialog.c:125
+#, c-format
+msgid "Are you sure you want to block '%s' from contacting you again?"
+msgstr "æçåæèåéã%sãèäçæåèæèçåï"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:253
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "äåèåèååèåéï"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:264
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "äåèåèåçæèåéï"
 
+#: ../libempathy-gtk/empathy-individual-dialogs.c:270
+#: ../libempathy-gtk/empathy-subscription-dialog.c:130
+#: ../libempathy-gtk/empathy-subscription-dialog.c:275
+msgid "_Block"
+msgstr "åé(_B)"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:279
+#: ../libempathy-gtk/empathy-subscription-dialog.c:150
+msgid "_Report this contact as abusive"
+msgid_plural "_Report these contacts as abusive"
+msgstr[0] "ååéäèçäæçåè(_R)"
+
 #: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
 msgid "Edit Contact Information"
 msgstr "çèéçäèè"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:293
 msgid "Linked Contacts"
 msgstr "éçèçç"
 
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:332
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts åæåè"
+
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:335
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "èåè gnome-contacts äååèçäççã"
+
 #. 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:174
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:349
+#: ../libempathy-gtk/empathy-individual-menu.c:347
 msgid "Select account to use to place the call"
 msgstr "éåèçäæçéèçåè"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:353
+#: ../libempathy-gtk/empathy-individual-menu.c:351
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "éè"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:418
+#: ../libempathy-gtk/empathy-individual-menu.c:416
 msgid "Mobile"
 msgstr "èåéè"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:420
+#: ../libempathy-gtk/empathy-individual-menu.c:418
 msgid "Work"
 msgstr "åä"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:422
+#: ../libempathy-gtk/empathy-individual-menu.c:420
 msgid "HOME"
 msgstr "äå"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:663
+#: ../libempathy-gtk/empathy-individual-menu.c:661
 msgid "_Block Contact"
 msgstr "åéèçä(_B)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:719
+#: ../libempathy-gtk/empathy-individual-menu.c:717
 msgid "Delete and _Block"
 msgstr "åéäåé(_B)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:781
+#: ../libempathy-gtk/empathy-individual-menu.c:779
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "æåæèçééçäã%sãï"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:790
+#: ../libempathy-gtk/empathy-individual-menu.c:788
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2097,83 +1944,75 @@ msgstr ""
 "æççæèçééçèçäã%sãåïèææéæçéæææææéçèçççèç"
 "äã"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:801
+#: ../libempathy-gtk/empathy-individual-menu.c:799
 msgid "Removing contact"
 msgstr "æåçééçä"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:865
+#: ../libempathy-gtk/empathy-individual-menu.c:863
 #: ../libempathy-gtk/empathy-individual-view.c:2454
 msgid "_Remove"
 msgstr "çé(_R)"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1228
+#: ../libempathy-gtk/empathy-individual-menu.c:1226
 #: ../libempathy-gtk/empathy-new-message-dialog.c:318
 msgid "_Chat"
 msgstr "èå(_C)"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1263
+#: ../libempathy-gtk/empathy-individual-menu.c:1261
 #: ../libempathy-gtk/empathy-new-message-dialog.c:312
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1296
+#: ../libempathy-gtk/empathy-individual-menu.c:1294
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "èééè(_A)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1329
+#: ../libempathy-gtk/empathy-individual-menu.c:1327
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "èèéè(_V)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1370
+#: ../libempathy-gtk/empathy-individual-menu.c:1368
 #: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "_Previous Conversations"
 msgstr "éåèè(_P)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1399
+#: ../libempathy-gtk/empathy-individual-menu.c:1397
 msgid "Send File"
 msgstr "åéææ"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1429
+#: ../libempathy-gtk/empathy-individual-menu.c:1427
 msgid "Share My Desktop"
 msgstr "åäæçæé"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1455
-#: ../libempathy-gtk/empathy-individual-widget.c:1357
+#: ../libempathy-gtk/empathy-individual-menu.c:1453
+#: ../libempathy-gtk/empathy-individual-widget.c:1368
 msgid "Favorite"
 msgstr "åå"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1474
-msgid "gnome-contacts not installed"
-msgstr "gnome-contacts åæåè"
-
-#: ../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:1608
+#: ../libempathy-gtk/empathy-individual-menu.c:1482
 msgid "Infor_mation"
 msgstr "èè(_M)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1657
+#: ../libempathy-gtk/empathy-individual-menu.c:1531
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "çè(_E)"
 
 #. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1773
-#: ../src/empathy-chat-window.c:1213
+#: ../libempathy-gtk/empathy-individual-menu.c:1647
+#: ../src/empathy-chat-window.c:1235
 msgid "Inviting you to this room"
 msgstr "éèæåéåèåå"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1819
+#: ../libempathy-gtk/empathy-individual-menu.c:1693
 msgid "_Invite to Chat Room"
 msgstr "éèåèåå(_I)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:2015
+#: ../libempathy-gtk/empathy-individual-menu.c:1889
 msgid "_Add Contactâ"
 msgstr "ååèçä(_A)â"
 
@@ -2190,33 +2029,149 @@ msgstr "æåçéçç"
 msgid "Re_name"
 msgstr "éæåå"
 
-#. Alias
-#: ../libempathy-gtk/empathy-individual-widget.c:1293
-msgid "Alias:"
-msgstr "ååï"
+#: ../libempathy-gtk/empathy-individual-widget.c:304
+msgid "Channels:"
+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:455
+msgid "Country ISO Code:"
+msgstr "åå ISO çï"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1641
-#, c-format
-msgid "Linked contact containing %u contact"
-msgid_plural "Linked contacts containing %u contacts"
-msgstr[0] "éçèççåå %u äèçä"
+#: ../libempathy-gtk/empathy-individual-widget.c:457
+msgid "Country:"
+msgstr "ååï"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
-msgid "<b>Location</b> at (date)"
-msgstr "<b>äç</b> æ (ææ)"
+#: ../libempathy-gtk/empathy-individual-widget.c:459
+msgid "State:"
+msgstr "åï"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Online from a phone or mobile device"
-msgstr "åæææèåèçäç"
+#: ../libempathy-gtk/empathy-individual-widget.c:461
+msgid "City:"
+msgstr "åï"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
-msgid "New Network"
-msgstr "æåçè"
+#: ../libempathy-gtk/empathy-individual-widget.c:463
+msgid "Area:"
+msgstr "ååï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:465
+msgid "Postal Code:"
+msgstr "ééåèï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:467
+msgid "Street:"
+msgstr "èï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:469
+msgid "Building:"
+msgstr "åçï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:471
+msgid "Floor:"
+msgstr "æåï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:473
+msgid "Room:"
+msgstr "åï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:475
+msgid "Text:"
+msgstr "æåï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:477
+msgid "Description:"
+msgstr "æèï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:479
+msgid "URI:"
+msgstr "URIï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:481
+msgid "Accuracy Level:"
+msgstr "æçåççï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:483
+msgid "Error:"
+msgstr "éèï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:485
+msgid "Vertical Error (meters):"
+msgstr "åçèå (åå)ï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:487
+msgid "Horizontal Error (meters):"
+msgstr "æåèå (åå)ï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:489
+msgid "Speed:"
+msgstr "éåï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:491
+msgid "Bearing:"
+msgstr "æäï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:493
+msgid "Climb Speed:"
+msgstr "çåéåï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:495
+msgid "Last Updated on:"
+msgstr "äææææï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:497
+msgid "Longitude:"
+msgstr "çåï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:499
+msgid "Latitude:"
+msgstr "çåï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:501
+msgid "Altitude:"
+msgstr "çåï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:39
+msgid "Location"
+msgstr "äç"
+
+#. translators: format is "Location, $date"
+#: ../libempathy-gtk/empathy-individual-widget.c:610
+#, c-format
+msgid "%s, %s"
+msgstr "%sï%s"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:659
+msgid "%B %e, %Y at %R UTC"
+msgstr "%Y %B %e æ %R UTC"
+
+#. Alias
+#: ../libempathy-gtk/empathy-individual-widget.c:1304
+msgid "Alias:"
+msgstr "ååï"
+
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-individual-widget.c:1513
+msgid "Identifier:"
+msgstr "èåèåï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#, c-format
+msgid "Linked contact containing %u contact"
+msgid_plural "Linked contacts containing %u contacts"
+msgstr[0] "éçèççåå %u äèçä"
+
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
+msgid "<b>Location</b> at (date)"
+msgstr "<b>äç</b> æ (ææ)"
+
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+msgid "Online from a phone or mobile device"
+msgstr "åæææèåèçäç"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
+msgid "New Network"
+msgstr "æåçè"
 
 #: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
@@ -2239,133 +2194,154 @@ msgstr "æåäæå"
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:617
+#: ../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: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> åçéååèã"
+
+#: ../libempathy-gtk/empathy-log-window.c:622
 msgid "History"
 msgstr "æå"
 
-#: ../libempathy-gtk/empathy-log-window.c:672
+#: ../libempathy-gtk/empathy-log-window.c:677
 msgid "Show"
 msgstr "éç"
 
-#: ../libempathy-gtk/empathy-log-window.c:694
+#: ../libempathy-gtk/empathy-log-window.c:699
 msgid "Search"
 msgstr "æå"
 
-#: ../libempathy-gtk/empathy-log-window.c:1145
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat in %s"
 msgstr "æ %s åèå"
 
-#: ../libempathy-gtk/empathy-log-window.c:1147
+#: ../libempathy-gtk/empathy-log-window.c:1152
 #, c-format
 msgid "Chat with %s"
 msgstr "è %s èåä"
 
-#: ../libempathy-gtk/empathy-log-window.c:1197
-#: ../libempathy-gtk/empathy-log-window.c:1341
+#: ../libempathy-gtk/empathy-log-window.c:1202
+#: ../libempathy-gtk/empathy-log-window.c:1346
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%Y %B %d %A"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1284
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1290
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%sï</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1365
+#: ../libempathy-gtk/empathy-log-window.c:1370
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s ç"
 
-#: ../libempathy-gtk/empathy-log-window.c:1372
+#: ../libempathy-gtk/empathy-log-window.c:1377
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s åé"
 
-#: ../libempathy-gtk/empathy-log-window.c:1380
+#: ../libempathy-gtk/empathy-log-window.c:1385
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "éèæé %sïçææ %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1711
+#: ../libempathy-gtk/empathy-log-window.c:1716
 msgid "Today"
 msgstr "äæ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1715
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Yesterday"
 msgstr "ææ"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1730
+#: ../libempathy-gtk/empathy-log-window.c:1735
 msgid "%e %B %Y"
 msgstr "%Yå%B%eæ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1834
-#: ../libempathy-gtk/empathy-log-window.c:3457
+#: ../libempathy-gtk/empathy-log-window.c:1839
+#: ../libempathy-gtk/empathy-log-window.c:3462
 msgid "Anytime"
 msgstr "ääæé"
 
-#: ../libempathy-gtk/empathy-log-window.c:1933
-#: ../libempathy-gtk/empathy-log-window.c:2392
+#: ../libempathy-gtk/empathy-log-window.c:1938
+#: ../libempathy-gtk/empathy-log-window.c:2397
 msgid "Anyone"
 msgstr "ääå"
 
-#: ../libempathy-gtk/empathy-log-window.c:2705
+#: ../libempathy-gtk/empathy-log-window.c:2710
 msgid "Who"
 msgstr "è"
 
-#: ../libempathy-gtk/empathy-log-window.c:2914
+#: ../libempathy-gtk/empathy-log-window.c:2919
 msgid "When"
 msgstr "äæ"
 
-#: ../libempathy-gtk/empathy-log-window.c:3032
+#: ../libempathy-gtk/empathy-log-window.c:3037
 msgid "Anything"
 msgstr "äää"
 
-#: ../libempathy-gtk/empathy-log-window.c:3034
+#: ../libempathy-gtk/empathy-log-window.c:3039
 msgid "Text chats"
 msgstr "æåèå"
 
-#: ../libempathy-gtk/empathy-log-window.c:3035
+#: ../libempathy-gtk/empathy-log-window.c:3040
 #: ../src/empathy-preferences.ui.h:29
 msgid "Calls"
 msgstr "éè"
 
-#: ../libempathy-gtk/empathy-log-window.c:3039
+#: ../libempathy-gtk/empathy-log-window.c:3044
 msgid "Incoming calls"
 msgstr "äé"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3045
 msgid "Outgoing calls"
 msgstr "æå"
 
-#: ../libempathy-gtk/empathy-log-window.c:3041
+#: ../libempathy-gtk/empathy-log-window.c:3046
 msgid "Missed calls"
 msgstr "ææäé"
 
-#: ../libempathy-gtk/empathy-log-window.c:3061
+#: ../libempathy-gtk/empathy-log-window.c:3066
 msgid "What"
 msgstr "äé"
 
-#: ../libempathy-gtk/empathy-log-window.c:3750
+#: ../libempathy-gtk/empathy-log-window.c:3755
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "æçåèåééåèèçææçéåï"
 
-#: ../libempathy-gtk/empathy-log-window.c:3754
+#: ../libempathy-gtk/empathy-log-window.c:3759
 msgid "Clear All"
 msgstr "æéåé"
 
-#: ../libempathy-gtk/empathy-log-window.c:3761
+#: ../libempathy-gtk/empathy-log-window.c:3766
 msgid "Delete from:"
 msgstr "åéåï"
 
@@ -2404,6 +2380,34 @@ msgstr "éé 2"
 msgid "<span size=\"x-large\">Loading...</span>"
 msgstr "<span size=\"x-large\">æåèå...</span>"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:129
+msgid "What kind of chat account do you have?"
+msgstr "æçèååèæåäçï"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:151
+msgid "Adding new account"
+msgstr "æååè"
+
+#: ../libempathy-gtk/empathy-new-call-dialog.c:199
+#: ../libempathy-gtk/empathy-new-message-dialog.c:289
+msgid "Enter a contact identifier or phone number:"
+msgstr "èèåèçäèèèäæéèèçï"
+
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:222
+msgid "_Video Call"
+msgstr "èèéè(_V)"
+
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:232
+msgid "_Audio Call"
+msgstr "èééè(_A)"
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+msgid "New Call"
+msgstr "æåéè"
+
 #: ../libempathy-gtk/empathy-new-message-dialog.c:82
 msgid "The contact is offline"
 msgstr "èçäåçéç"
@@ -2448,46 +2452,11 @@ msgstr "èåèæç"
 msgid "There was an error starting the conversation"
 msgstr "ååèèæççéè"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:289
-#: ../libempathy-gtk/empathy-new-call-dialog.c:199
-msgid "Enter a contact identifier or phone number:"
-msgstr "èèåèçäèèèäæéèèçï"
-
 #. Tweak the dialog
 #: ../libempathy-gtk/empathy-new-message-dialog.c:332
 msgid "New Conversation"
 msgstr "æåèè"
 
-#. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:222
-msgid "_Video Call"
-msgstr "èèéè(_V)"
-
-#. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:232
-msgid "_Audio Call"
-msgstr "èééè(_A)"
-
-#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:242
-msgid "New Call"
-msgstr "æåéè"
-
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
-#, c-format
-msgid "Authentication failed for account <b>%s</b>"
-msgstr "<b>%s</b> åèéèåæ"
-
-#: ../libempathy-gtk/empathy-base-password-dialog.c:224
-#: ../libempathy-gtk/empathy-password-dialog.c:134
-#, c-format
-msgid ""
-"Enter your password for account\n"
-"<b>%s</b>"
-msgstr ""
-"èåæåèçåç\n"
-"<b>%s</b>"
-
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
@@ -2535,11 +2504,15 @@ msgstr "èèèæâ"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:597
+#: ../libempathy-gtk/empathy-protocol-chooser.c:610
 #, c-format
 msgid "New %s account"
 msgstr "æå %s åè"
 
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "æåååå(_M)"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
 msgstr "åæï"
@@ -2604,31 +2577,34 @@ msgstr "èééèçæ"
 msgid "Edit Custom Messages"
 msgstr "çèèèèæ"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1056
+#: ../libempathy-gtk/empathy-subscription-dialog.c:234
+msgid "Subscription Request"
+msgstr "èéèæ"
+
+#: ../libempathy-gtk/empathy-subscription-dialog.c:240
+#: ../src/empathy-event-manager.c:1114
+#, c-format
+msgid "%s would like permission to see when you are online"
+msgstr "%s æèååæçææåäççèå"
+
+#: ../libempathy-gtk/empathy-subscription-dialog.c:281
+#: ../src/empathy-event-manager.c:731
+msgid "_Decline"
+msgstr "æç(_D)"
+
+#: ../libempathy-gtk/empathy-subscription-dialog.c:282
+msgid "_Accept"
+msgstr "æå(_A)"
+
+#: ../libempathy-gtk/empathy-theme-adium.c:1126
 #, c-format
 msgid "Message edited at %s"
 msgstr "èæçèæ %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1776
+#: ../libempathy-gtk/empathy-theme-adium.c:1843
 msgid "Normal"
 msgstr "äè"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
-msgid "Classic"
-msgstr "åå"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:71
-msgid "Simple"
-msgstr "çæ"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:72
-msgid "Clean"
-msgstr "æç"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:73
-msgid "Blue"
-msgstr "èè"
-
 #: ../libempathy-gtk/empathy-tls-dialog.c:150
 msgid "The identity provided by the chat server cannot be verified."
 msgstr "èåäæåææäçèåèåçæéééèã"
@@ -2704,30 +2680,48 @@ msgstr "èèäæéæääæäéçäç"
 msgid "Certificate Details"
 msgstr "æèèçèæ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1754
+#: ../libempathy-gtk/empathy-ui-utils.c:1050
 msgid "Unable to open URI"
 msgstr "çæéå URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1174
 msgid "Select a file"
 msgstr "éæäåææ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1947
+#: ../libempathy-gtk/empathy-ui-utils.c:1248
 msgid "Insufficient free space to save file"
 msgstr "çéäèäååææ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1256
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 msgstr "éè %s ççéäååæææïäåæ %s åçãèéæåääçã"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1999
+#: ../libempathy-gtk/empathy-ui-utils.c:1302
 #, c-format
 msgid "Incoming file from %s"
 msgstr "æåäè %s çææ"
 
+#: ../libempathy-gtk/empathy-user-info.c:384
+msgid "Go online to edit your personal information."
+msgstr "äçäçèæçåäèèã"
+
+#: ../libempathy-gtk/empathy-user-info.c:464
+msgid "<b>Personal Details</b>"
+msgstr "<b>åäèçèæ</b>"
+
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-webkit-utils.c:278
+msgid "_Copy Link Address"
+msgstr "èèéçäå(_C)"
+
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-webkit-utils.c:285
+msgid "_Open Link"
+msgstr "éåéç(_O)"
+
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
 msgstr "çåçååèè"
@@ -2895,50 +2889,14 @@ msgstr "èæèç"
 msgid "Vietnamese"
 msgstr "èåæ"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:66
-msgid "Select..."
-msgstr "éå..."
-
-#: ../libempathy-gtk/empathy-calendar-button.c:154
-msgid "_Select"
-msgstr "éå(_S)"
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:225
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
 msgid "No error message"
 msgstr "ææéèèæ"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:298
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304
 msgid "Instant Message (Empathy)"
 msgstr "åæéè (Empathy)"
 
-#: ../src/empathy.c:432
-msgid "Don't connect on startup"
-msgstr "ååæäèèåéç"
-
-#: ../src/empathy.c:436
-msgid "Don't display the contact list or any other dialogs on startup"
-msgstr "ååæäéçéçäæåæääåäåèç"
-
-#: ../src/empathy.c:452
-msgid "- Empathy IM Client"
-msgstr "- Empathy åæéçæç"
-
-#: ../src/empathy.c:628
-msgid "Error contacting the Account Manager"
-msgstr "èçåèçççåæççéè"
-
-#: ../src/empathy.c:630
-#, c-format
-msgid ""
-"There was an error while trying to connect to the Telepathy Account Manager. "
-"The error was:\n"
-"\n"
-"%s"
-msgstr ""
-"åèéæè Telepathy åèçççåæççéèãéèçï\n"
-"\n"
-"%s"
-
 #: ../src/empathy-about-dialog.c:81
 msgid ""
 "Empathy is free software; you can redistribute it and/or modify it under the "
@@ -2986,6 +2944,31 @@ msgstr ""
 "Craig Jeffares <cjeffares novell com>, 2004\n"
 "Joe Man <trmetal yahoo com hk>, 2001"
 
+#: ../src/empathy-accounts.c:184
+msgid "Don't display any dialogs; do any work (eg, importing) and exit"
+msgstr "äèéçääåèçïåèäääæ (äïåå) äéé"
+
+#: ../src/empathy-accounts.c:188
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr "äèéçääåèçïééåæãéèçäãåè"
+
+#: ../src/empathy-accounts.c:192
+msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
+msgstr "ååéåæçäçåè (äïgabble/jabber/foo_40example_2eorg0)"
+
+#: ../src/empathy-accounts.c:194
+msgid "<account-id>"
+msgstr "<account-id>"
+
+#: ../src/empathy-accounts.c:199
+msgid "- Empathy Accounts"
+msgstr "- Empathy åè"
+
+#: ../src/empathy-accounts.c:242
+msgid "Empathy Accounts"
+msgstr "Empathy åè"
+
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
 #: ../src/empathy-accounts-dialog.c:70
@@ -2999,29 +2982,29 @@ msgstr "æèæç %s åèçéçäæåæååã"
 msgid "Your new account has not been saved yet."
 msgstr "åæååæçæåèã"
 
-#: ../src/empathy-accounts-dialog.c:403 ../src/empathy-call-window.c:1268
+#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1268
 msgid "Connectingâ"
 msgstr "éçäâ"
 
-#: ../src/empathy-accounts-dialog.c:444
+#: ../src/empathy-accounts-dialog.c:445
 #, c-format
 msgid "Offline â %s"
 msgstr "éç â %s"
 
-#: ../src/empathy-accounts-dialog.c:456
+#: ../src/empathy-accounts-dialog.c:457
 #, c-format
 msgid "Disconnected â %s"
 msgstr "åæç â %s"
 
-#: ../src/empathy-accounts-dialog.c:467
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline â No Network Connection"
 msgstr "éç â ççèéç"
 
-#: ../src/empathy-accounts-dialog.c:474
+#: ../src/empathy-accounts-dialog.c:475
 msgid "Unknown Status"
 msgstr "æçççæ"
 
-#: ../src/empathy-accounts-dialog.c:491
+#: ../src/empathy-accounts-dialog.c:492
 msgid ""
 "This account has been disabled because it relies on an old, unsupported "
 "backend. Please install telepathy-haze and restart your session to migrate "
@@ -3030,36 +3013,28 @@ msgstr ""
 "éåååçåçïåçåéèèèãäååææçåççåãèåè telepathy-haze "
 "äéæååæçäæéæäéçåèèæã"
 
-#: ../src/empathy-accounts-dialog.c:501
+#: ../src/empathy-accounts-dialog.c:502
 msgid "Offline â Account Disabled"
 msgstr "éç â åèååç"
 
-#: ../src/empathy-accounts-dialog.c:607
+#: ../src/empathy-accounts-dialog.c:608
 msgid "Edit Connection Parameters"
 msgstr "çèéçåæ"
 
-#: ../src/empathy-accounts-dialog.c:770
-msgid "Failed to retrieve your personal information from the server."
-msgstr "çæåäæåæåæçåäèèã"
-
-#: ../src/empathy-accounts-dialog.c:776
-msgid "Go online to edit your personal information."
-msgstr "äçäçèæçåäèèã"
-
-#: ../src/empathy-accounts-dialog.c:862
+#: ../src/empathy-accounts-dialog.c:733
 msgid "_Edit Connection Parameters..."
 msgstr "çèéçåæ(_E)..."
 
-#: ../src/empathy-accounts-dialog.c:1358
+#: ../src/empathy-accounts-dialog.c:1235
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "æåæèåæçéèäçéçç %sï"
 
-#: ../src/empathy-accounts-dialog.c:1362
+#: ../src/empathy-accounts-dialog.c:1239
 msgid "This will not remove your account on the server."
 msgstr "éäæçéäæåäçæçåèã"
 
-#: ../src/empathy-accounts-dialog.c:1567
+#: ../src/empathy-accounts-dialog.c:1444
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3068,24 +3043,24 @@ msgstr ""
 "ææåçèæãçåèççï"
 
 #. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1758
+#: ../src/empathy-accounts-dialog.c:1635
 msgid "_Enabled"
 msgstr "ååç(_E)"
 
 #. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1781
+#: ../src/empathy-accounts-dialog.c:1658
 msgid "Rename"
 msgstr "éæåå"
 
-#: ../src/empathy-accounts-dialog.c:2197
+#: ../src/empathy-accounts-dialog.c:2074
 msgid "_Skip"
 msgstr "çé(_S)"
 
-#: ../src/empathy-accounts-dialog.c:2201
+#: ../src/empathy-accounts-dialog.c:2078
 msgid "_Connect"
 msgstr "éæ(_C)"
 
-#: ../src/empathy-accounts-dialog.c:2380
+#: ../src/empathy-accounts-dialog.c:2257
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3093,6 +3068,11 @@ msgstr ""
 "æååéééåèçïéææææ\n"
 "ææåçèæãçåèççï"
 
+#. Tweak the dialog
+#: ../src/empathy-accounts-dialog.c:2400
+msgid "Messaging and VoIP Accounts"
+msgstr "èæè VoIP åè"
+
 #: ../src/empathy-accounts-dialog.ui.h:3
 msgid "_Importâ"
 msgstr "åå(_I)â"
@@ -3115,9 +3095,211 @@ msgstr "åæåèéèåååççå"
 msgid " - Empathy authentication client"
 msgstr "- Empathy èèçæç"
 
-#: ../src/empathy-auth-client.c:304
-msgid "Empathy authentication client"
-msgstr "Empathy èèçæç"
+#: ../src/empathy-auth-client.c:304
+msgid "Empathy authentication client"
+msgstr "Empathy èèçæç"
+
+#: ../src/empathy.c:432
+msgid "Don't connect on startup"
+msgstr "ååæäèèåéç"
+
+#: ../src/empathy.c:436
+msgid "Don't display the contact list or any other dialogs on startup"
+msgstr "ååæäéçéçäæåæääåäåèç"
+
+#: ../src/empathy.c:452
+msgid "- Empathy IM Client"
+msgstr "- Empathy åæéçæç"
+
+#: ../src/empathy.c:628
+msgid "Error contacting the Account Manager"
+msgstr "èçåèçççåæççéè"
+
+#: ../src/empathy.c:630
+#, c-format
+msgid ""
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
+"\n"
+"%s"
+msgstr ""
+"åèéæè Telepathy åèçççåæççéèãéèçï\n"
+"\n"
+"%s"
+
+#: ../src/empathy-call.c:195
+msgid "- Empathy Audio/Video Client"
+msgstr "- Empathy éèèèçæç"
+
+#: ../src/empathy-call.c:219
+msgid "Empathy Audio/Video Client"
+msgstr "Empathy éèèèçæç"
+
+#: ../src/empathy-call-observer.c:119
+#, c-format
+msgid "%s just tried to call you, but you were in another call."
+msgstr "%s ååææçæïäææèääéèã"
+
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1125 ../src/empathy-call-window.c:1141
+msgid "i"
+msgstr "è"
+
+#: ../src/empathy-call-window.c:1485 ../src/empathy-event-manager.c:510
+msgid "Incoming call"
+msgstr "äé"
+
+#: ../src/empathy-call-window.c:1491 ../src/empathy-event-manager.c:915
+#, c-format
+msgid "Incoming video call from %s"
+msgstr "äè %s çèèéè"
+
+#: ../src/empathy-call-window.c:1491 ../src/empathy-event-manager.c:518
+#: ../src/empathy-event-manager.c:915
+#, c-format
+msgid "Incoming call from %s"
+msgstr "%s çäé"
+
+#: ../src/empathy-call-window.c:1495
+#: ../src/empathy-notifications-approver.c:197
+msgid "Reject"
+msgstr "æç"
+
+#: ../src/empathy-call-window.c:1496
+#: ../src/empathy-notifications-approver.c:202
+#: ../src/empathy-notifications-approver.c:207
+msgid "Answer"
+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:1862
+#, c-format
+msgid "Call with %s"
+msgstr "è %s éèä"
+
+#: ../src/empathy-call-window.c:2114
+msgid "The IP address as seen by the machine"
+msgstr "æåçèç IP äå"
+
+#: ../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:2118
+msgid "The IP address of the peer as seen by the other side"
+msgstr "åäççèçéç IP äå"
+
+#: ../src/empathy-call-window.c:2120
+msgid "The IP address of a relay server"
+msgstr "äçäæåç IP äå"
+
+#: ../src/empathy-call-window.c:2122
+msgid "The IP address of the multicast group"
+msgstr "åéåæççç IP äå"
+
+#: ../src/empathy-call-window.c:2523 ../src/empathy-call-window.c:2524
+#: ../src/empathy-call-window.c:2525 ../src/empathy-call-window.c:2526
+#: ../src/empathy-call-window.ui.h:26
+msgid "Unknown"
+msgstr "äæ"
+
+#: ../src/empathy-call-window.c:2869
+msgid "On hold"
+msgstr "äç"
+
+#: ../src/empathy-call-window.c:2871
+msgid "Mute"
+msgstr "éé"
+
+#: ../src/empathy-call-window.c:2873
+msgid "Duration"
+msgstr "æé"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2876
+#, c-format
+msgid "%s â %d:%02dm"
+msgstr "%s â %d:%02dm"
+
+#: ../src/empathy-call-window.c:2972
+msgid "Technical Details"
+msgstr "æèçç"
+
+#: ../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: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: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:3028
+msgid "There was a failure on the network"
+msgstr "éåçèäæéèçç"
+
+#: ../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:3035
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
+msgstr "æéèæåèçèèæååæåæçéèäåè"
+
+#: ../src/empathy-call-window.c:3047
+#, c-format
+msgid ""
+"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
+"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
+"the Help menu."
+msgstr ""
+"å Telepathy åääççæéæççæãè<a href=\"%s\">ååéåéè</a>äéä"
+"åæåéååçãééãèçäææéççéã"
+
+#: ../src/empathy-call-window.c:3056
+msgid "There was a failure in the call engine"
+msgstr "éèåæåæéèçç"
+
+#: ../src/empathy-call-window.c:3059
+msgid "The end of the stream was reached"
+msgstr "åéäææç"
+
+#: ../src/empathy-call-window.c:3099
+msgid "Can't establish audio stream"
+msgstr "çæåçéèäæ"
+
+#: ../src/empathy-call-window.c:3109
+msgid "Can't establish video stream"
+msgstr "çæåçèèäæ"
+
+#: ../src/empathy-call-window.c:3146
+#, c-format
+msgid "Your current balance is %s."
+msgstr "æçåçééç %sã"
+
+#: ../src/empathy-call-window.c:3150
+msgid "Sorry, you donât have enough credit for that call."
+msgstr "åææïæçåéäèäéèèéèã"
+
+#: ../src/empathy-call-window.c:3152
+msgid "Top Up"
+msgstr "åå"
 
 #: ../src/empathy-call-window.ui.h:1
 msgid "_Call"
@@ -3207,12 +3389,6 @@ msgstr "åæéèåæ"
 msgid "Encoding Codec:"
 msgstr "ççççèçåï"
 
-#: ../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 "Decoding Codec:"
 msgstr "èçççèçåï"
@@ -3229,18 +3405,38 @@ msgstr "ææåéï"
 msgid "Audio"
 msgstr "éè"
 
-#: ../src/empathy-chat-window.c:288
+#: ../src/empathy-chat.c:106
+msgid "- Empathy Chat Client"
+msgstr "- Empathy èåçæç"
+
+#: ../src/empathy-chatrooms-window.c:251
+msgid "Name"
+msgstr "åç"
+
+#: ../src/empathy-chatrooms-window.c:269
+msgid "Room"
+msgstr "èåå"
+
+#: ../src/empathy-chatrooms-window.c:277
+msgid "Auto-Connect"
+msgstr "èåéç"
+
+#: ../src/empathy-chatrooms-window.ui.h:1
+msgid "Manage Favorite Rooms"
+msgstr "ççååçèåå"
+
+#: ../src/empathy-chat-window.c:282
 msgid "Close this window?"
 msgstr "èéééåèçï"
 
-#: ../src/empathy-chat-window.c:293
+#: ../src/empathy-chat-window.c:288
 #, 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:304
+#: ../src/empathy-chat-window.c:301
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -3251,7 +3447,7 @@ msgid_plural ""
 msgstr[0] ""
 "ééæèçæéé %u åèååãæåçæææåäåçèæïééæåæåèã"
 
-#: ../src/empathy-chat-window.c:313
+#: ../src/empathy-chat-window.c:312
 #, c-format
 msgid "Leave %s?"
 msgstr "éé %sï"
@@ -3270,41 +3466,41 @@ msgstr "ééèç"
 msgid "Leave room"
 msgstr "ééèåå"
 
-#: ../src/empathy-chat-window.c:662 ../src/empathy-chat-window.c:682
+#: ../src/empathy-chat-window.c:667 ../src/empathy-chat-window.c:690
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d åæè)"
 
-#: ../src/empathy-chat-window.c:674
+#: ../src/empathy-chat-window.c:682
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (èåä %u å)"
 
-#: ../src/empathy-chat-window.c:690
+#: ../src/empathy-chat-window.c:698
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (äèåääç %d åæè)"
 
-#: ../src/empathy-chat-window.c:699
+#: ../src/empathy-chat-window.c:707
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (äèææäç %d åæè)"
 
-#: ../src/empathy-chat-window.c:914
+#: ../src/empathy-chat-window.c:944
 msgid "SMS:"
 msgstr "SMSï"
 
-#: ../src/empathy-chat-window.c:924
+#: ../src/empathy-chat-window.c:952
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "æååé %d åèæ"
 
-#: ../src/empathy-chat-window.c:946
+#: ../src/empathy-chat-window.c:972
 msgid "Typing a message."
 msgstr "æåèåèæã"
 
@@ -3368,30 +3564,100 @@ msgstr "ååéåç(_R)"
 msgid "_Detach Tab"
 msgstr "åéåé(_D)"
 
-#: ../src/empathy-chatrooms-window.c:251
-msgid "Name"
-msgstr "åç"
+#: ../src/empathy-debugger.c:69
+msgid "Show a particular service"
+msgstr "éççåæå"
 
-#: ../src/empathy-chatrooms-window.c:269
-msgid "Room"
-msgstr "èåå"
+#: ../src/empathy-debugger.c:74
+msgid "- Empathy Debugger"
+msgstr "- Empathy ééå"
 
-#: ../src/empathy-chatrooms-window.c:277
-msgid "Auto-Connect"
-msgstr "èåéç"
+#: ../src/empathy-debugger.c:113
+msgid "Empathy Debugger"
+msgstr "Empathy ééçå"
 
-#: ../src/empathy-chatrooms-window.ui.h:1
-msgid "Manage Favorite Rooms"
-msgstr "ççååçèåå"
+#: ../src/empathy-debug-window.c:1603
+msgid "Save"
+msgstr "åå"
+
+#: ../src/empathy-debug-window.c:1663
+msgid "Pastebin link"
+msgstr "Pastebin éç"
+
+#: ../src/empathy-debug-window.c:1672
+msgid "Pastebin response"
+msgstr "Pastebin åæ"
+
+#: ../src/empathy-debug-window.c:1679
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "åæåäèääèèæééåãèååçéèææã"
+
+#: ../src/empathy-debug-window.c:1860
+msgid "Debug Window"
+msgstr "åéèç"
+
+#: ../src/empathy-debug-window.c:1920
+msgid "Send to pastebin"
+msgstr "åéè pastebin"
+
+#: ../src/empathy-debug-window.c:1964
+msgid "Pause"
+msgstr "æå"
+
+#: ../src/empathy-debug-window.c:1976
+msgid "Level "
+msgstr "çç"
+
+#: ../src/empathy-debug-window.c:1995
+msgid "Debug"
+msgstr "åé"
+
+#: ../src/empathy-debug-window.c:2000
+msgid "Info"
+msgstr "èè"
+
+#: ../src/empathy-debug-window.c:2005 ../src/empathy-debug-window.c:2054
+msgid "Message"
+msgstr "èæ"
+
+#: ../src/empathy-debug-window.c:2010
+msgid "Warning"
+msgstr "èå"
+
+#: ../src/empathy-debug-window.c:2015
+msgid "Critical"
+msgstr "åé"
+
+#: ../src/empathy-debug-window.c:2020
+msgid "Error"
+msgstr "éè"
+
+#: ../src/empathy-debug-window.c:2039
+msgid "Time"
+msgstr "æå"
+
+#: ../src/empathy-debug-window.c:2042
+msgid "Domain"
+msgstr "çå"
+
+#: ../src/empathy-debug-window.c:2045
+msgid "Category"
+msgstr "åé"
+
+#: ../src/empathy-debug-window.c:2048
+msgid "Level"
+msgstr "çç"
+
+#: ../src/empathy-debug-window.c:2077
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr "éåçéççççåäææéçåéæååèã"
 
 #: ../src/empathy-event-manager.c:510
 msgid "Incoming video call"
 msgstr "ååçèèéè"
 
-#: ../src/empathy-event-manager.c:510 ../src/empathy-call-window.c:1485
-msgid "Incoming call"
-msgstr "äé"
-
 #: ../src/empathy-event-manager.c:514
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
@@ -3402,12 +3668,6 @@ msgstr "%s èèæéèèèéèãææåèæèï"
 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:1491
-#, c-format
-msgid "Incoming call from %s"
-msgstr "%s çäé"
-
 #: ../src/empathy-event-manager.c:543
 msgid "_Reject"
 msgstr "æç(_R)"
@@ -3434,10 +3694,6 @@ msgstr "éèåå %s"
 msgid "%s is inviting you to join %s"
 msgstr "%s æåéèæåå %s"
 
-#: ../src/empathy-event-manager.c:731
-msgid "_Decline"
-msgstr "æç(_D)"
-
 #: ../src/empathy-event-manager.c:736
 msgid "_Join"
 msgstr "åå(_J)"
@@ -3452,26 +3708,16 @@ msgstr "%s æéèæåå %s"
 msgid "You have been invited to join %s"
 msgstr "æèéèåå %s"
 
-#: ../src/empathy-event-manager.c:915 ../src/empathy-call-window.c:1491
-#, c-format
-msgid "Incoming video call from %s"
-msgstr "äè %s çèèéè"
-
 #: ../src/empathy-event-manager.c:947
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "æåäè %s çææåè"
 
-#: ../src/empathy-event-manager.c:983 ../src/empathy-roster-window.c:223
+#: ../src/empathy-event-manager.c:983 ../src/empathy-roster-window.c:224
 msgid "Password required"
 msgstr "éèåç"
 
-#: ../src/empathy-event-manager.c:1105
-#, c-format
-msgid "%s would like permission to see when you are online"
-msgstr "%s æèååæçææåäççèå"
-
-#: ../src/empathy-event-manager.c:1111
+#: ../src/empathy-event-manager.c:1120
 #, c-format
 msgid ""
 "\n"
@@ -3579,168 +3825,57 @@ msgstr "%"
 msgid "File"
 msgstr "ææ"
 
-#: ../src/empathy-ft-manager.c:1059
-msgid "Remaining"
-msgstr "åé"
-
-#: ../src/empathy-ft-manager.ui.h:1
-msgid "File Transfers"
-msgstr "ææåè"
-
-#: ../src/empathy-ft-manager.ui.h:2
-msgid "Remove completed, canceled and failed file transfers from the list"
-msgstr "åæåäçéååæãååæååæçææåè"
-
-#: ../src/empathy-import-dialog.c:76
-msgid "_Import"
-msgstr "åå(_I)"
-
-#: ../src/empathy-import-dialog.c:88
-msgid ""
-"No accounts to import could be found. Empathy currently only supports "
-"importing accounts from Pidgin."
-msgstr "æäååååçåèãEmpathy çååææå Pidgin åååèã"
-
-#: ../src/empathy-import-dialog.c:209
-msgid "Import Accounts"
-msgstr "åååè"
-
-#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:303
-msgid "Import"
-msgstr "åå"
-
-#: ../src/empathy-import-widget.c:312
-msgid "Protocol"
-msgstr "éèåå"
-
-#: ../src/empathy-import-widget.c:336
-msgid "Source"
-msgstr "äæ"
-
-#: ../src/empathy-roster-window.c:240
-msgid "Provide Password"
-msgstr "æäåç"
-
-#: ../src/empathy-roster-window.c:246
-msgid "Disconnect"
-msgstr "æç"
-
-#: ../src/empathy-roster-window.c:417
-msgid "You need to setup an account to see contacts here."
-msgstr "æéèèçäååèæèåéèæçèçäã"
-
-#: ../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:570
-msgid "Update software..."
-msgstr "ææèé..."
-
-#: ../src/empathy-roster-window.c:576 ../src/empathy-roster-window.c:693
-msgid "Close"
-msgstr "éé"
-
-#: ../src/empathy-roster-window.c:681
-msgid "Reconnect"
-msgstr "éæéæ"
-
-#: ../src/empathy-roster-window.c:687
-msgid "Edit Account"
-msgstr "çèåè"
-
-#: ../src/empathy-roster-window.c:867
-msgid "Top up account"
-msgstr "åååèåé"
-
-#: ../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:1537
-#, c-format
-msgid "You need to enable %s to see contacts here."
-msgstr "æéèåç %s æèåéèæçèçäã"
-
-#: ../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 "éçäæå"
-
-#: ../src/empathy-roster-window.ui.h:1
-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-ft-manager.c:1059
+msgid "Remaining"
+msgstr "åé"
 
-#: ../src/empathy-roster-window-menubar.ui.h:6
-msgid "_Blocked Contacts"
-msgstr "èåéçèçä"
+#: ../src/empathy-ft-manager.ui.h:1
+msgid "File Transfers"
+msgstr "ææåè"
 
-#: ../src/empathy-roster-window-menubar.ui.h:7
-msgid "_Rooms"
-msgstr "èåå(_R)"
+#: ../src/empathy-ft-manager.ui.h:2
+msgid "Remove completed, canceled and failed file transfers from the list"
+msgstr "åæåäçéååæãååæååæçææåè"
 
-#: ../src/empathy-roster-window-menubar.ui.h:8
-msgid "_Join..."
-msgstr "åå(_J)..."
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "åå(_I)"
 
-#: ../src/empathy-roster-window-menubar.ui.h:9
-msgid "Join _Favorites"
-msgstr "ååååèåå(_F)"
+#: ../src/empathy-import-dialog.c:88
+msgid ""
+"No accounts to import could be found. Empathy currently only supports "
+"importing accounts from Pidgin."
+msgstr "æäååååçåèãEmpathy çååææå Pidgin åååèã"
 
-#: ../src/empathy-roster-window-menubar.ui.h:10
-msgid "_Manage Favorites"
-msgstr "ççåå(_M)"
+#: ../src/empathy-import-dialog.c:209
+msgid "Import Accounts"
+msgstr "åååè"
 
-#: ../src/empathy-roster-window-menubar.ui.h:12
-msgid "_File Transfers"
-msgstr "ææåè(_F)"
+#. Translators: this is the header of a treeview column
+#: ../src/empathy-import-widget.c:303
+msgid "Import"
+msgstr "åå"
 
-#: ../src/empathy-roster-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "åè(_A)"
+#: ../src/empathy-import-widget.c:312
+msgid "Protocol"
+msgstr "éèåå"
 
-#: ../src/empathy-roster-window-menubar.ui.h:14
-msgid "P_references"
-msgstr "ååèå(_R)"
+#: ../src/empathy-import-widget.c:336
+msgid "Source"
+msgstr "äæ"
 
-#: ../src/empathy-roster-window-menubar.ui.h:15
-msgid "Help"
-msgstr "æå"
+#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:229
+msgid "Invite Participant"
+msgstr "éèåè"
 
-#: ../src/empathy-roster-window-menubar.ui.h:16
-msgid "About Empathy"
-msgstr "éæ Empathy"
+#: ../src/empathy-invite-participant-dialog.c:202
+msgid "Choose a contact to invite into the conversation:"
+msgstr "éææèéèéåèèçèçäï"
 
-#: ../src/empathy-roster-window-menubar.ui.h:17
-#: ../src/empathy-status-icon.ui.h:5
-msgid "_Quit"
-msgstr "çæ(_Q)"
+#: ../src/empathy-invite-participant-dialog.c:225
+msgid "Invite"
+msgstr "éè"
 
 #: ../src/empathy-new-chatroom-dialog.c:194
 msgid "Chat Room"
@@ -3777,7 +3912,7 @@ msgstr "æ"
 msgid "No"
 msgstr "å"
 
-#: ../src/empathy-new-chatroom-dialog.c:782
+#: ../src/empathy-new-chatroom-dialog.c:784
 msgid "Join Room"
 msgstr "ååèåå"
 
@@ -3816,79 +3951,104 @@ msgstr "çæèåèååæå"
 msgid "Room List"
 msgstr "èååæå"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-notifications-approver.c:188
+msgid "Respond"
+msgstr "åæ"
+
+#: ../src/empathy-notifications-approver.c:207
+msgid "Answer with video"
+msgstr "äèèæè"
+
+#: ../src/empathy-notifications-approver.c:215
+#: ../src/empathy-notifications-approver.c:225
+msgid "Decline"
+msgstr "æç"
+
+#: ../src/empathy-notifications-approver.c:219
+#: ../src/empathy-notifications-approver.c:230
+msgid "Accept"
+msgstr "æå"
+
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
+#: ../src/empathy-notifications-approver.c:240
+msgid "Provide"
+msgstr "æä"
+
+#: ../src/empathy-preferences.c:144
 msgid "Message received"
 msgstr "èæåæå"
 
-#: ../src/empathy-preferences.c:146
+#: ../src/empathy-preferences.c:145
 msgid "Message sent"
 msgstr "èæåéå"
 
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:146
 msgid "New conversation"
 msgstr "æåèè"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:147
 msgid "Contact comes online"
 msgstr "éçääç"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:148
 msgid "Contact goes offline"
 msgstr "éçäéç"
 
-#: ../src/empathy-preferences.c:150
+#: ../src/empathy-preferences.c:149
 msgid "Account connected"
 msgstr "åèåéç"
 
-#: ../src/empathy-preferences.c:151
+#: ../src/empathy-preferences.c:150
 msgid "Account disconnected"
 msgstr "åèåæç"
 
-#: ../src/empathy-preferences.c:388
+#: ../src/empathy-preferences.c:387
 msgid "Language"
 msgstr "èè"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:637
+#: ../src/empathy-preferences.c:638
 msgid "Juliet"
 msgstr "çèå"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:644
+#: ../src/empathy-preferences.c:645
 msgid "Romeo"
 msgstr "æåä"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:650
+#: ../src/empathy-preferences.c:651
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "çççèèèåïçääèååéï"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:654
+#: ../src/empathy-preferences.c:655
 msgid "Deny thy father and refuse thy name;"
 msgstr "èçäæèääïçäçåæèåã"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:657
+#: ../src/empathy-preferences.c:658
 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:660
+#: ../src/empathy-preferences.c:661
 msgid "And I'll no longer be a Capulet."
 msgstr "ççèäéååïååçïæéäã"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:663
+#: ../src/empathy-preferences.c:664
 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:666
+#: ../src/empathy-preferences.c:667
 msgid "Juliet has disconnected"
 msgstr "çèååæç"
 
-#: ../src/empathy-preferences.c:1070
+#: ../src/empathy-preferences.c:1033
 msgid "Preferences"
 msgstr "ååèå"
 
@@ -3900,6 +4060,10 @@ msgstr "éççç"
 msgid "Show account balances"
 msgstr "éçåèéé"
 
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2141
+msgid "Contact List"
+msgstr "éçäæå"
+
 #: ../src/empathy-preferences.ui.h:5
 msgid "Start chats in:"
 msgstr "éåèåæï"
@@ -4059,360 +4223,182 @@ msgstr "æåï"
 msgid "Themes"
 msgstr "äæäé"
 
-#: ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversationâ"
-msgstr "æåèè(_N)â"
-
-#: ../src/empathy-status-icon.ui.h:3
-msgid "New _Callâ"
-msgstr "æåéè(_C)â"
-
-#: ../src/empathy-status-icon.ui.h:4
-msgid "Status"
-msgstr "çæ"
-
-#: ../src/empathy-debug-window.c:1603
-msgid "Save"
-msgstr "åå"
-
-#: ../src/empathy-debug-window.c:1663
-msgid "Pastebin link"
-msgstr "Pastebin éç"
-
-#: ../src/empathy-debug-window.c:1672
-msgid "Pastebin response"
-msgstr "Pastebin åæ"
-
-#: ../src/empathy-debug-window.c:1679
-msgid "Data too large for a single paste. Please save logs to file."
-msgstr "åæåäèääèèæééåãèååçéèææã"
-
-#: ../src/empathy-debug-window.c:1860
-msgid "Debug Window"
-msgstr "åéèç"
-
-#: ../src/empathy-debug-window.c:1920
-msgid "Send to pastebin"
-msgstr "åéè pastebin"
-
-#: ../src/empathy-debug-window.c:1964
-msgid "Pause"
-msgstr "æå"
-
-#: ../src/empathy-debug-window.c:1976
-msgid "Level "
-msgstr "çç"
-
-#: ../src/empathy-debug-window.c:1995
-msgid "Debug"
-msgstr "åé"
-
-#: ../src/empathy-debug-window.c:2000
-msgid "Info"
-msgstr "èè"
-
-#: ../src/empathy-debug-window.c:2005 ../src/empathy-debug-window.c:2054
-msgid "Message"
-msgstr "èæ"
-
-#: ../src/empathy-debug-window.c:2010
-msgid "Warning"
-msgstr "èå"
-
-#: ../src/empathy-debug-window.c:2015
-msgid "Critical"
-msgstr "åé"
-
-#: ../src/empathy-debug-window.c:2020
-msgid "Error"
-msgstr "éè"
-
-#: ../src/empathy-debug-window.c:2039
-msgid "Time"
-msgstr "æå"
-
-#: ../src/empathy-debug-window.c:2042
-msgid "Domain"
-msgstr "çå"
-
-#: ../src/empathy-debug-window.c:2045
-msgid "Category"
-msgstr "åé"
-
-#: ../src/empathy-debug-window.c:2048
-msgid "Level"
-msgstr "çç"
-
-#: ../src/empathy-debug-window.c:2077
-msgid ""
-"The selected connection manager does not support the remote debugging "
-"extension."
-msgstr "éåçéççççåäææéçåéæååèã"
-
-#: ../src/empathy-invite-participant-dialog.c:201
-#: ../src/empathy-invite-participant-dialog.c:229
-msgid "Invite Participant"
-msgstr "éèåè"
-
-#: ../src/empathy-invite-participant-dialog.c:202
-msgid "Choose a contact to invite into the conversation:"
-msgstr "éææèéèéåèèçèçäï"
-
-#: ../src/empathy-invite-participant-dialog.c:225
-msgid "Invite"
-msgstr "éè"
-
-#: ../src/empathy-accounts.c:184
-msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr "äèéçääåèçïåèäääæ (äïåå) äéé"
-
-#: ../src/empathy-accounts.c:188
-msgid ""
-"Don't display any dialogs unless there are only \"People Nearby\" accounts"
-msgstr "äèéçääåèçïééåæãéèçäãåè"
-
-#: ../src/empathy-accounts.c:192
-msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr "ååéåæçäçåè (äïgabble/jabber/foo_40example_2eorg0)"
-
-#: ../src/empathy-accounts.c:194
-msgid "<account-id>"
-msgstr "<account-id>"
-
-#: ../src/empathy-accounts.c:199
-msgid "- Empathy Accounts"
-msgstr "- Empathy åè"
-
-#: ../src/empathy-accounts.c:242
-msgid "Empathy Accounts"
-msgstr "Empathy åè"
-
-#: ../src/empathy-debugger.c:69
-msgid "Show a particular service"
-msgstr "éççåæå"
-
-#: ../src/empathy-debugger.c:74
-msgid "- Empathy Debugger"
-msgstr "- Empathy ééå"
+#: ../src/empathy-roster-window.c:241
+msgid "Provide Password"
+msgstr "æäåç"
 
-#: ../src/empathy-debugger.c:113
-msgid "Empathy Debugger"
-msgstr "Empathy ééçå"
+#: ../src/empathy-roster-window.c:247
+msgid "Disconnect"
+msgstr "æç"
 
-#: ../src/empathy-chat.c:106
-msgid "- Empathy Chat Client"
-msgstr "- Empathy èåçæç"
+#: ../src/empathy-roster-window.c:418
+msgid "You need to setup an account to see contacts here."
+msgstr "æéèèçäååèæèåéèæçèçäã"
 
-#: ../src/empathy-notifications-approver.c:188
-msgid "Respond"
-msgstr "åæ"
+#: ../src/empathy-roster-window.c:505
+#, c-format
+msgid "Sorry, %s accounts canât be used until your %s software is updated."
+msgstr "åææï%s åèçæäçïééæç %s èéåææã"
 
-#: ../src/empathy-notifications-approver.c:197
-#: ../src/empathy-call-window.c:1495
-msgid "Reject"
-msgstr "æç"
+#: ../src/empathy-roster-window.c:571
+msgid "Update software..."
+msgstr "ææèé..."
 
-#: ../src/empathy-notifications-approver.c:202
-#: ../src/empathy-notifications-approver.c:207
-#: ../src/empathy-call-window.c:1496
-msgid "Answer"
-msgstr "æè"
+#: ../src/empathy-roster-window.c:577 ../src/empathy-roster-window.c:694
+msgid "Close"
+msgstr "éé"
 
-#: ../src/empathy-notifications-approver.c:207
-msgid "Answer with video"
-msgstr "äèèæè"
+#: ../src/empathy-roster-window.c:682
+msgid "Reconnect"
+msgstr "éæéæ"
 
-#: ../src/empathy-notifications-approver.c:215
-#: ../src/empathy-notifications-approver.c:225
-msgid "Decline"
-msgstr "æç"
+#: ../src/empathy-roster-window.c:688
+msgid "Edit Account"
+msgstr "çèåè"
 
-#: ../src/empathy-notifications-approver.c:219
-#: ../src/empathy-notifications-approver.c:230
-msgid "Accept"
-msgstr "æå"
+#: ../src/empathy-roster-window.c:868
+msgid "Top up account"
+msgstr "åååèåé"
 
-#. translators: the 'Provide' button is displayed in a notification
-#. * bubble when Empathy is asking for an account password; clicking on it
-#. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:240
-msgid "Provide"
-msgstr "æä"
+#: ../src/empathy-roster-window.c:1530
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "æéèåçæåäääçåèäæèåéèæçèçäã"
 
-#: ../src/empathy-call-observer.c:119
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:1538
 #, c-format
-msgid "%s just tried to call you, but you were in another call."
-msgstr "%s ååææçæïäææèääéèã"
+msgid "You need to enable %s to see contacts here."
+msgstr "æéèåç %s æèåéèæçèçäã"
 
-#. Translators: this is an "Info" label. It should be as short
-#. * as possible.
-#: ../src/empathy-call-window.c:1125 ../src/empathy-call-window.c:1141
-msgid "i"
-msgstr "è"
+#: ../src/empathy-roster-window.c:1595
+msgid "No match found"
+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:1862
-#, c-format
-msgid "Call with %s"
-msgstr "è %s éèä"
+#: ../src/empathy-roster-window.c:1599
+msgid "No online contacts"
+msgstr "çäçéçä"
 
-#: ../src/empathy-call-window.c:2114
-msgid "The IP address as seen by the machine"
-msgstr "æåçèç IP äå"
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_New Conversation..."
+msgstr "æåèè(_N)..."
 
-#: ../src/empathy-call-window.c:2116
-msgid "The IP address as seen by a server on the Internet"
-msgstr "çéçèäçäæåçèç IP äå"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+msgid "New _Call..."
+msgstr "æåéè(_C)..."
 
-#: ../src/empathy-call-window.c:2118
-msgid "The IP address of the peer as seen by the other side"
-msgstr "åäççèçéç IP äå"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+msgid "Contacts"
+msgstr "éçä"
 
-#: ../src/empathy-call-window.c:2120
-msgid "The IP address of a relay server"
-msgstr "äçäæåç IP äå"
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Add Contacts..."
+msgstr "ååèçä(_A)..."
 
-#: ../src/empathy-call-window.c:2122
-msgid "The IP address of the multicast group"
-msgstr "åéåæççç IP äå"
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Search for Contacts..."
+msgstr "æåèçä(_S)..."
 
-#: ../src/empathy-call-window.c:2869
-msgid "On hold"
-msgstr "äç"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Blocked Contacts"
+msgstr "èåéçèçä"
 
-#: ../src/empathy-call-window.c:2871
-msgid "Mute"
-msgstr "éé"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_Rooms"
+msgstr "èåå(_R)"
 
-#: ../src/empathy-call-window.c:2873
-msgid "Duration"
-msgstr "æé"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Join..."
+msgstr "åå(_J)..."
 
-#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2876
-#, c-format
-msgid "%s â %d:%02dm"
-msgstr "%s â %d:%02dm"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Join _Favorites"
+msgstr "ååååèåå(_F)"
 
-#: ../src/empathy-call-window.c:2972
-msgid "Technical Details"
-msgstr "æèçç"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "_Manage Favorites"
+msgstr "ççåå(_M)"
 
-#: ../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-roster-window-menubar.ui.h:12
+msgid "_File Transfers"
+msgstr "ææåè(_F)"
 
-#: ../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-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "åè(_A)"
 
-#: ../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-roster-window-menubar.ui.h:14
+msgid "P_references"
+msgstr "ååèå(_R)"
 
-#: ../src/empathy-call-window.c:3028
-msgid "There was a failure on the network"
-msgstr "éåçèäæéèçç"
+#: ../src/empathy-roster-window-menubar.ui.h:15
+msgid "Help"
+msgstr "æå"
 
-#: ../src/empathy-call-window.c:3032
-msgid ""
-"The audio formats necessary for this call are not installed on your computer"
-msgstr "æéèæåèçéèæååæåæçéèäåè"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "About Empathy"
+msgstr "éæ Empathy"
 
-#: ../src/empathy-call-window.c:3035
-msgid ""
-"The video formats necessary for this call are not installed on your computer"
-msgstr "æéèæåèçèèæååæåæçéèäåè"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-status-icon.ui.h:5
+msgid "_Quit"
+msgstr "çæ(_Q)"
 
-#: ../src/empathy-call-window.c:3047
-#, c-format
-msgid ""
-"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
-"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
-"the Help menu."
-msgstr ""
-"å Telepathy åääççæéæççæãè<a href=\"%s\">ååéåéè</a>äéä"
-"åæåéååçãééãèçäææéççéã"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "åèèåå"
 
-#: ../src/empathy-call-window.c:3056
-msgid "There was a failure in the call engine"
-msgstr "éèåæåæéèçç"
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversationâ"
+msgstr "æåèè(_N)â"
 
-#: ../src/empathy-call-window.c:3059
-msgid "The end of the stream was reached"
-msgstr "åéäææç"
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Callâ"
+msgstr "æåéè(_C)â"
 
-#: ../src/empathy-call-window.c:3099
-msgid "Can't establish audio stream"
-msgstr "çæåçéèäæ"
+#: ../src/empathy-status-icon.ui.h:4
+msgid "Status"
+msgstr "çæ"
 
-#: ../src/empathy-call-window.c:3109
-msgid "Can't establish video stream"
-msgstr "çæåçèèäæ"
+#: ../ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-widget.c:179
+#: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126
+msgid "Done"
+msgstr "åæ"
 
-#: ../src/empathy-call-window.c:3146
-#, c-format
-msgid "Your current balance is %s."
-msgstr "æçåçééç %sã"
+#: ../ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-widget.c:210
+msgid "Please enter your account details"
+msgstr "èèåæçåèèçèæ"
 
-#: ../src/empathy-call-window.c:3150
-msgid "Sorry, you donât have enough credit for that call."
-msgstr "åææïæçåéäèäéèèéèã"
+#: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:160
+#, c-format
+msgid "Edit %s account options"
+msgstr "çè %s åèéé"
 
-#: ../src/empathy-call-window.c:3152
-msgid "Top Up"
-msgstr "åå"
+#~ msgid "Manage Messaging and VoIP accounts"
+#~ msgstr "ççèæè VoIP åè"
 
-#: ../src/empathy-call.c:195
-msgid "- Empathy Audio/Video Client"
-msgstr "- Empathy éèèèçæç"
+#~ msgid "%A %B %d %Y"
+#~ msgstr "%Y %B %d %A"
 
-#: ../src/empathy-call.c:219
-msgid "Empathy Audio/Video Client"
-msgstr "Empathy éèèèçæç"
+#~ msgid "_Block User"
+#~ msgstr "åéäçè(_B)"
 
-#: ../libempathy-gtk/empathy-search-bar.c:243
-msgid "_Match case"
-msgstr "æåååå(_M)"
+#~ msgid "Decide _Later"
+#~ msgstr "çååæå(_L)"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:129
-msgid "What kind of chat account do you have?"
-msgstr "æçèååèæåäçï"
+#~ msgid "Classic"
+#~ msgstr "åå"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:151
-msgid "Adding new account"
-msgstr "æååè"
+#~ msgid "Simple"
+#~ msgstr "çæ"
 
-#: ../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 åäèåæçèæäåéçåçåçèäçäåïääåäåèåãåæææ"
-"äçæåèïèææäåèçèææåæçã"
+#~ msgid "Clean"
+#~ msgstr "æç"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:98
-msgid "People nearby"
-msgstr "éèçä"
+#~ msgid "Blue"
+#~ 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 "Failed to retrieve your personal information from the server."
+#~ msgstr "çæåäæåæåæçåäèèã"
 
 #~ msgid "Network:"
 #~ msgstr "çèï"
@@ -4669,9 +4655,6 @@ msgstr ""
 #~ msgid "Do you have any other chat accounts you want to set up?"
 #~ msgstr "æéæèèååäçèååèåï"
 
-#~ msgid "Enter your account details"
-#~ msgstr "èèåæçåèèçèæ"
-
 #~ msgid "What kind of chat account do you want to create?"
 #~ msgstr "ææèåçäçèååèï"
 



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