Merge branch 'sjoerd-mc5' into mc5

Conflicts: libempathy-gtk/empathy-account-widget.c libempathy-gtk/empathy-protocol-chooser.c
author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk> 2009-08-01 16:32:39 +0800
committer: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk> 2009-08-01 16:32:39 +0800
commit: 3e8f25168aadd741ecc0fe8da4d1847eece5ff83 (patch)
tree: 69b2fc8984c98b9cad38d2ca5e8563da2b9aad8a /po
parent: 41e5b31c1918f40c3ba47bff2dc9ab682fe0391f (diff)
parent: 87070d25c5f2d9a0ecba73e8ce913eca7f183c79 (diff)
download: gsoc2013-empathy-3e8f25168aadd741ecc0fe8da4d1847eece5ff83.tar
gsoc2013-empathy-3e8f25168aadd741ecc0fe8da4d1847eece5ff83.tar.gz
gsoc2013-empathy-3e8f25168aadd741ecc0fe8da4d1847eece5ff83.tar.bz2
gsoc2013-empathy-3e8f25168aadd741ecc0fe8da4d1847eece5ff83.tar.lz
gsoc2013-empathy-3e8f25168aadd741ecc0fe8da4d1847eece5ff83.tar.xz
gsoc2013-empathy-3e8f25168aadd741ecc0fe8da4d1847eece5ff83.tar.zst
gsoc2013-empathy-3e8f25168aadd741ecc0fe8da4d1847eece5ff83.zip
11 files changed, 10502 insertions, 6955 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d7aa74d61..89387f58d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -44,6 +44,7 @@ libempathy-gtk/empathy-presence-chooser.c
 libempathy-gtk/empathy-sound.c
 libempathy-gtk/empathy-status-preset-dialog.c
 [type: gettext/glade]libempathy-gtk/empathy-status-preset-dialog.ui
+libempathy-gtk/empathy-theme-adium.c
 libempathy-gtk/empathy-theme-boxes.c
 libempathy-gtk/empathy-theme-irc.c
 libempathy-gtk/empathy-theme-manager.c
diff --git a/po/ar.po b/po/ar.po
index 90c726e8d..c132c6d9d 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gossip.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-16 19:06+0200\n"
-"PO-Revision-Date: 2009-04-18 22:32+0300\n"
+"POT-Creation-Date: 2009-07-27 23:48+0300\n"
+"PO-Revision-Date: 2009-07-27 23:49+0300\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
 "Language: ar\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-Generator: Virtaal 0.3.1\n"
+"X-Generator: Virtaal 0.4.0-rc1\n"
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Empathy Instant Messenger"
@@ -55,11 +55,11 @@ msgstr "لائحة لغات التدقيق اللغوي (افصل بفاصلة،
 
 #: ../data/empathy.schemas.in.h:5
 msgid "Compact contact list"
-msgstr "لائحة مختصرة للمراسلين"
+msgstr "لائحة مختصرة للمتراسلين"
 
 #: ../data/empathy.schemas.in.h:6
 msgid "Contact list sort criterium"
-msgstr "معيار ترتيب لائحة المراسلين"
+msgstr "معيار ترتيب لائحة المتراسلين"
 
 #: ../data/empathy.schemas.in.h:7
 msgid "Default directory to select an avatar image from"
@@ -74,230 +74,330 @@ msgid "Disable sounds when away"
 msgstr "عطل الأصوات عندما أكون بعيدا"
 
 #: ../data/empathy.schemas.in.h:10
+msgid "Empathy can publish the user's location"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:11
+msgid "Empathy can use the GPS to guess the location"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:12
+msgid "Empathy can use the cellular network to guess the location"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:13
+msgid "Empathy can use the network to guess the location"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:14
 msgid "Empathy default download folder"
 msgstr "مجلد التنزيل المبدئي لإمباثي"
 
-#: ../data/empathy.schemas.in.h:11
+#: ../data/empathy.schemas.in.h:15
 msgid "Empathy has asked about importing accounts"
 msgstr "إمباثي يسأل عن استيراد الحسابات"
 
-#: ../data/empathy.schemas.in.h:12
+#: ../data/empathy.schemas.in.h:16
 msgid "Empathy should auto-connect on startup"
 msgstr "الاتصال الآلي عند بدء البرنامج"
 
-#: ../data/empathy.schemas.in.h:13
+#: ../data/empathy.schemas.in.h:17
+#, fuzzy
+msgid "Empathy should reduce the location's accuracy"
+msgstr "الاتصال الآلي عند بدء البرنامج"
+
+#: ../data/empathy.schemas.in.h:18
 msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "استخدام الصور الشخصيّة للمراسل كأيقونة لنافذة المحادثة"
+msgstr "استخدام الصور الشخصيّة للمتراسل كأيقونة لنافذة المحادثة"
 
-#: ../data/empathy.schemas.in.h:14
+#: ../data/empathy.schemas.in.h:19
+msgid "Enable WebKit Developer Tools"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:20
 msgid "Enable popup notifications for new messages"
 msgstr "فعّل التنبيهات المنبثقة للرسائل الجديدة"
 
-#: ../data/empathy.schemas.in.h:15
+#: ../data/empathy.schemas.in.h:21
 msgid "Enable spell checker"
 msgstr "فعّل التدقيق الإملائي"
 
-#: ../data/empathy.schemas.in.h:16
+#: ../data/empathy.schemas.in.h:22
 msgid "Hide main window"
 msgstr "أخفِ النافذة الرئيسية"
 
-#: ../data/empathy.schemas.in.h:17
+#: ../data/empathy.schemas.in.h:23
 msgid "Hide the main window."
 msgstr "أخفِ النافذة الرئيسية"
 
-#: ../data/empathy.schemas.in.h:18
+#: ../data/empathy.schemas.in.h:24
 msgid "NetworkManager should be used"
 msgstr "يجب استعمال مدير الشبكة"
 
-#: ../data/empathy.schemas.in.h:19
+#: ../data/empathy.schemas.in.h:25
 msgid "Nick completed character"
 msgstr "مِحرف الكنية التام"
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:26
 msgid "Open new chats in separate windows"
 msgstr "افتح المحادثات الجديدة في نوافذ متفرقة"
 
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:27
+msgid "Path of the adium theme to use"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:28
+#, fuzzy
+msgid "Path of the adium theme to use if the theme used for chat is adium."
+msgstr "استخدام سمة لغرف المحادثة."
+
+#: ../data/empathy.schemas.in.h:29
 msgid "Play a sound for incoming messages"
 msgstr "شغل صوت عند وصول الرسائل"
 
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:30
 msgid "Play a sound for new conversations"
 msgstr "شغل صوت للمحادثات الجديدة"
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:31
 msgid "Play a sound for outgoing messages"
 msgstr "شغل صوت عند إرسال الرسائل"
 
-#: ../data/empathy.schemas.in.h:24
+#: ../data/empathy.schemas.in.h:32
 msgid "Play a sound when a contact logs in"
 msgstr "_شغل صوت عندما يسجل الدخول أحد جهات الإتصال"
 
-#: ../data/empathy.schemas.in.h:25
+#: ../data/empathy.schemas.in.h:33
 msgid "Play a sound when a contact logs out"
-msgstr "شغل صوت عندما يقوم أحد المُرَاسلين بالخروج"
+msgstr "شغل صوت عندما يقوم أحد المتراسلين بالخروج"
 
-#: ../data/empathy.schemas.in.h:26
+#: ../data/empathy.schemas.in.h:34
 msgid "Play a sound when we log in"
 msgstr "شغل صوت عندما ألج"
 
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:35
 msgid "Play a sound when we log out"
 msgstr "شغل صوت عندما أخرج"
 
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:36
 msgid "Popup notifications if the chat isn't focused"
 msgstr "أظهر التنبيهات المنبثقة إذا لم يكن التركيز على المحادثة"
 
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:37
+#, fuzzy
+msgid "Popup notifications when a contact sign in"
+msgstr "أظهر التنبيهات المنبثقة إذا لم يكن التركيز على المحادثة"
+
+#: ../data/empathy.schemas.in.h:38
+#, fuzzy
+msgid "Popup notifications when a contact sign out"
+msgstr "أظهر التنبيهات المنبثقة إذا لم يكن التركيز على المحادثة"
+
+#: ../data/empathy.schemas.in.h:39
 msgid "Salut account is created"
 msgstr "أُنشئ حساب الترحيب"
 
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:40
 msgid "Show avatars"
 msgstr "أعرض الصور الشخصية"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:41
+#, fuzzy
+msgid "Show contact list in rooms"
+msgstr "أظهر _قائمة المتراسلين"
+
+#: ../data/empathy.schemas.in.h:42
 msgid "Show hint about closing the main window"
 msgstr "أظهر تلميحة إغلاق النافذة الرئيسية"
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:43
 msgid "Show offline contacts"
-msgstr "أظهر المراسلين غير المتَّصلين"
+msgstr "أظهر المتراسلين غير المتَّصلين"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:44
 msgid "Spell checking languages"
 msgstr "لغات التدقيق اللغوي"
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:45
 msgid "The default folder to save file transfers in."
 msgstr "المجلد المبدئي لحفظ الملفات المنقولة فيه."
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:46
 msgid "The last directory that an avatar image was chosen from."
 msgstr "آخر مجلد اختِيرت منه الصورة الشخصية."
 
-#: ../data/empathy.schemas.in.h:36
+#: ../data/empathy.schemas.in.h:47
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "السِمة المستخدمة لعرض المحادثة في نوافذ الدردشة."
 
-#: ../data/empathy.schemas.in.h:37
+#: ../data/empathy.schemas.in.h:48
 msgid "Use graphical smileys"
 msgstr "استخدم التعابير المرسومة"
 
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:49
 msgid "Use notification sounds"
 msgstr "استخدم أصوات التبليغ"
 
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:50
 msgid "Use theme for chat rooms"
 msgstr "استخدم سمة لغرف الدردشة"
 
-#: ../data/empathy.schemas.in.h:40
+#: ../data/empathy.schemas.in.h:51
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be "
+"enabled."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:52
+#, fuzzy
+msgid "Whether or not Empathy can publish the user's location to his contacts."
+msgstr "عرض المرسلين غير المتصلين في لائحة المتراسلين."
+
+#: ../data/empathy.schemas.in.h:53
+#, fuzzy
+msgid "Whether or not Empathy can use the GPS to guess the location."
+msgstr "استخدام الصور الشخصية للمتراسل كأيقونة لنافذة المحادثة"
+
+#: ../data/empathy.schemas.in.h:54
+#, fuzzy
+msgid ""
+"Whether or not Empathy can use the cellular network to guess the location."
+msgstr "استخدام الصور الشخصية للمتراسل كأيقونة لنافذة المحادثة"
+
+#: ../data/empathy.schemas.in.h:55
+#, fuzzy
+msgid "Whether or not Empathy can use the network to guess the location."
+msgstr "استخدام الصور الشخصية للمتراسل كأيقونة لنافذة المحادثة"
+
+#: ../data/empathy.schemas.in.h:56
 msgid ""
 "Whether or not Empathy has asked about importing accounts from other "
 "programs."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:41
+#: ../data/empathy.schemas.in.h:57
 msgid ""
 "Whether or not Empathy should automatically log in to your accounts on "
 "startup."
 msgstr "الولوج آليا إلى حساباتك عند بدء التشغيل."
 
-#: ../data/empathy.schemas.in.h:42
+#: ../data/empathy.schemas.in.h:58
+#, fuzzy
+msgid ""
+"Whether or not Empathy should reduce the location's accuracy for privacy "
+"reasons."
+msgstr "استخدام الصور الشخصية للمتراسل كأيقونة لنافذة المحادثة"
+
+#: ../data/empathy.schemas.in.h:59
 msgid ""
 "Whether or not Empathy should use the avatar of the contact as the chat "
 "window icon."
-msgstr "استخدام الصور الشخصية للمراسل كأيقونة لنافذة المحادثة"
+msgstr "استخدام الصور الشخصية للمتراسل كأيقونة لنافذة المحادثة"
 
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:60
 msgid ""
 "Whether or not the Salut account has been created on the first Empathy run."
 msgstr "إنشاء حساب الترحيب عند أول تشغيل لمرسال جنوم."
 
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:61
 msgid ""
 "Whether or not the network manager should be used to automatically "
 "disconnect/reconnect."
 msgstr "استخدام مدير الشبكة لقطع الاتصال أو استرجاعه."
 
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:62
 msgid ""
 "Whether or not to check words typed against the languages you want to check "
 "with."
 msgstr "التأكد من الكلمات المكتوبة باللغة التي حددتها."
 
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:63
 msgid ""
 "Whether or not to convert smileys into graphical images in conversations."
 msgstr "تحويل الابتسامات إلى صور معبّرة."
 
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:64
 msgid ""
-"Whether or not to play a sound to notify for contacts logging in the network."
+"Whether or not to play a sound to notify for contacts logging in the "
+"network."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:65
 msgid ""
 "Whether or not to play a sound to notify for contacts logging off the "
 "network."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:66
 msgid "Whether or not to play a sound to notify for events."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:67
 msgid "Whether or not to play a sound to notify for incoming messages."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:68
 msgid "Whether or not to play a sound to notify for new conversations."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:69
 msgid "Whether or not to play a sound to notify for outgoing messages."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:70
 msgid "Whether or not to play a sound when logging in a network."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:71
 msgid "Whether or not to play a sound when logging off a network."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:72
 msgid "Whether or not to play sound notifications when away or busy."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:73
+#, fuzzy
+msgid ""
+"Whether or not to show a popup notification when a contact goes offline."
+msgstr "إظهار صور شخصية للمتراسلين في لائحة المتراسلين ونوافذ المحادثة."
+
+#: ../data/empathy.schemas.in.h:74
+#, fuzzy
+msgid "Whether or not to show a popup notification when a contact goes online."
+msgstr "إظهار صور شخصية للمتراسلين في لائحة المتراسلين ونوافذ المحادثة."
+
+#: ../data/empathy.schemas.in.h:75
 msgid ""
 "Whether or not to show a popup notification when receiving a new message "
 "even if the chat is already opened, but not focused."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:76
 msgid ""
 "Whether or not to show a popup notification when receiving a new message."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:77
 msgid ""
 "Whether or not to show avatars for contacts in the contact list and chat "
 "windows."
-msgstr "إظهار صور شخصية للمراسلين في لائحة المراسلين ونوافذ المحادثة."
+msgstr "إظهار صور شخصية للمتراسلين في لائحة المتراسلين ونوافذ المحادثة."
 
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:78
 msgid "Whether or not to show contacts that are offline in the contact list."
-msgstr "عرض المرسلين غير المتصلين في لائحة المراسلين."
+msgstr "عرض المرسلين غير المتصلين في لائحة المتراسلين."
 
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:79
 msgid "Whether or not to show popup notifications when away or busy."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:80
+#, fuzzy
+msgid "Whether or not to show the contact list in chat rooms."
+msgstr "عرض لائحة المتراسلين في شكلها المختصر."
+
+#: ../data/empathy.schemas.in.h:81
 msgid ""
 "Whether or not to show the message dialog about closing the main window with "
 "the 'x' button in the title bar."
@@ -305,740 +405,1013 @@ msgstr ""
 "عرض حوار الرسائل حول إغلاق النافذة الرئيسية التي بها علامة الإغلاق في شريط "
 "العناوين. "
 
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:82
 msgid "Whether to show the contact list in compact mode or not."
-msgstr "عرض لائحة المراسلين في شكلها المختصر."
+msgstr "عرض لائحة المتراسلين في شكلها المختصر."
 
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:83
 msgid "Whether to use the theme for chat rooms or not."
 msgstr "استخدام سمة لغرف المحادثة."
 
-#: ../data/empathy.schemas.in.h:64
+#: ../data/empathy.schemas.in.h:84
 msgid ""
 "Which criterium to use when sorting the contact list. Default is to use sort "
 "by the contact's name with the value \"name\". A value of \"state\" will "
 "sort the contact list by state."
 msgstr ""
-"المعيار المطلوب استخدامه لفرز لائحة المراسلين. المفترض  الفرز حسب اسم "
-"المراسل. يمكن أيضا استخدام معيار الحالة للفرز حسب حالة المراسلين."
+"المعيار المطلوب استخدامه لفرز لائحة المتراسلين. المفترض  الفرز حسب اسم "
+"المتراسل. يمكن أيضا استخدام معيار الحالة للفرز حسب حالة المتراسلين."
+
+#: ../libempathy/empathy-ft-handler.c:838
+msgid "The hash of the received file and the sent one do not match"
+msgstr "تلبيدة الملف المُرسَل ولمُستَقبل لا تتطابقان."
+
+#: ../libempathy/empathy-ft-handler.c:1098
+msgid "File transfer not supported by remote contact"
+msgstr "لا يدعم المتراسل البعيد نقل الملفات"
+
+#: ../libempathy/empathy-ft-handler.c:1156
+msgid "The selected file is not a regular file"
+msgstr "الملف المختار ليس ملفا اعتياديا"
 
-#: ../libempathy/empathy-tp-contact-list.c:731 ../src/empathy.c:271
+#: ../libempathy/empathy-ft-handler.c:1165
+msgid "The selected file is empty"
+msgstr "الملف المختار فارغ"
+
+#: ../libempathy/empathy-tp-contact-list.c:843 ../src/empathy.c:289
 msgid "People nearby"
 msgstr "مع أصدقاء"
 
-#: ../libempathy/empathy-utils.c:252
+#: ../libempathy/empathy-tp-file.c:279
+msgid "Socket type not supported"
+msgstr "نوع المقبس غير مدعوم"
+
+#: ../libempathy/empathy-tp-file.c:398
+msgid "No reason was specified"
+msgstr "لم يحدد أي سبب"
+
+#: ../libempathy/empathy-tp-file.c:401
+msgid "The change in state was requested"
+msgstr "رفض تغيير الحالة"
+
+#: ../libempathy/empathy-tp-file.c:404
+msgid "You canceled the file transfer"
+msgstr "أنت ألغيت نقل الملف"
+
+#: ../libempathy/empathy-tp-file.c:407
+msgid "The other participant canceled the file transfer"
+msgstr "الشخص الآخر قام بإلغاء نقل الملف"
+
+#: ../libempathy/empathy-tp-file.c:410
+msgid "Error while trying to transfer the file"
+msgstr "حدثت مشكلة أثناء محاولة نقل الملف"
+
+#: ../libempathy/empathy-tp-file.c:413
+msgid "The other participant is unable to transfer the file"
+msgstr "الشخص الآخر غير قادر على نقل الملف"
+
+#: ../libempathy/empathy-tp-file.c:416
+msgid "Unknown reason"
+msgstr "سبب مجهول"
+
+#: ../libempathy/empathy-utils.c:265
 msgid "Available"
 msgstr "موجود"
 
-#: ../libempathy/empathy-utils.c:254
+#: ../libempathy/empathy-utils.c:267
 msgid "Busy"
 msgstr "مشغول"
 
-#: ../libempathy/empathy-utils.c:257
+#: ../libempathy/empathy-utils.c:270
 msgid "Away"
 msgstr "غائب"
 
-#: ../libempathy/empathy-utils.c:259
+#: ../libempathy/empathy-utils.c:272
 msgid "Hidden"
 msgstr "مخفي"
 
-#: ../libempathy/empathy-utils.c:262
+#: ../libempathy/empathy-utils.c:274
 msgid "Offline"
 msgstr "غير متصل"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:326
+#: ../libempathy/empathy-time.c:137
+#, c-format
+msgid "%d second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "الآن"
+msgstr[1] "منذ ثانية واحدة"
+msgstr[2] "منذ ثانيتين"
+msgstr[3] "منذ %d ثوان"
+msgstr[4] "منذ %d ثانية"
+msgstr[5] "منذ %d ثانية"
+
+#: ../libempathy/empathy-time.c:142
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "منذ أقل من دقيقة"
+msgstr[1] "منذ دقيقة واحدة"
+msgstr[2] "منذ دقيقتين"
+msgstr[3] "منذ %d دقائق"
+msgstr[4] "منذ %d دقيقة"
+msgstr[5] "منذ %d دقيقة"
+
+#: ../libempathy/empathy-time.c:147
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "منذ أقل من ساعة"
+msgstr[1] "منذ ساعة واحدة"
+msgstr[2] "منذ ساعتين"
+msgstr[3] "منذ %d ساعات"
+msgstr[4] "منذ %d ساعة"
+msgstr[5] "منذ %d ساعة"
+
+#: ../libempathy/empathy-time.c:152
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "منذ أقل من يوم"
+msgstr[1] "منذ يوم واحد"
+msgstr[2] "منذ يومين"
+msgstr[3] "منذ %d أيام"
+msgstr[4] "منذ %d يوما"
+msgstr[5] "منذ %d يوم"
+
+#: ../libempathy/empathy-time.c:157
+#, c-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "منذ أقل من أسبوع"
+msgstr[1] "منذ أسبوع واحد"
+msgstr[2] "منذ أسبوعين"
+msgstr[3] "منذ %d أسابيع"
+msgstr[4] "منذ %d أسبوعا"
+msgstr[5] "منذ %d أسبوع"
+
+#: ../libempathy/empathy-time.c:162
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "منذ أقل من شهر"
+msgstr[1] "منذ شهر واحد"
+msgstr[2] "منذ شهرين"
+msgstr[3] "منذ %d أشهر"
+msgstr[4] "منذ %d شهرا"
+msgstr[5] "منذ %d شهر"
+
+#: ../libempathy/empathy-time.c:167
+msgid "in the future"
+msgstr "في المستقبل"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:426
 msgid "All"
 msgstr "الكل"
 
 #: ../libempathy-gtk/empathy-account-widget.c:302
-#: ../libempathy-gtk/empathy-account-widget.c:347
+#: ../libempathy-gtk/empathy-account-widget.c:354
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-generic.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:1
-msgid "<b>Advanced</b>"
-msgstr "<b>متقدم</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:2
-msgid "Forget password and clear the entry."
-msgstr "انس كلمة السر وامح المدخلة."
-
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Advanced"
+msgstr "متقدم"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
 msgid "Pass_word:"
 msgstr "كلمة ال_سر:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
 msgid "Screen _Name:"
 msgstr "الاسم الم_عروض:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:11
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "_Port:"
 msgstr "ال_منْفذ:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:12
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:10
-#: ../src/empathy-new-chatroom-dialog.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
 msgstr "ال_خادوم:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "ا_سم المستخدم:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
 msgid "ICQ _UIN:"
 msgstr "ICQ _UIN:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "_Charset:"
 msgstr "_طقم المحارف:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:245
+#: ../libempathy-gtk/empathy-account-widget-irc.c:240
 msgid "New Network"
 msgstr "شبكة جديدة"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:1
-msgid "<b>Network</b>"
-msgstr "<b>الشبكة</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:2
-msgid "<b>Servers</b>"
-msgstr "<b>الخادمات</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 msgid "Charset:"
 msgstr "طقم المحارف:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:4
-msgid "Create a new IRC network"
-msgstr "أنشئ شبكة IRC جديدة"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:5
-msgid "Edit the selected IRC network"
-msgstr "حرّر شبكة IRC المحددة"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Network"
 msgstr "الشبكة"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Network:"
 msgstr "الشبكة:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Nickname:"
 msgstr "الاسم المستعار:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Password:"
 msgstr "كلمة السر:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Quit message:"
 msgstr "رسالة الخروج:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:11
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Real name:"
 msgstr "الاسم الحقيقي:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:12
-msgid "Remove the selected IRC network"
-msgstr "احذف شبكة IRC المحددة"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+msgid "Servers"
+msgstr "الخواديم"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:2
-msgid "<b>Override server settings</b>"
-msgstr "<b>تجاوز إعدادات الخادم</b>"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+msgid "Override server settings"
+msgstr "تجاوز إعدادات الخادوم"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
 msgid "Pri_ority:"
 msgstr "الأو_لويّة:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "Reso_urce:"
 msgstr "الم_ورد:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 msgid "Use old SS_L"
-msgstr "استعمل التشفير القديم SS_L"
+msgstr "استعمل SS_L القديم"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "_Encryption required (TLS/SSL)"
-msgstr "ال_تشفير مطلوب (TLS/SSL)"
+msgstr "ال_تعمية مطلوبة (TLS/SSL)"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
 msgid "_Ignore SSL certificate errors"
 msgstr "_تجاهل أخطاء شهادة SSL"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:2
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:2
 msgid "_Email:"
 msgstr "ال_عنوان الإلكـتروني:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3
 msgid "_First Name:"
 msgstr "الا_سم الأول:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:4
 msgid "_Jabber ID:"
 msgstr "معرّف _Jabber:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:5
 msgid "_Last Name:"
 msgstr "الاسم ال_عائلي:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:6
-#: ../src/empathy-chatrooms-window.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:6
 msgid "_Nickname:"
 msgstr "الاسم المست_عار:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:7
 msgid "_Published Name:"
 msgstr "الا_سم المنشور:"
 
 #. look up the DNS SRV record at the service's domain for the host name of a STUN server.
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "Discover STUN"
 msgstr "اكتشف ال‍STUN"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 msgid "STUN Server:"
-msgstr "خادم STUN:"
+msgstr "خادوم STUN:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
 msgid "STUN port:"
 msgstr "منفذ STUN:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "_Username:"
 msgstr "اسم المست_خدم:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
 msgid "Use _Yahoo Japan"
 msgstr "استخدم يا_هو اليابان"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
 msgid "Yahoo I_D:"
 msgstr "مُعرّف ال_ياهو:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 msgid "_Ignore conference and chatroom invitations"
 msgstr "_تجاهل دعوات المحاضرات وغرف الدردشة"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
 msgid "_Room List locale:"
 msgstr "محلية لائحة ال_غرف:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:462
-#: ../libempathy-gtk/empathy-avatar-chooser.c:537
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:525
 msgid "Couldn't convert image"
 msgstr "تعذّر تحويل الصورة"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:463
+#: ../libempathy-gtk/empathy-avatar-chooser.c:450
 msgid "None of the accepted image formats is supported on your system"
 msgstr "ولا واحدة من المصور المقبولة مدعومة في نظامك"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:954
+#: ../libempathy-gtk/empathy-avatar-chooser.c:933
 msgid "Select Your Avatar Image"
 msgstr "اختر صورتك الشخصية"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:957
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
 msgid "No Image"
 msgstr "لا صورة"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1019
+#: ../libempathy-gtk/empathy-avatar-chooser.c:998
 msgid "Images"
 msgstr "صور"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1023
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
 msgid "All Files"
 msgstr "كل الملفّات"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:294
+#: ../libempathy-gtk/empathy-avatar-image.c:324
 msgid "Click to enlarge"
 msgstr "انقر للتكبير"
 
-#: ../libempathy-gtk/empathy-chat.c:522
+#: ../libempathy-gtk/empathy-chat.c:186
+msgid "Failed to reconnect this chat"
+msgstr "تعذّرت إعادة الاتصال بهذه الدردشة"
+
+#: ../libempathy-gtk/empathy-chat.c:404
+msgid "Unsupported command"
+msgstr "أمر غير مدعوم"
+
+#: ../libempathy-gtk/empathy-chat.c:539
 msgid "offline"
 msgstr "غير متّصل"
 
-#: ../libempathy-gtk/empathy-chat.c:525
+#: ../libempathy-gtk/empathy-chat.c:542
 msgid "invalid contact"
-msgstr "مراسل غير صحيح"
+msgstr "متراسل غير صحيح"
 
-#: ../libempathy-gtk/empathy-chat.c:528
+#: ../libempathy-gtk/empathy-chat.c:545
 msgid "permission denied"
 msgstr "رُفض التّصريح"
 
-#: ../libempathy-gtk/empathy-chat.c:531
+#: ../libempathy-gtk/empathy-chat.c:548
 msgid "too long message"
 msgstr "الرسالة طويلة جدا"
 
-#: ../libempathy-gtk/empathy-chat.c:534
+#: ../libempathy-gtk/empathy-chat.c:551
 msgid "not implemented"
 msgstr "غير مطبق"
 
-#: ../libempathy-gtk/empathy-chat.c:537
+#: ../libempathy-gtk/empathy-chat.c:554
 msgid "unknown"
 msgstr "مجهول"
 
-#: ../libempathy-gtk/empathy-chat.c:541
+#: ../libempathy-gtk/empathy-chat.c:558
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "خطأ في ارسال الرسالة '%s': %s"
 
-#: ../libempathy-gtk/empathy-chat.c:571
+#: ../libempathy-gtk/empathy-chat.c:588
 #, c-format
 msgid "Topic set to: %s"
 msgstr "الموضوع: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:573
+#: ../libempathy-gtk/empathy-chat.c:590
 msgid "No topic defined"
 msgstr "لم يحدد أي موضوع"
 
-#: ../libempathy-gtk/empathy-chat.c:988
+#: ../libempathy-gtk/empathy-chat.c:960
+msgid "(No Suggestions)"
+msgstr "(لا اقتراحات)"
+
+#: ../libempathy-gtk/empathy-chat.c:1014
 msgid "Insert Smiley"
 msgstr "أدرج التعابير المرسومة"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1006
-#: ../libempathy-gtk/empathy-ui-utils.c:1559
+#: ../libempathy-gtk/empathy-chat.c:1032
+#: ../libempathy-gtk/empathy-ui-utils.c:1480
 msgid "_Send"
 msgstr "أ_رسل"
 
-#: ../libempathy-gtk/empathy-chat.c:1040
-msgid "_Check Word Spelling..."
-msgstr "_دقق الإملاء..."
+#: ../libempathy-gtk/empathy-chat.c:1066
+msgid "_Spelling Suggestions"
+msgstr "ا_قتراحات الإملاء"
 
-#: ../libempathy-gtk/empathy-chat.c:1158
+#: ../libempathy-gtk/empathy-chat.c:1181
 #, c-format
-msgid "%s has joined the room"
-msgstr "انضم %s الى غرفة"
+msgid "%s has disconnected"
+msgstr "‏%s قطع الاتصال"
 
-#: ../libempathy-gtk/empathy-chat.c:1161
+#: ../libempathy-gtk/empathy-chat.c:1185
+#, c-format
+msgid "%s was kicked by %s"
+msgstr "‏%s طرده %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1188
+#, c-format
+msgid "%s was kicked"
+msgstr "‏%s طُرِد"
+
+#: ../libempathy-gtk/empathy-chat.c:1193
+#, c-format
+msgid "%s was banned by %s"
+msgstr "‏%s حظره %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1196
+#, c-format
+msgid "%s was banned"
+msgstr "‏%s حُظِر"
+
+#: ../libempathy-gtk/empathy-chat.c:1200
 #, c-format
 msgid "%s has left the room"
-msgstr "غادر %s الغرفة"
+msgstr "‏%s غادر الغرفة"
+
+#. Note to translators: this string is appended to
+#. * notifications like "foo has left the room", with the message
+#. * given by the user living the room. If this poses a problem,
+#. * please let us know. :-)
+#.
+#: ../libempathy-gtk/empathy-chat.c:1209
+#, c-format
+msgid " (%s)"
+msgstr "‏‏ (%s)"
+
+#: ../libempathy-gtk/empathy-chat.c:1232
+#, c-format
+msgid "%s has joined the room"
+msgstr "انضم %s إلى الغرفة"
 
-#: ../libempathy-gtk/empathy-chat.c:1276 ../src/empathy-call-window.c:764
+#: ../libempathy-gtk/empathy-chat.c:1365 ../src/empathy-call-window.c:1225
 msgid "Disconnected"
 msgstr "غير متَصل"
 
-#: ../libempathy-gtk/empathy-chat.c:1673
+#: ../libempathy-gtk/empathy-chat.c:1800
 msgid "Connected"
 msgstr "متَصل"
 
-#: ../libempathy-gtk/empathy-chat.c:1723
-#: ../libempathy-gtk/empathy-log-window.c:505
+#: ../libempathy-gtk/empathy-chat.c:1850
+#: ../libempathy-gtk/empathy-log-window.c:502
 msgid "Conversation"
 msgstr "محادثة"
 
-#: ../libempathy-gtk/empathy-chat.glade.h:1
-msgid "<b>Topic:</b>"
-msgstr "<b>الموضوع:</b>"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:2
-msgid "Group Chat"
-msgstr "محادثة جماعية"
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472
+msgid "Topic:"
+msgstr "الموضوع:"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:331
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:316
+#: ../libempathy-gtk/empathy-theme-adium.c:264
 msgid "_Copy Link Address"
 msgstr "ا_نسخ عنوان الوصلة"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:339
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:323
+#: ../libempathy-gtk/empathy-theme-adium.c:272
 msgid "_Open Link"
 msgstr "ا_فتح الوصلة"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:432
+#: ../libempathy-gtk/empathy-chat-text-view.c:421
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:180
-msgid "Personal Information"
-msgstr "المعلومات الشخصية"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:183
+#: ../libempathy-gtk/empathy-contact-dialogs.c:179
+#: ../libempathy-gtk/empathy-contact-dialogs.c:238
 msgid "Edit Contact Information"
-msgstr "عدّل معلومات المراسل"
+msgstr "عدّل معلومات المتراسل"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:186
-msgid "Contact Information"
-msgstr "معلومات المراسَل"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:267
-msgid "I would like to add you to my contact list."
-msgstr "أود إضافتك إلى قائمة مراسليَّ."
+#: ../libempathy-gtk/empathy-contact-dialogs.c:289
+msgid "Personal Information"
+msgstr "المعلومات الشخصية"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:291
+#: ../libempathy-gtk/empathy-contact-dialogs.c:393
 msgid "New Contact"
-msgstr "مراسَل جديد"
+msgstr "متراسل جديد"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:1
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
 msgid "Decide _Later"
 msgstr "_سأقرر لاحقًا"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:2
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "طلب تسجيل"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1255
+#: ../libempathy-gtk/empathy-contact-list-view.c:1400
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "هل ترغب حقا بإزالة المجموعة '%s'؟"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1257
+#: ../libempathy-gtk/empathy-contact-list-view.c:1402
 msgid "Removing group"
 msgstr "إزالة مجموعة"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1304
-#: ../libempathy-gtk/empathy-contact-list-view.c:1383
+#. Remove
+#: ../libempathy-gtk/empathy-contact-list-view.c:1449
+#: ../libempathy-gtk/empathy-contact-list-view.c:1526
 msgid "_Remove"
 msgstr "أ_زل"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1334
+#: ../libempathy-gtk/empathy-contact-list-view.c:1479
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
-msgstr "هل ترغب حقا بإزالة المراسل '%s'؟"
+msgstr "هل ترغب حقا بإزالة المتراسل '%s'؟"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1336
+#: ../libempathy-gtk/empathy-contact-list-view.c:1481
 msgid "Removing contact"
-msgstr "حذف المراسل"
+msgstr "حذف المتراسل"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1341
-msgid "Sorry, I don't want you in my contact list anymore."
-msgstr "آسف، ولكن لا أرغب بك في لائحة مراسليَّ بعد الآن."
+#: ../libempathy-gtk/empathy-contact-menu.c:195
+#: ../src/empathy-main-window.ui.h:11
+msgid "_Add Contact..."
+msgstr "أضِف متراسلا..."
 
-#: ../libempathy-gtk/empathy-contact-menu.c:130
-#: ../src/empathy-main-window.glade.h:9
+#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../src/empathy-main-window.ui.h:12
 msgid "_Chat"
 msgstr "_دردشة"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:161
-#: ../src/empathy-call-window.glade.h:5
-msgid "_Call"
-msgstr "_اتصال"
+#: ../libempathy-gtk/empathy-contact-menu.c:253
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_مكالمة صوتية"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:285
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_مكالمة مرئية"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:200
-#: ../src/empathy-main-window.glade.h:17
+#: ../libempathy-gtk/empathy-contact-menu.c:324
 msgid "_View Previous Conversations"
 msgstr "ا_عرض المحادثات السابقة"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../libempathy-gtk/empathy-contact-menu.c:346
 msgid "Send file"
 msgstr "أرسل ملفا"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:250
+#: ../libempathy-gtk/empathy-contact-menu.c:369
+msgid "Share my desktop"
+msgstr "شارك سطح مكتبي"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:397
 msgid "Infor_mation"
 msgstr "_معلومات"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:277
-#: ../src/empathy-chat-window.glade.h:14 ../src/empathy-main-window.glade.h:11
+#: ../libempathy-gtk/empathy-contact-menu.c:441
+#: ../src/empathy-main-window.ui.h:16
 msgid "_Edit"
-msgstr "_حرّر"
+msgstr "ت_حرير"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:336
+#: ../libempathy-gtk/empathy-contact-menu.c:501
 msgid "Inviting to this room"
 msgstr "الدعوة لهذه الغرفة"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:369
+#: ../libempathy-gtk/empathy-contact-menu.c:532
 msgid "_Invite to chatroom"
 msgstr "ا_دع إلى غرفة المحادثة"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:111
+#: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
-msgstr "حدد مراسَلا"
+msgstr "حدد متراسلا"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:361
+#: ../libempathy-gtk/empathy-contact-widget.c:447
 msgid "Save Avatar"
 msgstr "احفظ الصور الشخصية"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:417
+#: ../libempathy-gtk/empathy-contact-widget.c:503
 msgid "Unable to save avatar"
 msgstr "لا يمكن حفظ الصورة الشخصية"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:912
+#: ../libempathy-gtk/empathy-contact-widget.c:992
 msgid "Select"
 msgstr "حدّد"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../src/empathy-main-window.c:991
+#: ../libempathy-gtk/empathy-contact-widget.c:1001
+#: ../src/empathy-main-window.c:1023
 msgid "Group"
 msgstr "المجموعة"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:1
-msgid "<b>Client Information</b>"
-msgstr "<b>معلومات عن العميل</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1252
+msgid "Country ISO Code:"
+msgstr "رمز البلد"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1254
+msgid "Country:"
+msgstr "البلد:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1256
+msgid "State:"
+msgstr "الولاية:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1258
+msgid "City:"
+msgstr "المدينة:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1260
+msgid "Area:"
+msgstr "المنطقة:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1262
+msgid "Postal Code:"
+msgstr "الرمز البريدي:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1264
+msgid "Street:"
+msgstr "الشارع:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1266
+msgid "Building:"
+msgstr "المبنى:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1268
+msgid "Floor:"
+msgstr "الطابق:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1270
+msgid "Room:"
+msgstr "الغرفة:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1272
+msgid "Text:"
+msgstr "النص:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1274
+msgid "Description:"
+msgstr "الوصف:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1276
+msgid "URI:"
+msgstr "المسار:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1278
+msgid "Accuracy Level:"
+msgstr "مستوى الدقة:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1280
+msgid "Error:"
+msgstr "خطأ:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1282
+msgid "Vertical Error (meters):"
+msgstr "خطأ رأسي (أمتار):"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1284
+msgid "Horizontal Error (meters):"
+msgstr "خطأ أفقي (أمتار):"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1286
+msgid "Speed:"
+msgstr "السرعة:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1288
+msgid "Bearing:"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:2
-msgid "<b>Contact Details</b>"
-msgstr "<b>تفاصيل المراسل</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1290
+msgid "Climb Speed:"
+msgstr "سرعة التسلّق:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:3
-msgid "<b>Contact</b>"
-msgstr "<b>مراسَل</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1292
+msgid "Last Updated on:"
+msgstr "آخر تحديث:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:4
-msgid "<b>Groups</b>"
-msgstr "<b>المجموعات</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1294
+msgid "Longitude:"
+msgstr "خط الطول:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:5
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:1
-#: ../src/empathy-chatrooms-window.glade.h:1
-#: ../src/empathy-new-chatroom-dialog.glade.h:1
+#: ../libempathy-gtk/empathy-contact-widget.c:1296
+msgid "Latitude:"
+msgstr "دائرة العرض:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1298
+msgid "Altitude:"
+msgstr "الارتفاع:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1345
+msgid "<b>Location</b>"
+msgstr "<b>المكان:</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1358
+msgid "<b>Location</b>, "
+msgstr "<b>المكان:</b>، "
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1408
+msgid "%B %e, %Y at %R UTC"
+msgstr "%e %B، %Y في %R ت‌ع‌م"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>المكان</b> في (تاريخ)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid "Account:"
-msgstr "حساب:"
+msgstr "الحساب:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:6
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
 msgid "Alias:"
 msgstr "الكنية:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:7
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
 msgid "Birthday:"
 msgstr "يوم الميلاد:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:8
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "Client Information"
+msgstr "معلومات العميل"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
 msgid "Client:"
 msgstr "العميل:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:9
-msgid "Contact information"
-msgstr "معلومات المراسَل"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../src/empathy-main-window.c:1006
+msgid "Contact"
+msgstr "متراسل"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Contact Details"
+msgstr "تفاصيل المتراسل"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "Email:"
 msgstr "البريد الإلكتروني:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Fullname:"
 msgstr "الاسم الكامل:"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Groups"
+msgstr "المجموعات"
+
 #. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
 msgid "Identifier:"
-msgstr "اسم:"
+msgstr "المعرف:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:14
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
 msgid "Information requested..."
 msgstr "معلومات م_طلوبة..."
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
 msgid "OS:"
 msgstr "نظام التشغيل:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:16
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 msgstr ""
-"انتقِ المجموعات التي تود أن يظهر فيها هذا المراسَل، يمكنك انتقاء أكثر من "
+"انتقِ المجموعات التي تود أن يظهر فيها هذا المتراسل، يمكنك انتقاء أكثر من "
 "مجموعة أو لا مجموعة."
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:17
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
 msgid "Version:"
 msgstr "الإصدارة:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:18
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
 msgid "Web site:"
 msgstr "موقع الإنترنت:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:19
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
 msgid "_Add Group"
 msgstr "أ_ضف مجموعة"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:284
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:283
 msgid "new server"
-msgstr "خادم جديد"
+msgstr "خادوم جديد"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:513
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:510
 msgid "Server"
-msgstr "الخادم"
+msgstr "الخادوم"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:528
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:525
 msgid "Port"
 msgstr "المنفذ"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:541
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:498
-#: ../src/empathy-import-dialog.c:282
+#: ../libempathy-gtk/empathy-log-window.c:495
+#: ../src/empathy-import-dialog.c:285
 msgid "Account"
 msgstr "حساب"
 
-#: ../libempathy-gtk/empathy-log-window.c:515
+#: ../libempathy-gtk/empathy-log-window.c:512
 msgid "Date"
 msgstr "التاريخ"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.glade.h:2
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
 msgid "Conversations"
 msgstr "محادثات"
 
-#: ../libempathy-gtk/empathy-log-window.glade.h:3
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
 msgid "Previous Conversations"
 msgstr "المحادثات السابقة"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.glade.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Search"
 msgstr "ابحث"
 
-#. Searching *for* something
-#: ../libempathy-gtk/empathy-log-window.glade.h:7
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "_For:"
 msgstr "_عن:"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:2
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
 msgid "C_all"
 msgstr "ا_تصل"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:3
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
 msgid "C_hat"
 msgstr "ا_بدأ محادثة"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:4
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
 msgid "Contact ID:"
-msgstr "معرّف المراسَل:"
+msgstr "معرّف المتراسل:"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:5
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
 msgid "New Conversation"
 msgstr "محادثة جديدة"
 
-#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:685
-msgid "Custom messages..."
-msgstr "الرسائل المخصصة..."
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:1
-msgid "Custom message"
-msgstr "رسالة مخصّصة"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:2
-msgid "Message:"
-msgstr "الرسالة:"
+#. COL_STATE_ICON_NAME
+#. COL_STATE
+#. COL_STATUS_TEXT
+#. COL_DISPLAY_MARKUP
+#. COL_STATUS_CUSTOMISABLE
+#. COL_TYPE
+#: ../libempathy-gtk/empathy-presence-chooser.c:172
+msgid "Custom Message..."
+msgstr "رسالة مخصّصة..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:3
-msgid "Save message"
-msgstr "احفظ الرّسالة"
+#: ../libempathy-gtk/empathy-presence-chooser.c:227
+msgid "Edit Custom Messages..."
+msgstr "حرر الرسائل المخصّصة..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:4
-msgid "Status:"
-msgstr "الحالة:"
+#: ../libempathy-gtk/empathy-presence-chooser.c:326
+msgid "Click to remove this status as a favorite"
+msgstr "انقر لإزالة كون هذه الحالة هي المفضلة"
 
-#: ../libempathy-gtk/empathy-spell-dialog.c:88
-msgid "Word"
-msgstr "كلمة"
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
+msgid "Click to make this status a favorite"
+msgstr "انقر لجعل هذه الحالة هي المفضلة"
 
-#: ../libempathy-gtk/empathy-spell-dialog.c:265
-msgid "Suggestions for the word"
-msgstr "الاقتراحات للكلمة"
+#: ../libempathy-gtk/empathy-presence-chooser.c:369
+msgid "Set status"
+msgstr "حدد الحالة"
 
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:1
-msgid "Spell Checker"
-msgstr "مدقق الإملاء"
+#: ../libempathy-gtk/empathy-presence-chooser.c:782
+msgid "Set your presence and current status"
+msgstr "حدد تواجدك وحالتك الحالية"
 
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:2
-msgid "Suggestions for the word:"
-msgstr "الاقتراحات للكلمة:"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:60
-msgid "Classic"
-msgstr "تقليدي"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:61
-msgid "Simple"
-msgstr "بسيط"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:62
-msgid "Clean"
-msgstr "نظيف"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:63
-msgid "Blue"
-msgstr "أزرق"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1406
-msgid "Unable to open URI"
-msgstr "تعذّر فتح المسار"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1551
-msgid "Select a file"
-msgstr "اختر ملفا"
+#. Custom messages
+#: ../libempathy-gtk/empathy-presence-chooser.c:1017
+msgid "Custom messages..."
+msgstr "الرسائل المخصصة..."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1587
+#: ../libempathy-gtk/empathy-sound.c:51
 msgid "Received an instant message"
 msgstr "وصلت رسالة فورية"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1589
+#: ../libempathy-gtk/empathy-sound.c:53
 msgid "Sent an instant message"
 msgstr "أُرسِلت رسالة فورية"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1591
+#: ../libempathy-gtk/empathy-sound.c:55
 msgid "Incoming chat request"
 msgstr "وارد طلب محادثة"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1593
+#: ../libempathy-gtk/empathy-sound.c:57
 msgid "Contact connected"
-msgstr "اتصل المراسل"
+msgstr "اتصل المتراسل"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1595
+#: ../libempathy-gtk/empathy-sound.c:59
 msgid "Contact disconnected"
-msgstr "قطع المراسل اتصاله"
+msgstr "قطع المتراسل اتصاله"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1597
+#: ../libempathy-gtk/empathy-sound.c:61
 msgid "Connected to server"
-msgstr "تم الاتصال بالخادم"
+msgstr "تم الاتصال بالخادوم"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1599
+#: ../libempathy-gtk/empathy-sound.c:63
 msgid "Disconnected from server"
-msgstr "قُطع الاتصال بالخادم"
+msgstr "قُطع الاتصال بالخادوم"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1601
+#: ../libempathy-gtk/empathy-sound.c:65
 msgid "Incoming voice call"
 msgstr "مكالمة صوتية واردة"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1603
+#: ../libempathy-gtk/empathy-sound.c:67
 msgid "Outgoing voice call"
 msgstr "مكالمة صوتية صادرة"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1605
+#: ../libempathy-gtk/empathy-sound.c:69
 msgid "Voice call ended"
 msgstr "أنهيت المكالمة الصوتية"
 
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
+msgid "Enter Custom Message"
+msgstr "حرر الرسالة المخصّصة"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
+msgid "Edit Custom Messages"
+msgstr "حرر الرسائل المخصّصة"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+msgid "Add _New Preset"
+msgstr "أضف إعداد مسبق _جديد"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
+msgid "Saved Presets"
+msgstr "الإعدادات المسبقة المحفوظة"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:3
+msgid "gtk-add"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:4
+msgid "gtk-remove"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-theme-manager.c:67
+msgid "Classic"
+msgstr "تقليدي"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:68
+msgid "Simple"
+msgstr "بسيط"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:69
+msgid "Clean"
+msgstr "نظيف"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:70
+msgid "Blue"
+msgstr "أزرق"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1382
+msgid "Unable to open URI"
+msgstr "تعذّر فتح المسار"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1472
+msgid "Select a file"
+msgstr "اختر ملفا"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1530
+msgid "Select a destination"
+msgstr "اختر وجهة"
+
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
 msgstr "المحلية الحالية"
@@ -1212,19 +1585,19 @@ msgstr "فيتنامي"
 #: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:1
 msgid ""
 "The contact to display in the applet. Empty means no contact is displayed."
-msgstr "المراسَل الذي سيعرض في البريمج. فارغ يعني أنه لا يعرض أي مراسَل. "
+msgstr "المتراسل الذي سيعرض في البريمج. فارغ يعني أنه لا يعرض أي متراسل. "
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:2
 msgid "The contact's avatar token. Empty means contact has no avatar."
 msgstr ""
-"اسم صورة المراسَل الشخصية. إذا كانت فارغة فهذا يعني أن المراسَل بلا صورة."
+"اسم صورة المتراسل الشخصية. إذا كانت فارغة فهذا يعني أن المتراسل بلا صورة."
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:1
 msgid "Megaphone"
 msgstr "مكبّر الصوت"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:417
+#: ../megaphone/src/megaphone-applet.c:519
 msgid "Talk!"
 msgstr "تكلم!"
 
@@ -1238,17 +1611,17 @@ msgid "_Information"
 msgstr "_معلومات"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.glade.h:15
+#: ../src/empathy-main-window.ui.h:23
 msgid "_Preferences"
 msgstr "ال_تفضيلات"
 
-#: ../megaphone/src/megaphone-applet.c:255
+#: ../megaphone/src/megaphone-applet.c:168
 msgid "Please configure a contact."
-msgstr "من فضلك أضف مُراسَلا."
+msgstr "من فضلك أضف متراسلا."
 
-#: ../megaphone/src/megaphone-applet.c:348
+#: ../megaphone/src/megaphone-applet.c:258
 msgid "Select contact..."
-msgstr "حدد مراسلًا..."
+msgstr "حدد متراسلا..."
 
 #: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:1
 msgid "Presence"
@@ -1259,23 +1632,23 @@ msgstr "التواجد"
 msgid "Set your own presence"
 msgstr "اضبط تواجدك"
 
-#: ../src/empathy.c:430
+#: ../src/empathy.c:567
 msgid "Don't connect on startup"
 msgstr "لا تتصل عند بدء التشغيل"
 
-#: ../src/empathy.c:434
+#: ../src/empathy.c:571
 msgid "Don't show the contact list on startup"
-msgstr "لا تعرض قائمة المراسلين عند بدء التشغيل"
+msgstr "لا تعرض قائمة المتراسلين عند بدء التشغيل"
 
-#: ../src/empathy.c:438
+#: ../src/empathy.c:575
 msgid "Show the accounts dialog"
 msgstr "أعرض مربع حوار الحسابات"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:587
 msgid "- Empathy Instant Messenger"
 msgstr "- المرسال إمباثي"
 
-#: ../src/empathy-about-dialog.c:84
+#: ../src/empathy-about-dialog.c:83
 msgid ""
 "Empathy is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU General Public License as published by the Free Software "
@@ -1285,7 +1658,7 @@ msgstr ""
 "إمباثي البرنامج حر، يمكنك توزيعه و/أو تعديله حسب بنود رخصة جنو العمومية كما "
 "نشرتها مؤسسة البرامج الحرة، الإصدار الثاني أو أي إصدار أحدث (حسب رغبتك)."
 
-#: ../src/empathy-about-dialog.c:88
+#: ../src/empathy-about-dialog.c:87
 msgid ""
 "Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1296,7 +1669,7 @@ msgstr ""
 "قابلية البرنامج للتسويق أو الملاءمة لغرض معين. انظر نص رخصة جنو العمومية "
 "لمزيد من التفاصيل."
 
-#: ../src/empathy-about-dialog.c:92
+#: ../src/empathy-about-dialog.c:91
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
@@ -1307,11 +1680,11 @@ msgstr ""
 "Free Software Fondation Inc., 59 Temple Place - Suite 330, Boston, MA 02111 "
 "- 1307, USA"
 
-#: ../src/empathy-about-dialog.c:120
+#: ../src/empathy-about-dialog.c:119
 msgid "An Instant Messaging client for GNOME"
-msgstr "عميل مراسلة فورية لجنوم"
+msgstr "عميل متراسلة فورية لجنوم"
 
-#: ../src/empathy-about-dialog.c:126
+#: ../src/empathy-about-dialog.c:125
 msgid "translator-credits"
 msgstr ""
 "فريق عربآيز للترجمة http://www.arabeyes.org :\n"
@@ -1321,22 +1694,21 @@ msgstr ""
 "محمد الحبيِّب\t<mih1406@gmail.com>\n"
 "خالد حسني\t<khaledhosny@eglug.org>"
 
-#: ../src/empathy-accounts-dialog.c:391
+#: ../src/empathy-accounts-dialog.c:392
 msgid "Enabled"
 msgstr "مفعّل"
 
-#: ../src/empathy-accounts-dialog.c:401
-#: ../src/empathy-accounts-dialog.glade.h:4
+#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1
 msgid "Accounts"
 msgstr "حسابات"
 
 #. To translator: %s is the protocol name
-#: ../src/empathy-accounts-dialog.c:833
+#: ../src/empathy-accounts-dialog.c:837
 #, c-format
 msgid "New %s account"
 msgstr "حساب %s جديد"
 
-#: ../src/empathy-accounts-dialog.c:943
+#: ../src/empathy-accounts-dialog.c:950
 #, c-format
 msgid ""
 "You are about to remove your %s account!\n"
@@ -1345,7 +1717,7 @@ msgstr ""
 "إنك علة وشك إزالة حسابك %s!\n"
 "أمُتأكد أنك ترغب في إتمام العملية؟"
 
-#: ../src/empathy-accounts-dialog.c:949
+#: ../src/empathy-accounts-dialog.c:956
 msgid ""
 "Any associated conversations and chat rooms will NOT be removed if you "
 "decide to proceed.\n"
@@ -1357,31 +1729,31 @@ msgstr ""
 "\n"
 "إذا ما قررت إضافة الحساب لاحقا، سيبقون متوفرين. "
 
-#: ../src/empathy-accounts-dialog.glade.h:1
-msgid "<b>New Account</b>"
-msgstr "<b>حساب جديد</b>"
+#: ../src/empathy-accounts-dialog.ui.h:2
+msgid "Add Account"
+msgstr "أضف حسابا"
 
-#: ../src/empathy-accounts-dialog.glade.h:2
-msgid "<b>No protocol installed</b>"
-msgstr "<b>لم يتم تثبيت أي بروتوكول</b>"
-
-#: ../src/empathy-accounts-dialog.glade.h:3
-msgid "<b>Settings</b>"
-msgstr "<b>إعدادات</b>"
-
-#: ../src/empathy-accounts-dialog.glade.h:5
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "Cr_eate"
 msgstr "أ_نشئ"
 
-#: ../src/empathy-accounts-dialog.glade.h:6
-msgid "I already have an account I want to use"
-msgstr "لدي حساب بالفعل وأريد استخدامه"
+#: ../src/empathy-accounts-dialog.ui.h:4
+msgid "Gmail"
+msgstr "جيميل"
 
-#: ../src/empathy-accounts-dialog.glade.h:7
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid "Import Accounts..."
 msgstr "استورد الحسابات..."
 
-#: ../src/empathy-accounts-dialog.glade.h:8
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol installed"
+msgstr "لم يثبّت أي بروتوكول"
+
+#: ../src/empathy-accounts-dialog.ui.h:7
+msgid "Settings"
+msgstr "الإعدادات"
+
+#: ../src/empathy-accounts-dialog.ui.h:8
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -1389,272 +1761,195 @@ msgstr ""
 "لإضافة حساب جديد، عليك أولا بتثبيت الخلفية المناسبة لكل بروتوكول تود "
 "استعماله."
 
-#: ../src/empathy-accounts-dialog.glade.h:9
+#: ../src/empathy-accounts-dialog.ui.h:9
 msgid "Type:"
 msgstr "النوع:"
 
-#: ../src/empathy-call-window.c:346
+#: ../src/empathy-accounts-dialog.ui.h:10
+msgid "_Add..."
+msgstr "أ_ضف..."
+
+#: ../src/empathy-accounts-dialog.ui.h:11
+msgid "_Create a new account"
+msgstr "أ_نشئ حسابا جديدا"
+
+#: ../src/empathy-accounts-dialog.ui.h:12
+msgid "_Reuse an existing account"
+msgstr "ا_ستخدم حسابا موجودا"
+
+#: ../src/empathy-call-window.c:420
 msgid "Contrast"
-msgstr "التضاد"
+msgstr "التباين"
 
-#: ../src/empathy-call-window.c:349
+#: ../src/empathy-call-window.c:423
 msgid "Brightness"
 msgstr "السطوع"
 
-#: ../src/empathy-call-window.c:352
+#: ../src/empathy-call-window.c:426
 msgid "Gamma"
 msgstr "جاما"
 
-#: ../src/empathy-call-window.c:456
+#: ../src/empathy-call-window.c:531
 msgid "Volume"
 msgstr "الحجم"
 
-#: ../src/empathy-call-window.c:547
+#: ../src/empathy-call-window.c:662
+msgid "Connecting..."
+msgstr "يتّصل..."
+
+#: ../src/empathy-call-window.c:746
 msgid "_Sidebar"
 msgstr "الشريط ال_جانبي"
 
-#: ../src/empathy-call-window.c:565
+#: ../src/empathy-call-window.c:765
 msgid "Dialpad"
 msgstr "لوحة الأرقام"
 
-#: ../src/empathy-call-window.c:571
+#: ../src/empathy-call-window.c:771
 msgid "Audio input"
 msgstr "مدخلات الصوت"
 
-#: ../src/empathy-call-window.c:575
+#: ../src/empathy-call-window.c:775
 msgid "Video input"
 msgstr "مدخلات الفيديو"
 
-#: ../src/empathy-call-window.c:588
-msgid "Connecting..."
-msgstr "يتّصل..."
+#: ../src/empathy-call-window.c:835
+#, c-format
+msgid "Call with %s"
+msgstr "اتصل باستخدام %s"
+
+#: ../src/empathy-call-window.c:904
+msgid "Call"
+msgstr "اتصل"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:844
+#: ../src/empathy-call-window.c:1335
 #, c-format
-msgid "Connected -- %d:%02dm"
-msgstr "متَصل -- %d:%02dm"
+msgid "Connected — %d:%02dm"
+msgstr "متَصل — %d:%02dm"
 
-#: ../src/empathy-call-window.glade.h:1
+#: ../src/empathy-call-window.ui.h:1
 msgid "Hang up"
 msgstr "اقطع الاتصال"
 
-#: ../src/empathy-call-window.glade.h:2
+#: ../src/empathy-call-window.ui.h:2
+msgid "Redial"
+msgstr "أعِد الاتصال"
+
+#: ../src/empathy-call-window.ui.h:3
 msgid "Send Audio"
 msgstr "أرسل ملف صوتي"
 
-#: ../src/empathy-call-window.glade.h:3
+#: ../src/empathy-call-window.ui.h:4
 msgid "Send video"
 msgstr "أرسل ملف فيديو"
 
-#: ../src/empathy-call-window.glade.h:4
+#: ../src/empathy-call-window.ui.h:5
 msgid "Video preview"
 msgstr "معاينة الفيديو"
 
-#: ../src/empathy-call-window.glade.h:6
+#: ../src/empathy-call-window.ui.h:6
+msgid "_Call"
+msgstr "_اتصال"
+
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
 msgid "_View"
 msgstr "_عرض"
 
-#: ../src/empathy-chat-window.c:313
+#: ../src/empathy-chat-window.c:344
 #, c-format
 msgid "Conversations (%d)"
 msgstr "محادثات (%d)"
 
-#: ../src/empathy-chat-window.c:418
-msgid "Topic:"
-msgstr "الموضوع:"
-
-#: ../src/empathy-chat-window.c:423
+#: ../src/empathy-chat-window.c:476
 msgid "Typing a message."
 msgstr "يكتب رسالة..."
 
-#: ../src/empathy-chat-window.c:892 ../src/empathy-event-manager.c:429
-#, c-format
-msgid "New message from %s"
-msgstr "رسالة جديدة من %s"
-
-#: ../src/empathy-chat-window.glade.h:1
-msgid "C_lear"
-msgstr "ا_مسح"
-
-#: ../src/empathy-chat-window.glade.h:2
-msgid "Chat"
-msgstr "محادثة"
-
-#: ../src/empathy-chat-window.glade.h:3
-msgid "Insert _Smiley"
-msgstr "أدرج تعبيرا ر_سوميا"
-
-#: ../src/empathy-chat-window.glade.h:4
-msgid "Invitation _message:"
-msgstr "رسالة ال_دعوة:"
-
-#: ../src/empathy-chat-window.glade.h:5
-msgid "Invite"
-msgstr "ادعُ"
-
-#: ../src/empathy-chat-window.glade.h:6
-msgid "Move Tab _Left"
-msgstr "انقل اللِّسان إلى اليسا_ر"
-
-#: ../src/empathy-chat-window.glade.h:7
-msgid "Move Tab _Right"
-msgstr "انقل اللِّسان إلى ال_يمين"
-
-#: ../src/empathy-chat-window.glade.h:8
-msgid "Select who would you like to invite:"
-msgstr "اختر من تريد دعوته:"
-
-#: ../src/empathy-chat-window.glade.h:9
-msgid "You have been invited to join a chat conference."
-msgstr "لقد دُعيت للانضمام إلى اجتماع دردشة. "
-
-#: ../src/empathy-chat-window.glade.h:10
-msgid "_Contact"
-msgstr "_مراسَل"
-
-#: ../src/empathy-chat-window.glade.h:11 ../src/empathy-main-window.glade.h:10
-msgid "_Contents"
-msgstr "الم_حتويات"
-
-#: ../src/empathy-chat-window.glade.h:12
-msgid "_Conversation"
-msgstr "م_حادثة"
-
-#: ../src/empathy-chat-window.glade.h:13
-msgid "_Detach Tab"
-msgstr "_فصل اللسان"
-
-#: ../src/empathy-chat-window.glade.h:15
-msgid "_Favorite Chatroom"
-msgstr "الغرفة الم_فضلة"
-
-#: ../src/empathy-chat-window.glade.h:16 ../src/empathy-main-window.glade.h:12
-msgid "_Help"
-msgstr "م_ساعدة"
-
-#: ../src/empathy-chat-window.glade.h:17
-msgid "_Next Tab"
-msgstr "اللسان ال_تالي"
-
-#: ../src/empathy-chat-window.glade.h:18
-msgid "_Previous Tab"
-msgstr "اللسان ال_سابق"
-
-#: ../src/empathy-chat-window.glade.h:19
-msgid "_Tabs"
-msgstr "أ_لسنة"
-
-#: ../src/empathy-chatrooms-window.c:262
+#: ../src/empathy-chatrooms-window.c:258
 msgid "Name"
 msgstr "اسم"
 
-#: ../src/empathy-chatrooms-window.c:280
+#: ../src/empathy-chatrooms-window.c:276
 msgid "Room"
 msgstr "غرفة"
 
-#: ../src/empathy-chatrooms-window.c:289
+#: ../src/empathy-chatrooms-window.c:285
 msgid "Auto-Connect"
 msgstr "اتصل تلقائيا"
 
-#: ../src/empathy-chatrooms-window.glade.h:2
-msgid "Edit Favorite Room"
-msgstr "حرّر الغرفة المفضلة"
-
-#: ../src/empathy-chatrooms-window.glade.h:3
-msgid "Join room on start_up"
-msgstr "انضم للغرفة عند بدء التشغيل"
-
-#: ../src/empathy-chatrooms-window.glade.h:4
-msgid "Join this chat room when Empathy starts and you are connected"
-msgstr "انضم إلى غرفة الدردشة هاته حين يبدأ مرسال جنوم وأنت متصَل"
-
-#: ../src/empathy-chatrooms-window.glade.h:5
+#: ../src/empathy-chatrooms-window.ui.h:2
 msgid "Manage Favorite Rooms"
 msgstr "أدر الغرف المفضّلة"
 
-#: ../src/empathy-chatrooms-window.glade.h:6
-msgid "N_ame:"
-msgstr "الا_سم:"
-
-#: ../src/empathy-chatrooms-window.glade.h:7
-msgid "S_erver:"
-msgstr "ال_خادم:"
-
-#: ../src/empathy-chatrooms-window.glade.h:9
-#: ../src/empathy-new-chatroom-dialog.glade.h:9
-msgid "_Room:"
-msgstr "ال_غُرفة:"
-
-#: ../src/empathy-event-manager.c:377
+#: ../src/empathy-event-manager.c:321
 msgid "Incoming call"
 msgstr "مكالمة واردة"
 
-#: ../src/empathy-event-manager.c:380
+#: ../src/empathy-event-manager.c:324
 #, c-format
 msgid "%s is calling you, do you want to answer?"
 msgstr "يتصل بك %s، هل ترغب بالإجابة؟"
 
-#: ../src/empathy-event-manager.c:387
+#: ../src/empathy-event-manager.c:331
 msgid "_Reject"
 msgstr "_ارفض"
 
-#: ../src/empathy-event-manager.c:393
+#: ../src/empathy-event-manager.c:337
 msgid "_Answer"
 msgstr "_أجب"
 
-#: ../src/empathy-event-manager.c:516
+#: ../src/empathy-event-manager.c:452
 #, c-format
 msgid "Incoming call from %s"
 msgstr "مكالمة واردة من %s"
 
-#: ../src/empathy-event-manager.c:564
+#: ../src/empathy-event-manager.c:496
 #, c-format
 msgid "%s is offering you an invitation"
 msgstr "قام %s بدعوتك"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:502
 msgid "An external application will be started to handle it."
 msgstr "سيُشغّل برنامج خارجي للتعامل معها."
 
-#: ../src/empathy-event-manager.c:575
+#: ../src/empathy-event-manager.c:507
 msgid "You don't have the needed external application to handle it."
 msgstr "لا تملك البرنامج المطلوب للتعامل معها."
 
-#: ../src/empathy-event-manager.c:698
+#: ../src/empathy-event-manager.c:634
 msgid "Room invitation"
 msgstr "دعوة غرفة"
 
-#: ../src/empathy-event-manager.c:701
+#: ../src/empathy-event-manager.c:637
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "يدعوك %s للانضمام إلى %s"
 
-#. Decline button
-#: ../src/empathy-event-manager.c:709 ../src/empathy-ft-manager.c:1031
+#: ../src/empathy-event-manager.c:645
 msgid "_Decline"
 msgstr "ا_رفض"
 
-#: ../src/empathy-event-manager.c:714
+#: ../src/empathy-event-manager.c:650
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "ان_ضم"
 
-#: ../src/empathy-event-manager.c:744
+#: ../src/empathy-event-manager.c:689
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "دعاك %s للانضمام إلى %s"
 
-#: ../src/empathy-event-manager.c:867
+#: ../src/empathy-event-manager.c:715
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "ملف وارد من %s"
 
-#: ../src/empathy-event-manager.c:961
+#: ../src/empathy-event-manager.c:895
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "طُلِبَ التسجيل من %s"
 
-#: ../src/empathy-event-manager.c:965
+#: ../src/empathy-event-manager.c:899
 #, c-format
 msgid ""
 "\n"
@@ -1663,496 +1958,822 @@ msgstr ""
 "\n"
 "رسالة: %s"
 
+#. someone is logging off
+#: ../src/empathy-event-manager.c:935
+#, c-format
+msgid "%s is now offline."
+msgstr "‏%s غير متّصل الآن."
+
+#. someone is logging in
+#: ../src/empathy-event-manager.c:951
+#, c-format
+msgid "%s is now online."
+msgstr "‏%s متّصل الآن."
+
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:114
+#: ../src/empathy-ft-manager.c:101
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:117
+#: ../src/empathy-ft-manager.c:104
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:166
-msgid "No reason was specified"
-msgstr "لم يحدد أي سبب"
-
-#: ../src/empathy-ft-manager.c:168
-msgid "The change in state was requested"
-msgstr "رفض تغيير الحالة"
-
-#: ../src/empathy-ft-manager.c:170
-msgid "You canceled the file transfer"
-msgstr "أنت ألغيت نقل الملف"
-
-#: ../src/empathy-ft-manager.c:172
-msgid "The other participant canceled the file transfer"
-msgstr "الشخص الآخر قام بإلغاء نقل الملف"
-
-#: ../src/empathy-ft-manager.c:174
-msgid "Error while trying to transfer the file"
-msgstr "حدثت مشكلة أثناء محاولة نقل الملف"
+#: ../src/empathy-ft-manager.c:180
+msgctxt "file transfer percent"
+msgid "Unknown"
+msgstr "مجهول"
 
-#: ../src/empathy-ft-manager.c:176
-msgid "The other participant is unable to transfer the file"
-msgstr "الشخص الآخر غير قادر على نقل الملف"
+#: ../src/empathy-ft-manager.c:275
+#, c-format
+msgid "%s of %s at %s/s"
+msgstr "%s من %s في %s/ث"
 
-#: ../src/empathy-ft-manager.c:178
-msgid "Unknown reason"
-msgstr "سبب مجهول"
+#: ../src/empathy-ft-manager.c:276
+#, c-format
+msgid "%s of %s"
+msgstr "%s من %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:226
+#: ../src/empathy-ft-manager.c:307
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "يستلم \"%s\" من %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:229
+#: ../src/empathy-ft-manager.c:310
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "يُرسِل \"%s\" إلى %s"
 
-#: ../src/empathy-ft-manager.c:239
-msgctxt "file size"
-msgid "Unknown"
-msgstr "مجهول"
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:340
+#, c-format
+msgid "Error receiving \"%s\" from %s"
+msgstr "خطأ أثناء استلام \"%s\" من %s"
 
-#. translators: first %s is the transferred size, second %s is
-#. * the total file size
-#: ../src/empathy-ft-manager.c:247
+#: ../src/empathy-ft-manager.c:343
+msgid "Error receiving a file"
+msgstr "خطأ أثناء استلام الملف"
+
+#: ../src/empathy-ft-manager.c:348
 #, c-format
-msgid "%s of %s"
-msgstr "%s من %s"
+msgid "Error sending \"%s\" to %s"
+msgstr "خطأ أثناء إرسال \"%s\" إلى %s"
 
-#: ../src/empathy-ft-manager.c:254
-msgid "Waiting the other participant's response"
-msgstr "ينتظر رد الشخص الآخر"
+#: ../src/empathy-ft-manager.c:351
+msgid "Error sending a file"
+msgstr "خطأ أثناء إرسال الملف"
 
-#: ../src/empathy-ft-manager.c:264
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:490
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" استلم من %s"
 
-#: ../src/empathy-ft-manager.c:270
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:495
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" أُرسل إلى %s"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:498
 msgid "File transfer completed"
 msgstr "تم نقل الملف"
 
-#: ../src/empathy-ft-manager.c:282
-#, c-format
-msgid "\"%s\" receiving from %s"
-msgstr "\"%s\" يستلم من %s"
+#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784
+msgid "Waiting for the other participant's response"
+msgstr "بانتظار رد الشخص الآخر"
 
-#: ../src/empathy-ft-manager.c:288
+#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
 #, c-format
-msgid "\"%s\" sending to %s"
-msgstr "\"%s\" يُرسِل إلى %s"
+msgid "Checking integrity of \"%s\""
+msgstr "يتحقق من سالة \"%s\""
 
-#: ../src/empathy-ft-manager.c:291
+#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684
 #, c-format
-msgid "File transfer canceled: %s"
-msgstr "أُلغي نقل الملف: %s"
-
-#: ../src/empathy-ft-manager.c:306
-msgctxt "remaining time"
-msgid "Unknown"
-msgstr "مجهول"
-
-#: ../src/empathy-ft-manager.c:366
-msgctxt "file transfer percent"
-msgid "Unknown"
-msgstr "مجهول"
+msgid "Hashing \"%s\""
+msgstr "يُلبّد \"%s\""
 
-#: ../src/empathy-ft-manager.c:663
+#: ../src/empathy-ft-manager.c:1024
 msgid "%"
-msgstr "%"
+msgstr "٪"
 
-#: ../src/empathy-ft-manager.c:675
+#: ../src/empathy-ft-manager.c:1036
 msgid "File"
 msgstr "ملف"
 
-#: ../src/empathy-ft-manager.c:697
+#: ../src/empathy-ft-manager.c:1058
 msgid "Remaining"
-msgstr "تغيير الاسم"
-
-#: ../src/empathy-ft-manager.c:895
-msgid "Cannot save file to this location"
-msgstr "تعذّر حفظ الملف في هذا المكان"
-
-#: ../src/empathy-ft-manager.c:941
-msgid "Save file as..."
-msgstr "احفظ الملف باسم..."
-
-#: ../src/empathy-ft-manager.c:1011
-msgid "unknown size"
-msgstr "الحجم غير معروف"
-
-#: ../src/empathy-ft-manager.c:1017
-#, c-format
-msgid "%s would like to send you a file"
-msgstr "%s يود أن يرسل لك ملف"
-
-#: ../src/empathy-ft-manager.c:1022
-#, c-format
-msgid "Do you want to accept the file \"%s\" (%s)?"
-msgstr "هل ترغب في قبول الملف \"%s\" (%s)؟"
+msgstr "الباقي"
 
-#. Accept button
-#: ../src/empathy-ft-manager.c:1040
-msgid "_Accept"
-msgstr "ا_قبل"
+#: ../src/empathy-ft-manager.ui.h:1
+msgid "File Transfers"
+msgstr "نقل الملفات"
 
-#: ../src/empathy-ft-manager.glade.h:1
-msgid "File transfers"
-msgstr "نقل ملف"
-
-#: ../src/empathy-ft-manager.glade.h:2
+#: ../src/empathy-ft-manager.ui.h:2
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "أزل الملفات المرسلة الكاملة والملغية والتي فشلت من القائمة"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-dialog.c:260
+#: ../src/empathy-import-dialog.c:263
 msgid "Import"
 msgstr "استورد"
 
-#: ../src/empathy-import-dialog.c:269
+#: ../src/empathy-import-dialog.c:272
 msgid "Protocol"
 msgstr "بروتوكول"
 
-#: ../src/empathy-import-dialog.c:295
+#: ../src/empathy-import-dialog.c:298
 msgid "Source"
 msgstr "المصدر"
 
-#: ../src/empathy-import-dialog.c:383
+#: ../src/empathy-import-dialog.c:392
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr ""
 "لم يُعثر على أي حساب لاستيراده. إمباثي يدعم استيراد الحسابات من بدجن فقط."
 
-#: ../src/empathy-import-dialog.glade.h:1
+#: ../src/empathy-import-dialog.ui.h:1
 msgid "Import Accounts"
 msgstr "استورد الحسابات"
 
-#: ../src/empathy-main-window.c:391
+#: ../src/empathy-main-window.c:402
+msgid "_Edit account"
+msgstr "_حرِر الحساب"
+
+#: ../src/empathy-main-window.c:505
 msgid "No error specified"
 msgstr "لم يحدد أي خطأ"
 
-#: ../src/empathy-main-window.c:394
+#: ../src/empathy-main-window.c:508
 msgid "Network error"
 msgstr "خطأ شبكي"
 
-#: ../src/empathy-main-window.c:397
+#: ../src/empathy-main-window.c:511
 msgid "Authentication failed"
 msgstr "فشل التحقق"
 
-#: ../src/empathy-main-window.c:400
+#: ../src/empathy-main-window.c:514
 msgid "Encryption error"
 msgstr "خطأ في التعمية"
 
-#: ../src/empathy-main-window.c:403
+#: ../src/empathy-main-window.c:517
 msgid "Name in use"
 msgstr "الاسم مستخدم مسبقا"
 
-#: ../src/empathy-main-window.c:406
+#: ../src/empathy-main-window.c:520
 msgid "Certificate not provided"
 msgstr "الشهادة غير متوفرة"
 
-#: ../src/empathy-main-window.c:409
+#: ../src/empathy-main-window.c:523
 msgid "Certificate untrusted"
 msgstr "الشهادة غير موثوق بها"
 
-#: ../src/empathy-main-window.c:412
+#: ../src/empathy-main-window.c:526
 msgid "Certificate expired"
 msgstr "انتهت صلاحية الشهادة"
 
-#: ../src/empathy-main-window.c:415
+#: ../src/empathy-main-window.c:529
 msgid "Certificate not activated"
 msgstr "الشهادة غير نشطة"
 
-#: ../src/empathy-main-window.c:418
+#: ../src/empathy-main-window.c:532
 msgid "Certificate hostname mismatch"
 msgstr "عدم تطابق الشهادة مع اسم الخادوم"
 
-#: ../src/empathy-main-window.c:421
+#: ../src/empathy-main-window.c:535
 msgid "Certificate fingerprint mismatch"
 msgstr "عدم تطابق الشهادة مع التوقيع"
 
-#: ../src/empathy-main-window.c:424
+#: ../src/empathy-main-window.c:538
 msgid "Certificate self-signed"
 msgstr "شهادة موقعة ذاتيا"
 
-#: ../src/empathy-main-window.c:427
+#: ../src/empathy-main-window.c:541
 msgid "Certificate error"
 msgstr "خطأ في الشهادة"
 
-#: ../src/empathy-main-window.c:430
+#: ../src/empathy-main-window.c:544
 msgid "Unknown error"
 msgstr "خطأ مجهول"
 
-#: ../src/empathy-main-window.c:594
+#: ../src/empathy-main-window.c:1293
 msgid "Show and edit accounts"
 msgstr "اعرض و _حرّر الحسابات"
 
-#: ../src/empathy-main-window.c:974
-msgid "Contact"
-msgstr "مراسَل"
-
-#: ../src/empathy-main-window.c:1176
-msgid "_Edit account"
-msgstr "_حرِر الحساب"
-
-#: ../src/empathy-main-window.glade.h:1
+#: ../src/empathy-main-window.ui.h:1
 msgid "Contact List"
-msgstr "قائمة المراسَلين"
+msgstr "قائمة المتراسلين"
 
-#: ../src/empathy-main-window.glade.h:2
+#: ../src/empathy-main-window.ui.h:2
+msgid "Contacts on a _Map"
+msgstr "المتراسلين على ال_خريطة"
+
+#: ../src/empathy-main-window.ui.h:3
 msgid "Context"
 msgstr "السياق"
 
-#: ../src/empathy-main-window.glade.h:3
+#: ../src/empathy-main-window.ui.h:4
 msgid "Join _Favorites"
 msgstr "ان_ضِم إلى المفضلين"
 
-#: ../src/empathy-main-window.glade.h:4
-msgid "Join _New..."
-msgstr "ان_ضم الى جدبد..."
-
-#: ../src/empathy-main-window.glade.h:5
+#: ../src/empathy-main-window.ui.h:5
 msgid "Manage Favorites"
 msgstr "أدر المفضلة"
 
-#: ../src/empathy-main-window.glade.h:6
-msgid "Show _Offline Contacts"
-msgstr "أظهر المراسلين _غير المتَّصلين"
+#: ../src/empathy-main-window.ui.h:6
+msgid "N_ormal Size"
+msgstr "حجم _عادي"
+
+#: ../src/empathy-main-window.ui.h:7
+msgid "Normal Size With _Avatars"
+msgstr "حجم عادي مع أي_قونات"
+
+#: ../src/empathy-main-window.ui.h:8
+msgid "Sort by _Name"
+msgstr "رتب حسب الا_سم"
 
-#: ../src/empathy-main-window.glade.h:7
+#: ../src/empathy-main-window.ui.h:9
+msgid "Sort by _Status"
+msgstr "رتّب حسب ال_حالة"
+
+#: ../src/empathy-main-window.ui.h:10
 msgid "_Accounts"
 msgstr "ال_حسابات"
 
-#: ../src/empathy-main-window.glade.h:8
-msgid "_Add Contact..."
-msgstr "أضِف مراسلا..."
+#: ../src/empathy-main-window.ui.h:13
+msgid "_Compact Size"
+msgstr "حجم _مضغوط"
+
+#: ../src/empathy-main-window.ui.h:14
+msgid "_Contents"
+msgstr "الم_حتويات"
+
+#: ../src/empathy-main-window.ui.h:15
+msgid "_Debug"
+msgstr "_نقّح"
+
+#: ../src/empathy-main-window.ui.h:17
+msgid "_File Transfers"
+msgstr "_نقل الملفات"
 
-#: ../src/empathy-main-window.glade.h:13 ../src/empathy-status-icon.glade.h:2
+#: ../src/empathy-main-window.ui.h:18
+msgid "_Help"
+msgstr "م_ساعدة"
+
+#: ../src/empathy-main-window.ui.h:19
+msgid "_Join..."
+msgstr "ان_ضم..."
+
+#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2
 msgid "_New Conversation..."
 msgstr "م_حادثة جديدة..."
 
-#: ../src/empathy-main-window.glade.h:14
+#: ../src/empathy-main-window.ui.h:21
+msgid "_Offline Contacts"
+msgstr "المتراسلين _غير المتَّصلين"
+
+#: ../src/empathy-main-window.ui.h:22
 msgid "_Personal Information"
 msgstr "الم_علومات الشخصية"
 
-#: ../src/empathy-main-window.glade.h:16
+#: ../src/empathy-main-window.ui.h:24
+msgid "_Previous Conversations"
+msgstr "المحادثات ال_سابقة"
+
+#: ../src/empathy-main-window.ui.h:25
 msgid "_Room"
 msgstr "_غرفة"
 
-#: ../src/empathy-new-chatroom-dialog.c:291
-msgid "Chat Rooms"
-msgstr "غرف المحادثة"
+#: ../src/empathy-new-chatroom-dialog.c:331
+msgid "Chat Room"
+msgstr "غرفة دردشة"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:2
-msgid "Browse:"
-msgstr "تصفّح:"
+#: ../src/empathy-new-chatroom-dialog.c:347
+msgid "Members"
+msgstr "الأعضاء"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:3
+#: ../src/empathy-new-chatroom-dialog.c:496
+#, c-format
+msgctxt ""
+"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
+"and a number."
+msgid ""
+"<b>%s</b>\n"
+"Invite required: %s\n"
+"Password required: %s\n"
+"Members: %s"
+msgstr ""
+"<b>%s</b>\n"
+"مطلوب دعوة: %s\n"
+"مطلوب كلمة سر: %s\n"
+"الأعضاء: %s"
+
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
+msgid "Yes"
+msgstr "نعم"
+
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
+msgid "No"
+msgstr "لا"
+
+#: ../src/empathy-new-chatroom-dialog.c:526
+msgid "Could not start room listing"
+msgstr "تعذّر بدء سرد الغرف"
+
+#: ../src/empathy-new-chatroom-dialog.c:536
+msgid "Could not stop room listing"
+msgstr "تعذّر إيقاف سرد الغرف"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
+msgid "Couldn't load room list"
+msgstr "تعذّر تحميل قائمة الغرف"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
 "Enter the room name to join here or click on one or more rooms in the list."
 msgstr ""
 "أدخِل هنا اسم الغرفة التي تود الانضمام إليها أو انقر غرفة واحدة أو أكثر في "
 "الائحة."
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:4
+#: ../src/empathy-new-chatroom-dialog.ui.h:4
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
 msgstr ""
-"أدخِل الخادم الذي يستضيف الغرفة، أو اتركه فارغا إذا كانت الغرفة على خادوم "
+"أدخِل الخادوم الذي يستضيف الغرفة، أو اتركه فارغا إذا كانت الغرفة على خادوم "
 "الحساب الحالي"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:5
-msgid "Join"
-msgstr "انضم"
-
-#: ../src/empathy-new-chatroom-dialog.glade.h:6
-msgid "Join New"
-msgstr "انضم لجديد"
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
+msgid "Join Room"
+msgstr "انضم للغرفة"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:7
-msgid "Re_fresh"
-msgstr "ح_دّث"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "Room List"
+msgstr "قائمة الغرف"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:8
-msgid ""
-"This list represents all chat rooms hosted on the server you have entered."
-msgstr "هذه اللائحة تمثل كل الغرف المُستضافة على الخادم الذي أدخلت اسمه."
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "_Room:"
+msgstr "ال_غُرفة:"
 
-#: ../src/empathy-preferences.c:157
+#: ../src/empathy-preferences.c:147
 msgid "Message received"
 msgstr "تم إستلام الرسالة"
 
-#: ../src/empathy-preferences.c:158
+#: ../src/empathy-preferences.c:148
 msgid "Message sent"
 msgstr "أرسلت الرسالة"
 
-#: ../src/empathy-preferences.c:159
+#: ../src/empathy-preferences.c:149
 msgid "New conversation"
 msgstr "محادثة جديدة"
 
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:150
 msgid "Contact goes online"
-msgstr "اتصل المُراسل"
+msgstr "اتصل المتراسل"
 
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:151
 msgid "Contact goes offline"
-msgstr "انفصل المُراسل"
+msgstr "انفصل المتراسل"
 
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:152
 msgid "Account connected"
 msgstr "الحساب متصل"
 
-#: ../src/empathy-preferences.c:163
+#: ../src/empathy-preferences.c:153
 msgid "Account disconnected"
 msgstr "الحساب غير متصل"
 
-#: ../src/empathy-preferences.c:397
+#: ../src/empathy-preferences.c:393
 msgid "Language"
 msgstr "اللغة"
 
-#: ../src/empathy-preferences.glade.h:1
-msgid "<b>Appearance</b>"
-msgstr "<b>المظهر</b>"
-
-#: ../src/empathy-preferences.glade.h:2
-msgid "<b>Behavior</b>"
-msgstr "<b>السلوك</b>"
+#: ../src/empathy-preferences.ui.h:1
+msgid "Allow _GPS usage"
+msgstr "اسمح باستخدام نظام تحديد الموا_قع"
 
-#: ../src/empathy-preferences.glade.h:3
-msgid "<b>Contact List</b>"
-msgstr "<b>قائمة المراسَلين</b>"
+#: ../src/empathy-preferences.ui.h:2
+msgid "Allow _cellphone usage"
+msgstr "اسمح باستخدام الهاتف ال_خلوي"
 
-#: ../src/empathy-preferences.glade.h:4
-msgid "<b>Enable spell checking for languages:</b>"
-msgstr "<b>فعل تدقيق التهجئة للغات:</b>"
+#: ../src/empathy-preferences.ui.h:3
+msgid "Allow _network usage"
+msgstr "اسمح باستخدام ال_شبكة"
 
-#: ../src/empathy-preferences.glade.h:5
-msgid "<b>Play sound for events</b>"
-msgstr "<b>شغل صوت أو أحداث</b>"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Appearance"
+msgstr "المظهر"
 
-#: ../src/empathy-preferences.glade.h:6
-msgid ""
-"<small>The list of languages reflects only the languages for which you have "
-"a dictionary installed.</small>"
-msgstr ""
-"<small>قائمة اللغات الموجودة هنا لا تظهر إلا اللغات التي يوجد لها قاموس مثبت."
-"</small>"
-
-#: ../src/empathy-preferences.glade.h:7
+#: ../src/empathy-preferences.ui.h:5
 msgid "Automatically _connect on startup "
 msgstr "_اتّصل آليا عند بدء التَّشغيل"
 
-#: ../src/empathy-preferences.glade.h:8
-msgid "Avatars are user chosen images shown in the contact list"
-msgstr "الصور الشخصية هي الصور التي اختار المستخدم والظاهرة في لائحة المراسَل"
+#: ../src/empathy-preferences.ui.h:6
+msgid "Behavior"
+msgstr "السلوك"
 
-#: ../src/empathy-preferences.glade.h:9
+#: ../src/empathy-preferences.ui.h:7
 msgid "Chat Th_eme:"
 msgstr "_سمة المحادثة:"
 
-#: ../src/empathy-preferences.glade.h:10
+#: ../src/empathy-preferences.ui.h:8
 msgid "Disable notifications when _away or busy"
 msgstr "عطل التنبيهات عندما أكون بعيدا أو مشغولا"
 
-#: ../src/empathy-preferences.glade.h:11
+#: ../src/empathy-preferences.ui.h:9
 msgid "Disable sounds when _away or busy"
 msgstr "عطل الأصوات عندما أكون بعيدا أو مشغولا"
 
-#: ../src/empathy-preferences.glade.h:12
+#: ../src/empathy-preferences.ui.h:10
+msgid "Enable notifications when a contact comes online"
+msgstr "فعّل التنبيهات عندما يصبح المتراسل على الخط"
+
+#: ../src/empathy-preferences.ui.h:11
+msgid "Enable notifications when a contact goes offline"
+msgstr "فعّل التنبيهات عندما يصبح المتراسل غير متصل"
+
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "فعّل التنبيهات عندما تكون المحادثة غير مركز عليها"
 
-#: ../src/empathy-preferences.glade.h:13
+#: ../src/empathy-preferences.ui.h:13
+msgid "Enable spell checking for languages:"
+msgstr "فعل تدقيق التهجئة للغات:"
+
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "عامّ"
 
-#: ../src/empathy-preferences.glade.h:14
+#: ../src/empathy-preferences.ui.h:15
+msgid "Geoclue Settings"
+msgstr "إعدادات تحديد المكان"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Location"
+msgstr "المكان"
+
+#: ../src/empathy-preferences.ui.h:17
 msgid "Notifications"
 msgstr "التنبيهات"
 
-#: ../src/empathy-preferences.glade.h:15
+#: ../src/empathy-preferences.ui.h:18
+msgid "Play sound for events"
+msgstr "شغل صوت للأحداث"
+
+#: ../src/empathy-preferences.ui.h:19
 msgid "Preferences"
 msgstr "التفضيلات"
 
-#: ../src/empathy-preferences.glade.h:16
-msgid "Show _avatars"
-msgstr "اعرض ال_صور الشخصية"
+#: ../src/empathy-preferences.ui.h:20
+msgid "Privacy"
+msgstr "الخصوصية"
 
-#: ../src/empathy-preferences.glade.h:17
+#: ../src/empathy-preferences.ui.h:21
+msgid ""
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will have a random "
+"value added (&#xB1;0.25&#xB0;)."
+msgstr ""
+"دقة المكان المنخفضة تعني أن لا شيء أدق من المدينة والولاية والبلد سيُنشر.  "
+"ستُضاف قيمة عشوائية إلى إحداثيات نظام تحديد المواقع (&#xB1;0.25&#xB0;)."
+
+#: ../src/empathy-preferences.ui.h:22
 msgid "Show _smileys as images"
 msgstr "أظهر الابت_سامات كرسوم"
 
-#: ../src/empathy-preferences.glade.h:18
-msgid "Show co_mpact contact list"
-msgstr "أظهر _قائمة مضغوطة للمراسلين"
-
-#: ../src/empathy-preferences.glade.h:19
-msgid "Sort by _name"
-msgstr "رتّب بالا_سم"
+#: ../src/empathy-preferences.ui.h:23
+msgid "Show contact _list in rooms"
+msgstr "أظهر _قائمة المتراسلين في الغرف"
 
-#: ../src/empathy-preferences.glade.h:20
-msgid "Sort by s_tate"
-msgstr "رتّب بال_حالة"
-
-#: ../src/empathy-preferences.glade.h:21
+#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "الأصوات"
 
-#: ../src/empathy-preferences.glade.h:22
+#: ../src/empathy-preferences.ui.h:25
 msgid "Spell Checking"
 msgstr "التدقيق الإملائي"
 
-#: ../src/empathy-preferences.glade.h:23
+#: ../src/empathy-preferences.ui.h:26
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr "قائمة اللغات الموجودة هنا لا تعكس إلا اللغات التي يوجد لها قاموس مركب."
+
+#: ../src/empathy-preferences.ui.h:27
 msgid "Themes"
 msgstr "السِمات"
 
-#: ../src/empathy-preferences.glade.h:24
+#: ../src/empathy-preferences.ui.h:28
 msgid "_Enable bubble notifications"
 msgstr "_فعّل بالون التنبيهات"
 
-#: ../src/empathy-preferences.glade.h:25
+#: ../src/empathy-preferences.ui.h:29
 msgid "_Enable sound notifications"
 msgstr "_فعّل التنبيهات الصوتية"
 
-#: ../src/empathy-preferences.glade.h:26
+#: ../src/empathy-preferences.ui.h:30
 msgid "_Open new chats in separate windows"
 msgstr "ا_فتح غرف الدردشة الجديدة في نوافذ منفصلة"
 
-#: ../src/empathy-status-icon.glade.h:1
+#: ../src/empathy-preferences.ui.h:31
+msgid "_Publish location to my contacts"
+msgstr "ا_نشر مكاني إلى المتراسلين"
+
+#: ../src/empathy-preferences.ui.h:32
+msgid "_Reduce location accuracy"
+msgstr "_قلل دقة المكان"
+
+#: ../src/empathy-status-icon.ui.h:1
 msgid "Status"
 msgstr "الحالة"
 
-#: ../src/empathy-status-icon.glade.h:3
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_Quit"
 msgstr "أ_نه"
 
-#: ../src/empathy-status-icon.glade.h:4
+#: ../src/empathy-status-icon.ui.h:4
 msgid "_Show Contact List"
-msgstr "أظهر _قائمة المراسلين"
+msgstr "أظهر _قائمة المتراسلين"
 
-#: ../src/empathy-tube-dispatch.c:364
+#: ../src/empathy-tube-dispatch.c:375
 #, c-format
 msgid "Unable to start application for service %s: %s"
 msgstr "تعذّر بدأ التطبيق للخدمة %s: %s"
 
-#: ../src/empathy-tube-dispatch.c:435
+#: ../src/empathy-tube-dispatch.c:446
 #, c-format
 msgid ""
 "An invitation was offered for service %s, but you don't have the needed "
 "application to handle it"
 msgstr "عرضت دعوة لخدمة  %s، ولكنك لا تملك البرنامج المطلوب للتعامل معها."
+
+#: ../src/empathy-call-window-fullscreen.ui.h:1
+msgid "gtk-leave-fullscreen"
+msgstr ""
+
+#: ../src/empathy-map-view.ui.h:1
+msgid "Contact Map View"
+msgstr "مشهد خريطة المتراسَلين"
+
+#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
+msgid "Error"
+msgstr "خطأ"
+
+#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
+msgid "Critical"
+msgstr "حرِج"
+
+#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
+msgid "Warning"
+msgstr "تحذير"
+
+#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065
+#: ../src/empathy-debug-dialog.c:1113
+msgid "Message"
+msgstr "رسالة"
+
+#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059
+msgid "Info"
+msgstr "معلومات"
+
+#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053
+msgid "Debug"
+msgstr "تنقيح"
+
+#: ../src/empathy-debug-dialog.c:845
+msgid "Save"
+msgstr "احفظ"
+
+#: ../src/empathy-debug-dialog.c:948
+msgid "Debug Window"
+msgstr "نافذة التنقيح"
+
+#: ../src/empathy-debug-dialog.c:1021
+msgid "Pause"
+msgstr "ألبِث"
+
+#: ../src/empathy-debug-dialog.c:1033
+msgid "Level "
+msgstr "المستوى"
+
+#: ../src/empathy-debug-dialog.c:1102
+msgid "Time"
+msgstr "الوقت"
+
+#: ../src/empathy-debug-dialog.c:1104
+msgid "Domain"
+msgstr "النطاق"
+
+#: ../src/empathy-debug-dialog.c:1106
+msgid "Category"
+msgstr "الفئة"
+
+#: ../src/empathy-debug-dialog.c:1108
+msgid "Level"
+msgstr "المستوى"
+
+#: ../src/empathy-debug-dialog.c:1140
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr "مدير الاتصالات المختار لا يدعم امتداد التنقيح عن بعد."
+
+#~ msgid "Avatars are user chosen images shown in the contact list"
+#~ msgstr ""
+#~ "الصور الشخصية هي الصور التي اختار المستخدم والظاهرة في لائحة المتراسل"
+
+#~ msgid "Show _avatars"
+#~ msgstr "اعرض ال_صور الشخصية"
+
+#~ msgid "Show co_mpact contact list"
+#~ msgstr "أظهر _قائمة مضغوطة للمتراسلين"
+
+#~ msgid "Forget password and clear the entry."
+#~ msgstr "انس كلمة السر وامح المدخلة."
+
+#~ msgid "<b>Network</b>"
+#~ msgstr "<b>الشبكة</b>"
+
+#~ msgid "<b>Servers</b>"
+#~ msgstr "<b>الخادمات</b>"
+
+#~ msgid "Edit the selected IRC network"
+#~ msgstr "حرّر شبكة IRC المحددة"
+
+#~ msgid "Remove the selected IRC network"
+#~ msgstr "احذف شبكة IRC المحددة"
+
+#~ msgid "_Check Word Spelling..."
+#~ msgstr "_دقق الإملاء..."
+
+#~ msgid "<b>Topic:</b>"
+#~ msgstr "<b>الموضوع:</b>"
+
+#~ msgid "Group Chat"
+#~ msgstr "محادثة جماعية"
+
+#~ msgid "Contact Information"
+#~ msgstr "معلومات المتراسل"
+
+#~ msgid "I would like to add you to my contact list."
+#~ msgstr "أود إضافتك إلى قائمة متراسليَّ."
+
+#~ msgid "Sorry, I don't want you in my contact list anymore."
+#~ msgstr "آسف، ولكن لا أرغب بك في لائحة متراسليَّ بعد الآن."
+
+#~ msgid "<b>Groups</b>"
+#~ msgstr "<b>المجموعات</b>"
+
+#~ msgid "Contact information"
+#~ msgstr "معلومات المتراسل"
+
+#~ msgid "Word"
+#~ msgstr "كلمة"
+
+#~ msgid "Suggestions for the word"
+#~ msgstr "الاقتراحات للكلمة"
+
+#~ msgid "Spell Checker"
+#~ msgstr "مدقق الإملاء"
+
+#~ msgid "Suggestions for the word:"
+#~ msgstr "الاقتراحات للكلمة:"
+
+#~ msgid "<b>New Account</b>"
+#~ msgstr "<b>حساب جديد</b>"
+
+#~ msgid "I already have an account I want to use"
+#~ msgstr "لدي حساب بالفعل وأريد استخدامه"
+
+#~ msgid "New message from %s"
+#~ msgstr "رسالة جديدة من %s"
+
+#~ msgid "C_lear"
+#~ msgstr "ا_مسح"
+
+#~ msgid "Chat"
+#~ msgstr "محادثة"
+
+#~ msgid "Insert _Smiley"
+#~ msgstr "أدرج تعبيرا ر_سوميا"
+
+#~ msgid "Invitation _message:"
+#~ msgstr "رسالة ال_دعوة:"
+
+#~ msgid "Invite"
+#~ msgstr "ادعُ"
+
+#~ msgid "Move Tab _Left"
+#~ msgstr "انقل اللِّسان إلى اليسا_ر"
+
+#~ msgid "Move Tab _Right"
+#~ msgstr "انقل اللِّسان إلى ال_يمين"
+
+#~ msgid "Select who would you like to invite:"
+#~ msgstr "اختر من تريد دعوته:"
+
+#~ msgid "You have been invited to join a chat conference."
+#~ msgstr "لقد دُعيت للانضمام إلى اجتماع دردشة. "
+
+#~ msgid "_Contact"
+#~ msgstr "_متراسل"
+
+#~ msgid "_Conversation"
+#~ msgstr "م_حادثة"
+
+#~ msgid "_Detach Tab"
+#~ msgstr "_فصل اللسان"
+
+#~ msgid "_Favorite Chatroom"
+#~ msgstr "الغرفة الم_فضلة"
+
+#~ msgid "_Next Tab"
+#~ msgstr "اللسان ال_تالي"
+
+#~ msgid "_Previous Tab"
+#~ msgstr "اللسان ال_سابق"
+
+#~ msgid "_Tabs"
+#~ msgstr "أ_لسنة"
+
+#~ msgid "Edit Favorite Room"
+#~ msgstr "حرّر الغرفة المفضلة"
+
+#~ msgid "Join room on start_up"
+#~ msgstr "انضم للغرفة عند بدء التشغيل"
+
+#~ msgid "Join this chat room when Empathy starts and you are connected"
+#~ msgstr "انضم إلى غرفة الدردشة هاته حين يبدأ مرسال جنوم وأنت متصَل"
+
+#~ msgid "N_ame:"
+#~ msgstr "الا_سم:"
+
+#~ msgid "S_erver:"
+#~ msgstr "ال_خادم:"
+
+#~ msgctxt "file size"
+#~ msgid "Unknown"
+#~ msgstr "مجهول"
+
+#~ msgid "\"%s\" receiving from %s"
+#~ msgstr "\"%s\" يستلم من %s"
+
+#~ msgid "\"%s\" sending to %s"
+#~ msgstr "\"%s\" يُرسِل إلى %s"
+
+#~ msgid "File transfer canceled: %s"
+#~ msgstr "أُلغي نقل الملف: %s"
+
+#~ msgctxt "remaining time"
+#~ msgid "Unknown"
+#~ msgstr "مجهول"
+
+#~ msgid "Cannot save file to this location"
+#~ msgstr "تعذّر حفظ الملف في هذا المكان"
+
+#~ msgid "Save file as..."
+#~ msgstr "احفظ الملف باسم..."
+
+#~ msgid "unknown size"
+#~ msgstr "الحجم غير معروف"
+
+#~ msgid "%s would like to send you a file"
+#~ msgstr "%s يود أن يرسل لك ملف"
+
+#~ msgid "Do you want to accept the file \"%s\" (%s)?"
+#~ msgstr "هل ترغب في قبول الملف \"%s\" (%s)؟"
+
+#~ msgid "_Accept"
+#~ msgstr "ا_قبل"
+
+#~ msgid "Join _New..."
+#~ msgstr "ان_ضم الى جدبد..."
+
+#~ msgid "Browse:"
+#~ msgstr "تصفّح:"
+
+#~ msgid "Join"
+#~ msgstr "انضم"
+
+#~ msgid "Join New"
+#~ msgstr "انضم لجديد"
+
+#~ msgid "Re_fresh"
+#~ msgstr "ح_دّث"
+
+#~ msgid ""
+#~ "This list represents all chat rooms hosted on the server you have entered."
+#~ msgstr "هذه اللائحة تمثل كل الغرف المُستضافة على الخادم الذي أدخلت اسمه."
+
+#~ msgid "<b>Contact List</b>"
+#~ msgstr "<b>قائمة المتراسلين</b>"
diff --git a/po/be.po b/po/be.po
index 6d87306b4..5ca7572f4 100644
--- a/po/be.po
+++ b/po/be.po
@@ -2,19 +2,23 @@
 # Copyright (C) 2009 THE Empathy'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the Empathy package.
 # insomnia <defragbrain@gmail.com>, 2009.
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: Empathy\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?\n"
-"POT-Creation-Date: 2009-03-30 16:50+0000\n"
-"PO-Revision-Date: 2009-04-11 15:42+0300\n"
-"Last-Translator: insomnia <defragbrain@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=empathy&component=general\n"
+"POT-Creation-Date: 2009-07-20 15:33+0000\n"
+"PO-Revision-Date: 2009-07-25 10:48+0300\n"
+"Last-Translator: Alexander Nyakhaychyk <nyakhaychyk@gmail.com>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Poedit-Bookmarks: -1,-1,104,-1,-1,-1,-1,-1,-1,-1\n"
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Empathy Instant Messenger"
@@ -32,8 +36,9 @@ msgstr "Заўсёды адчыняць новае акно для новай р
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
-msgstr "Знак, які неабходна ўстаўляць пасля мянушкі пры яе заканчэньні клявішай Тab у групавой размове"
-""
+msgstr ""
+"Знак, які неабходна ўстаўляць пасля мянушкі пры яе заканчэньні клявішай Тab "
+"у групавой размове"
 
 #: ../data/empathy.schemas.in.h:3
 msgid "Chat window theme"
@@ -42,7 +47,9 @@ msgstr "Тэма акна размовы"
 #: ../data/empathy.schemas.in.h:4
 msgid ""
 "Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
-msgstr "Падзелены коскамі спіс моў,  якія выкарыстоўваюцца для праверкі артаграфіі (напрыклад, «en, be, ru»)."
+msgstr ""
+"Падзелены коскамі спіс моў,  якія выкарыстоўваюцца для праверкі артаграфіі "
+"(напрыклад, «en, be, ru»)."
 
 #: ../data/empathy.schemas.in.h:5
 msgid "Compact contact list"
@@ -57,810 +64,1409 @@ msgid "Default directory to select an avatar image from"
 msgstr "Змоўчаны каталёг, зь якога выбіраецца аватар"
 
 #: ../data/empathy.schemas.in.h:8
-msgid "Empathy should auto-connect on startup"
-msgstr "Empathy павінна аўтаматычна злучацца падчас стартаваньня"
+#| msgid "Enable sounds when _away"
+msgid "Disable popup notifications when away"
+msgstr "Адключыць раптоўнае інфармаваньне, калі мяне няма"
 
 #: ../data/empathy.schemas.in.h:9
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Empathy павінна выкарыстоўваць аватар кантакту як малюнак акна размовы"
+#| msgid "Enable sounds when _away"
+msgid "Disable sounds when away"
+msgstr "Адключыць гук, калі мяне няма"
 
 #: ../data/empathy.schemas.in.h:10
-msgid "Enable popup when contact is available"
-msgstr "Уключыць выплыўное нагадваньне, калі кантакт даступны"
+msgid "Empathy can publish the user's location"
+msgstr "Empathy можа апублікаваць знаходжаньне карыстальніка"
 
 #: ../data/empathy.schemas.in.h:11
-msgid "Enable sound when away"
-msgstr "Уключыць гукі ў стане «адсутнічаю»"
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy можа ўжыць GPS, каб вызначыць знаходжаньне"
 
 #: ../data/empathy.schemas.in.h:12
-msgid "Enable sound when busy"
-msgstr "Уключыць гукі, калі я заняты"
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy можа ўжыць сотавую сетку, каб вызначыць знаходжаньне"
 
 #: ../data/empathy.schemas.in.h:13
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy можа ўжыць сетку, каб вызначыць знаходжаньне"
+
+#: ../data/empathy.schemas.in.h:14
+msgid "Empathy default download folder"
+msgstr "Прадвызначаная тэка запамповак Empathy"
+
+#: ../data/empathy.schemas.in.h:15
+msgid "Empathy has asked about importing accounts"
+msgstr "Empathy спытала пра імпарт рахункаў"
+
+#: ../data/empathy.schemas.in.h:16
+msgid "Empathy should auto-connect on startup"
+msgstr "Empathy павінна аўтаматычна злучацца падчас стартаваньня"
+
+#: ../data/empathy.schemas.in.h:17
+#| msgid "Empathy should auto-connect on startup"
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy мусіць зьменшыць дакладнасьць разьмяшчэньня"
+
+#: ../data/empathy.schemas.in.h:18
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Empathy павінна выкарыстоўваць аватар кантакту як малюнак акна размовы"
+
+#: ../data/empathy.schemas.in.h:19
+msgid "Enable WebKit Developer Tools"
+msgstr "Уключыць сродкі распрацоўкі WebKit"
+
+#: ../data/empathy.schemas.in.h:20
+msgid "Enable popup notifications for new messages"
+msgstr "Уключыць інфармаваньне раптоўнымі вокнамі пра новыя паведамленьні"
+
+#: ../data/empathy.schemas.in.h:21
 msgid "Enable spell checker"
 msgstr "Уключыць праверку артаграфіі"
 
-#: ../data/empathy.schemas.in.h:14
+#: ../data/empathy.schemas.in.h:22
 msgid "Hide main window"
 msgstr "Схаваць галоўнае акно"
 
-#: ../data/empathy.schemas.in.h:15
+#: ../data/empathy.schemas.in.h:23
 msgid "Hide the main window."
 msgstr "Схаваць галоўнае акно."
 
-#: ../data/empathy.schemas.in.h:16
+#: ../data/empathy.schemas.in.h:24
 msgid "NetworkManager should be used"
 msgstr "Неабходна выкарыстоўваць NetworkManager"
 
-#: ../data/empathy.schemas.in.h:17
+#: ../data/empathy.schemas.in.h:25
 msgid "Nick completed character"
-msgstr ""
+msgstr "Сымбаль аўтадапаўненьня мянушкі"
 
-#: ../data/empathy.schemas.in.h:18
+#: ../data/empathy.schemas.in.h:26
 msgid "Open new chats in separate windows"
 msgstr "Адкрываць новую размову ў асобным акне"
 
-#: ../data/empathy.schemas.in.h:19
+#: ../data/empathy.schemas.in.h:27
+msgid "Path of the adium theme to use"
+msgstr "Шлях да тэмы adium"
+
+#: ../data/empathy.schemas.in.h:28
+#| msgid "Whether to use the theme for chat rooms or not."
+msgid "Path of the adium theme to use if the theme used for chat is adium."
+msgstr "Шляш да тэмы adium, каб выкарыстоўваць з чатамі ў adium."
+
+#: ../data/empathy.schemas.in.h:29
+#| msgid "_Play sound when messages arrive"
+msgid "Play a sound for incoming messages"
+msgstr "Агучваць уваходныя паведамленьні"
+
+#: ../data/empathy.schemas.in.h:30
+msgid "Play a sound for new conversations"
+msgstr "Граць гукі для новых размоў"
+
+#: ../data/empathy.schemas.in.h:31
+#| msgid "_Play sound when messages arrive"
+msgid "Play a sound for outgoing messages"
+msgstr "Агучваць выходныя паведамленьні"
+
+#: ../data/empathy.schemas.in.h:32
+#| msgid "_Play sound when messages arrive"
+msgid "Play a sound when a contact logs in"
+msgstr "Агучваць далучэньне кантактаў"
+
+#: ../data/empathy.schemas.in.h:33
+msgid "Play a sound when a contact logs out"
+msgstr "Граць гук, калі кантакт адлучаецца"
+
+#: ../data/empathy.schemas.in.h:34
+#| msgid "_Play sound when messages arrive"
+msgid "Play a sound when we log in"
+msgstr "Акучваць маё далучэньне"
+
+#: ../data/empathy.schemas.in.h:35
+#| msgid "_Play sound when messages arrive"
+msgid "Play a sound when we log out"
+msgstr "Агучваць маё адлучэньне"
+
+#: ../data/empathy.schemas.in.h:36
+msgid "Popup notifications if the chat isn't focused"
+msgstr "Раптоўныя інфармаваньні, калі вакно размоў ня мае фокусу"
+
+#: ../data/empathy.schemas.in.h:37
+#| msgid "Display notifications when contacts come _online"
+msgid "Popup notifications when a contact sign in"
+msgstr "Раптоўнае інфармаваньне далучэньня кантактаў"
+
+#: ../data/empathy.schemas.in.h:38
+#| msgid "Display notifications when contacts come _online"
+msgid "Popup notifications when a contact sign out"
+msgstr "Раптоўнае інфармаваньне адлучэньня кантакатў"
+
+#: ../data/empathy.schemas.in.h:39
 msgid "Salut account is created"
 msgstr "Створаны рахунак Salut"
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:40
 msgid "Show avatars"
 msgstr "Паказваць аватары"
 
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:41
+#| msgid "_Show Contact List"
+msgid "Show contact list in rooms"
+msgstr "Паказаць сьпіс кантактаў у пакоях"
+
+#: ../data/empathy.schemas.in.h:42
 msgid "Show hint about closing the main window"
 msgstr "Паказваць падказку падчас закрыцьця галоўнага акна"
 
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:43
 msgid "Show offline contacts"
 msgstr "Паказваць адключаныя кантакты"
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:44
 msgid "Spell checking languages"
 msgstr "Мовы для праверкі правапісу"
 
-#: ../data/empathy.schemas.in.h:24
+#: ../data/empathy.schemas.in.h:45
+msgid "The default folder to save file transfers in."
+msgstr "Прадвызначаная тэчка для захаваньня атрыманых файлаў."
+
+#: ../data/empathy.schemas.in.h:46
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Апошні каталёг, зь якога быў абраны аватар."
 
-#: ../data/empathy.schemas.in.h:25
+#: ../data/empathy.schemas.in.h:47
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Тэма, з дапамогай якой адлюстроўваецца размова ў акне."
 
-#: ../data/empathy.schemas.in.h:26
+#: ../data/empathy.schemas.in.h:48
 msgid "Use graphical smileys"
 msgstr "Карыстацца графічнымі смайламі"
 
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:49
 msgid "Use notification sounds"
 msgstr "Выкарыстоўваць гукі паведамленьняў"
 
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:50
 msgid "Use theme for chat rooms"
 msgstr "Выкарыстоўваць тэму для пакою размовы"
 
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:51
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr ""
+"Ці мусяць быць уключаны сродкі распрацоўкі WebKit, такія як Web Inspector."
+
+#: ../data/empathy.schemas.in.h:52
+#| msgid ""
+#| "Whether or not to show contacts that are offline in the contact list."
+msgid "Whether or not Empathy can publish the user's location to his contacts."
+msgstr "Ці можа Empathy паведамляць знаходжаньне кантактам карыстальніка."
+
+#: ../data/empathy.schemas.in.h:53
+#| msgid "Whether or not to play a sound when messages arrive."
+msgid "Whether or not Empathy can use the GPS to guess the location."
+msgstr "Ці мусіць Empathy выкарыстоўваць GPS."
+
+#: ../data/empathy.schemas.in.h:54
+msgid ""
+"Whether or not Empathy can use the cellular network to guess the location."
+msgstr ""
+"Ці можа Empathy выкарыстоўваць сотавую сетку, каб вызначыць знаходжаньне."
+
+#: ../data/empathy.schemas.in.h:55
+msgid "Whether or not Empathy can use the network to guess the location."
+msgstr "Ці можа Empathy выкарыстоўваць сетку, каб вызначыць знаходжаньне."
+
+#: ../data/empathy.schemas.in.h:56
+msgid ""
+"Whether or not Empathy has asked about importing accounts from other "
+"programs."
+msgstr "Ці можа Empathy пытацца пра імпартаваньне рахункаў зь іншых праграм."
+
+#: ../data/empathy.schemas.in.h:57
 msgid ""
 "Whether or not Empathy should automatically log in to your accounts on "
 "startup."
 msgstr ""
+"Ці мусіць Empathy аўтаматычна аўтэнтыфікаваць вашыя рахункі ў час запуску."
 
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:58
+msgid ""
+"Whether or not Empathy should reduce the location's accuracy for privacy "
+"reasons."
+msgstr ""
+"Ці мусіць Empathy зьмяншаць дакладнасьць знаходжаньня, каб зьберагчы вашу "
+"адасобленасьць."
+
+#: ../data/empathy.schemas.in.h:59
 msgid ""
 "Whether or not Empathy should use the avatar of the contact as the chat "
 "window icon."
 msgstr ""
+"Ці мусіць Empathy выкарыстоўваць аватар кантакта у якасьці значка вакна "
+"размовы."
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:60
 msgid ""
 "Whether or not the Salut account has been created on the first Empathy run."
-msgstr ""
+msgstr "Ці мусіць быць створаны рахунак Salut у час першага запуску Empathy."
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:61
 msgid ""
 "Whether or not the network manager should be used to automatically "
 "disconnect/reconnect."
-msgstr "Карыстацца NetworkManager, каб аўтаматычна спалучацца і разлучацца зь сецівам?"
+msgstr ""
+"Карыстацца NetworkManager, каб аўтаматычна спалучацца і разлучацца зь "
+"сецівам?"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:62
 msgid ""
 "Whether or not to check words typed against the languages you want to check "
 "with."
-msgstr ""
+msgstr "Ці спраўджваць правапіс словаў згодна з пазначанымі мовамі."
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:63
 msgid ""
 "Whether or not to convert smileys into graphical images in conversations."
 msgstr "Ці канвэртаваць смайлы ў графічныя малюнкі ў размовах?"
 
-#: ../data/empathy.schemas.in.h:35
-msgid "Whether or not to play a sound when messages arrive."
-msgstr "Ці граць гукі, калі атрымліваеш паведамленьне?"
+#: ../data/empathy.schemas.in.h:64
+#| msgid ""
+#| "Whether or not to show avatars for contacts in the contact list and chat "
+#| "windows."
+msgid ""
+"Whether or not to play a sound to notify for contacts logging in the network."
+msgstr "Ці граць гук, каб інфармаваць пра далучэньне кантактаў."
 
-#: ../data/empathy.schemas.in.h:36
-msgid "Whether or not to play sounds when away."
-msgstr "Ці граць гукі, калі я адыйшоў?"
+#: ../data/empathy.schemas.in.h:65
+#| msgid ""
+#| "Whether or not to show avatars for contacts in the contact list and chat "
+#| "windows."
+msgid ""
+"Whether or not to play a sound to notify for contacts logging off the "
+"network."
+msgstr "Ці граць гук, каб інфармаваць пра адлучэньне кантактаў."
+
+#: ../data/empathy.schemas.in.h:66
+#| msgid "Whether or not to play sounds when busy."
+msgid "Whether or not to play a sound to notify for events."
+msgstr "Ці граць гук, каб інфармаваць пра падзеі."
+
+#: ../data/empathy.schemas.in.h:67
+#| msgid "Whether or not to play a sound when messages arrive."
+msgid "Whether or not to play a sound to notify for incoming messages."
+msgstr "Ці граць гук, каб інфармаваць пра ўваходныя паведамленьні."
+
+#: ../data/empathy.schemas.in.h:68
+#| msgid "Whether or not to play a sound when messages arrive."
+msgid "Whether or not to play a sound to notify for new conversations."
+msgstr "Ці граць гук, каб інфармаваць пра новыя размовы."
+
+#: ../data/empathy.schemas.in.h:69
+#| msgid "Whether or not to play a sound when messages arrive."
+msgid "Whether or not to play a sound to notify for outgoing messages."
+msgstr "Ці граць гук, каб інфармаваць пра выходнае паведамленьне."
+
+#: ../data/empathy.schemas.in.h:70
+#| msgid "Whether or not to play sounds when away."
+msgid "Whether or not to play a sound when logging in a network."
+msgstr "Ці граць гук, калі далучаемся."
+
+#: ../data/empathy.schemas.in.h:71
+#| msgid "Whether or not to play sounds when away."
+msgid "Whether or not to play a sound when logging off a network."
+msgstr "Ці граць куг, калі адлучаемся."
+
+#: ../data/empathy.schemas.in.h:72
+#| msgid "Whether or not to play sounds when away."
+msgid "Whether or not to play sound notifications when away or busy."
+msgstr "Ці прайграваць гук, калі мяне няма ці заняты."
+
+#: ../data/empathy.schemas.in.h:73
+#| msgid "Whether or not to show a popup when a contact becomes available."
+msgid ""
+"Whether or not to show a popup notification when a contact goes offline."
+msgstr "Ці паказваць раптоўнае інфармаваньне, калі кантакт адлучаецца."
 
-#: ../data/empathy.schemas.in.h:37
-msgid "Whether or not to play sounds when busy."
-msgstr "Ці граць гукі, калі я заняты?"
+#: ../data/empathy.schemas.in.h:74
+#| msgid "Whether or not to show a popup when a contact becomes available."
+msgid "Whether or not to show a popup notification when a contact goes online."
+msgstr "Ці паказваць раптоўнае інфармаваньне, калі кантакт далучаецца."
 
-#: ../data/empathy.schemas.in.h:38
-msgid "Whether or not to show a popup when a contact becomes available."
-msgstr "Ці паказваць выплыўное нагадваньне, калі кантакт становіцца даступным?"
+#: ../data/empathy.schemas.in.h:75
+msgid ""
+"Whether or not to show a popup notification when receiving a new message "
+"even if the chat is already opened, but not focused."
+msgstr ""
+"Ці адлюстроўваць раптоўнае інфармаваньне, калі прыходзіць новае "
+"паведамленьне, нават калі вакно гутаркі ўжо адркрыта, але ня мае фокусу."
 
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:76
+#| msgid "Whether or not to show a popup when a contact becomes available."
+msgid ""
+"Whether or not to show a popup notification when receiving a new message."
+msgstr ""
+"Ці паказваць раптоўныя інфармаваньні, калі атрымліваю новае паведамленьне."
+
+#: ../data/empathy.schemas.in.h:77
 msgid ""
 "Whether or not to show avatars for contacts in the contact list and chat "
 "windows."
 msgstr "Ці паказваць аватары ў сьпісе кантактаў і вокнах размовы?"
 
-#: ../data/empathy.schemas.in.h:40
+#: ../data/empathy.schemas.in.h:78
 msgid "Whether or not to show contacts that are offline in the contact list."
 msgstr "Ці паказваць у сьпісе офлайн-кантакты?"
 
-#: ../data/empathy.schemas.in.h:41
+#: ../data/empathy.schemas.in.h:79
+#| msgid "Whether or not to play sounds when away."
+msgid "Whether or not to show popup notifications when away or busy."
+msgstr "Ці адлюстроўваць раптоўныя інфармаваньні, калі мяне няма ці заняты."
+
+#: ../data/empathy.schemas.in.h:80
+#| msgid "Whether to show the contact list in compact mode or not."
+msgid "Whether or not to show the contact list in chat rooms."
+msgstr "Ці паказваць сьпіс кантактаў у пакоях чатаў."
+
+#: ../data/empathy.schemas.in.h:81
 msgid ""
 "Whether or not to show the message dialog about closing the main window with "
 "the 'x' button in the title bar."
 msgstr ""
+"Ці паказваць дыялёг з паведамленьнем пра закрыцьцё галоўнага вакна з кнопкай "
+"x у панэлі загалоўка."
 
-#: ../data/empathy.schemas.in.h:42
+#: ../data/empathy.schemas.in.h:82
 msgid "Whether to show the contact list in compact mode or not."
 msgstr "Ці паказваць сьпіс кантактаў у сьціслым выглядзе?"
 
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:83
 msgid "Whether to use the theme for chat rooms or not."
 msgstr "Ці карыстацца тэмамі для пакояў?"
 
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:84
 msgid ""
 "Which criterium to use when sorting the contact list. Default is to use sort "
 "by the contact's name with the value \"name\". A value of \"state\" will "
 "sort the contact list by state."
 msgstr ""
+"Які крытэр выкарыстоўваць для ўпарадкаваньня сьпісу кантактаў. "
+"Прадвызначанае значэньне - упарадковаць па назвах кантактаў - „name”. "
+"Значэньне „state” будзе ўпарадкоўваць знодна з станам кантактаў."
+
+#: ../libempathy/empathy-ft-handler.c:838
+msgid "The hash of the received file and the sent one do not match"
+msgstr "Хэш атрыманага і дасланага файлаў не супадае"
+
+#: ../libempathy/empathy-ft-handler.c:1098
+msgid "File transfer not supported by remote contact"
+msgstr "Кантакт не падтрымлівае перадачу файлаў"
+
+#: ../libempathy/empathy-ft-handler.c:1156
+msgid "The selected file is not a regular file"
+msgstr "Вылучаны файл не зьяўляецца звычайным"
 
-#: ../libempathy/empathy-tp-contact-list.c:731 ../src/empathy.c:248
+#: ../libempathy/empathy-ft-handler.c:1165
+msgid "The selected file is empty"
+msgstr "Вылучаны файл пусты"
+
+#: ../libempathy/empathy-tp-contact-list.c:843 ../src/empathy.c:289
 msgid "People nearby"
 msgstr "Людзі побач"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-tp-file.c:279
+msgid "Socket type not supported"
+msgstr "Тып сокетаў не падтрымліваецца"
+
+#: ../libempathy/empathy-tp-file.c:398
+#| msgid "No error specified"
+msgid "No reason was specified"
+msgstr "Няма вызначанае прычыны"
+
+#: ../libempathy/empathy-tp-file.c:401
+msgid "The change in state was requested"
+msgstr "Запыт зьмены стану"
+
+#: ../libempathy/empathy-tp-file.c:404
+msgid "You canceled the file transfer"
+msgstr "Вы скасавалі перадачу файла"
+
+#: ../libempathy/empathy-tp-file.c:407
+msgid "The other participant canceled the file transfer"
+msgstr "Другі ўдзельнік скасаваў перадачу файла"
+
+#: ../libempathy/empathy-tp-file.c:410
+msgid "Error while trying to transfer the file"
+msgstr "Памылка перадачы файла"
+
+#: ../libempathy/empathy-tp-file.c:413
+msgid "The other participant is unable to transfer the file"
+msgstr "Другі ўдзельнік ня мога перадаць файл"
+
+#: ../libempathy/empathy-tp-file.c:416
+#| msgid "Unknown error"
+msgid "Unknown reason"
+msgstr "Невядомая прычына"
+
+#: ../libempathy/empathy-utils.c:265
 msgid "Available"
 msgstr "Даступны"
 
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:267
 msgid "Busy"
 msgstr "Заняты"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:270
 msgid "Away"
 msgstr "Адсутнічаю"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:272
 msgid "Hidden"
 msgstr "Схаваны"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:274
 msgid "Offline"
-msgstr "Ня ў сеціве"
+msgstr "Адлучаны"
+
+#: ../libempathy/empathy-time.c:137
+#, c-format
+msgid "%d second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "%d сэкунду таму"
+msgstr[1] "%d сэкунды таму"
+msgstr[2] "%d сэкунд таму"
+
+#: ../libempathy/empathy-time.c:142
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "%d хвіліну таму"
+msgstr[1] "%d хвіліны таму"
+msgstr[2] "%d хвілін таму"
+
+#: ../libempathy/empathy-time.c:147
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "%d гадзіну таму"
+msgstr[1] "%d гадзіны таму"
+msgstr[2] "%d гадзін таму"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:337
+#: ../libempathy/empathy-time.c:152
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d дзень таму"
+msgstr[1] "%d дні таму"
+msgstr[2] "%d дзён таму"
+
+#: ../libempathy/empathy-time.c:157
+#, c-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "%d тыдзень таму"
+msgstr[1] "%d тыдні таму"
+msgstr[2] "%d тыдняў таму"
+
+#: ../libempathy/empathy-time.c:162
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "%d месяц таму"
+msgstr[1] "%d месяцы таму"
+msgstr[2] "%d месяцаў таму"
+
+#: ../libempathy/empathy-time.c:167
+msgid "in the future"
+msgstr "у будучыні"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:426
 msgid "All"
 msgstr "Усе"
 
 #: ../libempathy-gtk/empathy-account-widget.c:302
-#: ../libempathy-gtk/empathy-account-widget.c:347
+#: ../libempathy-gtk/empathy-account-widget.c:354
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-generic.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:1
-msgid "<b>Advanced</b>"
-msgstr "<b>Дадатковы</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:2
-msgid "Forget password and clear the entry."
-msgstr "Забыць пароль і вычысьціць гэты элемэнт."
-
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+#| msgid "<b>Advanced</b>"
+msgid "Advanced"
+msgstr "Дадатковы"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
 msgid "Pass_word:"
 msgstr "_Пароль:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
 msgid "Screen _Name:"
 msgstr "_Імя:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:11
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "_Port:"
 msgstr "_Порт:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:12
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:10
-#: ../src/empathy-new-chatroom-dialog.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
 msgstr "_Сэрвэр:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "Login I_D:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
 msgid "ICQ _UIN:"
 msgstr "ICQ _UIN:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "_Charset:"
 msgstr "_Знаказбор:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:245
+#: ../libempathy-gtk/empathy-account-widget-irc.c:240
 msgid "New Network"
 msgstr "Новае сеціва"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:1
-msgid "<b>Network</b>"
-msgstr "<b>Сеціва</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:2
-msgid "<b>Servers</b>"
-msgstr "<b>Сэрвэры</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 msgid "Charset:"
 msgstr "Знаказбор:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:4
-msgid "Create a new IRC network"
-msgstr "Стварыць новае IRC сеціва"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:5
-msgid "Edit the selected IRC network"
-msgstr "Рэдагаваць абранае IRC сеціва"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Network"
 msgstr "Сеціва"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Network:"
 msgstr "Сеціва:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Nickname:"
 msgstr "Імя:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Quit message:"
 msgstr "Разьвітальнае паведамленьне:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:11
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Real name:"
 msgstr "Сапраўднае імя:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:12
-msgid "Remove the selected IRC network"
-msgstr "Выдаліць абранае IRC сеціва"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#| msgid "Server"
+msgid "Servers"
+msgstr "Сэрвэры"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:2
-msgid "<b>Override server settings</b>"
-msgstr "<b>Падмяняць налады сэрвэра</b>"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#| msgid "<b>Override server settings</b>"
+msgid "Override server settings"
+msgstr "Замяніць настаўленьні сэрвэра"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
 msgid "Pri_ority:"
 msgstr "_Прыярытэт:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "Reso_urce:"
 msgstr "_Рэсурс:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 msgid "Use old SS_L"
 msgstr "Карыстацца старым SS_L"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "_Encryption required (TLS/SSL)"
 msgstr "_Патрабаваньне шыфраваньня (TLS/SSL)"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
 msgid "_Ignore SSL certificate errors"
 msgstr "_Ігнараваць памылкі SSL сэртыфікату"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:2
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:2
 msgid "_Email:"
 msgstr "_Email:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:3
-msgid "_First Name: "
-msgstr "_Імя: "
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3
+#| msgid "_First Name: "
+msgid "_First Name:"
+msgstr "_Імя:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:4
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:5
 msgid "_Last Name:"
 msgstr "_Прозьвішча:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:6
-#: ../src/empathy-chatrooms-window.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:6
 msgid "_Nickname:"
 msgstr "_Мянушка:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:7
 msgid "_Published Name:"
 msgstr "_Апублікаванае імя:"
 
 #. look up the DNS SRV record at the service's domain for the host name of a STUN server.
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "Discover STUN"
 msgstr "Знайсьці STUN"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 msgid "STUN Server:"
 msgstr "STUN сэрвэр:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
 msgid "STUN port:"
 msgstr "STUN порт:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "_Username:"
 msgstr "_Імя карыстальніка:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
 msgid "Use _Yahoo Japan"
 msgstr "Карыстацца _Yahoo Japan"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
 msgid "Yahoo I_D:"
 msgstr "Yahoo I_D:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 msgid "_Ignore conference and chatroom invitations"
 msgstr "_Ігнараваць запрашэньні да канфэрэнцыі і ў пакоі размоў"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
 msgid "_Room List locale:"
 msgstr "_Лякальнасьць сьпісу пакояў:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:457
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:525
+msgid "Couldn't convert image"
+msgstr "Немагчыма канвертаваць відарыс"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:450
+msgid "None of the accepted image formats is supported on your system"
+msgstr ""
+"Ніводны з прынятых фарматаў відарысаў не падтрымліваецца вашай сыстэмай"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:933
 msgid "Select Your Avatar Image"
 msgstr "Абраць сабе аватар"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:460
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
 msgid "No Image"
 msgstr "Няма малюнка"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:520
+#: ../libempathy-gtk/empathy-avatar-chooser.c:998
 msgid "Images"
 msgstr "Малюнкі"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:524
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
 msgid "All Files"
 msgstr "Усе файлы"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:294
+#: ../libempathy-gtk/empathy-avatar-image.c:324
 msgid "Click to enlarge"
 msgstr "Пстрыкнуць, каб павялічыць"
 
-#: ../libempathy-gtk/empathy-chat.c:497
+#: ../libempathy-gtk/empathy-chat.c:186
+msgid "Failed to reconnect this chat"
+msgstr "Немагчыма перадалучыцца да гэтага чату"
+
+#: ../libempathy-gtk/empathy-chat.c:404
+msgid "Unsupported command"
+msgstr "Загад не падтрымліваецца"
+
+#: ../libempathy-gtk/empathy-chat.c:539
 msgid "offline"
-msgstr "ня ў сеціве"
+msgstr "адлучаны"
 
-#: ../libempathy-gtk/empathy-chat.c:500
+#: ../libempathy-gtk/empathy-chat.c:542
 msgid "invalid contact"
 msgstr "памылковы кантакт"
 
-#: ../libempathy-gtk/empathy-chat.c:503
+#: ../libempathy-gtk/empathy-chat.c:545
 msgid "permission denied"
 msgstr "у дазволе адмоўлена"
 
-#: ../libempathy-gtk/empathy-chat.c:506
+#: ../libempathy-gtk/empathy-chat.c:548
 msgid "too long message"
 msgstr "вельмі вялікае паведамленьне"
 
-#: ../libempathy-gtk/empathy-chat.c:509
+#: ../libempathy-gtk/empathy-chat.c:551
 msgid "not implemented"
 msgstr "не ўжыцьцёўлена"
 
-#: ../libempathy-gtk/empathy-chat.c:512
+#: ../libempathy-gtk/empathy-chat.c:554
 msgid "unknown"
 msgstr "невядомы"
 
-#: ../libempathy-gtk/empathy-chat.c:516
+#: ../libempathy-gtk/empathy-chat.c:558
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Памылка падчас адпраўкі паведамленьня '%s': %s"
 
-#: ../libempathy-gtk/empathy-chat.c:546
+#: ../libempathy-gtk/empathy-chat.c:588
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Тэма ўсталяваная для: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:548
+#: ../libempathy-gtk/empathy-chat.c:590
 msgid "No topic defined"
 msgstr "Няма вызначанай тэмы"
 
-#: ../libempathy-gtk/empathy-chat.c:963
+#: ../libempathy-gtk/empathy-chat.c:960
+msgid "(No Suggestions)"
+msgstr "(няма прапаноў)"
+
+#: ../libempathy-gtk/empathy-chat.c:1014
 msgid "Insert Smiley"
 msgstr "Уставіць смайл"
 
-#: ../libempathy-gtk/empathy-chat.c:979
+#. send button
+#: ../libempathy-gtk/empathy-chat.c:1032
+#: ../libempathy-gtk/empathy-ui-utils.c:1480
 msgid "_Send"
 msgstr "_Даслаць"
 
-#: ../libempathy-gtk/empathy-chat.c:1013
-msgid "_Check Word Spelling..."
-msgstr "_Праверыць артаграфію..."
+#: ../libempathy-gtk/empathy-chat.c:1066
+msgid "_Spelling Suggestions"
+msgstr "Пра_вапісныя прапановы"
 
-#: ../libempathy-gtk/empathy-chat.c:1119
+#: ../libempathy-gtk/empathy-chat.c:1181
 #, c-format
-msgid "%s has joined the room"
-msgstr "%s увайшоў у пакой"
+#| msgid "Disconnected"
+msgid "%s has disconnected"
+msgstr "%s адлучаны"
+
+#: ../libempathy-gtk/empathy-chat.c:1185
+#, c-format
+msgid "%s was kicked by %s"
+msgstr "%s быў кікнуты %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1122
+#: ../libempathy-gtk/empathy-chat.c:1188
+#, c-format
+msgid "%s was kicked"
+msgstr "%s быў кікнуты"
+
+#: ../libempathy-gtk/empathy-chat.c:1193
+#, c-format
+msgid "%s was banned by %s"
+msgstr "%s быў забанены %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1196
+#, c-format
+msgid "%s was banned"
+msgstr "%s быў забанены"
+
+#: ../libempathy-gtk/empathy-chat.c:1200
 #, c-format
 msgid "%s has left the room"
-msgstr ""
+msgstr "%s пакінуў пакой"
 
-#: ../libempathy-gtk/empathy-chat.c:1236 ../src/empathy-call-window.c:406
+#. Note to translators: this string is appended to
+#. * notifications like "foo has left the room", with the message
+#. * given by the user living the room. If this poses a problem,
+#. * please let us know. :-)
+#.
+#: ../libempathy-gtk/empathy-chat.c:1209
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#: ../libempathy-gtk/empathy-chat.c:1232
+#, c-format
+msgid "%s has joined the room"
+msgstr "%s увайшоў у пакой"
+
+#: ../libempathy-gtk/empathy-chat.c:1365 ../src/empathy-call-window.c:1225
 msgid "Disconnected"
 msgstr "Разлучаны"
 
-#: ../libempathy-gtk/empathy-chat.c:1608
+#: ../libempathy-gtk/empathy-chat.c:1800
 msgid "Connected"
 msgstr "Злучаны"
 
-#: ../libempathy-gtk/empathy-chat.glade.h:1
-msgid "<b>Topic:</b>"
-msgstr "<b>Тэма:</b>"
+#: ../libempathy-gtk/empathy-chat.c:1850
+#: ../libempathy-gtk/empathy-log-window.c:502
+msgid "Conversation"
+msgstr "Размова"
 
-#: ../libempathy-gtk/empathy-chat.glade.h:2
-msgid "Group Chat"
-msgstr "Групавая размова"
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472
+msgid "Topic:"
+msgstr "Тэма:"
 
-#: ../libempathy-gtk/empathy-chat-view.c:430
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:316
+#: ../libempathy-gtk/empathy-theme-adium.c:264
 msgid "_Copy Link Address"
 msgstr "С_капіяваць адрас спасылкі"
 
-#: ../libempathy-gtk/empathy-chat-view.c:438
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:323
+#: ../libempathy-gtk/empathy-theme-adium.c:272
 msgid "_Open Link"
 msgstr "_Адкрыць спасылку"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:180
-msgid "Personal Information"
-msgstr "Асабістая інфармацыя"
+#. Translators: timestamp displayed between conversations in
+#. * chat windows (strftime format string)
+#: ../libempathy-gtk/empathy-chat-text-view.c:421
+#| msgid "%A %d %B %Y"
+msgid "%A %B %d %Y"
+msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:183
+#: ../libempathy-gtk/empathy-contact-dialogs.c:179
+#: ../libempathy-gtk/empathy-contact-dialogs.c:238
 msgid "Edit Contact Information"
 msgstr "Рэдагаваць кантактную інфармацыю"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:186
-msgid "Contact Information"
-msgstr "Зьвесткі аб кантакце"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:283
-msgid "I would like to add you to my contact list."
-msgstr "Я жадаю дадаць цябе ў свой сьпіс кантактаў."
+#: ../libempathy-gtk/empathy-contact-dialogs.c:289
+msgid "Personal Information"
+msgstr "Асабістая інфармацыя"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:307
+#: ../libempathy-gtk/empathy-contact-dialogs.c:393
 msgid "New Contact"
 msgstr "Новы кантакт"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:1
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
 msgid "Decide _Later"
 msgstr "Вырашыць _пазьней"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:2
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Запыт падпіскі"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1244
+#: ../libempathy-gtk/empathy-contact-list-view.c:1400
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Вы сапраўды жадаеце пакінуць суполку '%s'?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1246
+#: ../libempathy-gtk/empathy-contact-list-view.c:1402
 msgid "Removing group"
 msgstr "Выдаленьне суполкі"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1293
-#: ../libempathy-gtk/empathy-contact-list-view.c:1372
+#. Remove
+#: ../libempathy-gtk/empathy-contact-list-view.c:1449
+#: ../libempathy-gtk/empathy-contact-list-view.c:1526
 msgid "_Remove"
 msgstr "_Выдаліць"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1323
+#: ../libempathy-gtk/empathy-contact-list-view.c:1479
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Вы сапраўды жадаеце выдаліць кантакт '%s'?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1325
+#: ../libempathy-gtk/empathy-contact-list-view.c:1481
 msgid "Removing contact"
 msgstr "Выдаленьне кантакту"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1330
-msgid "Sorry, I don't want you in my contact list anymore."
-msgstr "Прабачце, але я не жадаю больш бачыць вас у сваім сьпісе кантактаў."
+#: ../libempathy-gtk/empathy-contact-menu.c:195
+#: ../src/empathy-main-window.ui.h:11
+msgid "_Add Contact..."
+msgstr "_Дадаць кантакт…"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:109
-#: ../src/empathy-main-window.glade.h:9
+#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../src/empathy-main-window.ui.h:12
 msgid "_Chat"
 msgstr "_Размова"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:130
-msgid "_Call"
-msgstr "_Званок"
+#: ../libempathy-gtk/empathy-contact-menu.c:253
+#| msgid "_End Call"
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Аўдыё выклік"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:285
+#| msgid "_End Call"
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Відэа выклік"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:169
-#: ../src/empathy-main-window.glade.h:17
+#: ../libempathy-gtk/empathy-contact-menu.c:324
 msgid "_View Previous Conversations"
 msgstr "_Прагляд папярэдніх размоў"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:197
+#: ../libempathy-gtk/empathy-contact-menu.c:346
+#| msgid "Send Video"
+msgid "Send file"
+msgstr "Даслаць файл"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:369
+msgid "Share my desktop"
+msgstr "Даць доступ да майго стальца"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:397
 msgid "Infor_mation"
 msgstr "_Інфармацыя"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:224
-#: ../src/empathy-chat-window.glade.h:14 ../src/empathy-main-window.glade.h:11
+#: ../libempathy-gtk/empathy-contact-menu.c:441
+#: ../src/empathy-main-window.ui.h:16
 msgid "_Edit"
 msgstr "_Рэдагаваць"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:358
+#: ../libempathy-gtk/empathy-contact-menu.c:501
+msgid "Inviting to this room"
+msgstr "Запрашэньне ў гэты пакой"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:532
+#| msgid "_Favorite Chatroom"
+msgid "_Invite to chatroom"
+msgstr "За_прасіць у пакой"
+
+#: ../libempathy-gtk/empathy-contact-selector.c:129
+#| msgid "Select contact..."
+msgid "Select a contact"
+msgstr "Вылучыце кантакт"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:447
 msgid "Save Avatar"
 msgstr "Захаваць аватар"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:414
+#: ../libempathy-gtk/empathy-contact-widget.c:503
 msgid "Unable to save avatar"
 msgstr "Немагчыма захаваць аватар"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:875
+#: ../libempathy-gtk/empathy-contact-widget.c:992
 msgid "Select"
 msgstr "Абраць"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:884
-#: ../src/empathy-main-window.c:855
+#: ../libempathy-gtk/empathy-contact-widget.c:1001
+#: ../src/empathy-main-window.c:1023
 msgid "Group"
 msgstr "Суполка"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:1
-msgid "<b>Client Information</b>"
-msgstr "<b>Зьвесткі пра кліент</b>"
-
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:2
-msgid "<b>Contact Details</b>"
-msgstr "<b>Падрабязна пра кантакт</b>"
-
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:3
-msgid "<b>Contact</b>"
-msgstr "<b>Кантакт</b>"
-
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:4
-msgid "<b>Groups</b>"
-msgstr "<b>Суполкі</b>"
-
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:5
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:1
-#: ../src/empathy-chatrooms-window.glade.h:1
-#: ../src/empathy-new-chatroom-dialog.glade.h:1
+#: ../libempathy-gtk/empathy-contact-widget.c:1252
+msgid "Country ISO Code:"
+msgstr "ISO-код краіны:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1254
+#| msgid "Account:"
+msgid "Country:"
+msgstr "Краіна:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1256
+#| msgid "Status:"
+msgid "State:"
+msgstr "Штат:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1258
+#| msgid "Client:"
+msgid "City:"
+msgstr "Места:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1260
+#| msgid "Armenian"
+msgid "Area:"
+msgstr "Край:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1262
+msgid "Postal Code:"
+msgstr "Паштовы індэкс:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1264
+#| msgid "Select"
+msgid "Street:"
+msgstr "Вуліца:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1266
+msgid "Building:"
+msgstr "Будынак:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1268
+#| msgid "_For:"
+msgid "Floor:"
+msgstr "Паверх:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1270
+#| msgid "_Room:"
+msgid "Room:"
+msgstr "Офіс:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1272
+#| msgid "Type:"
+msgid "Text:"
+msgstr "Тэкст:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1274
+#| msgid "Version:"
+msgid "Description:"
+msgstr "Апісаньне:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1276
+msgid "URI:"
+msgstr "URI:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1278
+msgid "Accuracy Level:"
+msgstr "Узровень дакладнасьці:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1280
+msgid "Error:"
+msgstr "Памылка:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1282
+msgid "Vertical Error (meters):"
+msgstr "Вэртыкальная памылка (мэтры):"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1284
+msgid "Horizontal Error (meters):"
+msgstr "Гарызантальная памылка (мэтры):"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1286
+msgid "Speed:"
+msgstr "Хуткасьць:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1288
+#| msgid "Version:"
+msgid "Bearing:"
+msgstr "Паводзіны:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1290
+msgid "Climb Speed:"
+msgstr "Вэртэкальная хуткасьць:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1292
+msgid "Last Updated on:"
+msgstr "Апошняе абнаўленьне:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1294
+msgid "Longitude:"
+msgstr "Даўгата:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1296
+msgid "Latitude:"
+msgstr "Шырата:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1298
+msgid "Altitude:"
+msgstr "Вышыня:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1345
+#| msgid "<b>Contact</b>"
+msgid "<b>Location</b>"
+msgstr "<b>Знаходжаньне</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1358
+#| msgid "<b>Contact</b>"
+msgid "<b>Location</b>, "
+msgstr "<b>Знаходжаньне</b>, "
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1408
+msgid "%B %e, %Y at %R UTC"
+msgstr "%B %e, %Y у %R UTC"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Знаходжаньне</b> на (дата)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid "Account:"
 msgstr "Рахунак:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:6
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
 msgid "Alias:"
 msgstr "Мянушка:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:7
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
 msgid "Birthday:"
 msgstr "Дзень народзінаў:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:8
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+#| msgid "<b>Client Information</b>"
+msgid "Client Information"
+msgstr "Зьвесткі пра кліента"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
 msgid "Client:"
 msgstr "Кліент:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:9
-msgid "Contact information"
-msgstr "Зьвесткі аб кантакце"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../src/empathy-main-window.c:1006
+msgid "Contact"
+msgstr "Кантакт"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+#| msgid "<b>Contact Details</b>"
+msgid "Contact Details"
+msgstr "Падрабязнасьці кантакта"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "Email:"
 msgstr "Email:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Fullname:"
 msgstr "Поўнае імя:"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#| msgid "Group"
+msgid "Groups"
+msgstr "Суполкі"
+
 #. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
 msgid "Identifier:"
 msgstr "Ідэнтыфікатар:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:14
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
 msgid "Information requested..."
 msgstr "Высланы запыт на інфармацыю... "
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
 msgid "OS:"
 msgstr "Сістэма:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:16
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
-msgstr "Абраць суполку, у якой павінен зьявіцца суразмоўца. Дазволена абраць больш за адну суполку, альбо ўвогуле ніводнай."
+msgstr ""
+"Абраць суполку, у якой павінен зьявіцца суразмоўца. Дазволена абраць больш "
+"за адну суполку, альбо ўвогуле ніводнай."
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:17
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
 msgid "Version:"
 msgstr "Вэрсія:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:18
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
 msgid "Web site:"
 msgstr "Ўэб-старонка:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:19
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
 msgid "_Add Group"
 msgstr "_Дадаць суполку"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:284
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:283
 msgid "new server"
 msgstr "новы сэрвэр"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:513
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:510
 msgid "Server"
 msgstr "Сэрвэр"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:528
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:525
 msgid "Port"
 msgstr "Порт"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:541
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:497
+#: ../libempathy-gtk/empathy-log-window.c:495
+#: ../src/empathy-import-dialog.c:285
 msgid "Account"
 msgstr "Рахунак"
 
-#: ../libempathy-gtk/empathy-log-window.c:504 ../src/empathy-chat-window.c:280
-msgid "Conversation"
-msgstr "Размова"
-
-#: ../libempathy-gtk/empathy-log-window.c:514
+#: ../libempathy-gtk/empathy-log-window.c:512
 msgid "Date"
 msgstr "Дата"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.glade.h:2
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
 msgid "Conversations"
 msgstr "Размовы"
 
-#: ../libempathy-gtk/empathy-log-window.glade.h:3
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
 msgid "Previous Conversations"
 msgstr "Папярэдняя размова"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.glade.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Search"
 msgstr "Пошук"
 
-#. Searching *for* something
-#: ../libempathy-gtk/empathy-log-window.glade.h:7
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "_For:"
 msgstr "_Што:"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:2
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
 msgid "C_all"
 msgstr "_Званок"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:3
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
 msgid "C_hat"
 msgstr "_Размова"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:4
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
 msgid "Contact ID:"
 msgstr "Ідэнтыфікатар кантакта:"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:5
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
 msgid "New Conversation"
 msgstr "Новая размова"
 
+#. COL_STATE_ICON_NAME
+#. COL_STATE
+#. COL_STATUS_TEXT
+#. COL_DISPLAY_MARKUP
+#. COL_STATUS_CUSTOMISABLE
+#. COL_TYPE
+#: ../libempathy-gtk/empathy-presence-chooser.c:172
+#| msgid "Custom messages..."
+msgid "Custom Message..."
+msgstr "Адмысловае паведамленьне…"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:227
+#| msgid "Custom messages..."
+msgid "Edit Custom Messages..."
+msgstr "Рэдагаваць адмысловыя паведамленьні…"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:326
+msgid "Click to remove this status as a favorite"
+msgstr "Пстрыкніце, каб выдаліць гэты ўлюбёны статус"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
+msgid "Click to make this status a favorite"
+msgstr "Пстрыкніце, каб зрабіць гэты статус улюбёным"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:369
+#| msgid "Status"
+msgid "Set status"
+msgstr "Задаць стан"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:782
+msgid "Set your presence and current status"
+msgstr "Усталяваць вашу прысутнасьць і бягучы статус"
+
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:685
+#: ../libempathy-gtk/empathy-presence-chooser.c:1017
 msgid "Custom messages..."
 msgstr "Асаблівыя паведамленьні..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:1
-msgid "Custom message"
-msgstr "Асаблівае паведамленьне"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:2
-msgid "Message:"
-msgstr "Паведамленьне:"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:3
-msgid "Save message"
-msgstr "Захаваць паведамленьне"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:4
-msgid "Status:"
-msgstr "Стан:"
-
-#: ../libempathy-gtk/empathy-spell-dialog.c:88
-msgid "Word"
-msgstr "Слова"
-
-#: ../libempathy-gtk/empathy-spell-dialog.c:265
-msgid "Suggestions for the word"
-msgstr "Прапанаваныя словы"
-
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:1
-msgid "Spell Checker"
-msgstr "Праверка артаграфіі"
-
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:2
-msgid "Suggestions for the word:"
-msgstr "Прапанаваныя словы:"
-
-#: ../libempathy-gtk/empathy-theme-boxes.c:745
-#: ../libempathy-gtk/empathy-theme-irc.c:293
-msgid "%A %d %B %Y"
-msgstr "%A %d %B %Y"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:73
+#: ../libempathy-gtk/empathy-sound.c:51
+#| msgid "Send and receive instant messages"
+msgid "Received an instant message"
+msgstr "Атрымана імгненнае паведамленьне"
+
+#: ../libempathy-gtk/empathy-sound.c:53
+#| msgid "Send and receive instant messages"
+msgid "Sent an instant message"
+msgstr "Імгненнае паведамленьне даслана"
+
+#: ../libempathy-gtk/empathy-sound.c:55
+#| msgid "Incoming call from %s"
+msgid "Incoming chat request"
+msgstr "Уваходны запыт на чат"
+
+#: ../libempathy-gtk/empathy-sound.c:57
+#| msgid "Connected"
+msgid "Contact connected"
+msgstr "Кантакт далучаны"
+
+#: ../libempathy-gtk/empathy-sound.c:59
+#| msgid "Disconnected"
+msgid "Contact disconnected"
+msgstr "Кантакт адлучаны"
+
+#: ../libempathy-gtk/empathy-sound.c:61
+#| msgid "Connected"
+msgid "Connected to server"
+msgstr "Далучаны да сэрвэра"
+
+#: ../libempathy-gtk/empathy-sound.c:63
+#| msgid "Disconnected"
+msgid "Disconnected from server"
+msgstr "Адлучаны ад сэрвэра"
+
+#: ../libempathy-gtk/empathy-sound.c:65
+#| msgid "Incoming call"
+msgid "Incoming voice call"
+msgstr "Уваходны галасавы выклік"
+
+#: ../libempathy-gtk/empathy-sound.c:67
+msgid "Outgoing voice call"
+msgstr "Выходны галасавы выклік"
+
+#: ../libempathy-gtk/empathy-sound.c:69
+msgid "Voice call ended"
+msgstr "Галасавы выклік скончыўся"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
+#| msgid "Custom message"
+msgid "Enter Custom Message"
+msgstr "Увядзіце адмысловае паведамленьне"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
+#| msgid "Custom message"
+msgid "Edit Custom Messages"
+msgstr "Рэдагаваць адмысловыя паведамленьні"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+msgid "Add _New Preset"
+msgstr "Дадаць _новыя настаўленьні"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
+#| msgid "Save message"
+msgid "Saved Presets"
+msgstr "Захаваць настаўленьні"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:3
+msgid "gtk-add"
+msgstr "gtk-add"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:4
+msgid "gtk-remove"
+msgstr "gtk-remove"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:67
 msgid "Classic"
 msgstr "Клясычны"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:74
+#: ../libempathy-gtk/empathy-theme-manager.c:68
 msgid "Simple"
 msgstr "Просты"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:75
+#: ../libempathy-gtk/empathy-theme-manager.c:69
 msgid "Clean"
 msgstr "Чысты"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:76
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Blue"
 msgstr "Блакітны"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1330
+#: ../libempathy-gtk/empathy-ui-utils.c:1382
 msgid "Unable to open URI"
 msgstr "Немагчыма адкрыць URI"
 
+#: ../libempathy-gtk/empathy-ui-utils.c:1472
+#| msgid "Select"
+msgid "Select a file"
+msgstr "Вылучыце файл"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1530
+msgid "Select a destination"
+msgstr "Вылучыце прызначэньне"
+
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
 msgstr "Дзейная лякальнасьць"
@@ -1035,17 +1641,19 @@ msgstr "Віетнамскі"
 msgid ""
 "The contact to display in the applet. Empty means no contact is displayed."
 msgstr ""
+"Кантакт, які адлюстроўваць у аплеце. „Empty” азначае, што кантакт не "
+"адлюстроўваецца."
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:2
 msgid "The contact's avatar token. Empty means contact has no avatar."
-msgstr ""
+msgstr "Аватар кантакта. „Empty” азначае што няма аватару."
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:1
 msgid "Megaphone"
 msgstr "Мэгафон"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:417
+#: ../megaphone/src/megaphone-applet.c:519
 msgid "Talk!"
 msgstr "Размаўляй!"
 
@@ -1059,15 +1667,15 @@ msgid "_Information"
 msgstr "_Інфармацыя"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.glade.h:15
+#: ../src/empathy-main-window.ui.h:23
 msgid "_Preferences"
 msgstr "_Перавагі"
 
-#: ../megaphone/src/megaphone-applet.c:255
+#: ../megaphone/src/megaphone-applet.c:168
 msgid "Please configure a contact."
 msgstr "Калі ласка, сканфігуруйце кантакт."
 
-#: ../megaphone/src/megaphone-applet.c:348
+#: ../megaphone/src/megaphone-applet.c:258
 msgid "Select contact..."
 msgstr "Абраць кантакт..."
 
@@ -1078,80 +1686,89 @@ msgstr "Прысутнасьць"
 #: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:2
 #: ../nothere/src/nothere-applet.c:106
 msgid "Set your own presence"
-msgstr ""
+msgstr "Задаць уласнае паведамленьне"
 
-#: ../src/empathy.c:380
+#: ../src/empathy.c:506
 msgid "Don't connect on startup"
 msgstr "Не злучацца падчас стартаваньня"
 
-#: ../src/empathy.c:384
+#: ../src/empathy.c:510
 msgid "Don't show the contact list on startup"
 msgstr "Не паказваць сьпіс кантактаў падчас стартаваньня"
 
-#: ../src/empathy.c:388
+#: ../src/empathy.c:514
 msgid "Show the accounts dialog"
 msgstr "Паказваць дыялёгі рахункаў"
 
-#: ../src/empathy.c:400
+#: ../src/empathy.c:526
 msgid "- Empathy Instant Messenger"
 msgstr "- Абмен паведамленьнямі Empathy"
 
-#: ../src/empathy-about-dialog.c:84
+#: ../src/empathy-about-dialog.c:83
 msgid ""
 "Empathy is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU General Public License as published by the Free Software "
 "Foundation; either version 2 of the License, or (at your option) any later "
 "version."
-msgstr "Empathy зьяўляецца свабоднай праграмай, якую можна распаўсюджваць і мадыфікаваць згодна з умовамі GNU General Public License, апублікаванай Free "
+msgstr ""
+"Empathy зьяўляецца свабоднай праграмай, якую можна распаўсюджваць і "
+"мадыфікаваць згодна з умовамі GNU General Public License, апублікаванай Free "
 "Software Foundation у вэрсіі 2 альбо любой пазьнейшай."
-""
 
-#: ../src/empathy-about-dialog.c:88
+#: ../src/empathy-about-dialog.c:87
 msgid ""
 "Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
 "FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
 "details."
 msgstr ""
+"Empathy распаўсюджваецца з надзеяй, што ён будзе карысны, але  БЕЗЬ НІЯКІХ "
+"ГАРАНТЫЯЎ; нават, без намёкаў гарантыі прадукта ці прдатнасьці для "
+"практычнага выкарыстоўваньня.  За падрабязнасьцямі зьвяртайцеся да GNU "
+"General Public License."
 
-#: ../src/empathy-about-dialog.c:92
+#: ../src/empathy-about-dialog.c:91
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-130159 USA"
-msgstr "Калі вы не атрымалі копію Ўсеагульнай Грамадзкай Ліцэнзіі GNU разам з Empathy, дашліце ліст да Free Software Foundation, Inc., на адрас: 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
+msgstr ""
+"Калі вы не атрымалі копію Ўсеагульнай Грамадзкай Ліцэнзіі GNU разам з "
+"Empathy, дашліце ліст да Free Software Foundation, Inc., на адрас: 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:120
+#: ../src/empathy-about-dialog.c:119
 msgid "An Instant Messaging client for GNOME"
 msgstr "Кліент абмену паведамленьнямі для GNOME"
 
-#: ../src/empathy-about-dialog.c:126
+#: ../src/empathy-about-dialog.c:125
 msgid "translator-credits"
 msgstr "insomnia <defragbrain@gmail.com>"
 
-#: ../src/empathy-accounts-dialog.c:389
+#: ../src/empathy-accounts-dialog.c:392
 msgid "Enabled"
 msgstr "Уключаны"
 
-#: ../src/empathy-accounts-dialog.c:399
-#: ../src/empathy-accounts-dialog.glade.h:4
+#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1
 msgid "Accounts"
 msgstr "Рахункі"
 
 #. To translator: %s is the protocol name
-#: ../src/empathy-accounts-dialog.c:862
+#: ../src/empathy-accounts-dialog.c:837
 #, c-format
 msgid "New %s account"
 msgstr "Новы рахунак %s"
 
-#: ../src/empathy-accounts-dialog.c:972
+#: ../src/empathy-accounts-dialog.c:950
 #, c-format
 msgid ""
 "You are about to remove your %s account!\n"
 "Are you sure you want to proceed?"
 msgstr ""
+"Вы збіраецесь выдаліць ваш %s рахунак!\n"
+"Вы насамрэч жадаеце выдаліць яго?"
 
-#: ../src/empathy-accounts-dialog.c:978
+#: ../src/empathy-accounts-dialog.c:956
 msgid ""
 "Any associated conversations and chat rooms will NOT be removed if you "
 "decide to proceed.\n"
@@ -1159,598 +1776,1161 @@ msgid ""
 "Should you decide to add the account back at a later time, they will still "
 "be available."
 msgstr ""
+"Усе зьвязаныя размовы і пакоі *ня будуць* выдалены, калі вы вырашыце "
+"выдаліць рахунак.\n"
+"\n"
+"Калі вы вырашыце дадаць рахунак калі-небудзь потым, яны будуць даступныя."
 
-#: ../src/empathy-accounts-dialog.glade.h:1
-msgid "<b>New Account</b>"
-msgstr "<b>Новы рахунак</b>"
-
-#: ../src/empathy-accounts-dialog.glade.h:2
-msgid "<b>No protocol installed</b>"
-msgstr "<b>Не ўсталяваны пратакол</b>"
-
-#: ../src/empathy-accounts-dialog.glade.h:3
-msgid "<b>Settings</b>"
-msgstr "<b>Налады</b>"
+#: ../src/empathy-accounts-dialog.ui.h:2
+#| msgid "Account"
+msgid "Add Account"
+msgstr "Дадаць рахунак"
 
-#: ../src/empathy-accounts-dialog.glade.h:5
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "Cr_eate"
 msgstr "_Стварыць"
 
-#: ../src/empathy-accounts-dialog.glade.h:6
-msgid "I already have an account I want to use"
-msgstr "У мяне ўжо ёсьць рахунак, якім я жадаю карыстацца"
+#: ../src/empathy-accounts-dialog.ui.h:4
+#| msgid "Email:"
+msgid "Gmail"
+msgstr "Gmail"
+
+#: ../src/empathy-accounts-dialog.ui.h:5
+#| msgid "Accounts"
+msgid "Import Accounts..."
+msgstr "Імпарт рахункаў…"
 
-#: ../src/empathy-accounts-dialog.glade.h:7
+#: ../src/empathy-accounts-dialog.ui.h:6
+#| msgid "<b>No protocol installed</b>"
+msgid "No protocol installed"
+msgstr "Пратакол не ўсталяваны"
+
+#: ../src/empathy-accounts-dialog.ui.h:7
+#| msgid "<b>Settings</b>"
+msgid "Settings"
+msgstr "Настаўленьні"
+
+#: ../src/empathy-accounts-dialog.ui.h:8
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
-msgstr "Каб дадаць новы рахунак, вы спачатку павінны ўсталяваць выхадны буфэр для кожнага рахунку, якім вы жадаеце карыстацца."
+msgstr ""
+"Каб дадаць новы рахунак, вы спачатку павінны ўсталяваць выхадны буфэр для "
+"кожнага рахунку, якім вы жадаеце карыстацца."
 
-#: ../src/empathy-accounts-dialog.glade.h:8
+#: ../src/empathy-accounts-dialog.ui.h:9
 msgid "Type:"
 msgstr "Тып:"
 
-#: ../src/empathy-call-window.c:142
-msgid "Closed"
-msgstr "Закрыты"
-
-#: ../src/empathy-call-window.c:254
-msgid "End this call?"
-msgstr "Скончыць гэты званок?"
-
-#: ../src/empathy-call-window.c:256
-msgid "Closing this window will end the call in progress."
-msgstr "Закрыцьцё гэтага акна скончыць дзейную размову."
-
-#: ../src/empathy-call-window.c:257
-msgid "_End Call"
-msgstr "_Скончыць званок"
-
-#: ../src/empathy-call-window.c:311
-msgid "Incoming call"
-msgstr "Уваходны званок"
-
-#: ../src/empathy-call-window.c:313
+#: ../src/empathy-accounts-dialog.ui.h:10
+#| msgid "_Add Contact..."
+msgid "_Add..."
+msgstr "_Дадаць…"
+
+#: ../src/empathy-accounts-dialog.ui.h:11
+#| msgid "Create a new IRC network"
+msgid "_Create a new account"
+msgstr "_Стварыць новы рахунак"
+
+#: ../src/empathy-accounts-dialog.ui.h:12
+#| msgid "Show and edit accounts"
+msgid "_Reuse an existing account"
+msgstr "_Ужыць існы рахунак"
+
+#: ../src/empathy-call-window.c:420
+#| msgid "Contact"
+msgid "Contrast"
+msgstr "Кантраст"
+
+#: ../src/empathy-call-window.c:423
+msgid "Brightness"
+msgstr "Зыркасьць"
+
+#: ../src/empathy-call-window.c:426
+msgid "Gamma"
+msgstr "Гама"
+
+#: ../src/empathy-call-window.c:531
+#| msgid "<b>Volume</b>"
+msgid "Volume"
+msgstr "Гучнасьць"
+
+#: ../src/empathy-call-window.c:662
+#| msgid "Connecting"
+msgid "Connecting..."
+msgstr "Далучэньне…"
+
+#: ../src/empathy-call-window.c:746
+msgid "_Sidebar"
+msgstr "Бакав_іна"
+
+#: ../src/empathy-call-window.c:765
+msgid "Dialpad"
+msgstr "Панэль набору"
+
+#: ../src/empathy-call-window.c:771
+msgid "Audio input"
+msgstr "Аўдыё-выхад"
+
+#: ../src/empathy-call-window.c:775
+msgid "Video input"
+msgstr "Відэа-выхад"
+
+#: ../src/empathy-call-window.c:835
 #, c-format
-msgid "%s is calling you, do you want to answer?"
-msgstr "%s·звоніць вам. Будзеце адказваць?"
-
-#: ../src/empathy-call-window.c:319
-msgid "_Reject"
-msgstr "_Скінуць"
-
-#: ../src/empathy-call-window.c:324
-msgid "_Answer"
-msgstr "_Адказ"
-
-#: ../src/empathy-call-window.c:379
-msgid "Empathy Call"
-msgstr "Званок Empathy"
+msgid "Call with %s"
+msgstr "Размова з %s"
 
-#. To translators: Readying is the first state of the call, it is
-#. * preparing the connection and it does not yet ring.
-#: ../src/empathy-call-window.c:382
-msgid "Readying"
-msgstr "Падрыхтоўка"
+#: ../src/empathy-call-window.c:904
+#| msgid "_Call"
+msgid "Call"
+msgstr "Размова"
 
-#: ../src/empathy-call-window.c:391
+#. Translators: number of minutes:seconds the caller has been connected
+#: ../src/empathy-call-window.c:1335
 #, c-format
-msgid "%s - Empathy Call"
-msgstr "%s - Званок Empathy"
-
-#: ../src/empathy-call-window.c:395
-msgid "Ringing"
-msgstr "Зьвініць"
+msgid "Connected — %d:%02dm"
+msgstr "Працягласьць выкліку %d:%02d хв."
 
-#: ../src/empathy-call-window.c:408
-msgid "Connecting"
-msgstr "Спалучэньне"
-
-#: ../src/empathy-call-window.c:524
-#, c-format
-msgid "Incoming call from %s rejected because there is already a running call."
-msgstr "Уваходны званок ад %s скінуты, бо ўжо дзейнічае іншая размова."
+#: ../src/empathy-call-window.ui.h:1
+#| msgid "Hang Up"
+msgid "Hang up"
+msgstr "Скончыць размову"
 
-#: ../src/empathy-call-window.glade.h:1
-msgid "#"
-msgstr "#"
+#: ../src/empathy-call-window.ui.h:2
+msgid "Redial"
+msgstr "Паўтарыць спробу"
 
-#: ../src/empathy-call-window.glade.h:2
-msgid "*"
-msgstr "*"
+#: ../src/empathy-call-window.ui.h:3
+#| msgid "Send Video"
+msgid "Send Audio"
+msgstr "Даслаць аўдыЁ"
 
-#: ../src/empathy-call-window.glade.h:3
-msgid "0"
-msgstr "0"
+#: ../src/empathy-call-window.ui.h:4
+#| msgid "Send Video"
+msgid "Send video"
+msgstr "Даслаць відэа"
 
-#: ../src/empathy-call-window.glade.h:4
-msgid "1"
-msgstr "1"
+#: ../src/empathy-call-window.ui.h:5
+msgid "Video preview"
+msgstr "Прыклад відэа"
 
-#: ../src/empathy-call-window.glade.h:5
-msgid "2"
-msgstr "2"
+#: ../src/empathy-call-window.ui.h:6
+msgid "_Call"
+msgstr "_Званок"
 
-#: ../src/empathy-call-window.glade.h:6
-msgid "3"
-msgstr "3"
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
+msgid "_View"
+msgstr "_Выгляд"
 
-#: ../src/empathy-call-window.glade.h:7
-msgid "4"
-msgstr "4"
+#: ../src/empathy-chat-window.c:344
+#, c-format
+msgid "Conversations (%d)"
+msgstr "Размовы (%d)"
 
-#: ../src/empathy-call-window.glade.h:8
-msgid "5"
-msgstr "5"
+#: ../src/empathy-chat-window.c:476
+msgid "Typing a message."
+msgstr "Набор паведамленьня."
 
-#: ../src/empathy-call-window.glade.h:9
-msgid "6"
-msgstr "6"
+#: ../src/empathy-chatrooms-window.c:258
+msgid "Name"
+msgstr "Імя"
 
-#: ../src/empathy-call-window.glade.h:10
-msgid "7"
-msgstr "7"
+#: ../src/empathy-chatrooms-window.c:276
+msgid "Room"
+msgstr "Пакой"
 
-#: ../src/empathy-call-window.glade.h:11
-msgid "8"
-msgstr "8"
+#: ../src/empathy-chatrooms-window.c:285
+msgid "Auto-Connect"
+msgstr "Аўта-злучэньне"
 
-#: ../src/empathy-call-window.glade.h:12
-msgid "9"
-msgstr "9"
+#: ../src/empathy-chatrooms-window.ui.h:2
+msgid "Manage Favorite Rooms"
+msgstr "Кіраваць улюбёнымі пакоямі"
 
-#. To translators: The keypad is numbers [0-9], asterisk (*) and hash (#). Presented like on any phone
-#: ../src/empathy-call-window.glade.h:14
-msgid "<b>Keypad</b>"
-msgstr "<b>Клявіятура</b>"
+#: ../src/empathy-event-manager.c:321
+msgid "Incoming call"
+msgstr "Уваходны званок"
 
-#: ../src/empathy-call-window.glade.h:15
-msgid "<b>Volume</b>"
-msgstr "<b>Гучнасьць</b>"
+#: ../src/empathy-event-manager.c:324
+#, c-format
+msgid "%s is calling you, do you want to answer?"
+msgstr "%s·звоніць вам. Будзеце адказваць?"
 
-#: ../src/empathy-call-window.glade.h:16
-msgid "Hang Up"
-msgstr "Скончыць размову"
+#: ../src/empathy-event-manager.c:331
+msgid "_Reject"
+msgstr "_Скінуць"
 
-#: ../src/empathy-call-window.glade.h:17
-msgid "Send Video"
-msgstr "Даслаць відэа"
+#: ../src/empathy-event-manager.c:337
+msgid "_Answer"
+msgstr "_Адказ"
 
-#: ../src/empathy-chat-window.c:326
+#: ../src/empathy-event-manager.c:452
 #, c-format
-msgid "Conversations (%d)"
-msgstr "Размовы (%d)"
+msgid "Incoming call from %s"
+msgstr "Уваходны званок ад %s"
 
-#: ../src/empathy-chat-window.c:418
-msgid "Topic:"
-msgstr "Тэма:"
+#: ../src/empathy-event-manager.c:496
+#, c-format
+msgid "%s is offering you an invitation"
+msgstr "%s запрашае вас"
 
-#: ../src/empathy-chat-window.c:421
-msgid "Typing a message."
-msgstr "Набор паведамленьня."
+#: ../src/empathy-event-manager.c:502
+msgid "An external application will be started to handle it."
+msgstr "Вонкавае дастасаваньне будзе запушчана каб працаваць зь ім."
 
-#: ../src/empathy-chat-window.glade.h:1
-msgid "C_lear"
-msgstr "_Ачысціць"
+#: ../src/empathy-event-manager.c:507
+msgid "You don't have the needed external application to handle it."
+msgstr "Вам не спатрэбіцца вонкавае дастасаваньне каб працаваць зь ім."
 
-#: ../src/empathy-chat-window.glade.h:2
-msgid "Chat"
-msgstr "Размова"
+#: ../src/empathy-event-manager.c:634
+#| msgid "Romanian"
+msgid "Room invitation"
+msgstr "Запрашэньне ў пакой"
 
-#: ../src/empathy-chat-window.glade.h:3
-msgid "Insert _Smiley"
-msgstr "Дадаць _смайл"
+#: ../src/empathy-event-manager.c:637
+#, c-format
+msgid "%s is inviting you to join %s"
+msgstr "%s запрашае вас далучыцца да %s"
 
-#: ../src/empathy-chat-window.glade.h:4
-msgid "Invitation _message:"
-msgstr "Паведамленьне _запрашэньня:"
+#: ../src/empathy-event-manager.c:645
+msgid "_Decline"
+msgstr "Ад_мовіць"
 
-#: ../src/empathy-chat-window.glade.h:5
-msgid "Invite"
-msgstr "Запрасіць"
+#: ../src/empathy-event-manager.c:650
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#| msgid "Join"
+msgid "_Join"
+msgstr "Да_лучыцца"
 
-#: ../src/empathy-chat-window.glade.h:6
-msgid "Move Tab _Left"
-msgstr "Перанесьці закладку _ўлева"
+#: ../src/empathy-event-manager.c:689
+#, c-format
+msgid "%s invited you to join %s"
+msgstr "%s запрасіў вас увайсьці ў %s"
 
-#: ../src/empathy-chat-window.glade.h:7
-msgid "Move Tab _Right"
-msgstr "Перанесьці закладку _ўправа"
+#: ../src/empathy-event-manager.c:715
+#, c-format
+#| msgid "Incoming call from %s"
+msgid "Incoming file transfer from %s"
+msgstr "Уваходны перадача файла ад %s"
 
-#: ../src/empathy-chat-window.glade.h:8
-msgid "Select who would you like to invite:"
-msgstr "Абраць тых, каго жадаеце запрасіць:"
+#: ../src/empathy-event-manager.c:895
+#, c-format
+msgid "Subscription requested by %s"
+msgstr "Патрабаваньне падпіскі ад %s"
 
-#: ../src/empathy-chat-window.glade.h:9
-msgid "You have been invited to join a chat conference."
-msgstr "Вас запрасілі паўдзельнічаць у канфэрэнцыі."
+#: ../src/empathy-event-manager.c:899
+#, c-format
+msgid ""
+"\n"
+"Message: %s"
+msgstr ""
+"\n"
+"Паведамленьне: %s"
 
-#: ../src/empathy-chat-window.glade.h:10
-msgid "_Contact"
-msgstr "_Кантакт"
+#. someone is logging off
+#: ../src/empathy-event-manager.c:935
+#, c-format
+msgid "%s is now offline."
+msgstr "%s зараз адлучаны."
 
-#: ../src/empathy-chat-window.glade.h:11 ../src/empathy-main-window.glade.h:10
-msgid "_Contents"
-msgstr "_Змест"
+#. someone is logging in
+#: ../src/empathy-event-manager.c:951
+#, c-format
+msgid "%s is now online."
+msgstr "%s зараз далучаны."
 
-#: ../src/empathy-chat-window.glade.h:12
-msgid "_Conversation"
-msgstr "_Размова"
+#. Translators: time left, when it is more than one hour
+#: ../src/empathy-ft-manager.c:101
+#, c-format
+msgid "%u:%02u.%02u"
+msgstr "%u:%02u.%02u"
 
-#: ../src/empathy-chat-window.glade.h:13
-msgid "_Detach Tab"
-msgstr "_Адлучыць укладку"
+#. Translators: time left, when is is less than one hour
+#: ../src/empathy-ft-manager.c:104
+#, c-format
+msgid "%02u.%02u"
+msgstr "%02u.%02u"
 
-#: ../src/empathy-chat-window.glade.h:15
-msgid "_Favorite Chatroom"
-msgstr "_Абраны пакой"
+#: ../src/empathy-ft-manager.c:180
+#| msgid "unknown"
+msgctxt "file transfer percent"
+msgid "Unknown"
+msgstr "Невядома"
 
-#: ../src/empathy-chat-window.glade.h:16 ../src/empathy-main-window.glade.h:12
-msgid "_Help"
-msgstr "_Даведка"
+#: ../src/empathy-ft-manager.c:275
+#, c-format
+msgid "%s of %s at %s/s"
+msgstr "%s з %s, хуткасьць %s/s"
 
-#: ../src/empathy-chat-window.glade.h:17
-msgid "_Next Tab"
-msgstr "Наступная закладка"
+#: ../src/empathy-ft-manager.c:276
+#, c-format
+msgid "%s of %s"
+msgstr "%s p %s"
 
-#: ../src/empathy-chat-window.glade.h:18
-msgid "_Previous Tab"
-msgstr "_Папярэдняя закладка"
+#. translators: first %s is filename, second %s is the contact name
+#: ../src/empathy-ft-manager.c:307
+#, c-format
+#| msgid "Incoming call from %s"
+msgid "Receiving \"%s\" from %s"
+msgstr "Атрыманьне „%s” ад %s"
 
-#: ../src/empathy-chat-window.glade.h:19
-msgid "_Tabs"
-msgstr "_Укладкі"
+#. translators: first %s is filename, second %s is the contact name
+#: ../src/empathy-ft-manager.c:310
+#, c-format
+msgid "Sending \"%s\" to %s"
+msgstr "Перадача „%s” %s"
 
-#: ../src/empathy-chatrooms-window.c:262
-msgid "Name"
-msgstr "Імя"
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:340
+#, c-format
+msgid "Error receiving \"%s\" from %s"
+msgstr "Памылка атрыманьня „%s” ад %s"
 
-#: ../src/empathy-chatrooms-window.c:280
-msgid "Room"
-msgstr "Пакой"
+#: ../src/empathy-ft-manager.c:343
+msgid "Error receiving a file"
+msgstr "Памылка атрыманьня файла"
 
-#: ../src/empathy-chatrooms-window.c:289
-msgid "Auto-Connect"
-msgstr "Аўта-злучэньне"
+#: ../src/empathy-ft-manager.c:348
+#, c-format
+#| msgid "Error sending message '%s': %s"
+msgid "Error sending \"%s\" to %s"
+msgstr "Памылка перадачы „%s” %s"
+
+#: ../src/empathy-ft-manager.c:351
+#| msgid "Error sending message '%s': %s"
+msgid "Error sending a file"
+msgstr "Памылка адпраўкі файла"
+
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:490
+#, c-format
+msgid "\"%s\" received from %s"
+msgstr "„%s” атрыманы ад %s"
 
-#: ../src/empathy-chatrooms-window.glade.h:2
-msgid "Edit Favorite Room"
-msgstr "Рэдагаваць улюбёны пакой"
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:495
+#, c-format
+#| msgid "Topic set to: %s"
+msgid "\"%s\" sent to %s"
+msgstr "„%s” дасланы %s"
 
-#: ../src/empathy-chatrooms-window.glade.h:3
-msgid "Join room on start_up"
-msgstr "Злучацца з пакоем падчас стартаваньня"
+#: ../src/empathy-ft-manager.c:498
+msgid "File transfer completed"
+msgstr "Перадача файла завершана"
 
-#: ../src/empathy-chatrooms-window.glade.h:4
-msgid "Join this chat room when Empathy starts and you are connected"
-msgstr "Злучыцца з гэтым пакоем пасьля спалучэньня"
+#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784
+msgid "Waiting for the other participant's response"
+msgstr "Чаканьне адказу іншага ўдзейльніка"
 
-#: ../src/empathy-chatrooms-window.glade.h:5
-msgid "Manage Favorite Rooms"
-msgstr "Кіраваць улюбёнымі пакоямі"
+#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
+#, c-format
+msgid "Checking integrity of \"%s\""
+msgstr "Праверка цэласнасьці „%s”"
 
-#: ../src/empathy-chatrooms-window.glade.h:6
-msgid "N_ame:"
-msgstr "_Імя:"
+#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684
+#, c-format
+msgid "Hashing \"%s\""
+msgstr "Стварэньне хэшу „%s”"
 
-#: ../src/empathy-chatrooms-window.glade.h:7
-msgid "S_erver:"
-msgstr "_Сэрвэр:"
+#: ../src/empathy-ft-manager.c:1024
+msgid "%"
+msgstr "%"
 
-#: ../src/empathy-chatrooms-window.glade.h:9
-#: ../src/empathy-new-chatroom-dialog.glade.h:9
-msgid "_Room:"
-msgstr "_Пакой:"
+#: ../src/empathy-ft-manager.c:1036
+#| msgid "All Files"
+msgid "File"
+msgstr "Файл"
 
-#: ../src/empathy-event-manager.c:166
-#, c-format
-msgid ""
-"New message from %s:\n"
-"%s"
-msgstr "Новае паведамленьне ад %s:\n"
-"%s"
+#: ../src/empathy-ft-manager.c:1058
+#| msgid "Ringing"
+msgid "Remaining"
+msgstr "Засталося"
 
-#: ../src/empathy-event-manager.c:205
-#, c-format
-msgid "Incoming call from %s"
-msgstr "Уваходны званок ад %s"
+#: ../src/empathy-ft-manager.ui.h:1
+msgid "File Transfers"
+msgstr "Перадачы файлаў"
 
-#: ../src/empathy-event-manager.c:238
-#, c-format
-msgid ""
-"%s is offering you an invitation, but you don't have the needed external "
-"application to handle it."
+#: ../src/empathy-ft-manager.ui.h:2
+msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr ""
+"Выдаляць завершаныя, скасаваныя і абарваныя перадачы файлаў з гэтага сьпісу"
 
-#: ../src/empathy-event-manager.c:263
-msgid "Invitation Error"
-msgstr "Памылка запрашэньня"
+#. Translators: this is the header of a treeview column
+#: ../src/empathy-import-dialog.c:263
+#| msgid "Port"
+msgid "Import"
+msgstr "Імпарт"
 
-#: ../src/empathy-event-manager.c:289
-#, c-format
-msgid ""
-"%s is offering you an invitation. An external application will be started to "
-"handle it."
-msgstr ""
+#: ../src/empathy-import-dialog.c:272
+msgid "Protocol"
+msgstr "Пратакол"
 
-#: ../src/empathy-event-manager.c:345
-#, c-format
-msgid "Subscription requested by %s"
-msgstr "Патрабаваньне падпіскі ад %s"
+#: ../src/empathy-import-dialog.c:298
+#| msgid "Reso_urce:"
+msgid "Source"
+msgstr "Крыніца"
 
-#: ../src/empathy-event-manager.c:348
-#, c-format
+#: ../src/empathy-import-dialog.c:392
 msgid ""
-"\n"
-"Message: %s"
-msgstr "\n"
-"Паведамленьне: %s"
-
-#: ../src/empathy-main-window.c:466
-msgid "Show and edit accounts"
-msgstr "Паказаць і рэдагаваць рахункі"
+"No accounts to import could be found. Empathy currently only supports "
+"importing accounts from Pidgin."
+msgstr ""
+"Немагчыма адшукаць рахункі для імпарту. Empathy покуль падтрымлівае імпарт "
+"толькі з Pidgin."
 
-#: ../src/empathy-main-window.c:838
-msgid "Contact"
-msgstr "Кантакт"
+#: ../src/empathy-import-dialog.ui.h:1
+#| msgid "Accounts"
+msgid "Import Accounts"
+msgstr "Імпарт рахункаў"
 
-#: ../src/empathy-main-window.c:1040
+#: ../src/empathy-main-window.c:402
 msgid "_Edit account"
 msgstr "_Рэдагаваць рахунак"
 
-#: ../src/empathy-main-window.c:1123
+#: ../src/empathy-main-window.c:505
 msgid "No error specified"
 msgstr "Няма вызначанай памылкі"
 
-#: ../src/empathy-main-window.c:1126
+#: ../src/empathy-main-window.c:508
 msgid "Network error"
 msgstr "Памылка сеціва"
 
-#: ../src/empathy-main-window.c:1129
+#: ../src/empathy-main-window.c:511
 msgid "Authentication failed"
 msgstr "Няўдалая аутэнтыфікацыя"
 
-#: ../src/empathy-main-window.c:1132
+#: ../src/empathy-main-window.c:514
 msgid "Encryption error"
 msgstr "Памылка шыфраваньня"
 
-#: ../src/empathy-main-window.c:1135
+#: ../src/empathy-main-window.c:517
 msgid "Name in use"
 msgstr "Імя ўжо выкарыстоўваецца"
 
-#: ../src/empathy-main-window.c:1138
+#: ../src/empathy-main-window.c:520
 msgid "Certificate not provided"
 msgstr "Сэртыфікат не пададзены"
 
-#: ../src/empathy-main-window.c:1141
+#: ../src/empathy-main-window.c:523
 msgid "Certificate untrusted"
 msgstr "Не правераны сэртыфікат"
 
-#: ../src/empathy-main-window.c:1144
+#: ../src/empathy-main-window.c:526
 msgid "Certificate expired"
 msgstr "Скончыўся тэрмін дзеяньня сэртыфікату"
 
-#: ../src/empathy-main-window.c:1147
+#: ../src/empathy-main-window.c:529
 msgid "Certificate not activated"
 msgstr "Сэртыфікат не актывізаваны"
 
-#: ../src/empathy-main-window.c:1150
+#: ../src/empathy-main-window.c:532
 msgid "Certificate hostname mismatch"
-msgstr ""
+msgstr "Назва вузла ў сэртыфікаце не супадае зь існай"
 
-#: ../src/empathy-main-window.c:1153
+#: ../src/empathy-main-window.c:535
 msgid "Certificate fingerprint mismatch"
 msgstr "Адбітак сэртыфікату не адпавядае"
 
-#: ../src/empathy-main-window.c:1156
+#: ../src/empathy-main-window.c:538
 msgid "Certificate self-signed"
-msgstr ""
+msgstr "Самападпісны сэртыфікат"
 
-#: ../src/empathy-main-window.c:1159
+#: ../src/empathy-main-window.c:541
 msgid "Certificate error"
 msgstr "Памылка сэртыфікату"
 
-#: ../src/empathy-main-window.c:1162
+#: ../src/empathy-main-window.c:544
 msgid "Unknown error"
 msgstr "Невядомая памылка"
 
-#: ../src/empathy-main-window.glade.h:1
+#: ../src/empathy-main-window.c:1293
+msgid "Show and edit accounts"
+msgstr "Паказаць і рэдагаваць рахункі"
+
+#: ../src/empathy-main-window.ui.h:1
 msgid "Contact List"
 msgstr "Сьпіс кантактаў"
 
-#: ../src/empathy-main-window.glade.h:2
+#: ../src/empathy-main-window.ui.h:2
+msgid "Contacts on a _Map"
+msgstr "Кантакты на _Мапе"
+
+#: ../src/empathy-main-window.ui.h:3
 msgid "Context"
 msgstr "Кантэкст"
 
-#: ../src/empathy-main-window.glade.h:3
+#: ../src/empathy-main-window.ui.h:4
 msgid "Join _Favorites"
 msgstr "Злучыцца з _улюбёнымі"
 
-#: ../src/empathy-main-window.glade.h:4
-msgid "Join _New..."
-msgstr "Злучыцца з _новым..."
-
-#: ../src/empathy-main-window.glade.h:5
+#: ../src/empathy-main-window.ui.h:5
 msgid "Manage Favorites"
 msgstr "Кіраваць улюбёнымі"
 
-#: ../src/empathy-main-window.glade.h:6
-msgid "Show _Offline Contacts"
-msgstr "Паказваць адключаныя кантакты"
+#: ../src/empathy-main-window.ui.h:6
+msgid "N_ormal Size"
+msgstr "Звы_чайны памер"
+
+#: ../src/empathy-main-window.ui.h:7
+msgid "Normal Size With _Avatars"
+msgstr "Звычайны памер з _аватарамі"
 
-#: ../src/empathy-main-window.glade.h:7
+#: ../src/empathy-main-window.ui.h:8
+#| msgid "Sort by _name"
+msgid "Sort by _Name"
+msgstr "Упарадкаваць паводле _імя"
+
+#: ../src/empathy-main-window.ui.h:9
+#| msgid "Sort by s_tate"
+msgid "Sort by _Status"
+msgstr "Упарадкаваць паводле _стану"
+
+#: ../src/empathy-main-window.ui.h:10
 msgid "_Accounts"
 msgstr "_Рахункі"
 
-#: ../src/empathy-main-window.glade.h:8
-msgid "_Add Contact..."
-msgstr "_Дадаць кантакт..."
+#: ../src/empathy-main-window.ui.h:13
+msgid "_Compact Size"
+msgstr "_Кампактны памер"
+
+#: ../src/empathy-main-window.ui.h:14
+msgid "_Contents"
+msgstr "_Змест"
+
+#: ../src/empathy-main-window.ui.h:15
+msgid "_Debug"
+msgstr "Ад_ладка"
 
-#: ../src/empathy-main-window.glade.h:13 ../src/empathy-status-icon.glade.h:2
+#: ../src/empathy-main-window.ui.h:17
+msgid "_File Transfers"
+msgstr "Перадачы _файлаў"
+
+#: ../src/empathy-main-window.ui.h:18
+msgid "_Help"
+msgstr "_Даведка"
+
+#: ../src/empathy-main-window.ui.h:19
+#| msgid "Join _New..."
+msgid "_Join..."
+msgstr "_Увайсьці…"
+
+#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2
 msgid "_New Conversation..."
-msgstr "_Новая размова..."
+msgstr "_Новая размова…"
+
+#: ../src/empathy-main-window.ui.h:21
+#| msgid "Show _Offline Contacts"
+msgid "_Offline Contacts"
+msgstr "Ад_лучаныя кантакты"
 
-#: ../src/empathy-main-window.glade.h:14
+#: ../src/empathy-main-window.ui.h:22
 msgid "_Personal Information"
 msgstr "_Асабістая інфармацыя"
 
-#: ../src/empathy-main-window.glade.h:16
+#: ../src/empathy-main-window.ui.h:24
+#| msgid "Previous Conversations"
+msgid "_Previous Conversations"
+msgstr "Раней_шыя размовы"
+
+#: ../src/empathy-main-window.ui.h:25
 msgid "_Room"
 msgstr "_Пакой"
 
-#: ../src/empathy-new-chatroom-dialog.c:290
-msgid "Chat Rooms"
-msgstr "Пакоі размовы"
+#: ../src/empathy-new-chatroom-dialog.c:331
+#| msgid "Chat Rooms"
+msgid "Chat Room"
+msgstr "Пакоі"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:2
-msgid "Browse:"
-msgstr "Агляд:"
+#: ../src/empathy-new-chatroom-dialog.c:347
+#| msgid "Themes"
+msgid "Members"
+msgstr "Удзельнікі"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:3
+#: ../src/empathy-new-chatroom-dialog.c:496
+#, c-format
+msgctxt ""
+"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
+"and a number."
+msgid ""
+"<b>%s</b>\n"
+"Invite required: %s\n"
+"Password required: %s\n"
+"Members: %s"
+msgstr ""
+"<b>%s</b>\n"
+"Патрабуецца запрашэньне: %s\n"
+"Патрабуецца пароль: %s\n"
+"Удзельнікі: %s"
+
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
+msgid "Yes"
+msgstr "Так"
+
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
+msgid "No"
+msgstr "Не"
+
+#: ../src/empathy-new-chatroom-dialog.c:526
+msgid "Could not start room listing"
+msgstr "Немагчыма пачаць агляд пакояў"
+
+#: ../src/empathy-new-chatroom-dialog.c:536
+msgid "Could not stop room listing"
+msgstr "Немагчыма спыніць агляд пакояў"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
+msgid "Couldn't load room list"
+msgstr "Немагчыма загрузіць сьпіс пакояў"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
 "Enter the room name to join here or click on one or more rooms in the list."
-msgstr "Каб увайсьці ў пакой, злучыцеся тут альбо клікніце ў адзін (ці болей) пакой у сьпісе."
+msgstr ""
+"Каб увайсьці ў пакой, злучыцеся тут альбо клікніце ў адзін (ці болей) пакой "
+"у сьпісе."
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:4
+#: ../src/empathy-new-chatroom-dialog.ui.h:4
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
-msgstr "Увайсьці на сэрвэр, на якім месьціцца пакой, альбо пакінуць пустым, калі пакой знаходзіцца на сэрвэры дзейнага рахунку"
+msgstr ""
+"Увайсьці на сэрвэр, на якім месьціцца пакой, альбо пакінуць пустым, калі "
+"пакой знаходзіцца на сэрвэры дзейнага рахунку"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:5
-msgid "Join"
-msgstr "Злучыць"
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
+#| msgid "Room"
+msgid "Join Room"
+msgstr "Увайсьці ў пако"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:6
-msgid "Join New"
-msgstr "Злучыць з новым"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#| msgid "_Room List locale:"
+msgid "Room List"
+msgstr "Сьпіс пакояў"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:7
-msgid "Re_fresh"
-msgstr "_Абнавіць"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "_Room:"
+msgstr "_Пакой:"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:8
-msgid ""
-"This list represents all chat rooms hosted on the server you have entered."
-msgstr "Сьпіс усіх пакояў месьціцца на сэрвэры, зь якім вы спалучыліся."
+#: ../src/empathy-preferences.c:147
+msgid "Message received"
+msgstr "Атрымана паведамленьне"
 
-#: ../src/empathy-preferences.c:264
-msgid "Language"
-msgstr "Мова"
+#: ../src/empathy-preferences.c:148
+#| msgid ""
+#| "\n"
+#| "Message: %s"
+msgid "Message sent"
+msgstr "Паведамленьне даслана"
 
-#: ../src/empathy-preferences.glade.h:1
-msgid "<b>Appearance</b>"
-msgstr "<b>Вонкавы выгляд</b>"
+#: ../src/empathy-preferences.c:149
+#| msgid "New Conversation"
+msgid "New conversation"
+msgstr "Новая размова"
+
+#: ../src/empathy-preferences.c:150
+msgid "Contact goes online"
+msgstr "Кантакт далучыўся"
 
-#. To translators: Audio notifications preferences
-#: ../src/empathy-preferences.glade.h:3
-msgid "<b>Audio</b>"
-msgstr "<b>Аўдыё</b>"
+#: ../src/empathy-preferences.c:151
+msgid "Contact goes offline"
+msgstr "Кантакт адлучыўся"
 
-#: ../src/empathy-preferences.glade.h:4
-msgid "<b>Behaviour</b>"
-msgstr "<b>Паводзіны</b>"
+#: ../src/empathy-preferences.c:152
+#| msgid "Disconnected"
+msgid "Account connected"
+msgstr "Рахунак далучаны"
 
-#: ../src/empathy-preferences.glade.h:5
-msgid "<b>Contact List</b>"
-msgstr "<b>Сьпіс кантактаў</b>"
+#: ../src/empathy-preferences.c:153
+#| msgid "Disconnected"
+msgid "Account disconnected"
+msgstr "Рахунак адлучаны"
 
-#: ../src/empathy-preferences.glade.h:6
-msgid "<b>Enable spell checking for languages:</b>"
-msgstr "<b>Правяраць артаграфію для гэтых моваў:</b>"
+#: ../src/empathy-preferences.c:393
+msgid "Language"
+msgstr "Мова"
 
-#. To translators: Visual notifications preferences, like notify bubbles, etc.
-#: ../src/empathy-preferences.glade.h:8
-msgid "<b>Visual</b>"
-msgstr "<b>Візуальнае</b>"
+#: ../src/empathy-preferences.ui.h:1
+msgid "Allow _GPS usage"
+msgstr "Дазволіць выкарыстаньне _GPS"
 
-#: ../src/empathy-preferences.glade.h:9
-msgid ""
-"<small>The list of languages reflects only the languages for which you have "
-"a dictionary installed.</small>"
-msgstr ""
+#: ../src/empathy-preferences.ui.h:2
+msgid "Allow _cellphone usage"
+msgstr "Дазвольіць выкарыстаньне _сотавай сувязі"
 
-#: ../src/empathy-preferences.glade.h:10
+#: ../src/empathy-preferences.ui.h:3
+msgid "Allow _network usage"
+msgstr "Дазволіць выкарыстаньне _сеткі"
+
+#: ../src/empathy-preferences.ui.h:4
+#| msgid "<b>Appearance</b>"
+msgid "Appearance"
+msgstr "<b>Вонкавы выгляд</b>"
+
+#: ../src/empathy-preferences.ui.h:5
 msgid "Automatically _connect on startup "
 msgstr "Аўтаматычна _злучацца падчас стартаваньня "
 
-#: ../src/empathy-preferences.glade.h:11
-msgid "Avatars are user chosen images shown in the contact list"
-msgstr "У сьпісе кантактаў паказаныя аватары, абраныя суразмоўцамі"
+#: ../src/empathy-preferences.ui.h:6
+#| msgid "<b>Behaviour</b>"
+msgid "Behavior"
+msgstr "Паводзіны"
 
-#: ../src/empathy-preferences.glade.h:12
+#: ../src/empathy-preferences.ui.h:7
 msgid "Chat Th_eme:"
 msgstr "_Тэма размовы:"
 
-#: ../src/empathy-preferences.glade.h:13
-msgid "Display notifications when contacts come _online"
-msgstr "Паказваць паведамленьні, калі кантакт зьяўляецца _анлайн"
-
-#: ../src/empathy-preferences.glade.h:14
-msgid "Enable sounds when _away"
-msgstr "Уключыць гукі, калі мяне _няма"
-
-#: ../src/empathy-preferences.glade.h:15
-msgid "Enable sounds when _busy"
-msgstr "Уключыць гукі, каля я _заняты"
-
-#: ../src/empathy-preferences.glade.h:16
+#: ../src/empathy-preferences.ui.h:8
+#| msgid "Display notifications when contacts come _online"
+msgid "Disable notifications when _away or busy"
+msgstr "Адключыць інфармаваньні, калі мяне н_яма ці заняты"
+
+#: ../src/empathy-preferences.ui.h:9
+#| msgid "Enable sounds when _away"
+msgid "Disable sounds when _away or busy"
+msgstr "Адключыць гукі, калі м_яне няма ці заняты"
+
+#: ../src/empathy-preferences.ui.h:10
+#| msgid "Display notifications when contacts come _online"
+msgid "Enable notifications when a contact comes online"
+msgstr "Паказваць інфармаваньні, калі кантакт далучаецца"
+
+#: ../src/empathy-preferences.ui.h:11
+#| msgid "Display notifications when contacts come _online"
+msgid "Enable notifications when a contact goes offline"
+msgstr "Паказваць інфармаваньні, калі кантакт адлучаецца"
+
+#: ../src/empathy-preferences.ui.h:12
+#| msgid "Display notifications when contacts come _online"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Паказваць інфармаваньні, калі вакно _размоў ня мае фокусу"
+
+#: ../src/empathy-preferences.ui.h:13
+#| msgid "<b>Enable spell checking for languages:</b>"
+msgid "Enable spell checking for languages:"
+msgstr "Спраўджваць правапіс для гэтых моў:"
+
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "Агульнае"
 
-#: ../src/empathy-preferences.glade.h:17
+#: ../src/empathy-preferences.ui.h:15
+msgid "Geoclue Settings"
+msgstr "Настаўленьні знаходжаньня"
+
+#: ../src/empathy-preferences.ui.h:16
+#| msgid "Notifications"
+msgid "Location"
+msgstr "Знаходжаньне"
+
+#: ../src/empathy-preferences.ui.h:17
 msgid "Notifications"
 msgstr "Паведамленьні"
 
-#: ../src/empathy-preferences.glade.h:18
+#: ../src/empathy-preferences.ui.h:18
+msgid "Play sound for events"
+msgstr "Агучваць падзеі"
+
+#: ../src/empathy-preferences.ui.h:19
 msgid "Preferences"
 msgstr "Перавагі"
 
-#: ../src/empathy-preferences.glade.h:19
-msgid "Show _avatars"
-msgstr "Паказаць _аватары"
+#: ../src/empathy-preferences.ui.h:20
+msgid "Privacy"
+msgstr "Адасобленасьць"
+
+#: ../src/empathy-preferences.ui.h:21
+msgid ""
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will have a random "
+"value added (&#xB1;0.25&#xB0;)."
+msgstr ""
+"Паменшаная дакладнасьць знаходжаньня азначае, што нічога дакладней за ваш "
+"горад, штат ці краіну ня будзе вядома. Да каардынат GPS будзе дададзена "
+"выпадковае значэньне (&#xB1;0.25&#xB0;)."
 
-#: ../src/empathy-preferences.glade.h:20
+#: ../src/empathy-preferences.ui.h:22
 msgid "Show _smileys as images"
 msgstr "Паказваць смайлы як малюнкі"
 
-#: ../src/empathy-preferences.glade.h:21
-msgid "Show co_mpact contact list"
-msgstr "Паказаць сьціслы сьпіс кантактаў"
-
-#: ../src/empathy-preferences.glade.h:22
-msgid "Sort by _name"
-msgstr "Парадкаваць паводле _назваў"
+#: ../src/empathy-preferences.ui.h:23
+#| msgid "_Show Contact List"
+msgid "Show contact _list in rooms"
+msgstr "_Паказаць сьпіс кантактаў ў пакоях"
 
-#: ../src/empathy-preferences.glade.h:23
-msgid "Sort by s_tate"
-msgstr "Парадкаваць паводле _стану"
+#: ../src/empathy-preferences.ui.h:24
+msgid "Sounds"
+msgstr "Гукі"
 
-#: ../src/empathy-preferences.glade.h:24
+#: ../src/empathy-preferences.ui.h:25
 msgid "Spell Checking"
 msgstr "Праверка артаграфіі"
 
-#: ../src/empathy-preferences.glade.h:25
+#: ../src/empathy-preferences.ui.h:26
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"Сьпіс моў адлюстроўвае толькі мовы, для якіх вы маеце ўсталяваныя слоўнікі."
+
+#: ../src/empathy-preferences.ui.h:27
 msgid "Themes"
 msgstr "Тэмы"
 
-#: ../src/empathy-preferences.glade.h:26
+#: ../src/empathy-preferences.ui.h:28
+msgid "_Enable bubble notifications"
+msgstr "_Уключыць раптоўныя інфармаваньні"
+
+#: ../src/empathy-preferences.ui.h:29
+#| msgid "Enable sound when away"
+msgid "_Enable sound notifications"
+msgstr "_Агучваць інфармаваньні"
+
+#: ../src/empathy-preferences.ui.h:30
 msgid "_Open new chats in separate windows"
 msgstr "_Адкрываць новую размову ў асобным акне"
 
-#: ../src/empathy-preferences.glade.h:27
-msgid "_Play sound when messages arrive"
-msgstr "_Граць гукі падчас атрыманьня паведамленьня"
+#: ../src/empathy-preferences.ui.h:31
+msgid "_Publish location to my contacts"
+msgstr "_Паведамльяць аб знаходжаньні маім кантактам"
+
+#: ../src/empathy-preferences.ui.h:32
+msgid "_Reduce location accuracy"
+msgstr "Па_меншыць дакладнасьць знаходжаньня"
 
-#: ../src/empathy-status-icon.glade.h:1
+#: ../src/empathy-status-icon.ui.h:1
 msgid "Status"
 msgstr "Стан"
 
-#: ../src/empathy-status-icon.glade.h:3
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_Quit"
 msgstr "_Выйсьці"
 
-#: ../src/empathy-status-icon.glade.h:4
+#: ../src/empathy-status-icon.ui.h:4
 msgid "_Show Contact List"
 msgstr "_Паказаць сьпіс кантактаў"
 
+#: ../src/empathy-tube-dispatch.c:375
+#, c-format
+msgid "Unable to start application for service %s: %s"
+msgstr "Немагчыма запусьціць дастасаваньне для службы %s: %s"
+
+#: ../src/empathy-tube-dispatch.c:446
+#, c-format
+msgid ""
+"An invitation was offered for service %s, but you don't have the needed "
+"application to handle it"
+msgstr ""
+"Атрымана запрашэньне для службы %s, але вы ня маеце дастасаваньня, каб "
+"працаваць зь ёй."
+
+#: ../src/empathy-call-window-fullscreen.ui.h:1
+msgid "gtk-leave-fullscreen"
+msgstr "gtk-leave-fullscreen"
+
+#: ../src/empathy-map-view.ui.h:1
+#| msgid "Contact List"
+msgid "Contact Map View"
+msgstr "Мапа кантактаў"
+
+#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
+msgid "Error"
+msgstr "Памылка"
+
+#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
+#| msgid "Croatian"
+msgid "Critical"
+msgstr "Крытычна"
+
+#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
+msgid "Warning"
+msgstr "Папярэджаньне"
+
+#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065
+#: ../src/empathy-debug-dialog.c:1113
+#| msgid "Message:"
+msgid "Message"
+msgstr "Паведамленьне"
+
+#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059
+msgid "Info"
+msgstr "Інфармаваньне"
+
+#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053
+msgid "Debug"
+msgstr "Адладка"
+
+#: ../src/empathy-debug-dialog.c:845
+#| msgid "Server"
+msgid "Save"
+msgstr "Захаваць"
+
+#: ../src/empathy-debug-dialog.c:948
+msgid "Debug Window"
+msgstr "Вакно адладкі"
+
+#: ../src/empathy-debug-dialog.c:1021
+msgid "Pause"
+msgstr "Паўза"
+
+#: ../src/empathy-debug-dialog.c:1033
+msgid "Level "
+msgstr "Узровень"
+
+#: ../src/empathy-debug-dialog.c:1102
+#| msgid "Simple"
+msgid "Time"
+msgstr "Час"
+
+#: ../src/empathy-debug-dialog.c:1104
+#| msgid "Romanian"
+msgid "Domain"
+msgstr "Дамэн"
+
+#: ../src/empathy-debug-dialog.c:1106
+msgid "Category"
+msgstr "Катэгорыя"
+
+#: ../src/empathy-debug-dialog.c:1108
+msgid "Level"
+msgstr "Узровень"
+
+#: ../src/empathy-debug-dialog.c:1140
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr ""
+"Вылучаны кіраўнік далучэньня не падтрымлівае пашырэньне аддаленае адладкі."
+
+#~ msgid "Enable popup when contact is available"
+#~ msgstr "Уключыць выплыўное нагадваньне, калі кантакт даступны"
+
+#~ msgid "Enable sound when busy"
+#~ msgstr "Уключыць гукі, калі я заняты"
+
+#~ msgid "Forget password and clear the entry."
+#~ msgstr "Забыць пароль і вычысьціць гэты элемэнт."
+
+#~ msgid "<b>Network</b>"
+#~ msgstr "<b>Сеціва</b>"
+
+#~ msgid "<b>Servers</b>"
+#~ msgstr "<b>Сэрвэры</b>"
+
+#~ msgid "Edit the selected IRC network"
+#~ msgstr "Рэдагаваць абранае IRC сеціва"
+
+#~ msgid "Remove the selected IRC network"
+#~ msgstr "Выдаліць абранае IRC сеціва"
+
+#~ msgid "_Check Word Spelling..."
+#~ msgstr "_Праверыць артаграфію..."
+
+#~ msgid "<b>Topic:</b>"
+#~ msgstr "<b>Тэма:</b>"
+
+#~ msgid "Group Chat"
+#~ msgstr "Групавая размова"
+
+#~ msgid "Contact Information"
+#~ msgstr "Зьвесткі аб кантакце"
+
+#~ msgid "I would like to add you to my contact list."
+#~ msgstr "Я жадаю дадаць цябе ў свой сьпіс кантактаў."
+
+#~ msgid "Sorry, I don't want you in my contact list anymore."
+#~ msgstr "Прабачце, але я не жадаю больш бачыць вас у сваім сьпісе кантактаў."
+
+#~ msgid "<b>Groups</b>"
+#~ msgstr "<b>Суполкі</b>"
+
+#~ msgid "Contact information"
+#~ msgstr "Зьвесткі аб кантакце"
+
+#~ msgid "Word"
+#~ msgstr "Слова"
+
+#~ msgid "Suggestions for the word"
+#~ msgstr "Прапанаваныя словы"
+
+#~ msgid "Spell Checker"
+#~ msgstr "Праверка артаграфіі"
+
+#~ msgid "Suggestions for the word:"
+#~ msgstr "Прапанаваныя словы:"
+
+#~ msgid "<b>New Account</b>"
+#~ msgstr "<b>Новы рахунак</b>"
+
+#~ msgid "I already have an account I want to use"
+#~ msgstr "У мяне ўжо ёсьць рахунак, якім я жадаю карыстацца"
+
+#~ msgid "Closed"
+#~ msgstr "Закрыты"
+
+#~ msgid "End this call?"
+#~ msgstr "Скончыць гэты званок?"
+
+#~ msgid "Closing this window will end the call in progress."
+#~ msgstr "Закрыцьцё гэтага акна скончыць дзейную размову."
+
+#~ msgid "Empathy Call"
+#~ msgstr "Званок Empathy"
+
+#~ msgid "Readying"
+#~ msgstr "Падрыхтоўка"
+
+#~ msgid "%s - Empathy Call"
+#~ msgstr "%s - Званок Empathy"
+
+#~ msgid ""
+#~ "Incoming call from %s rejected because there is already a running call."
+#~ msgstr "Уваходны званок ад %s скінуты, бо ўжо дзейнічае іншая размова."
+
+#~ msgid "#"
+#~ msgstr "#"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid "2"
+#~ msgstr "2"
+
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "4"
+#~ msgstr "4"
+
+#~ msgid "5"
+#~ msgstr "5"
+
+#~ msgid "6"
+#~ msgstr "6"
+
+#~ msgid "7"
+#~ msgstr "7"
+
+#~ msgid "8"
+#~ msgstr "8"
+
+#~ msgid "9"
+#~ msgstr "9"
+
+#~ msgid "<b>Keypad</b>"
+#~ msgstr "<b>Клявіятура</b>"
+
+#~ msgid "C_lear"
+#~ msgstr "_Ачысціць"
+
+#~ msgid "Chat"
+#~ msgstr "Размова"
+
+#~ msgid "Insert _Smiley"
+#~ msgstr "Дадаць _смайл"
+
+#~ msgid "Invitation _message:"
+#~ msgstr "Паведамленьне _запрашэньня:"
+
+#~ msgid "Invite"
+#~ msgstr "Запрасіць"
+
+#~ msgid "Move Tab _Left"
+#~ msgstr "Перанесьці закладку _ўлева"
+
+#~ msgid "Move Tab _Right"
+#~ msgstr "Перанесьці закладку _ўправа"
+
+#~ msgid "Select who would you like to invite:"
+#~ msgstr "Абраць тых, каго жадаеце запрасіць:"
+
+#~ msgid "You have been invited to join a chat conference."
+#~ msgstr "Вас запрасілі паўдзельнічаць у канфэрэнцыі."
+
+#~ msgid "_Contact"
+#~ msgstr "_Кантакт"
+
+#~ msgid "_Conversation"
+#~ msgstr "_Размова"
+
+#~ msgid "_Detach Tab"
+#~ msgstr "_Адлучыць укладку"
+
+#~ msgid "_Next Tab"
+#~ msgstr "Наступная закладка"
+
+#~ msgid "_Previous Tab"
+#~ msgstr "_Папярэдняя закладка"
+
+#~ msgid "_Tabs"
+#~ msgstr "_Укладкі"
+
+#~ msgid "Edit Favorite Room"
+#~ msgstr "Рэдагаваць улюбёны пакой"
+
+#~ msgid "Join room on start_up"
+#~ msgstr "Злучацца з пакоем падчас стартаваньня"
+
+#~ msgid "Join this chat room when Empathy starts and you are connected"
+#~ msgstr "Злучыцца з гэтым пакоем пасьля спалучэньня"
+
+#~ msgid "N_ame:"
+#~ msgstr "_Імя:"
+
+#~ msgid "S_erver:"
+#~ msgstr "_Сэрвэр:"
+
+#~ msgid ""
+#~ "New message from %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Новае паведамленьне ад %s:\n"
+#~ "%s"
+
+#~ msgid "Invitation Error"
+#~ msgstr "Памылка запрашэньня"
+
+#~ msgid "Browse:"
+#~ msgstr "Агляд:"
+
+#~ msgid "Join New"
+#~ msgstr "Злучыць з новым"
+
+#~ msgid "Re_fresh"
+#~ msgstr "_Абнавіць"
+
+#~ msgid ""
+#~ "This list represents all chat rooms hosted on the server you have entered."
+#~ msgstr "Сьпіс усіх пакояў месьціцца на сэрвэры, зь якім вы спалучыліся."
+
+#~ msgid "<b>Audio</b>"
+#~ msgstr "<b>Аўдыё</b>"
+
+#~ msgid "<b>Contact List</b>"
+#~ msgstr "<b>Сьпіс кантактаў</b>"
+
+#~ msgid "<b>Visual</b>"
+#~ msgstr "<b>Візуальнае</b>"
+
+#~ msgid "Avatars are user chosen images shown in the contact list"
+#~ msgstr "У сьпісе кантактаў паказаныя аватары, абраныя суразмоўцамі"
+
+#~ msgid "Enable sounds when _busy"
+#~ msgstr "Уключыць гукі, каля я _заняты"
+
+#~ msgid "Show _avatars"
+#~ msgstr "Паказаць _аватары"
+
+#~ msgid "Show co_mpact contact list"
+#~ msgstr "Паказаць сьціслы сьпіс кантактаў"
diff --git a/po/es.po b/po/es.po
index 33c53b1e4..7f6874592 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: empathy.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=empathy&component=general\n"
-"POT-Creation-Date: 2009-06-23 10:10+0000\n"
-"PO-Revision-Date: 2009-06-27 15:03+0200\n"
+"POT-Creation-Date: 2009-07-20 15:33+0000\n"
+"PO-Revision-Date: 2009-07-20 20:08+0200\n"
 "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -107,154 +107,163 @@ msgstr ""
 "Empathy debería usar el avatar del contacto como icono de la ventana de chat"
 
 #: ../data/empathy.schemas.in.h:19
+msgid "Enable WebKit Developer Tools"
+msgstr "Activar las herramientas de desarrollo de WebKit"
+
+#: ../data/empathy.schemas.in.h:20
 msgid "Enable popup notifications for new messages"
 msgstr "Activar notificaciones emergentes para mensajes nuevos"
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:21
 msgid "Enable spell checker"
 msgstr "Activar revisor ortográfico"
 
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:22
 msgid "Hide main window"
 msgstr "Ocultar la ventana principal"
 
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:23
 msgid "Hide the main window."
 msgstr "Ocultar la ventana principal."
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:24
 msgid "NetworkManager should be used"
 msgstr "Se debería usar NetworkManager"
 
-#: ../data/empathy.schemas.in.h:24
+#: ../data/empathy.schemas.in.h:25
 msgid "Nick completed character"
 msgstr "Carácter de completado de apodo"
 
-#: ../data/empathy.schemas.in.h:25
+#: ../data/empathy.schemas.in.h:26
 msgid "Open new chats in separate windows"
 msgstr "Abrir chats nuevos en ventanas separadas"
 
-#: ../data/empathy.schemas.in.h:26
+#: ../data/empathy.schemas.in.h:27
 msgid "Path of the adium theme to use"
 msgstr "Ruta del tema adium que usar"
 
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:28
 msgid "Path of the adium theme to use if the theme used for chat is adium."
 msgstr "Ruta al tema adium que usar si el tema usado para el chat es adium."
 
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:29
 msgid "Play a sound for incoming messages"
 msgstr "Reproducir un sonido cuando lleguen mensajes"
 
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:30
 msgid "Play a sound for new conversations"
 msgstr "Reproducir un sonido para conversaciones nuevas"
 
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:31
 msgid "Play a sound for outgoing messages"
 msgstr "Reproducir un sonido al enviar mensajes"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:32
 msgid "Play a sound when a contact logs in"
 msgstr "Reproducir un sonido cuando un contacto inicie sesión"
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:33
 msgid "Play a sound when a contact logs out"
 msgstr "Reproducir un sonido cuando un contacto finalice su sesión"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:34
 msgid "Play a sound when we log in"
 msgstr "Reproducir un sonido cuando inicio sesión"
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:35
 msgid "Play a sound when we log out"
 msgstr "Reproducir un sonido cuando finalizo una sesión"
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:36
 msgid "Popup notifications if the chat isn't focused"
 msgstr ""
 "Mostrar notificaciones emergentes si la ventana de chat no tiene el foco"
 
-#: ../data/empathy.schemas.in.h:36
-#| msgid "Popup notifications if the chat isn't focused"
+#: ../data/empathy.schemas.in.h:37
 msgid "Popup notifications when a contact sign in"
 msgstr "Mostrar notificaciones emergentes cuando un contacto se conecta."
 
-#: ../data/empathy.schemas.in.h:37
-#| msgid "Popup notifications if the chat isn't focused"
+#: ../data/empathy.schemas.in.h:38
 msgid "Popup notifications when a contact sign out"
 msgstr "Mostrar notificaciones emergentes cuando un contacto se desconecta."
 
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:39
 msgid "Salut account is created"
 msgstr "Se creó la cuenta Salut"
 
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:40
 msgid "Show avatars"
 msgstr "Mostrar avatares"
 
-#: ../data/empathy.schemas.in.h:40
+#: ../data/empathy.schemas.in.h:41
 msgid "Show contact list in rooms"
 msgstr "Mostrar lista de contactos en salas"
 
-#: ../data/empathy.schemas.in.h:41
+#: ../data/empathy.schemas.in.h:42
 msgid "Show hint about closing the main window"
 msgstr "Mostrar consejo sobre cómo cerrar la ventana principal"
 
-#: ../data/empathy.schemas.in.h:42
+#: ../data/empathy.schemas.in.h:43
 msgid "Show offline contacts"
 msgstr "Mostrar contactos no conectados"
 
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:44
 msgid "Spell checking languages"
 msgstr "Idiomas para revisión ortográfica"
 
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:45
 msgid "The default folder to save file transfers in."
 msgstr "La carpeta predeterminada donde guardar los archivos transferidos."
 
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:46
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Último directorio del que fue elegido un avatar."
 
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:47
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr ""
 "El tema que se usará para mostrar la conversación en las ventanas de chat."
 
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:48
 msgid "Use graphical smileys"
 msgstr "Usar emoticonos gráficos"
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:49
 msgid "Use notification sounds"
 msgstr "Usar sonidos de notificación"
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:50
 msgid "Use theme for chat rooms"
 msgstr "Usar tema para salas de chat"
 
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:51
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr ""
+"Indica si las herramientas de desarrollo de WebKit, tales como el Inspector "
+"web, den activarse."
+
+#: ../data/empathy.schemas.in.h:52
 msgid "Whether or not Empathy can publish the user's location to his contacts."
 msgstr ""
 "Indica si Empathy puede publicar la ubicación del usuario a sus contactos."
 
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:53
 msgid "Whether or not Empathy can use the GPS to guess the location."
 msgstr "Indica si Empathy puede usar el GPS para deducir la ubicación."
 
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:54
 msgid ""
 "Whether or not Empathy can use the cellular network to guess the location."
 msgstr ""
 "Indica si Empathy puede usar la red telefónica móvil para deducir la "
 "ubicación."
 
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:55
 msgid "Whether or not Empathy can use the network to guess the location."
 msgstr "Indica si Empathy puede usar la red para deducir la ubicación."
 
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:56
 msgid ""
 "Whether or not Empathy has asked about importing accounts from other "
 "programs."
@@ -262,7 +271,7 @@ msgstr ""
 "Indica si Empathy ha preguntado acerca de importar cuentas de otros "
 "programas."
 
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:57
 msgid ""
 "Whether or not Empathy should automatically log in to your accounts on "
 "startup."
@@ -270,7 +279,7 @@ msgstr ""
 "Indica si Empathy debe iniciar sesión en sus cuentas automáticamente al "
 "inicio."
 
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:58
 msgid ""
 "Whether or not Empathy should reduce the location's accuracy for privacy "
 "reasons."
@@ -278,7 +287,7 @@ msgstr ""
 "Indica si Empathy debería reducir la precisión de la ubicación por motivos "
 "de privacidad."
 
-#: ../data/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:59
 msgid ""
 "Whether or not Empathy should use the avatar of the contact as the chat "
 "window icon."
@@ -286,14 +295,14 @@ msgstr ""
 "Indica si Empathy debería usar el avatar del contacto como el icono de la "
 "ventana de chat."
 
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:60
 msgid ""
 "Whether or not the Salut account has been created on the first Empathy run."
 msgstr ""
 "Indica si la cuenta Salut se ha creado cuando ejecutó por primera vez "
 "Empathy."
 
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:61
 msgid ""
 "Whether or not the network manager should be used to automatically "
 "disconnect/reconnect."
@@ -301,7 +310,7 @@ msgstr ""
 "Indica si se debe usar el gestor de la red para desconectarse/reconectarse "
 "automáticamente."
 
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:62
 msgid ""
 "Whether or not to check words typed against the languages you want to check "
 "with."
@@ -309,21 +318,21 @@ msgstr ""
 "Indica si se deben revisar las palabras tecleadas con respecto a los idiomas "
 "con los que quiere comprobarlo."
 
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:63
 msgid ""
 "Whether or not to convert smileys into graphical images in conversations."
 msgstr ""
 "Indica si se deben convertir los emoticonos en imágenes gráficas en las "
 "conversaciones."
 
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:64
 msgid ""
 "Whether or not to play a sound to notify for contacts logging in the network."
 msgstr ""
 "Indica si se debe reproducir un sonido para notificar los inicios de sesión "
 "de los contactos en la red."
 
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:65
 msgid ""
 "Whether or not to play a sound to notify for contacts logging off the "
 "network."
@@ -331,54 +340,52 @@ msgstr ""
 "Indica si se debe reproducir un sonido para notificar las finalizaciones de "
 "sesión de los contactos en la red."
 
-#: ../data/empathy.schemas.in.h:64
+#: ../data/empathy.schemas.in.h:66
 msgid "Whether or not to play a sound to notify for events."
 msgstr "Indica si se debe reproducir un sonido para notificar eventos."
 
-#: ../data/empathy.schemas.in.h:65
+#: ../data/empathy.schemas.in.h:67
 msgid "Whether or not to play a sound to notify for incoming messages."
 msgstr ""
 "Indica si se debe reproducir un sonido para notificar mensajes entrantes."
 
-#: ../data/empathy.schemas.in.h:66
+#: ../data/empathy.schemas.in.h:68
 msgid "Whether or not to play a sound to notify for new conversations."
 msgstr ""
 "Indica si se debe reproducir un sonido para notificar conversaciones nuevas."
 
-#: ../data/empathy.schemas.in.h:67
+#: ../data/empathy.schemas.in.h:69
 msgid "Whether or not to play a sound to notify for outgoing messages."
 msgstr ""
 "Indica si se debe reproducir un sonido para notificar mensajes salientes."
 
-#: ../data/empathy.schemas.in.h:68
+#: ../data/empathy.schemas.in.h:70
 msgid "Whether or not to play a sound when logging in a network."
 msgstr "Indica si se debe reproducir un sonido al iniciar sesión en una red."
 
-#: ../data/empathy.schemas.in.h:69
+#: ../data/empathy.schemas.in.h:71
 msgid "Whether or not to play a sound when logging off a network."
 msgstr "Indica si se debe reproducir un sonido al finalizar sesión en una red."
 
-#: ../data/empathy.schemas.in.h:70
+#: ../data/empathy.schemas.in.h:72
 msgid "Whether or not to play sound notifications when away or busy."
 msgstr ""
 "Indica si se deben reproducir sonidos de notificaciones cuando se esté "
 "ausente u ocupado."
 
-#: ../data/empathy.schemas.in.h:71
-#| msgid "Whether or not to show popup notifications when away or busy."
+#: ../data/empathy.schemas.in.h:73
 msgid ""
 "Whether or not to show a popup notification when a contact goes offline."
 msgstr ""
 "Indica si se deben mostrar las notificaciones emergentes cuando un contacto "
 "se desconecta."
 
-#: ../data/empathy.schemas.in.h:72
-#| msgid "Whether or not to show popup notifications when away or busy."
+#: ../data/empathy.schemas.in.h:74
 msgid "Whether or not to show a popup notification when a contact goes online."
 msgstr ""
 "Indica si se deben mostrar las notificaciones emergentes cuando se conecta."
 
-#: ../data/empathy.schemas.in.h:73
+#: ../data/empathy.schemas.in.h:75
 msgid ""
 "Whether or not to show a popup notification when receiving a new message "
 "even if the chat is already opened, but not focused."
@@ -386,14 +393,14 @@ msgstr ""
 "Indica si de deben mostrar notificaciones emergentes al recibir un mensaje "
 "nuevo incluso si la ventana de chat ya está abierta pero no tiene el foco."
 
-#: ../data/empathy.schemas.in.h:74
+#: ../data/empathy.schemas.in.h:76
 msgid ""
 "Whether or not to show a popup notification when receiving a new message."
 msgstr ""
 "Indica si se deben mostrar notificaciones emergentes al recibir un mensaje "
 "nuevo."
 
-#: ../data/empathy.schemas.in.h:75
+#: ../data/empathy.schemas.in.h:77
 msgid ""
 "Whether or not to show avatars for contacts in the contact list and chat "
 "windows."
@@ -401,23 +408,23 @@ msgstr ""
 "Indica si se debe mostrar los avatares para los contactos en la lista de "
 "contactos y ventanas de chat."
 
-#: ../data/empathy.schemas.in.h:76
+#: ../data/empathy.schemas.in.h:78
 msgid "Whether or not to show contacts that are offline in the contact list."
 msgstr ""
 "Indica si se debe mostrar los contactos que están desconectados en la lista "
 "de contactos."
 
-#: ../data/empathy.schemas.in.h:77
+#: ../data/empathy.schemas.in.h:79
 msgid "Whether or not to show popup notifications when away or busy."
 msgstr ""
 "Indica si se deben mostrar las notificaciones emergentes cuando se esté "
 "ausente u ocupado."
 
-#: ../data/empathy.schemas.in.h:78
+#: ../data/empathy.schemas.in.h:80
 msgid "Whether or not to show the contact list in chat rooms."
 msgstr "Indica si se debe mostrar la lista de contactos en salas de chat."
 
-#: ../data/empathy.schemas.in.h:79
+#: ../data/empathy.schemas.in.h:81
 msgid ""
 "Whether or not to show the message dialog about closing the main window with "
 "the 'x' button in the title bar."
@@ -425,15 +432,15 @@ msgstr ""
 "Indica si se debe mostrar un mensaje de diálogo sobre cómo cerrar la ventana "
 "principal con el botón 'x' en la barra de título."
 
-#: ../data/empathy.schemas.in.h:80
+#: ../data/empathy.schemas.in.h:82
 msgid "Whether to show the contact list in compact mode or not."
 msgstr "Indica si se debe mostrar la lista de contactos en modo compacto."
 
-#: ../data/empathy.schemas.in.h:81
+#: ../data/empathy.schemas.in.h:83
 msgid "Whether to use the theme for chat rooms or not."
 msgstr "Indica si se debe usar el tema para salas de chat."
 
-#: ../data/empathy.schemas.in.h:82
+#: ../data/empathy.schemas.in.h:84
 msgid ""
 "Which criterium to use when sorting the contact list. Default is to use sort "
 "by the contact's name with the value \"name\". A value of \"state\" will "
@@ -459,7 +466,7 @@ msgstr "El archivo seleccionado no es un archivo regular"
 msgid "The selected file is empty"
 msgstr "El archivo seleccionado está vacío"
 
-#: ../libempathy/empathy-tp-contact-list.c:757 ../src/empathy.c:287
+#: ../libempathy/empathy-tp-contact-list.c:843 ../src/empathy.c:289
 msgid "People nearby"
 msgstr "Gente cerca"
 
@@ -495,23 +502,23 @@ msgstr "El otro participante no puede transferir el archivo"
 msgid "Unknown reason"
 msgstr "Razón desconocida"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:265
 msgid "Available"
 msgstr "Disponible"
 
-#: ../libempathy/empathy-utils.c:276
+#: ../libempathy/empathy-utils.c:267
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../libempathy/empathy-utils.c:279
+#: ../libempathy/empathy-utils.c:270
 msgid "Away"
 msgstr "Ausente"
 
-#: ../libempathy/empathy-utils.c:281
+#: ../libempathy/empathy-utils.c:272
 msgid "Hidden"
 msgstr "Oculto"
 
-#: ../libempathy/empathy-utils.c:283
+#: ../libempathy/empathy-utils.c:274
 msgid "Offline"
 msgstr "Desconectado"
 
@@ -561,7 +568,7 @@ msgstr[1] "hace %d meses"
 msgid "in the future"
 msgstr "en el futuro"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:419
+#: ../libempathy-gtk/empathy-account-chooser.c:426
 msgid "All"
 msgstr "Todo"
 
@@ -631,7 +638,7 @@ msgstr "_UIN ICQ:"
 msgid "_Charset:"
 msgstr "Conjunto de _caracteres:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:241
+#: ../libempathy-gtk/empathy-account-widget-irc.c:240
 msgid "New Network"
 msgstr "Red nueva"
 
@@ -823,62 +830,101 @@ msgstr "El tema se ha establecido a: %s"
 msgid "No topic defined"
 msgstr "No se ha definido el tema"
 
-#: ../libempathy-gtk/empathy-chat.c:959
+#: ../libempathy-gtk/empathy-chat.c:960
 msgid "(No Suggestions)"
 msgstr "(Sin sugerencias)"
 
-#: ../libempathy-gtk/empathy-chat.c:1013
+#: ../libempathy-gtk/empathy-chat.c:1014
 msgid "Insert Smiley"
 msgstr "Insertar emoticono"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1031
-#: ../libempathy-gtk/empathy-ui-utils.c:1476
+#: ../libempathy-gtk/empathy-chat.c:1032
+#: ../libempathy-gtk/empathy-ui-utils.c:1480
 msgid "_Send"
 msgstr "E_nviar"
 
-#: ../libempathy-gtk/empathy-chat.c:1065
+#: ../libempathy-gtk/empathy-chat.c:1066
 msgid "_Spelling Suggestions"
 msgstr "_Sugerencias ortográficas"
 
-#: ../libempathy-gtk/empathy-chat.c:1179
+#: ../libempathy-gtk/empathy-chat.c:1181
 #, c-format
-msgid "%s has joined the room"
-msgstr "%s ha entrado en la sala"
+msgid "%s has disconnected"
+msgstr "%s se ha desconectado"
+
+#: ../libempathy-gtk/empathy-chat.c:1185
+#, c-format
+msgid "%s was kicked by %s"
+msgstr "%s fue expulsado por %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1188
+#, c-format
+msgid "%s was kicked"
+msgstr "%s fue expulsado"
 
-#: ../libempathy-gtk/empathy-chat.c:1182
+#: ../libempathy-gtk/empathy-chat.c:1193
+#, c-format
+msgid "%s was banned by %s"
+msgstr "%s fue vetado por %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1196
+#, c-format
+msgid "%s was banned"
+msgstr "%s fue vetado"
+
+#: ../libempathy-gtk/empathy-chat.c:1200
 #, c-format
 msgid "%s has left the room"
 msgstr "%s ha dejado la sala"
 
-#: ../libempathy-gtk/empathy-chat.c:1313 ../src/empathy-call-window.c:1199
+#. Note to translators: this string is appended to
+#. * notifications like "foo has left the room", with the message
+#. * given by the user living the room. If this poses a problem,
+#. * please let us know. :-)
+#.
+#: ../libempathy-gtk/empathy-chat.c:1209
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#: ../libempathy-gtk/empathy-chat.c:1232
+#, c-format
+msgid "%s has joined the room"
+msgstr "%s ha entrado en la sala"
+
+#: ../libempathy-gtk/empathy-chat.c:1365 ../src/empathy-call-window.c:1225
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: ../libempathy-gtk/empathy-chat.c:1742
+#: ../libempathy-gtk/empathy-chat.c:1800
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../libempathy-gtk/empathy-chat.c:1792
-#: ../libempathy-gtk/empathy-log-window.c:501
+#: ../libempathy-gtk/empathy-chat.c:1850
+#: ../libempathy-gtk/empathy-log-window.c:502
 msgid "Conversation"
 msgstr "Conversación"
 
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:471
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472
 msgid "Topic:"
 msgstr "Tema:"
 
+#. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:316
+#: ../libempathy-gtk/empathy-theme-adium.c:264
 msgid "_Copy Link Address"
 msgstr "_Copiar la dirección del enlace"
 
+#. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:323
+#: ../libempathy-gtk/empathy-theme-adium.c:272
 msgid "_Open Link"
 msgstr "_Abrir enlace"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:421
 msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
@@ -891,7 +937,7 @@ msgstr "Editar información del contacto"
 msgid "Personal Information"
 msgstr "Información personal"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:392
+#: ../libempathy-gtk/empathy-contact-dialogs.c:393
 msgid "New Contact"
 msgstr "Contacto nuevo"
 
@@ -903,66 +949,76 @@ msgstr "Decidir _luego"
 msgid "Subscription Request"
 msgstr "Petición de suscripción"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1378
+#: ../libempathy-gtk/empathy-contact-list-view.c:1400
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "¿Realmente quiere quitar el grupo «%s»?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1380
+#: ../libempathy-gtk/empathy-contact-list-view.c:1402
 msgid "Removing group"
 msgstr "Quitando grupo"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1427
-#: ../libempathy-gtk/empathy-contact-list-view.c:1505
+#. Remove
+#: ../libempathy-gtk/empathy-contact-list-view.c:1449
+#: ../libempathy-gtk/empathy-contact-list-view.c:1526
 msgid "_Remove"
 msgstr "_Quitar"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1457
+#: ../libempathy-gtk/empathy-contact-list-view.c:1479
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "¿Realmente quiere quitar el contacto «%s»?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1459
+#: ../libempathy-gtk/empathy-contact-list-view.c:1481
 msgid "Removing contact"
 msgstr "Quitando el contacto"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:135
-#: ../src/empathy-main-window.ui.h:8
+#: ../libempathy-gtk/empathy-contact-menu.c:195
+#: ../src/empathy-main-window.ui.h:11
+msgid "_Add Contact..."
+msgstr "_Añadir contacto…"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../src/empathy-main-window.ui.h:12
 msgid "_Chat"
 msgstr "_Chat"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:166
+#: ../libempathy-gtk/empathy-contact-menu.c:253
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "Llamada de _sonido"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:198
+#: ../libempathy-gtk/empathy-contact-menu.c:285
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "Llamada de _vídeo"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:237
+#: ../libempathy-gtk/empathy-contact-menu.c:324
 msgid "_View Previous Conversations"
 msgstr "_Ver conversaciones previas"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:259
+#: ../libempathy-gtk/empathy-contact-menu.c:346
 msgid "Send file"
 msgstr "Enviar archivo"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:287
+#: ../libempathy-gtk/empathy-contact-menu.c:369
+msgid "Share my desktop"
+msgstr "Compartir mi escritorio"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:397
 msgid "Infor_mation"
 msgstr "Infor_mación"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:314
-#: ../src/empathy-main-window.ui.h:11
+#: ../libempathy-gtk/empathy-contact-menu.c:441
+#: ../src/empathy-main-window.ui.h:16
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:372
+#: ../libempathy-gtk/empathy-contact-menu.c:501
 msgid "Inviting to this room"
 msgstr "Invitando a esta sala"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:403
+#: ../libempathy-gtk/empathy-contact-menu.c:532
 msgid "_Invite to chatroom"
 msgstr "_Invitar a la sala"
 
@@ -970,128 +1026,128 @@ msgstr "_Invitar a la sala"
 msgid "Select a contact"
 msgstr "Seleccionar un contacto"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:440
+#: ../libempathy-gtk/empathy-contact-widget.c:447
 msgid "Save Avatar"
 msgstr "Guardar avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:503
 msgid "Unable to save avatar"
 msgstr "No se pudo guardar el avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:979
+#: ../libempathy-gtk/empathy-contact-widget.c:992
 msgid "Select"
 msgstr "Seleccionar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:988
-#: ../src/empathy-main-window.c:905
+#: ../libempathy-gtk/empathy-contact-widget.c:1001
+#: ../src/empathy-main-window.c:1023
 msgid "Group"
 msgstr "Grupo"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1239
+#: ../libempathy-gtk/empathy-contact-widget.c:1252
 msgid "Country ISO Code:"
 msgstr "Código ISO de país:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1241
+#: ../libempathy-gtk/empathy-contact-widget.c:1254
 msgid "Country:"
 msgstr "País:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1243
+#: ../libempathy-gtk/empathy-contact-widget.c:1256
 msgid "State:"
 msgstr "Estado:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1245
+#: ../libempathy-gtk/empathy-contact-widget.c:1258
 msgid "City:"
 msgstr "Ciudad:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1247
+#: ../libempathy-gtk/empathy-contact-widget.c:1260
 msgid "Area:"
 msgstr "Área:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1249
+#: ../libempathy-gtk/empathy-contact-widget.c:1262
 msgid "Postal Code:"
 msgstr "Código postal:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1251
+#: ../libempathy-gtk/empathy-contact-widget.c:1264
 msgid "Street:"
 msgstr "Calle:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1253
+#: ../libempathy-gtk/empathy-contact-widget.c:1266
 msgid "Building:"
 msgstr "Edificio:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1255
+#: ../libempathy-gtk/empathy-contact-widget.c:1268
 msgid "Floor:"
 msgstr "Planta:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1257
+#: ../libempathy-gtk/empathy-contact-widget.c:1270
 msgid "Room:"
 msgstr "Habitación:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1259
+#: ../libempathy-gtk/empathy-contact-widget.c:1272
 msgid "Text:"
 msgstr "Texto:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1261
+#: ../libempathy-gtk/empathy-contact-widget.c:1274
 msgid "Description:"
 msgstr "Descripción:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1263
+#: ../libempathy-gtk/empathy-contact-widget.c:1276
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1265
+#: ../libempathy-gtk/empathy-contact-widget.c:1278
 msgid "Accuracy Level:"
 msgstr "Nivel de precisión:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1267
+#: ../libempathy-gtk/empathy-contact-widget.c:1280
 msgid "Error:"
 msgstr "Error:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1269
+#: ../libempathy-gtk/empathy-contact-widget.c:1282
 msgid "Vertical Error (meters):"
 msgstr "Error vertical (metros):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1271
+#: ../libempathy-gtk/empathy-contact-widget.c:1284
 msgid "Horizontal Error (meters):"
 msgstr "Error horizontal (metros):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1273
+#: ../libempathy-gtk/empathy-contact-widget.c:1286
 msgid "Speed:"
 msgstr "Velocidad:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1275
+#: ../libempathy-gtk/empathy-contact-widget.c:1288
 msgid "Bearing:"
 msgstr "Retardo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1277
+#: ../libempathy-gtk/empathy-contact-widget.c:1290
 msgid "Climb Speed:"
 msgstr "Velocidad de ascenso:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1279
+#: ../libempathy-gtk/empathy-contact-widget.c:1292
 msgid "Last Updated on:"
 msgstr "Actualizado por última vez:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1281
+#: ../libempathy-gtk/empathy-contact-widget.c:1294
 msgid "Longitude:"
 msgstr "Longitud_"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1283
+#: ../libempathy-gtk/empathy-contact-widget.c:1296
 msgid "Latitude:"
 msgstr "Latitud:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1285
+#: ../libempathy-gtk/empathy-contact-widget.c:1298
 msgid "Altitude:"
 msgstr "Altitud:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1332
+#: ../libempathy-gtk/empathy-contact-widget.c:1345
 msgid "<b>Location</b>"
 msgstr "<b>Ubicación</b>"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1345
+#: ../libempathy-gtk/empathy-contact-widget.c:1358
 msgid "<b>Location</b>, "
 msgstr "<b>Ubicación</b>, "
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1395
+#: ../libempathy-gtk/empathy-contact-widget.c:1408
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e de %B de %Y a las %R UTC"
 
@@ -1123,7 +1179,7 @@ msgid "Client:"
 msgstr "Cliente:"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:888
+#: ../src/empathy-main-window.c:1006
 msgid "Contact"
 msgstr "Contacto"
 
@@ -1192,12 +1248,12 @@ msgstr "Puerto"
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:494
-#: ../src/empathy-import-dialog.c:281
+#: ../libempathy-gtk/empathy-log-window.c:495
+#: ../src/empathy-import-dialog.c:285
 msgid "Account"
 msgstr "Cuenta"
 
-#: ../libempathy-gtk/empathy-log-window.c:511
+#: ../libempathy-gtk/empathy-log-window.c:512
 msgid "Date"
 msgstr "Fecha"
 
@@ -1268,6 +1324,46 @@ msgstr "Establecer su presencia y estado actual"
 msgid "Custom messages..."
 msgstr "Mensajes personalizados…"
 
+#: ../libempathy-gtk/empathy-sound.c:51
+msgid "Received an instant message"
+msgstr "Mensaje instantáneo recibido"
+
+#: ../libempathy-gtk/empathy-sound.c:53
+msgid "Sent an instant message"
+msgstr "Enviar un mensaje instantáneo"
+
+#: ../libempathy-gtk/empathy-sound.c:55
+msgid "Incoming chat request"
+msgstr "Solicitud de chat entrante"
+
+#: ../libempathy-gtk/empathy-sound.c:57
+msgid "Contact connected"
+msgstr "Contacto conectado"
+
+#: ../libempathy-gtk/empathy-sound.c:59
+msgid "Contact disconnected"
+msgstr "Contacto desconectado"
+
+#: ../libempathy-gtk/empathy-sound.c:61
+msgid "Connected to server"
+msgstr "Conectado con el servidor"
+
+#: ../libempathy-gtk/empathy-sound.c:63
+msgid "Disconnected from server"
+msgstr "Desconectado del servidor"
+
+#: ../libempathy-gtk/empathy-sound.c:65
+msgid "Incoming voice call"
+msgstr "Llamada de voz entrante"
+
+#: ../libempathy-gtk/empathy-sound.c:67
+msgid "Outgoing voice call"
+msgstr "Llamada de voz saliente"
+
+#: ../libempathy-gtk/empathy-sound.c:69
+msgid "Voice call ended"
+msgstr "Finalizó la llamada de vz"
+
 #: ../libempathy-gtk/empathy-status-preset-dialog.c:362
 msgid "Enter Custom Message"
 msgstr "Introducir mensaje personalizado"
@@ -1292,78 +1388,34 @@ msgstr "gtk-add"
 msgid "gtk-remove"
 msgstr "gtk-remove"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:66
+#: ../libempathy-gtk/empathy-theme-manager.c:67
 msgid "Classic"
 msgstr "Clásico"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-manager.c:68
 msgid "Simple"
 msgstr "Simple"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:69
 msgid "Clean"
 msgstr "Limpio"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Blue"
 msgstr "Azul"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:71
-msgid "Adium"
-msgstr "Adium"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1378
+#: ../libempathy-gtk/empathy-ui-utils.c:1382
 msgid "Unable to open URI"
 msgstr "No se pudo abrir el URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1468
+#: ../libempathy-gtk/empathy-ui-utils.c:1472
 msgid "Select a file"
 msgstr "Seleccionar un archivo"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1526
+#: ../libempathy-gtk/empathy-ui-utils.c:1530
 msgid "Select a destination"
 msgstr "Seleccionar un destino"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1555
-msgid "Received an instant message"
-msgstr "Mensaje instantáneo recibido"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1557
-msgid "Sent an instant message"
-msgstr "Enviar un mensaje instantáneo"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1559
-msgid "Incoming chat request"
-msgstr "Solicitud de chat entrante"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1561
-msgid "Contact connected"
-msgstr "Contacto conectado"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1563
-msgid "Contact disconnected"
-msgstr "Contacto desconectado"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1565
-msgid "Connected to server"
-msgstr "Conectado con el servidor"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1567
-msgid "Disconnected from server"
-msgstr "Desconectado del servidor"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1569
-msgid "Incoming voice call"
-msgstr "Llamada de voz entrante"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1571
-msgid "Outgoing voice call"
-msgstr "Llamada de voz saliente"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1573
-msgid "Voice call ended"
-msgstr "Finalizó la llamada de vz"
-
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
 msgstr "Configuración regional actual"
@@ -1550,7 +1602,7 @@ msgid "Megaphone"
 msgstr "Megáfono"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:527
+#: ../megaphone/src/megaphone-applet.c:519
 msgid "Talk!"
 msgstr "Hablar"
 
@@ -1564,7 +1616,7 @@ msgid "_Information"
 msgstr "_Información"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-main-window.ui.h:23
 msgid "_Preferences"
 msgstr "Prefere_ncias"
 
@@ -1585,19 +1637,19 @@ msgstr "Presencia"
 msgid "Set your own presence"
 msgstr "Establezca su propia presencia"
 
-#: ../src/empathy.c:478
+#: ../src/empathy.c:506
 msgid "Don't connect on startup"
 msgstr "No conectarse automáticamente al inicio"
 
-#: ../src/empathy.c:482
+#: ../src/empathy.c:510
 msgid "Don't show the contact list on startup"
 msgstr "No mostrar la lista de contactos al inicio"
 
-#: ../src/empathy.c:486
+#: ../src/empathy.c:514
 msgid "Show the accounts dialog"
 msgstr "Mostrar el diálogo de las cuentas"
 
-#: ../src/empathy.c:498
+#: ../src/empathy.c:526
 msgid "- Empathy Instant Messenger"
 msgstr "- Mensajería instantánea Empathy"
 
@@ -1643,11 +1695,11 @@ msgstr "Un cliente de mensajería instantánea para GNOME"
 msgid "translator-credits"
 msgstr "Jorge González <jorgegonz@svn.gnome.org>, 2007-2009"
 
-#: ../src/empathy-accounts-dialog.c:393
+#: ../src/empathy-accounts-dialog.c:392
 msgid "Enabled"
 msgstr "Activado"
 
-#: ../src/empathy-accounts-dialog.c:403 ../src/empathy-accounts-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1
 msgid "Accounts"
 msgstr "Cuentas"
 
@@ -1727,53 +1779,53 @@ msgstr "_Crear una cuenta nueva"
 msgid "_Reuse an existing account"
 msgstr "_Usar una cuenta ya existente"
 
-#: ../src/empathy-call-window.c:63
-msgid "Connecting..."
-msgstr "Conectando…"
-
-#: ../src/empathy-call-window.c:415
+#: ../src/empathy-call-window.c:420
 msgid "Contrast"
 msgstr "Contraste"
 
-#: ../src/empathy-call-window.c:418
+#: ../src/empathy-call-window.c:423
 msgid "Brightness"
 msgstr "Brillo"
 
-#: ../src/empathy-call-window.c:421
+#: ../src/empathy-call-window.c:426
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-call-window.c:526
+#: ../src/empathy-call-window.c:531
 msgid "Volume"
 msgstr "Volumen"
 
-#: ../src/empathy-call-window.c:728
+#: ../src/empathy-call-window.c:662
+msgid "Connecting..."
+msgstr "Conectando…"
+
+#: ../src/empathy-call-window.c:746
 msgid "_Sidebar"
 msgstr "Barra _lateral"
 
-#: ../src/empathy-call-window.c:747
+#: ../src/empathy-call-window.c:765
 msgid "Dialpad"
 msgstr "Teclado de llamada"
 
-#: ../src/empathy-call-window.c:753
+#: ../src/empathy-call-window.c:771
 msgid "Audio input"
 msgstr "Entrada de sonido"
 
-#: ../src/empathy-call-window.c:757
+#: ../src/empathy-call-window.c:775
 msgid "Video input"
 msgstr "Entrada de vídeo"
 
-#: ../src/empathy-call-window.c:820
+#: ../src/empathy-call-window.c:835
 #, c-format
 msgid "Call with %s"
 msgstr "Llamar con %s"
 
-#: ../src/empathy-call-window.c:889
+#: ../src/empathy-call-window.c:904
 msgid "Call"
 msgstr "Llamar"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1308
+#: ../src/empathy-call-window.c:1335
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Conectado — %d:%02dm"
@@ -1802,16 +1854,16 @@ msgstr "Vista preliminar de vídeo"
 msgid "_Call"
 msgstr "_Llamar"
 
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
 msgid "_View"
 msgstr "_Ver"
 
-#: ../src/empathy-chat-window.c:343
+#: ../src/empathy-chat-window.c:344
 #, c-format
 msgid "Conversations (%d)"
 msgstr "Conversaciones (%d)"
 
-#: ../src/empathy-chat-window.c:475
+#: ../src/empathy-chat-window.c:476
 msgid "Typing a message."
 msgstr "Tecleando un mensaje."
 
@@ -1831,75 +1883,75 @@ msgstr "Autoconectar"
 msgid "Manage Favorite Rooms"
 msgstr "Gestionar salas favoritas"
 
-#: ../src/empathy-event-manager.c:395
+#: ../src/empathy-event-manager.c:321
 msgid "Incoming call"
 msgstr "Llamada entrante"
 
-#: ../src/empathy-event-manager.c:398
+#: ../src/empathy-event-manager.c:324
 #, c-format
 msgid "%s is calling you, do you want to answer?"
 msgstr "%s le está llamando, ¿quiere responder?"
 
-#: ../src/empathy-event-manager.c:405
+#: ../src/empathy-event-manager.c:331
 msgid "_Reject"
 msgstr "_Rechazar"
 
-#: ../src/empathy-event-manager.c:411
+#: ../src/empathy-event-manager.c:337
 msgid "_Answer"
 msgstr "Re_spuesta"
 
-#: ../src/empathy-event-manager.c:523
+#: ../src/empathy-event-manager.c:452
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Llamada entrante de %s"
 
-#: ../src/empathy-event-manager.c:563
+#: ../src/empathy-event-manager.c:496
 #, c-format
 msgid "%s is offering you an invitation"
 msgstr "%s le está ofreciendo una invitación"
 
-#: ../src/empathy-event-manager.c:569
+#: ../src/empathy-event-manager.c:502
 msgid "An external application will be started to handle it."
 msgstr "Se iniciará una aplicación externa para manejarla."
 
-#: ../src/empathy-event-manager.c:574
+#: ../src/empathy-event-manager.c:507
 msgid "You don't have the needed external application to handle it."
 msgstr "No tiene la aplicación externa necesaria para manejarla."
 
-#: ../src/empathy-event-manager.c:701
+#: ../src/empathy-event-manager.c:634
 msgid "Room invitation"
 msgstr "Invitación a una sala"
 
-#: ../src/empathy-event-manager.c:704
+#: ../src/empathy-event-manager.c:637
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s le está invitando a unirse a %s"
 
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:645
 msgid "_Decline"
 msgstr "_Rechazar"
 
-#: ../src/empathy-event-manager.c:717
+#: ../src/empathy-event-manager.c:650
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Unirse"
 
-#: ../src/empathy-event-manager.c:756
+#: ../src/empathy-event-manager.c:689
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s le ha invitado a unirse a %s"
 
-#: ../src/empathy-event-manager.c:782
+#: ../src/empathy-event-manager.c:715
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Transferencia de archivo entrante de %s"
 
-#: ../src/empathy-event-manager.c:962
+#: ../src/empathy-event-manager.c:895
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "Petición de suscripción de %s"
 
-#: ../src/empathy-event-manager.c:966
+#: ../src/empathy-event-manager.c:899
 #, c-format
 msgid ""
 "\n"
@@ -1909,13 +1961,13 @@ msgstr ""
 "Mensaje: %s"
 
 #. someone is logging off
-#: ../src/empathy-event-manager.c:1009
+#: ../src/empathy-event-manager.c:935
 #, c-format
 msgid "%s is now offline."
 msgstr "Ahora %s está desconectado."
 
 #. someone is logging in
-#: ../src/empathy-event-manager.c:1025
+#: ../src/empathy-event-manager.c:951
 #, c-format
 msgid "%s is now online."
 msgstr "Ahora %s está conectado."
@@ -2034,19 +2086,19 @@ msgstr ""
 "lista"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-dialog.c:259
+#: ../src/empathy-import-dialog.c:263
 msgid "Import"
 msgstr "Importar"
 
-#: ../src/empathy-import-dialog.c:268
+#: ../src/empathy-import-dialog.c:272
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../src/empathy-import-dialog.c:294
+#: ../src/empathy-import-dialog.c:298
 msgid "Source"
 msgstr "Origen"
 
-#: ../src/empathy-import-dialog.c:388
+#: ../src/empathy-import-dialog.c:392
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -2058,71 +2110,71 @@ msgstr ""
 msgid "Import Accounts"
 msgstr "Importar cuentas"
 
-#: ../src/empathy-main-window.c:395
+#: ../src/empathy-main-window.c:402
 msgid "_Edit account"
 msgstr "_Editar cuenta"
 
-#: ../src/empathy-main-window.c:498
+#: ../src/empathy-main-window.c:505
 msgid "No error specified"
 msgstr "No se especificó el error"
 
-#: ../src/empathy-main-window.c:501
+#: ../src/empathy-main-window.c:508
 msgid "Network error"
 msgstr "Error de red"
 
-#: ../src/empathy-main-window.c:504
+#: ../src/empathy-main-window.c:511
 msgid "Authentication failed"
 msgstr "Falló la autenticación"
 
-#: ../src/empathy-main-window.c:507
+#: ../src/empathy-main-window.c:514
 msgid "Encryption error"
 msgstr "Error de cifrado"
 
-#: ../src/empathy-main-window.c:510
+#: ../src/empathy-main-window.c:517
 msgid "Name in use"
 msgstr "Nombre en uso"
 
-#: ../src/empathy-main-window.c:513
+#: ../src/empathy-main-window.c:520
 msgid "Certificate not provided"
 msgstr "No se proporcionó el certificado"
 
-#: ../src/empathy-main-window.c:516
+#: ../src/empathy-main-window.c:523
 msgid "Certificate untrusted"
 msgstr "Certificado sin confianza"
 
-#: ../src/empathy-main-window.c:519
+#: ../src/empathy-main-window.c:526
 msgid "Certificate expired"
 msgstr "El certificado ha expirado"
 
-#: ../src/empathy-main-window.c:522
+#: ../src/empathy-main-window.c:529
 msgid "Certificate not activated"
 msgstr "El certificado no está activado"
 
-#: ../src/empathy-main-window.c:525
+#: ../src/empathy-main-window.c:532
 msgid "Certificate hostname mismatch"
 msgstr "El nombre del equipo del certificado no coincide"
 
-#: ../src/empathy-main-window.c:528
+#: ../src/empathy-main-window.c:535
 msgid "Certificate fingerprint mismatch"
 msgstr "La huella del certificado no coincide"
 
-#: ../src/empathy-main-window.c:531
+#: ../src/empathy-main-window.c:538
 msgid "Certificate self-signed"
 msgstr "Certificado firmado consigo mismo"
 
-#: ../src/empathy-main-window.c:534
+#: ../src/empathy-main-window.c:541
 msgid "Certificate error"
 msgstr "Error del certificado"
 
-#: ../src/empathy-main-window.c:537
+#: ../src/empathy-main-window.c:544
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: ../src/empathy-main-window.c:1220
+#: ../src/empathy-main-window.c:1293
 msgid "Show and edit accounts"
 msgstr "Mostrar y editar cuentas"
 
-#: ../src/empathy-main-window.ui.h:1 ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-main-window.ui.h:1
 msgid "Contact List"
 msgstr "Lista de contactos"
 
@@ -2143,62 +2195,78 @@ msgid "Manage Favorites"
 msgstr "Gestionar favoritos"
 
 #: ../src/empathy-main-window.ui.h:6
-msgid "_Accounts"
-msgstr "_Cuentas"
+msgid "N_ormal Size"
+msgstr "Tamaño n_ormal"
 
 #: ../src/empathy-main-window.ui.h:7
-msgid "_Add Contact..."
-msgstr "_Añadir contacto…"
+msgid "Normal Size With _Avatars"
+msgstr "Tamaño normal con _avatares"
+
+#: ../src/empathy-main-window.ui.h:8
+msgid "Sort by _Name"
+msgstr "Ordenar por _nombre"
 
 #: ../src/empathy-main-window.ui.h:9
+msgid "Sort by _Status"
+msgstr "Ordenar por es_tado"
+
+#: ../src/empathy-main-window.ui.h:10
+msgid "_Accounts"
+msgstr "_Cuentas"
+
+#: ../src/empathy-main-window.ui.h:13
+msgid "_Compact Size"
+msgstr "Tamaño _compacto"
+
+#: ../src/empathy-main-window.ui.h:14
 msgid "_Contents"
 msgstr "Índ_ice"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:15
 msgid "_Debug"
 msgstr "_Depurar"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:17
 msgid "_File Transfers"
 msgstr "_Transferencias de archivos"
 
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:18
 msgid "_Help"
 msgstr "Ay_uda"
 
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window.ui.h:19
 msgid "_Join..."
 msgstr "_Unirse…"
 
-#: ../src/empathy-main-window.ui.h:15 ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2
 msgid "_New Conversation..."
 msgstr "_Conversación nueva…"
 
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window.ui.h:21
 msgid "_Offline Contacts"
 msgstr "Contactos _desconectados"
 
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window.ui.h:22
 msgid "_Personal Information"
 msgstr "Información p_ersonal"
 
-#: ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-main-window.ui.h:24
 msgid "_Previous Conversations"
 msgstr "Conversaciones an_teriores"
 
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window.ui.h:25
 msgid "_Room"
 msgstr "_Sala"
 
-#: ../src/empathy-new-chatroom-dialog.c:332
+#: ../src/empathy-new-chatroom-dialog.c:331
 msgid "Chat Room"
 msgstr "Sala de chat"
 
-#: ../src/empathy-new-chatroom-dialog.c:348
+#: ../src/empathy-new-chatroom-dialog.c:347
 msgid "Members"
 msgstr "Miembros"
 
-#: ../src/empathy-new-chatroom-dialog.c:492
+#: ../src/empathy-new-chatroom-dialog.c:496
 #, c-format
 msgctxt ""
 "Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
@@ -2214,21 +2282,21 @@ msgstr ""
 "Contraseña necesaria: %s\n"
 "Miembros: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:494
-#: ../src/empathy-new-chatroom-dialog.c:495
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
 msgid "Yes"
 msgstr "Sí"
 
-#: ../src/empathy-new-chatroom-dialog.c:494
-#: ../src/empathy-new-chatroom-dialog.c:495
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
 msgid "No"
 msgstr "No"
 
-#: ../src/empathy-new-chatroom-dialog.c:522
+#: ../src/empathy-new-chatroom-dialog.c:526
 msgid "Could not start room listing"
 msgstr "No se pudo iniciar la lista de la sala"
 
-#: ../src/empathy-new-chatroom-dialog.c:532
+#: ../src/empathy-new-chatroom-dialog.c:536
 msgid "Could not stop room listing"
 msgstr "No se pudo parar la lista de la sala"
 
@@ -2263,135 +2331,119 @@ msgstr "Lista de salas"
 msgid "_Room:"
 msgstr "_Sala:"
 
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:147
 msgid "Message received"
 msgstr "Mensaje recibido"
 
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:148
 msgid "Message sent"
 msgstr "Mensaje enviado"
 
-#: ../src/empathy-preferences.c:163
+#: ../src/empathy-preferences.c:149
 msgid "New conversation"
 msgstr "Conversación nueva"
 
-#: ../src/empathy-preferences.c:164
+#: ../src/empathy-preferences.c:150
 msgid "Contact goes online"
 msgstr "El contacto se conecta"
 
-#: ../src/empathy-preferences.c:165
+#: ../src/empathy-preferences.c:151
 msgid "Contact goes offline"
 msgstr "El contacto se desconecta"
 
-#: ../src/empathy-preferences.c:166
+#: ../src/empathy-preferences.c:152
 msgid "Account connected"
 msgstr "Cuenta conectada"
 
-#: ../src/empathy-preferences.c:167
+#: ../src/empathy-preferences.c:153
 msgid "Account disconnected"
 msgstr "Cuenta desconectada"
 
-#: ../src/empathy-preferences.c:446
+#: ../src/empathy-preferences.c:393
 msgid "Language"
 msgstr "Idioma"
 
 #: ../src/empathy-preferences.ui.h:1
-msgid "Adium theme to use:"
-msgstr "Tema adium que usar:"
-
-#: ../src/empathy-preferences.ui.h:2
 msgid "Allow _GPS usage"
 msgstr "Permitir el usso de _GPS"
 
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:2
 msgid "Allow _cellphone usage"
 msgstr "Permitir el uso de teléfono _móvil"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:3
 msgid "Allow _network usage"
 msgstr "Permitir el uso de la _red"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:4
 msgid "Appearance"
 msgstr "Apariencia"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:5
 msgid "Automatically _connect on startup "
 msgstr "_Conectarse automáticamente al inicio"
 
-#: ../src/empathy-preferences.ui.h:7
-msgid "Avatars are user chosen images shown in the contact list"
-msgstr ""
-"Los avatares son imágenes elegidas por el usuario que se muestran en la "
-"lista de contactos"
-
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:6
 msgid "Behavior"
 msgstr "Comportamiento"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:7
 msgid "Chat Th_eme:"
 msgstr "_Tema del chat:"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:8
 msgid "Disable notifications when _away or busy"
 msgstr "Desactivar notificaciones al _ausentarse o estar ocupado"
 
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:9
 msgid "Disable sounds when _away or busy"
 msgstr "Desactivar sonidos al _ausentarse o estar ocupado"
 
-#: ../src/empathy-preferences.ui.h:13
-#| msgid "Enable notifications when the _chat is not focused"
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "Activar notificaciones cuando un contacto se conecta"
 
-#: ../src/empathy-preferences.ui.h:14
-#| msgid "Enable notifications when the _chat is not focused"
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "Activar notificaciones cuando un contacto se desconecta"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Activar notificaciones cuando el _chat no tenga el foco"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "Activar la revisión ortográfica para idiomas:"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "General"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:15
 msgid "Geoclue Settings"
 msgstr "Configuración de Geoclue"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:16
 msgid "Location"
 msgstr "Ubicación"
 
-#: ../src/empathy-preferences.ui.h:20
-msgid "Not a valid adium theme"
-msgstr "No es un tema adium válido"
-
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:17
 msgid "Notifications"
 msgstr "Notificaciones"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:18
 msgid "Play sound for events"
 msgstr "Reproducir sonido para eventos"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:19
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:20
 msgid "Privacy"
 msgstr "Privacidad"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:21
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will have a random "
@@ -2401,39 +2453,23 @@ msgstr ""
 "preciso que su ciudad, estado y país. Las coordenadas GPS tendrán un valor "
 "aleatorio añadido (&#xB1;0.25&#xB0;)."
 
-#: ../src/empathy-preferences.ui.h:26
-msgid "Show _avatars"
-msgstr "Mostrar _avatares"
-
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:22
 msgid "Show _smileys as images"
 msgstr "Mostrar los _emoticonos como imágenes"
 
-#: ../src/empathy-preferences.ui.h:28
-msgid "Show co_mpact contact list"
-msgstr "Mostrar lista de contactos co_mpacta"
-
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:23
 msgid "Show contact _list in rooms"
 msgstr "Mostrar _lista de contactos en salas"
 
-#: ../src/empathy-preferences.ui.h:30
-msgid "Sort by _name"
-msgstr "Ordenar por _nombre"
-
-#: ../src/empathy-preferences.ui.h:31
-msgid "Sort by s_tate"
-msgstr "Ordenar por es_tado"
-
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "Sonidos"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:25
 msgid "Spell Checking"
 msgstr "Revisión ortográfica"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:26
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
@@ -2441,27 +2477,27 @@ msgstr ""
 "La lista de idiomas refleja sólo los idiomas para los cuales tiene un "
 "diccionario instalado."
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:27
 msgid "Themes"
 msgstr "Temas"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:28
 msgid "_Enable bubble notifications"
 msgstr "_Activar notificaciones de burbuja"
 
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:29
 msgid "_Enable sound notifications"
 msgstr "_Activar notificaciones de sonido"
 
-#: ../src/empathy-preferences.ui.h:38
+#: ../src/empathy-preferences.ui.h:30
 msgid "_Open new chats in separate windows"
 msgstr "_Abrir charlas nuevas en ventanas separadas"
 
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Publish location to my contacts"
 msgstr "_Publicar mi ubicación a mis contactos"
 
-#: ../src/empathy-preferences.ui.h:40
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Reduce location accuracy"
 msgstr "_Reducir la precisión de la ubicación"
 
@@ -2499,64 +2535,64 @@ msgstr "gtk-leave-fullscreen"
 msgid "Contact Map View"
 msgstr "Vista del mapa de contactos"
 
-#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1075
+#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
 msgid "Error"
 msgstr "Error"
 
-#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1069
+#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
 msgid "Critical"
 msgstr "Crítico"
 
-#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1063
+#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1057
-#: ../src/empathy-debug-dialog.c:1105
+#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065
+#: ../src/empathy-debug-dialog.c:1113
 msgid "Message"
 msgstr "Mensaje"
 
-#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1051
+#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059
 msgid "Info"
 msgstr "Información"
 
-#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1045
+#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053
 msgid "Debug"
 msgstr "Depurar"
 
-#: ../src/empathy-debug-dialog.c:837
+#: ../src/empathy-debug-dialog.c:845
 msgid "Save"
 msgstr "Guardar"
 
-#: ../src/empathy-debug-dialog.c:940
+#: ../src/empathy-debug-dialog.c:948
 msgid "Debug Window"
 msgstr "Depurar ventana"
 
-#: ../src/empathy-debug-dialog.c:1013
+#: ../src/empathy-debug-dialog.c:1021
 msgid "Pause"
 msgstr "Pausar"
 
-#: ../src/empathy-debug-dialog.c:1025
+#: ../src/empathy-debug-dialog.c:1033
 msgid "Level "
 msgstr "Nivel "
 
-#: ../src/empathy-debug-dialog.c:1094
+#: ../src/empathy-debug-dialog.c:1102
 msgid "Time"
 msgstr "Hora"
 
-#: ../src/empathy-debug-dialog.c:1096
+#: ../src/empathy-debug-dialog.c:1104
 msgid "Domain"
 msgstr "Dominio"
 
-#: ../src/empathy-debug-dialog.c:1098
+#: ../src/empathy-debug-dialog.c:1106
 msgid "Category"
 msgstr "Categoría"
 
-#: ../src/empathy-debug-dialog.c:1100
+#: ../src/empathy-debug-dialog.c:1108
 msgid "Level"
 msgstr "Nivel"
 
-#: ../src/empathy-debug-dialog.c:1132
+#: ../src/empathy-debug-dialog.c:1140
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -2564,6 +2600,26 @@ msgstr ""
 "El gestor de conexiones seleccionado no soporta la extensión de depuración "
 "remota."
 
+#~ msgid "Avatars are user chosen images shown in the contact list"
+#~ msgstr ""
+#~ "Los avatares son imágenes elegidas por el usuario que se muestran en la "
+#~ "lista de contactos"
+
+#~ msgid "Show _avatars"
+#~ msgstr "Mostrar _avatares"
+
+#~ msgid "Show co_mpact contact list"
+#~ msgstr "Mostrar lista de contactos co_mpacta"
+
+#~ msgid "Adium"
+#~ msgstr "Adium"
+
+#~ msgid "Adium theme to use:"
+#~ msgstr "Tema adium que usar:"
+
+#~ msgid "Not a valid adium theme"
+#~ msgstr "No es un tema adium válido"
+
 #~ msgid "<b>Network</b>"
 #~ msgstr "<b>Red</b>"
 
diff --git a/po/fr.po b/po/fr.po
index 318cb7354..460c9b24b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -15,16 +15,17 @@
 # Frederic Peters <fpeters@0d.be>, 2007-2008.
 # Laurent Bigonville <bigon@bigon.be>, 2007.
 # Stéphane Raimbault <stephane.raimbault@gmail.com>, 2007.
-# Christophe Benz <christophe.benz@gmail.com>, 2007.
+# Christophe Benz <christophe.benz@gmail.com>, 2007-2009.
 # Yannick Tailliez <ytdispatch-libre@yahoo.com>, 2008.
 # Laurent Coudeur <laurentc@iol.ie>, 2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-17 21:38+0100\n"
-"PO-Revision-Date: 2009-02-17 21:43+0100\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=empathy&component=general\n"
+"POT-Creation-Date: 2009-07-02 19:42+0000\n"
+"PO-Revision-Date: 2009-07-06 12:06+0200\n"
 "Last-Translator: Claude Paroz <claude@2xlibre.net>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "MIME-Version: 1.0\n"
@@ -87,128 +88,189 @@ msgid "Disable sounds when away"
 msgstr "Désactiver les sons en mode absent"
 
 #: ../data/empathy.schemas.in.h:10
+msgid "Empathy can publish the user's location"
+msgstr "Empathy peut publier l'emplacement de l'utilisateur"
+
+#: ../data/empathy.schemas.in.h:11
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy peut utiliser le GPS pour découvrir l'emplacement"
+
+#: ../data/empathy.schemas.in.h:12
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy peut utiliser le réseau cellulaire pour découvrir l'emplacement"
+
+#: ../data/empathy.schemas.in.h:13
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy peut utiliser le réseau pour découvrir l'emplacement"
+
+#: ../data/empathy.schemas.in.h:14
 msgid "Empathy default download folder"
 msgstr "Dossier de téléchargement par défaut d'Empathy"
 
-#: ../data/empathy.schemas.in.h:11
+#: ../data/empathy.schemas.in.h:15
 msgid "Empathy has asked about importing accounts"
 msgstr "Empathy a demandé à importer des comptes"
 
-#: ../data/empathy.schemas.in.h:12
+#: ../data/empathy.schemas.in.h:16
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy doit se connecter automatiquement au démarrage"
 
-#: ../data/empathy.schemas.in.h:13
+#: ../data/empathy.schemas.in.h:17
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy doit réduire la précision de l'emplacement"
+
+#: ../data/empathy.schemas.in.h:18
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr ""
 "Empathy doit utiliser l'avatar du contact comme icône de fenêtre de "
 "discussion"
 
-#: ../data/empathy.schemas.in.h:14
+#: ../data/empathy.schemas.in.h:19
 msgid "Enable popup notifications for new messages"
 msgstr "Activer les bulles de notification pour les nouveaux messages"
 
-#: ../data/empathy.schemas.in.h:15
+#: ../data/empathy.schemas.in.h:20
 msgid "Enable spell checker"
 msgstr "Activer le correcteur orthographique"
 
-#: ../data/empathy.schemas.in.h:16
+#: ../data/empathy.schemas.in.h:21
 msgid "Hide main window"
 msgstr "Masquer la fenêtre principale"
 
-#: ../data/empathy.schemas.in.h:17
+#: ../data/empathy.schemas.in.h:22
 msgid "Hide the main window."
 msgstr "Masque la fenêtre principale."
 
-#: ../data/empathy.schemas.in.h:18
+#: ../data/empathy.schemas.in.h:23
 msgid "NetworkManager should be used"
 msgstr "NetworkManager devrait être utilisé"
 
-#: ../data/empathy.schemas.in.h:19
+#: ../data/empathy.schemas.in.h:24
 msgid "Nick completed character"
 msgstr "Caractère d'auto-complétion du pseudonyme"
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:25
 msgid "Open new chats in separate windows"
 msgstr "Ouvrir les nouvelles discussions dans des fenêtres séparées"
 
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:26
+msgid "Path of the adium theme to use"
+msgstr "Chemin vers le thème Adium à utiliser"
+
+#: ../data/empathy.schemas.in.h:27
+msgid "Path of the adium theme to use if the theme used for chat is adium."
+msgstr ""
+"Chemin vers le thème Adium à utiliser si un thème Adium est choisi pour les discussions."
+
+#: ../data/empathy.schemas.in.h:28
 msgid "Play a sound for incoming messages"
 msgstr "Jouer un son lors de la réception des messages"
 
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:29
 msgid "Play a sound for new conversations"
 msgstr "Jouer un son lors de nouvelles discussions"
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:30
 msgid "Play a sound for outgoing messages"
 msgstr "Jouer un son lors de l'envoi des messages"
 
-#: ../data/empathy.schemas.in.h:24
+#: ../data/empathy.schemas.in.h:31
 msgid "Play a sound when a contact logs in"
 msgstr "Jouer un son lorsqu'un contact se connecte"
 
-#: ../data/empathy.schemas.in.h:25
+#: ../data/empathy.schemas.in.h:32
 msgid "Play a sound when a contact logs out"
 msgstr "Jouer un son lorsqu'un contact se déconnecte"
 
-#: ../data/empathy.schemas.in.h:26
+#: ../data/empathy.schemas.in.h:33
 msgid "Play a sound when we log in"
 msgstr "Jouer un son lors de la connexion"
 
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:34
 msgid "Play a sound when we log out"
 msgstr "Jouer un son lors de la déconnexion"
 
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:35
 msgid "Popup notifications if the chat isn't focused"
 msgstr "Bulles de notification si la discussion n'a pas le focus"
 
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:36
+msgid "Popup notifications when a contact sign in"
+msgstr "Bulles de notification lorsqu'un contact se connecte"
+
+#: ../data/empathy.schemas.in.h:37
+msgid "Popup notifications when a contact sign out"
+msgstr "Bulles de notification lorsqu'un contact se déconnecte"
+
+#: ../data/empathy.schemas.in.h:38
 msgid "Salut account is created"
 msgstr "Le compte Salut est créé"
 
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:39
 msgid "Show avatars"
 msgstr "Afficher les avatars"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:40
+msgid "Show contact list in rooms"
+msgstr "Afficher la liste des contacts dans les salles"
+
+#: ../data/empathy.schemas.in.h:41
 msgid "Show hint about closing the main window"
 msgstr "Afficher une astuce sur la fermeture de la fenêtre principale"
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:42
 msgid "Show offline contacts"
 msgstr "Afficher les contacts déconnectés"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:43
 msgid "Spell checking languages"
 msgstr "Langues de la correction orthographique"
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:44
 msgid "The default folder to save file transfers in."
 msgstr "Le dossier par défaut pour enregistrer les transferts de fichiers."
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:45
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Dernier répertoire où un avatar a été choisi."
 
-#: ../data/empathy.schemas.in.h:36
+#: ../data/empathy.schemas.in.h:46
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Le thème utilisé pour l'affichage dans les fenêtres de discussion."
 
-#: ../data/empathy.schemas.in.h:37
+#: ../data/empathy.schemas.in.h:47
 msgid "Use graphical smileys"
 msgstr "Utiliser des frimousses graphiques"
 
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:48
 msgid "Use notification sounds"
 msgstr "Utiliser des sons de notification"
 
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:49
 msgid "Use theme for chat rooms"
 msgstr "Utiliser des thèmes pour les salles de discussion"
 
-#: ../data/empathy.schemas.in.h:40
+#: ../data/empathy.schemas.in.h:50
+msgid "Whether or not Empathy can publish the user's location to his contacts."
+msgstr ""
+"Indique si Empathy peut publier l'emplacement de l'utilisateur à ses contacts."
+
+#: ../data/empathy.schemas.in.h:51
+msgid "Whether or not Empathy can use the GPS to guess the location."
+msgstr "Indique si Empathy peut utiliser le GPS pour découvrir l'emplacement."
+
+#: ../data/empathy.schemas.in.h:52
+msgid ""
+"Whether or not Empathy can use the cellular network to guess the location."
+msgstr ""
+"Indique si Empathy peut utiliser le réseau cellulaire pour découvrir l'emplacement."
+
+#: ../data/empathy.schemas.in.h:53
+msgid "Whether or not Empathy can use the network to guess the location."
+msgstr ""
+"Indique si Empathy peut utiliser le réseau pour découvrir l'emplacement."
+
+#: ../data/empathy.schemas.in.h:54
 msgid ""
 "Whether or not Empathy has asked about importing accounts from other "
 "programs."
@@ -216,7 +278,7 @@ msgstr ""
 "Indique si Empathy a demandé l'importation de comptes provenant d'autres "
 "logiciels."
 
-#: ../data/empathy.schemas.in.h:41
+#: ../data/empathy.schemas.in.h:55
 msgid ""
 "Whether or not Empathy should automatically log in to your accounts on "
 "startup."
@@ -224,7 +286,15 @@ msgstr ""
 "Indique si Empathy doit se connecter automatiquement à vos comptes au "
 "démarrage."
 
-#: ../data/empathy.schemas.in.h:42
+#: ../data/empathy.schemas.in.h:56
+msgid ""
+"Whether or not Empathy should reduce the location's accuracy for privacy "
+"reasons."
+msgstr ""
+"Indique si Empathy doit réduire la précision de l'emplacement pour des raisons "
+"de confidentialité."
+
+#: ../data/empathy.schemas.in.h:57
 msgid ""
 "Whether or not Empathy should use the avatar of the contact as the chat "
 "window icon."
@@ -232,12 +302,12 @@ msgstr ""
 "Indique si Empathy doit utiliser l'avatar des contacts comme icône de "
 "fenêtre de discussion."
 
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:58
 msgid ""
 "Whether or not the Salut account has been created on the first Empathy run."
 msgstr "Indique si le compte Salut a été créé au premier lancement d'Empathy."
 
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:59
 msgid ""
 "Whether or not the network manager should be used to automatically "
 "disconnect/reconnect."
@@ -245,7 +315,7 @@ msgstr ""
 "Indique si NetworkManager doit être utilisé pour se déconnecter ou se "
 "reconnecter automatiquement."
 
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:60
 msgid ""
 "Whether or not to check words typed against the languages you want to check "
 "with."
@@ -253,21 +323,21 @@ msgstr ""
 "Indique s'il faut vérifier l'orthographe des mots saisis selon les langues "
 "choisies."
 
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:61
 msgid ""
 "Whether or not to convert smileys into graphical images in conversations."
 msgstr ""
 "Indique s'il faut changer les frimousses en images graphiques dans les "
 "conversations."
 
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:62
 msgid ""
 "Whether or not to play a sound to notify for contacts logging in the network."
 msgstr ""
 "Indique s'il faut jouer un son pour avertir lorsque des contacts se "
 "connectent au réseau."
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:63
 msgid ""
 "Whether or not to play a sound to notify for contacts logging off the "
 "network."
@@ -275,37 +345,48 @@ msgstr ""
 "Indique s'il faut jouer un son pour avertir lorsque des contacts se "
 "déconnectent du réseau."
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:64
 msgid "Whether or not to play a sound to notify for events."
 msgstr "Indique s'il faut jouer un son pour signaler des événements."
 
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:65
 msgid "Whether or not to play a sound to notify for incoming messages."
 msgstr "Indique s'il faut jouer un son pour avertir de l'arrivée de messages."
 
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:66
 msgid "Whether or not to play a sound to notify for new conversations."
 msgstr ""
 "Indique s'il faut jouer un son pour signaler de nouvelles conversations."
 
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:67
 msgid "Whether or not to play a sound to notify for outgoing messages."
 msgstr "Indique s'il faut jouer un son pour signaler qu'un message est envoyé."
 
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:68
 msgid "Whether or not to play a sound when logging in a network."
 msgstr "Indique s'il faut jouer un son lors de la connexion à un réseau."
 
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:69
 msgid "Whether or not to play a sound when logging off a network."
 msgstr "Indique s'il faut jouer un son lors de la déconnexion d'un réseau."
 
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:70
 msgid "Whether or not to play sound notifications when away or busy."
 msgstr ""
 "Indique s'il faut émettre des sons en cas d'absence ou d'indisponibilité."
 
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:71
+msgid ""
+"Whether or not to show a popup notification when a contact goes offline."
+msgstr ""
+"Indique s'il faut afficher des notifications lorsqu'un contact se déconnecte."
+
+#: ../data/empathy.schemas.in.h:72
+msgid "Whether or not to show a popup notification when a contact goes online."
+msgstr ""
+"Indique s'il faut afficher des notifications lorsqu'un contact se connecte."
+
+#: ../data/empathy.schemas.in.h:73
 msgid ""
 "Whether or not to show a popup notification when receiving a new message "
 "even if the chat is already opened, but not focused."
@@ -313,14 +394,14 @@ msgstr ""
 "Indique s'il faut afficher une bulle de notification lorsqu'un message est "
 "reçu, même si la discussion est ouverte, mais sans disposer du focus."
 
-#: ../data/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:74
 msgid ""
 "Whether or not to show a popup notification when receiving a new message."
 msgstr ""
 "Indique s'il faut afficher une bulle de notification lorsqu'un message est "
 "reçu."
 
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:75
 msgid ""
 "Whether or not to show avatars for contacts in the contact list and chat "
 "windows."
@@ -328,19 +409,23 @@ msgstr ""
 "Indique s'il faut afficher les avatars des contacts dans la liste des "
 "contacts et les fenêtres de discussion."
 
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:76
 msgid "Whether or not to show contacts that are offline in the contact list."
 msgstr ""
 "Indique s'il faut afficher les contacts qui sont déconnectés dans la liste "
 "des contacts."
 
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:77
 msgid "Whether or not to show popup notifications when away or busy."
 msgstr ""
 "Indique s'il faut afficher des notifications en cas d'absence ou "
 "d'indisponibilité."
 
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:78
+msgid "Whether or not to show the contact list in chat rooms."
+msgstr "Indique s'il faut afficher la liste des contacts dans les salles de discussion."
+
+#: ../data/empathy.schemas.in.h:79
 msgid ""
 "Whether or not to show the message dialog about closing the main window with "
 "the 'x' button in the title bar."
@@ -348,15 +433,15 @@ msgstr ""
 "Indique s'il faut afficher la boîte de dialogue au sujet de la fermeture de "
 "la fenêtre principale avec le bouton « x » dans la barre de titre."
 
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:80
 msgid "Whether to show the contact list in compact mode or not."
 msgstr "Indique s'il faut afficher la liste des contacts en mode compact."
 
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:81
 msgid "Whether to use the theme for chat rooms or not."
 msgstr "Indique s'il faut utiliser les thèmes pour les salles de discussion."
 
-#: ../data/empathy.schemas.in.h:64
+#: ../data/empathy.schemas.in.h:82
 msgid ""
 "Which criterium to use when sorting the contact list. Default is to use sort "
 "by the contact's name with the value \"name\". A value of \"state\" will "
@@ -366,542 +451,757 @@ msgstr ""
 "par défaut est de trier selon le nom du contact (valeur: « name »).  Une "
 "valeur « state » triera la liste des contacts selon leur état."
 
-#: ../libempathy/empathy-tp-contact-list.c:731 ../src/empathy.c:269
+#: ../libempathy/empathy-ft-handler.c:838
+msgid "The hash of the received file and the sent one do not match"
+msgstr ""
+"La somme de contrôle du fichier reçu ne correspond pas à celle du fichier envoyé"
+
+#: ../libempathy/empathy-ft-handler.c:1098
+msgid "File transfer not supported by remote contact"
+msgstr "Le transfert de fichier n'est pas pris en charge par le contact distant"
+
+#: ../libempathy/empathy-ft-handler.c:1156
+msgid "The selected file is not a regular file"
+msgstr "Le fichier sélectionné n'est pas un fichier conventionnel"
+
+#: ../libempathy/empathy-ft-handler.c:1165
+msgid "The selected file is empty"
+msgstr "Le fichier sélectionné est vide"
+
+#: ../libempathy/empathy-tp-contact-list.c:757 ../src/empathy.c:289
 msgid "People nearby"
 msgstr "Personnes à proximité"
 
-#: ../libempathy/empathy-utils.c:252
+#: ../libempathy/empathy-tp-file.c:279
+msgid "Socket type not supported"
+msgstr "Le type de connecteur réseau (socket) n'est pas pris en charge"
+
+#: ../libempathy/empathy-tp-file.c:398
+msgid "No reason was specified"
+msgstr "Aucune raison n'a été indiquée"
+
+#: ../libempathy/empathy-tp-file.c:401
+msgid "The change in state was requested"
+msgstr "Le changement d'état a été demandé"
+
+#: ../libempathy/empathy-tp-file.c:404
+msgid "You canceled the file transfer"
+msgstr "Vous avez annulé le transfert de fichiers"
+
+#: ../libempathy/empathy-tp-file.c:407
+msgid "The other participant canceled the file transfer"
+msgstr "Le correspondant a annulé le transfert de fichiers"
+
+#: ../libempathy/empathy-tp-file.c:410
+msgid "Error while trying to transfer the file"
+msgstr "Erreur lors du téléchargement du fichier"
+
+#: ../libempathy/empathy-tp-file.c:413
+msgid "The other participant is unable to transfer the file"
+msgstr "Le correspondant n'est pas capable de transférer le fichier"
+
+#: ../libempathy/empathy-tp-file.c:416
+msgid "Unknown reason"
+msgstr "Raison inconnue"
+
+#: ../libempathy/empathy-utils.c:265
 msgid "Available"
 msgstr "Disponible"
 
-#: ../libempathy/empathy-utils.c:254
+#: ../libempathy/empathy-utils.c:267
 msgid "Busy"
 msgstr "Occupé"
 
-#: ../libempathy/empathy-utils.c:257
+#: ../libempathy/empathy-utils.c:270
 msgid "Away"
 msgstr "Absent"
 
-#: ../libempathy/empathy-utils.c:259
+#: ../libempathy/empathy-utils.c:272
 msgid "Hidden"
 msgstr "Masqué"
 
-#: ../libempathy/empathy-utils.c:262
+#: ../libempathy/empathy-utils.c:274
 msgid "Offline"
 msgstr "Déconnecté"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:326
+#: ../libempathy/empathy-time.c:137
+#, c-format
+msgid "%d second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "il y a %d seconde"
+msgstr[1] "il y a %d secondes"
+
+#: ../libempathy/empathy-time.c:142
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "il y a %d minute"
+msgstr[1] "il y a %d minutes"
+
+#: ../libempathy/empathy-time.c:147
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "il y a %d heure"
+msgstr[1] "il y a %d heures"
+
+#: ../libempathy/empathy-time.c:152
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "il y a %d jour"
+msgstr[1] "il y a %d jours"
+
+#: ../libempathy/empathy-time.c:157
+#, c-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "il y a %d semaine"
+msgstr[1] "il y a %d semaines"
+
+#: ../libempathy/empathy-time.c:162
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "il y a %d mois"
+msgstr[1] "il y a %d mois"
+
+#: ../libempathy/empathy-time.c:167
+msgid "in the future"
+msgstr "dans le futur"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:419
 msgid "All"
 msgstr "Toutes"
 
 #: ../libempathy-gtk/empathy-account-widget.c:302
-#: ../libempathy-gtk/empathy-account-widget.c:347
+#: ../libempathy-gtk/empathy-account-widget.c:354
 #, c-format
 msgid "%s:"
 msgstr "%s :"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-generic.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:1
-msgid "<b>Advanced</b>"
-msgstr "<b>Avancé</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:2
-msgid "Forget password and clear the entry."
-msgstr "Oublier le mot de passe et effacer la zone."
-
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Advanced"
+msgstr "Avancé"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
 msgid "Pass_word:"
 msgstr "_Mot de passe :"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
 msgid "Screen _Name:"
 msgstr "_Nom de l'écran :"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:11
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "_Port:"
 msgstr "_Port :"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:12
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:10
-#: ../src/empathy-new-chatroom-dialog.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
 msgstr "_Serveur :"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "I_dentifiant de connexion :"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
 msgid "ICQ _UIN:"
 msgstr "_UIN ICQ :"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "_Charset:"
 msgstr "Jeu de _caractères :"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:245
+#: ../libempathy-gtk/empathy-account-widget-irc.c:240
 msgid "New Network"
 msgstr "Nouveau réseau"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:1
-msgid "<b>Network</b>"
-msgstr "<b>Réseau</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:2
-msgid "<b>Servers</b>"
-msgstr "<b>Serveurs</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 msgid "Charset:"
 msgstr "Jeu de caractères :"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:4
-msgid "Create a new IRC network"
-msgstr "Crée un nouveau réseau IRC"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:5
-msgid "Edit the selected IRC network"
-msgstr "Modifie le réseau IRC sélectionné"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Network"
 msgstr "Réseau"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Network:"
 msgstr "Réseau :"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Nickname:"
 msgstr "Pseudonyme :"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Quit message:"
 msgstr "Message de départ :"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:11
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Real name:"
 msgstr "Nom réel :"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:12
-msgid "Remove the selected IRC network"
-msgstr "Supprime le réseau IRC sélectionné"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+msgid "Servers"
+msgstr "Serveurs"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:2
-msgid "<b>Override server settings</b>"
-msgstr "<b>Outrepasser les paramètres du serveur</b>"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+msgid "Override server settings"
+msgstr "Outrepasser les paramètres du serveur"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
 msgid "Pri_ority:"
 msgstr "Pri_orité :"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "Reso_urce:"
 msgstr "Resso_urce :"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 msgid "Use old SS_L"
 msgstr "Utiliser l'ancien SS_L"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "_Encryption required (TLS/SSL)"
 msgstr "Chiffr_ement requis (TLS/SSL)"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
 msgid "_Ignore SSL certificate errors"
 msgstr "_Ignorer les erreurs de certificat SSL"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:2
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:2
 msgid "_Email:"
 msgstr "_Adresse électronique :"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3
 msgid "_First Name:"
 msgstr "_Prénom :"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:4
 msgid "_Jabber ID:"
 msgstr "_Identifiant Jabber :"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:5
 msgid "_Last Name:"
 msgstr "_Nom :"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:6
-#: ../src/empathy-chatrooms-window.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:6
 msgid "_Nickname:"
 msgstr "_Pseudonyme :"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:7
 msgid "_Published Name:"
 msgstr "Nom _publié :"
 
 #. look up the DNS SRV record at the service's domain for the host name of a STUN server.
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "Discover STUN"
 msgstr "Découvrir STUN"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 msgid "STUN Server:"
 msgstr "Serveur STUN :"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
 msgid "STUN port:"
 msgstr "Port STUN :"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "_Username:"
 msgstr "_Nom d'utilisateur :"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
 msgid "Use _Yahoo Japan"
 msgstr "Utiliser _Yahoo Japan"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
 msgid "Yahoo I_D:"
 msgstr "I_dentifiant Yahoo :"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 msgid "_Ignore conference and chatroom invitations"
 msgstr "_Ignorer les invitations à des réunions ou à des salles de discussion"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
 msgid "_Room List locale:"
 msgstr "Locale de la liste des _salles :"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:462
-#: ../libempathy-gtk/empathy-avatar-chooser.c:537
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:525
 msgid "Couldn't convert image"
 msgstr "Impossible de convertir l'image"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:463
+#: ../libempathy-gtk/empathy-avatar-chooser.c:450
 msgid "None of the accepted image formats is supported on your system"
 msgstr ""
 "Aucun des formats d'image acceptés n'est pris en charge par votre système"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:956
+#: ../libempathy-gtk/empathy-avatar-chooser.c:933
 msgid "Select Your Avatar Image"
 msgstr "Sélection de l'image d'avatar"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:959
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
 msgid "No Image"
 msgstr "Aucune image"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
+#: ../libempathy-gtk/empathy-avatar-chooser.c:998
 msgid "Images"
 msgstr "Images"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1025
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
 msgid "All Files"
 msgstr "Tous les fichiers"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:294
+#: ../libempathy-gtk/empathy-avatar-image.c:324
 msgid "Click to enlarge"
 msgstr "Cliquer pour agrandir"
 
-#: ../libempathy-gtk/empathy-chat.c:507
+#: ../libempathy-gtk/empathy-chat.c:186
+msgid "Failed to reconnect this chat"
+msgstr "Échec de reconnexion à cette discussion"
+
+#: ../libempathy-gtk/empathy-chat.c:404
+msgid "Unsupported command"
+msgstr "Commande non prise en charge"
+
+#: ../libempathy-gtk/empathy-chat.c:539
 msgid "offline"
 msgstr "déconnecté"
 
-#: ../libempathy-gtk/empathy-chat.c:510
+#: ../libempathy-gtk/empathy-chat.c:542
 msgid "invalid contact"
 msgstr "contact non valide"
 
-#: ../libempathy-gtk/empathy-chat.c:513
+#: ../libempathy-gtk/empathy-chat.c:545
 msgid "permission denied"
 msgstr "permission refusée"
 
-#: ../libempathy-gtk/empathy-chat.c:516
+#: ../libempathy-gtk/empathy-chat.c:548
 msgid "too long message"
 msgstr "message trop long"
 
-#: ../libempathy-gtk/empathy-chat.c:519
+#: ../libempathy-gtk/empathy-chat.c:551
 msgid "not implemented"
 msgstr "non implémenté"
 
-#: ../libempathy-gtk/empathy-chat.c:522
+#: ../libempathy-gtk/empathy-chat.c:554
 msgid "unknown"
 msgstr "inconnu"
 
-#: ../libempathy-gtk/empathy-chat.c:526
+#: ../libempathy-gtk/empathy-chat.c:558
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Erreur à l'envoi du message « %s » : %s"
 
-#: ../libempathy-gtk/empathy-chat.c:556
+#: ../libempathy-gtk/empathy-chat.c:588
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Sujet défini : %s"
 
-#: ../libempathy-gtk/empathy-chat.c:558
+#: ../libempathy-gtk/empathy-chat.c:590
 msgid "No topic defined"
 msgstr "Pas de sujet défini"
 
-#: ../libempathy-gtk/empathy-chat.c:973
+#: ../libempathy-gtk/empathy-chat.c:959
+msgid "(No Suggestions)"
+msgstr "(aucune suggestion)"
+
+#: ../libempathy-gtk/empathy-chat.c:1013
 msgid "Insert Smiley"
 msgstr "Insérer une frimousse"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:991
-#: ../libempathy-gtk/empathy-ui-utils.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1031
+#: ../libempathy-gtk/empathy-ui-utils.c:1475
 msgid "_Send"
 msgstr "_Envoyer"
 
-#: ../libempathy-gtk/empathy-chat.c:1025
-msgid "_Check Word Spelling..."
-msgstr "_Vérifier l'orthographe..."
+#: ../libempathy-gtk/empathy-chat.c:1065
+msgid "_Spelling Suggestions"
+msgstr "_Suggestions orthographiques"
 
-#: ../libempathy-gtk/empathy-chat.c:1131
+#: ../libempathy-gtk/empathy-chat.c:1180
 #, c-format
-msgid "%s has joined the room"
-msgstr "%s a rejoint la salle"
+msgid "%s has disconnected"
+msgstr "%s s'est déconnecté"
+
+#: ../libempathy-gtk/empathy-chat.c:1184
+#, c-format
+msgid "%s was kicked by %s"
+msgstr "%s a été expulsé par %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1187
+#, c-format
+msgid "%s was kicked"
+msgstr "%s a été expulsé"
+
+#: ../libempathy-gtk/empathy-chat.c:1192
+#, c-format
+msgid "%s was banned by %s"
+msgstr "%s a été banni par %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1195
+#, c-format
+msgid "%s was banned"
+msgstr "%s a été banni"
 
-#: ../libempathy-gtk/empathy-chat.c:1134
+#: ../libempathy-gtk/empathy-chat.c:1199
 #, c-format
 msgid "%s has left the room"
 msgstr "%s a quitté la salle"
 
-#: ../libempathy-gtk/empathy-chat.c:1248 ../src/empathy-call-window.c:548
+#. Note to translators: this string is appended to
+#. * notifications like "foo has left the room", with the message
+#. * given by the user living the room. If this poses a problem,
+#. * please let us know. :-)
+#.
+#: ../libempathy-gtk/empathy-chat.c:1208
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#: ../libempathy-gtk/empathy-chat.c:1231
+#, c-format
+msgid "%s has joined the room"
+msgstr "%s a rejoint la salle"
+
+#: ../libempathy-gtk/empathy-chat.c:1364 ../src/empathy-call-window.c:1226
 msgid "Disconnected"
 msgstr "Déconnecté"
 
-#: ../libempathy-gtk/empathy-chat.c:1644
+#: ../libempathy-gtk/empathy-chat.c:1793
 msgid "Connected"
 msgstr "Connecté"
 
-#: ../libempathy-gtk/empathy-chat.c:1694
-#: ../libempathy-gtk/empathy-log-window.c:505
+#: ../libempathy-gtk/empathy-chat.c:1843
+#: ../libempathy-gtk/empathy-log-window.c:502
 msgid "Conversation"
 msgstr "Conversation"
 
-#: ../libempathy-gtk/empathy-chat.glade.h:1
-msgid "<b>Topic:</b>"
-msgstr "<b>Sujet :</b>"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:2
-msgid "Group Chat"
-msgstr "Groupe de discussion"
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472
+msgid "Topic:"
+msgstr "Sujet :"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:340
+#: ../libempathy-gtk/empathy-chat-text-view.c:316
 msgid "_Copy Link Address"
 msgstr "_Copier l'adresse du lien"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:348
+#: ../libempathy-gtk/empathy-chat-text-view.c:323
 msgid "_Open Link"
 msgstr "_Ouvrir le lien"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:439
+#. Translators: timestamp displayed between conversations in
+#. * chat windows (strftime format string)
+#: ../libempathy-gtk/empathy-chat-text-view.c:421
 msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:180
-msgid "Personal Information"
-msgstr "Informations personnelles"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:183
+#: ../libempathy-gtk/empathy-contact-dialogs.c:179
+#: ../libempathy-gtk/empathy-contact-dialogs.c:238
 msgid "Edit Contact Information"
 msgstr "Modifier les informations du contact"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:186
-msgid "Contact Information"
-msgstr "Informations du contact"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:267
-msgid "I would like to add you to my contact list."
-msgstr "Je voudrais vous ajouter à ma liste de contacts."
+#: ../libempathy-gtk/empathy-contact-dialogs.c:289
+msgid "Personal Information"
+msgstr "Informations personnelles"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:291
+#: ../libempathy-gtk/empathy-contact-dialogs.c:384
 msgid "New Contact"
 msgstr "Nouveau contact"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:1
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
 msgid "Decide _Later"
 msgstr "Décider plus _tard"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:2
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Requête d'abonnement"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1249
+#: ../libempathy-gtk/empathy-contact-list-view.c:1375
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Voulez-vous réellement supprimer le groupe « %s » ?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1251
+#: ../libempathy-gtk/empathy-contact-list-view.c:1377
 msgid "Removing group"
 msgstr "Suppression du groupe"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1298
-#: ../libempathy-gtk/empathy-contact-list-view.c:1377
+#: ../libempathy-gtk/empathy-contact-list-view.c:1424
+#: ../libempathy-gtk/empathy-contact-list-view.c:1502
 msgid "_Remove"
 msgstr "_Supprimer"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1328
+#: ../libempathy-gtk/empathy-contact-list-view.c:1454
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Voulez-vous réellement supprimer le contact « %s » ?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1330
+#: ../libempathy-gtk/empathy-contact-list-view.c:1456
 msgid "Removing contact"
 msgstr "Suppression du contact"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1335
-msgid "Sorry, I don't want you in my contact list anymore."
-msgstr "Désolé, je ne te veux plus dans ma liste de contacts."
-
-#: ../libempathy-gtk/empathy-contact-menu.c:130
-#: ../src/empathy-main-window.glade.h:9
+#: ../libempathy-gtk/empathy-contact-menu.c:135
+#: ../src/empathy-main-window.ui.h:8
 msgid "_Chat"
 msgstr "Dis_cussion"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:161
-#: ../src/empathy-call-window.glade.h:5
-msgid "_Call"
-msgstr "_Appeler"
+#: ../libempathy-gtk/empathy-contact-menu.c:166
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "Appel _audio"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:198
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "Appel _vidéo"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:200
-#: ../src/empathy-main-window.glade.h:17
+#: ../libempathy-gtk/empathy-contact-menu.c:237
 msgid "_View Previous Conversations"
 msgstr "_Afficher les conversations précédentes"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../libempathy-gtk/empathy-contact-menu.c:259
 msgid "Send file"
 msgstr "Envoyer un fichier"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:250
+#: ../libempathy-gtk/empathy-contact-menu.c:287
 msgid "Infor_mation"
 msgstr "Infor_mations"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:277
-#: ../src/empathy-chat-window.glade.h:14 ../src/empathy-main-window.glade.h:11
+#: ../libempathy-gtk/empathy-contact-menu.c:314
+#: ../src/empathy-main-window.ui.h:11
 msgid "_Edit"
 msgstr "É_dition"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:336
+#: ../libempathy-gtk/empathy-contact-menu.c:372
 msgid "Inviting to this room"
 msgstr "Inviter à ce salon"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:369
+#: ../libempathy-gtk/empathy-contact-menu.c:403
 msgid "_Invite to chatroom"
 msgstr "_Inviter à un salon de discussion"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:111
+#: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "Sélectionner un contact"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:358
+#: ../libempathy-gtk/empathy-contact-widget.c:440
 msgid "Save Avatar"
 msgstr "Enregistrer l'avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:414
+#: ../libempathy-gtk/empathy-contact-widget.c:496
 msgid "Unable to save avatar"
 msgstr "Impossible d'enregistrer l'avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:895
+#: ../libempathy-gtk/empathy-contact-widget.c:979
 msgid "Select"
 msgstr "Sélectionner"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:904
-#: ../src/empathy-main-window.c:991
+#: ../libempathy-gtk/empathy-contact-widget.c:988
+#: ../src/empathy-main-window.c:903
 msgid "Group"
 msgstr "Groupe"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:1
-msgid "<b>Client Information</b>"
-msgstr "<b>Informations du client</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1239
+msgid "Country ISO Code:"
+msgstr "Code ISO du pays :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1241
+msgid "Country:"
+msgstr "Pays :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1243
+msgid "State:"
+msgstr "État :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1245
+msgid "City:"
+msgstr "Ville :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1247
+msgid "Area:"
+msgstr "Région :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1249
+msgid "Postal Code:"
+msgstr "Code postal :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1251
+msgid "Street:"
+msgstr "Rue :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1253
+msgid "Building:"
+msgstr "Bâtiment :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1255
+msgid "Floor:"
+msgstr "Étage :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1257
+msgid "Room:"
+msgstr "Salle :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1259
+msgid "Text:"
+msgstr "Texte :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1261
+msgid "Description:"
+msgstr "Description :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1263
+msgid "URI:"
+msgstr "URI :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1265
+msgid "Accuracy Level:"
+msgstr "Niveau de précision :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1267
+msgid "Error:"
+msgstr "Erreur :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1269
+msgid "Vertical Error (meters):"
+msgstr "Erreur verticale (mètres) :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1271
+msgid "Horizontal Error (meters):"
+msgstr "Erreur horizontale (mètres) :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1273
+msgid "Speed:"
+msgstr "Vitesse :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1275
+msgid "Bearing:"
+msgstr "Relèvement :"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:2
-msgid "<b>Contact Details</b>"
-msgstr "<b>Détails sur le contact</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1277
+msgid "Climb Speed:"
+msgstr "Vitesse ascensionnelle :"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:3
-msgid "<b>Contact</b>"
-msgstr "<b>Contact</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1279
+msgid "Last Updated on:"
+msgstr "Dernière mise à jour le :"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:4
-msgid "<b>Groups</b>"
-msgstr "<b>Groupes</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1281
+msgid "Longitude:"
+msgstr "Longitude :"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:5
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:1
-#: ../src/empathy-chatrooms-window.glade.h:1
-#: ../src/empathy-new-chatroom-dialog.glade.h:1
+#: ../libempathy-gtk/empathy-contact-widget.c:1283
+msgid "Latitude:"
+msgstr "Latitude :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1285
+msgid "Altitude:"
+msgstr "Altitude :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1332
+msgid "<b>Location</b>"
+msgstr "<b>Emplacement</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1345
+msgid "<b>Location</b>, "
+msgstr "<b>Emplacement</b>, "
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1395
+msgid "%B %e, %Y at %R UTC"
+msgstr "%e %B %Y à %R UTC"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Emplacement</b> le (date)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid "Account:"
 msgstr "Compte :"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:6
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
 msgid "Alias:"
 msgstr "Alias :"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:7
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
 msgid "Birthday:"
 msgstr "Anniversaire :"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:8
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "Client Information"
+msgstr "Informations du client"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
 msgid "Client:"
 msgstr "Client :"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:9
-msgid "Contact information"
-msgstr "Informations sur le contact"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../src/empathy-main-window.c:886
+msgid "Contact"
+msgstr "Contact"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Contact Details"
+msgstr "Détails sur le contact"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "Email:"
 msgstr "Adresse électronique :"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Fullname:"
 msgstr "Nom complet :"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Groups"
+msgstr "Groupes"
+
 #. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
 msgid "Identifier:"
 msgstr "Identifiant :"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:14
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
 msgid "Information requested..."
 msgstr "Demande des informations en cours..."
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
 msgid "OS:"
 msgstr "OS :"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:16
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -909,181 +1209,204 @@ msgstr ""
 "Sélectionnez les groupes auxquels ce contact appartiendra ; vous pouvez "
 "sélectionner plus d'un groupe ou aucun groupe."
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:17
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
 msgid "Version:"
 msgstr "Version :"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:18
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
 msgid "Web site:"
 msgstr "Site Web :"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:19
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
 msgid "_Add Group"
 msgstr "_Ajouter un groupe"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:284
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:283
 msgid "new server"
 msgstr "nouveau serveur"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:513
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:510
 msgid "Server"
 msgstr "Serveur"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:528
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:525
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:541
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:498
-#: ../src/empathy-import-dialog.c:277
+#: ../libempathy-gtk/empathy-log-window.c:495
+#: ../src/empathy-import-dialog.c:285
 msgid "Account"
 msgstr "Compte"
 
-#: ../libempathy-gtk/empathy-log-window.c:515
+#: ../libempathy-gtk/empathy-log-window.c:512
 msgid "Date"
 msgstr "Date"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.glade.h:2
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
 msgid "Conversations"
 msgstr "Conversations"
 
-#: ../libempathy-gtk/empathy-log-window.glade.h:3
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
 msgid "Previous Conversations"
 msgstr "Conversations précédentes"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.glade.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Search"
 msgstr "Rechercher"
 
 # Search est le titre de l'onglet, et est suivi de _For placé devant la zone de
 # texte à rechercher, j'ai donc essayé d'adapter au mieux.
-#. Searching *for* something
-#: ../libempathy-gtk/empathy-log-window.glade.h:7
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "_For:"
 msgstr "ce _terme :"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:2
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
 msgid "C_all"
 msgstr "_Appeler"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:3
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
 msgid "C_hat"
 msgstr "_Discuter"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:4
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
 msgid "Contact ID:"
 msgstr "Identifiant du contact :"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:5
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
 msgid "New Conversation"
 msgstr "Nouvelle conversation"
 
-#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:685
-msgid "Custom messages..."
-msgstr "Messages personnalisés..."
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:1
-msgid "Custom message"
-msgstr "Message personnalisé"
+#. COL_STATE_ICON_NAME
+#. COL_STATE
+#. COL_STATUS_TEXT
+#. COL_DISPLAY_MARKUP
+#. COL_STATUS_CUSTOMISABLE
+#. COL_TYPE
+#: ../libempathy-gtk/empathy-presence-chooser.c:172
+msgid "Custom Message..."
+msgstr "Message personnalisé..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:2
-msgid "Message:"
-msgstr "Message :"
+#: ../libempathy-gtk/empathy-presence-chooser.c:227
+msgid "Edit Custom Messages..."
+msgstr "Modifier les messages personnalisés..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:3
-msgid "Save message"
-msgstr "Enregistrer le message"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:4
-msgid "Status:"
-msgstr "État :"
+#: ../libempathy-gtk/empathy-presence-chooser.c:326
+msgid "Click to remove this status as a favorite"
+msgstr "Cliquez pour enlever cet état des favoris"
 
-#: ../libempathy-gtk/empathy-spell-dialog.c:88
-msgid "Word"
-msgstr "Mot"
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
+msgid "Click to make this status a favorite"
+msgstr "Cliquez pour ajouter cet état aux favoris"
 
-#: ../libempathy-gtk/empathy-spell-dialog.c:265
-msgid "Suggestions for the word"
-msgstr "Suggestions pour le mot"
+#: ../libempathy-gtk/empathy-presence-chooser.c:369
+msgid "Set status"
+msgstr "Changer l'état"
 
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:1
-msgid "Spell Checker"
-msgstr "Correcteur orthographique"
-
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:2
-msgid "Suggestions for the word:"
-msgstr "Suggestions pour le mot :"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:60
-msgid "Classic"
-msgstr "Classique"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:61
-msgid "Simple"
-msgstr "Simple"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:62
-msgid "Clean"
-msgstr "Propre"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:63
-msgid "Blue"
-msgstr "Bleu"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1385
-msgid "Unable to open URI"
-msgstr "Impossible d'ouvrir l'URI"
+#: ../libempathy-gtk/empathy-presence-chooser.c:782
+msgid "Set your presence and current status"
+msgstr "Définit votre état de présence actuel"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1530
-msgid "Select a file"
-msgstr "Sélectionner un fichier"
+#. Custom messages
+#: ../libempathy-gtk/empathy-presence-chooser.c:1017
+msgid "Custom messages..."
+msgstr "Messages personnalisés..."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1566
+#: ../libempathy-gtk/empathy-sound.c:51
 msgid "Received an instant message"
 msgstr "Réception d'un message instantané"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1568
+#: ../libempathy-gtk/empathy-sound.c:53
 msgid "Sent an instant message"
 msgstr "Envoi d'un message instantané"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1570
+#: ../libempathy-gtk/empathy-sound.c:55
 msgid "Incoming chat request"
 msgstr "Réception d'une demande de discussion"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1572
+#: ../libempathy-gtk/empathy-sound.c:57
 msgid "Contact connected"
 msgstr "Contact connecté"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1574
+#: ../libempathy-gtk/empathy-sound.c:59
 msgid "Contact disconnected"
 msgstr "Contact déconnecté"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1576
+#: ../libempathy-gtk/empathy-sound.c:61
 msgid "Connected to server"
 msgstr "Connecté au serveur"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1578
+#: ../libempathy-gtk/empathy-sound.c:63
 msgid "Disconnected from server"
 msgstr "Déconnecté du serveur"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1580
+#: ../libempathy-gtk/empathy-sound.c:65
 msgid "Incoming voice call"
 msgstr "Appel vocal entrant"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1582
+#: ../libempathy-gtk/empathy-sound.c:67
 msgid "Outgoing voice call"
 msgstr "Appel vocal sortant"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1584
+#: ../libempathy-gtk/empathy-sound.c:69
 msgid "Voice call ended"
 msgstr "Appel vocal terminé"
 
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
+msgid "Enter Custom Message"
+msgstr "Saisissez un message personnalisé"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
+msgid "Edit Custom Messages"
+msgstr "Édition des messages personnalisés"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+msgid "Add _New Preset"
+msgstr "Ajouter _nouveau message prédéfini"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
+msgid "Saved Presets"
+msgstr "Messages prédéfinis enregistrés"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:3
+msgid "gtk-add"
+msgstr "gtk-add"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:4
+msgid "gtk-remove"
+msgstr "gtk-remove"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:67
+msgid "Classic"
+msgstr "Classique"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:68
+msgid "Simple"
+msgstr "Simple"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:69
+msgid "Clean"
+msgstr "Propre"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:70
+msgid "Blue"
+msgstr "Bleu"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1377
+msgid "Unable to open URI"
+msgstr "Impossible d'ouvrir l'URI"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1467
+msgid "Select a file"
+msgstr "Sélectionner un fichier"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1525
+msgid "Select a destination"
+msgstr "Sélectionner une destination"
+
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
 msgstr "Locale actuelle"
@@ -1272,7 +1595,7 @@ msgid "Megaphone"
 msgstr "Mégaphone"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:417
+#: ../megaphone/src/megaphone-applet.c:519
 msgid "Talk!"
 msgstr "Parlez !"
 
@@ -1286,15 +1609,15 @@ msgid "_Information"
 msgstr "_Informations"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.glade.h:15
+#: ../src/empathy-main-window.ui.h:18
 msgid "_Preferences"
 msgstr "_Préférences"
 
-#: ../megaphone/src/megaphone-applet.c:255
+#: ../megaphone/src/megaphone-applet.c:168
 msgid "Please configure a contact."
 msgstr "Veuillez configurer un contact."
 
-#: ../megaphone/src/megaphone-applet.c:348
+#: ../megaphone/src/megaphone-applet.c:258
 msgid "Select contact..."
 msgstr "Sélectionner le contact..."
 
@@ -1307,23 +1630,23 @@ msgstr "Présence"
 msgid "Set your own presence"
 msgstr "Définissez votre présence"
 
-#: ../src/empathy.c:426
+#: ../src/empathy.c:506
 msgid "Don't connect on startup"
 msgstr "Ne pas se connecter au démarrage"
 
-#: ../src/empathy.c:430
+#: ../src/empathy.c:510
 msgid "Don't show the contact list on startup"
 msgstr "Ne pas afficher la liste des contacts au démarrage"
 
-#: ../src/empathy.c:434
+#: ../src/empathy.c:514
 msgid "Show the accounts dialog"
 msgstr "Afficher la boîte de dialogue des comptes"
 
-#: ../src/empathy.c:446
+#: ../src/empathy.c:526
 msgid "- Empathy Instant Messenger"
 msgstr "- Messagerie instantanée Empathy"
 
-#: ../src/empathy-about-dialog.c:84
+#: ../src/empathy-about-dialog.c:83
 msgid ""
 "Empathy is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU General Public License as published by the Free Software "
@@ -1335,7 +1658,7 @@ msgstr ""
 "publiée par la Free Software Foundation ; version 2 de la licence ou (à "
 "votre discrétion) toute version ultérieure."
 
-#: ../src/empathy-about-dialog.c:88
+#: ../src/empathy-about-dialog.c:87
 msgid ""
 "Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1347,7 +1670,7 @@ msgstr ""
 "D'ADÉQUATION À UN BESOIN PARTICULIER. Pour plus de détails, voir la Licence "
 "Publique Générale GNU."
 
-#: ../src/empathy-about-dialog.c:92
+#: ../src/empathy-about-dialog.c:91
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
@@ -1357,11 +1680,11 @@ msgstr ""
 "Empathy ; si ce n'est pas le cas, écrivez à la Free Software Foundation, "
 "Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:120
+#: ../src/empathy-about-dialog.c:119
 msgid "An Instant Messaging client for GNOME"
 msgstr "Un client de messagerie instantanée pour GNOME"
 
-#: ../src/empathy-about-dialog.c:126
+#: ../src/empathy-about-dialog.c:125
 msgid "translator-credits"
 msgstr ""
 "Frédéric Brin <duckx@mezimail.com>\n"
@@ -1379,22 +1702,21 @@ msgstr ""
 "Stéphane Raimbault <stephane.raimbault@gmail.com>\n"
 "Christophe Benz <christophe.benz@gmail.com>"
 
-#: ../src/empathy-accounts-dialog.c:391
+#: ../src/empathy-accounts-dialog.c:392
 msgid "Enabled"
 msgstr "Activé"
 
-#: ../src/empathy-accounts-dialog.c:401
-#: ../src/empathy-accounts-dialog.glade.h:4
+#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1
 msgid "Accounts"
 msgstr "Comptes"
 
 #. To translator: %s is the protocol name
-#: ../src/empathy-accounts-dialog.c:833
+#: ../src/empathy-accounts-dialog.c:837
 #, c-format
 msgid "New %s account"
 msgstr "Nouveau compte %s"
 
-#: ../src/empathy-accounts-dialog.c:943
+#: ../src/empathy-accounts-dialog.c:950
 #, c-format
 msgid ""
 "You are about to remove your %s account!\n"
@@ -1403,7 +1725,7 @@ msgstr ""
 "Vous êtes sur le point de supprimer votre compte %s !\n"
 "Voulez-vous vraiment continuer ?"
 
-#: ../src/empathy-accounts-dialog.c:949
+#: ../src/empathy-accounts-dialog.c:956
 msgid ""
 "Any associated conversations and chat rooms will NOT be removed if you "
 "decide to proceed.\n"
@@ -1417,31 +1739,31 @@ msgstr ""
 "Si vous décidez de recréer ce compte plus tard, elles seront toujours "
 "disponibles."
 
-#: ../src/empathy-accounts-dialog.glade.h:1
-msgid "<b>New Account</b>"
-msgstr "<b>Nouveau compte</b>"
+#: ../src/empathy-accounts-dialog.ui.h:2
+msgid "Add Account"
+msgstr "Ajouter un compte"
 
-#: ../src/empathy-accounts-dialog.glade.h:2
-msgid "<b>No protocol installed</b>"
-msgstr "<b>Aucun protocole installé</b>"
-
-#: ../src/empathy-accounts-dialog.glade.h:3
-msgid "<b>Settings</b>"
-msgstr "<b>Paramètres</b>"
-
-#: ../src/empathy-accounts-dialog.glade.h:5
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "Cr_eate"
 msgstr "C_réer"
 
-#: ../src/empathy-accounts-dialog.glade.h:6
-msgid "I already have an account I want to use"
-msgstr "Je possède déjà un compte que je souhaite utiliser"
+#: ../src/empathy-accounts-dialog.ui.h:4
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/empathy-accounts-dialog.glade.h:7
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid "Import Accounts..."
 msgstr "Importer des comptes..."
 
-#: ../src/empathy-accounts-dialog.glade.h:8
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol installed"
+msgstr "Aucun protocole installé"
+
+#: ../src/empathy-accounts-dialog.ui.h:7
+msgid "Settings"
+msgstr "Paramètres"
+
+#: ../src/empathy-accounts-dialog.ui.h:8
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -1449,273 +1771,195 @@ msgstr ""
 "Pour ajouter un nouveau compte, vous devez d'abord installer le moteur "
 "correspondant à chaque protocole que vous voulez utiliser."
 
-#: ../src/empathy-accounts-dialog.glade.h:9
+#: ../src/empathy-accounts-dialog.ui.h:9
 msgid "Type:"
 msgstr "Type :"
 
-#: ../src/empathy-call-window.c:258
+#: ../src/empathy-accounts-dialog.ui.h:10
+msgid "_Add..."
+msgstr "A_jouter..."
+
+#: ../src/empathy-accounts-dialog.ui.h:11
+msgid "_Create a new account"
+msgstr "_Créer un nouveau compte"
+
+#: ../src/empathy-accounts-dialog.ui.h:12
+msgid "_Reuse an existing account"
+msgstr "Ré_utiliser un compte existant"
+
+#: ../src/empathy-call-window.c:420
 msgid "Contrast"
 msgstr "Contraste"
 
-#: ../src/empathy-call-window.c:258
+#: ../src/empathy-call-window.c:423
 msgid "Brightness"
 msgstr "Luminosité"
 
-#: ../src/empathy-call-window.c:258
+#: ../src/empathy-call-window.c:426
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-call-window.c:290
+#: ../src/empathy-call-window.c:531
 msgid "Volume"
 msgstr "Volume"
 
-#: ../src/empathy-call-window.c:366
+#: ../src/empathy-call-window.c:662
+msgid "Connecting..."
+msgstr "Connexion en cours ..."
+
+#: ../src/empathy-call-window.c:746
 msgid "_Sidebar"
 msgstr "Barre _latérale"
 
-#: ../src/empathy-call-window.c:384
+#: ../src/empathy-call-window.c:765
 msgid "Dialpad"
 msgstr "Numéroteur"
 
-#: ../src/empathy-call-window.c:390
+#: ../src/empathy-call-window.c:771
 msgid "Audio input"
 msgstr "Entrée audio"
 
-#: ../src/empathy-call-window.c:394
+#: ../src/empathy-call-window.c:775
 msgid "Video input"
 msgstr "Entrée vidéo"
 
-#: ../src/empathy-call-window.c:407
-msgid "Connecting..."
-msgstr "Connexion en cours ..."
+#: ../src/empathy-call-window.c:836
+#, c-format
+msgid "Call with %s"
+msgstr "Conversation avec %s"
 
-#: ../src/empathy-call-window.c:572
+#: ../src/empathy-call-window.c:905
+msgid "Call"
+msgstr "Appeler"
+
+#. Translators: number of minutes:seconds the caller has been connected
+#: ../src/empathy-call-window.c:1336
 #, c-format
-msgid "Connected -- %d:%02dm"
-msgstr "Connecté -- %d:%02dm"
+msgid "Connected — %d:%02dm"
+msgstr "Connecté — %d:%02dm"
 
-#: ../src/empathy-call-window.glade.h:1
+#: ../src/empathy-call-window.ui.h:1
 msgid "Hang up"
 msgstr "Raccrocher"
 
-#: ../src/empathy-call-window.glade.h:2
+#: ../src/empathy-call-window.ui.h:2
+msgid "Redial"
+msgstr "Rappeler"
+
+#: ../src/empathy-call-window.ui.h:3
 msgid "Send Audio"
 msgstr "Envoyer le son"
 
-#: ../src/empathy-call-window.glade.h:3
+#: ../src/empathy-call-window.ui.h:4
 msgid "Send video"
 msgstr "Envoyer la vidéo"
 
-#: ../src/empathy-call-window.glade.h:4
+#: ../src/empathy-call-window.ui.h:5
 msgid "Video preview"
 msgstr "Aperçu de la vidéo"
 
-#: ../src/empathy-call-window.glade.h:6
+#: ../src/empathy-call-window.ui.h:6
+msgid "_Call"
+msgstr "_Appeler"
+
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:21
 msgid "_View"
 msgstr "_Affichage"
 
-#: ../src/empathy-chat-window.c:313
+#: ../src/empathy-chat-window.c:344
 #, c-format
 msgid "Conversations (%d)"
 msgstr "Conversations (%d)"
 
-#: ../src/empathy-chat-window.c:418
-msgid "Topic:"
-msgstr "Sujet :"
-
-#: ../src/empathy-chat-window.c:423
+#: ../src/empathy-chat-window.c:476
 msgid "Typing a message."
 msgstr "Saisie d'un message."
 
-#: ../src/empathy-chat-window.c:892 ../src/empathy-event-manager.c:424
-#, c-format
-msgid "New message from %s"
-msgstr "Nouveau message de %s"
-
-#: ../src/empathy-chat-window.glade.h:1
-msgid "C_lear"
-msgstr "_Nettoyer"
-
-#: ../src/empathy-chat-window.glade.h:2
-msgid "Chat"
-msgstr "Discuter"
-
-#: ../src/empathy-chat-window.glade.h:3
-msgid "Insert _Smiley"
-msgstr "Insérer une _frimousse"
-
-#: ../src/empathy-chat-window.glade.h:4
-msgid "Invitation _message:"
-msgstr "_Message d'invitation :"
-
-#: ../src/empathy-chat-window.glade.h:5
-msgid "Invite"
-msgstr "Inviter"
-
-#: ../src/empathy-chat-window.glade.h:6
-msgid "Move Tab _Left"
-msgstr "Déplacer l'onglet à _gauche"
-
-#: ../src/empathy-chat-window.glade.h:7
-msgid "Move Tab _Right"
-msgstr "Déplacer l'onglet à _droite"
-
-#: ../src/empathy-chat-window.glade.h:8
-msgid "Select who would you like to invite:"
-msgstr "Sélectionnez la personne à inviter :"
-
-#: ../src/empathy-chat-window.glade.h:9
-msgid "You have been invited to join a chat conference."
-msgstr "Vous avez été invité(e) à joindre une salle de discussion"
-
-#: ../src/empathy-chat-window.glade.h:10
-msgid "_Contact"
-msgstr "_Contact"
-
-#: ../src/empathy-chat-window.glade.h:11 ../src/empathy-main-window.glade.h:10
-msgid "_Contents"
-msgstr "_Sommaire"
-
-#: ../src/empathy-chat-window.glade.h:12
-msgid "_Conversation"
-msgstr "_Conversation"
-
-#: ../src/empathy-chat-window.glade.h:13
-msgid "_Detach Tab"
-msgstr "_Détacher l'onglet"
-
-#: ../src/empathy-chat-window.glade.h:15
-msgid "_Favorite Chatroom"
-msgstr "Salles de discussion _favorites"
-
-#: ../src/empathy-chat-window.glade.h:16 ../src/empathy-main-window.glade.h:12
-msgid "_Help"
-msgstr "Aid_e"
-
-#: ../src/empathy-chat-window.glade.h:17
-msgid "_Next Tab"
-msgstr "Onglet _suivant"
-
-#: ../src/empathy-chat-window.glade.h:18
-msgid "_Previous Tab"
-msgstr "Onglet _précédent"
-
-#: ../src/empathy-chat-window.glade.h:19
-msgid "_Tabs"
-msgstr "_Onglets"
-
-#: ../src/empathy-chatrooms-window.c:262
+#: ../src/empathy-chatrooms-window.c:258
 msgid "Name"
 msgstr "Nom"
 
-#: ../src/empathy-chatrooms-window.c:280
+#: ../src/empathy-chatrooms-window.c:276
 msgid "Room"
 msgstr "Salle"
 
-#: ../src/empathy-chatrooms-window.c:289
+#: ../src/empathy-chatrooms-window.c:285
 msgid "Auto-Connect"
 msgstr "Connexion automatique"
 
-#: ../src/empathy-chatrooms-window.glade.h:2
-msgid "Edit Favorite Room"
-msgstr "Modifier les salles favorites"
-
-#: ../src/empathy-chatrooms-window.glade.h:3
-msgid "Join room on start_up"
-msgstr "Joindre la salle au _démarrage"
-
-#: ../src/empathy-chatrooms-window.glade.h:4
-msgid "Join this chat room when Empathy starts and you are connected"
-msgstr ""
-"Joindre cette salle de discussion quand Empathy démarre et que vous êtes "
-"connecté"
-
-#: ../src/empathy-chatrooms-window.glade.h:5
+#: ../src/empathy-chatrooms-window.ui.h:2
 msgid "Manage Favorite Rooms"
 msgstr "Gérer les salles favorites"
 
-#: ../src/empathy-chatrooms-window.glade.h:6
-msgid "N_ame:"
-msgstr "_Nom :"
-
-#: ../src/empathy-chatrooms-window.glade.h:7
-msgid "S_erver:"
-msgstr "_Serveur :"
-
-#: ../src/empathy-chatrooms-window.glade.h:9
-#: ../src/empathy-new-chatroom-dialog.glade.h:9
-msgid "_Room:"
-msgstr "Sall_e :"
-
-#: ../src/empathy-event-manager.c:372
+#: ../src/empathy-event-manager.c:321
 msgid "Incoming call"
 msgstr "Appel entrant"
 
-#: ../src/empathy-event-manager.c:375
+#: ../src/empathy-event-manager.c:324
 #, c-format
 msgid "%s is calling you, do you want to answer?"
 msgstr "%s vous appelle, souhaitez-vous répondre ?"
 
-#: ../src/empathy-event-manager.c:382
+#: ../src/empathy-event-manager.c:331
 msgid "_Reject"
 msgstr "Re_fuser"
 
-#: ../src/empathy-event-manager.c:388
+#: ../src/empathy-event-manager.c:337
 msgid "_Answer"
 msgstr "_Répondre"
 
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:452
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Appel entrant de %s"
 
-#: ../src/empathy-event-manager.c:559
+#: ../src/empathy-event-manager.c:496
 #, c-format
 msgid "%s is offering you an invitation"
 msgstr "%s vous invite"
 
-#: ../src/empathy-event-manager.c:565
+#: ../src/empathy-event-manager.c:502
 msgid "An external application will be started to handle it."
 msgstr "Une application externe sera lancée pour la gérer."
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:507
 msgid "You don't have the needed external application to handle it."
 msgstr "Vous ne disposez pas de l'application externe nécessaire."
 
-#: ../src/empathy-event-manager.c:692
+#: ../src/empathy-event-manager.c:634
 msgid "Room invitation"
 msgstr "Invitation dans une salle"
 
-#: ../src/empathy-event-manager.c:695
+#: ../src/empathy-event-manager.c:637
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s vous invite à rejoindre %s"
 
-#. Decline button
-#: ../src/empathy-event-manager.c:703 ../src/empathy-ft-manager.c:1021
+#: ../src/empathy-event-manager.c:645
 msgid "_Decline"
 msgstr "_Refuser"
 
-#: ../src/empathy-event-manager.c:708
+#: ../src/empathy-event-manager.c:650
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Joindre"
 
-#: ../src/empathy-event-manager.c:738
+#: ../src/empathy-event-manager.c:689
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s vous a invité à rejoindre %s"
 
-#: ../src/empathy-event-manager.c:860
+#: ../src/empathy-event-manager.c:715
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Transfert de fichier entrant de %s"
 
-#: ../src/empathy-event-manager.c:954
+#: ../src/empathy-event-manager.c:895
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "Demande d'abonnement de %s"
 
-#: ../src/empathy-event-manager.c:958
+#: ../src/empathy-event-manager.c:899
 #, c-format
 msgid ""
 "\n"
@@ -1724,173 +1968,143 @@ msgstr ""
 "\n"
 "Message : %s"
 
-#: ../src/empathy-ft-manager.c:113
+#. someone is logging off
+#: ../src/empathy-event-manager.c:935
+#, c-format
+msgid "%s is now offline."
+msgstr "%s s'est déconnecté."
+
+#. someone is logging in
+#: ../src/empathy-event-manager.c:951
+#, c-format
+msgid "%s is now online."
+msgstr "%s s'est connecté."
+
+#. Translators: time left, when it is more than one hour
+#: ../src/empathy-ft-manager.c:101
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:115
+#. Translators: time left, when is is less than one hour
+#: ../src/empathy-ft-manager.c:104
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:164
-msgid "No reason was specified"
-msgstr "Aucune raison n'a été indiquée"
-
-#: ../src/empathy-ft-manager.c:166
-msgid "The change in state was requested"
-msgstr "Le changement d'état a été demandé"
-
-#: ../src/empathy-ft-manager.c:168
-msgid "You canceled the file transfer"
-msgstr "Vous avez annulé le transfert de fichiers"
-
-#: ../src/empathy-ft-manager.c:170
-msgid "The other participant canceled the file transfer"
-msgstr "Le correspondant a annulé le transfert de fichiers"
-
-#: ../src/empathy-ft-manager.c:172
-msgid "Error while trying to transfer the file"
-msgstr "Erreur lors du téléchargement du fichier"
+#: ../src/empathy-ft-manager.c:180
+msgctxt "file transfer percent"
+msgid "Unknown"
+msgstr "Inconnu"
 
-#: ../src/empathy-ft-manager.c:174
-msgid "The other participant is unable to transfer the file"
-msgstr "Le correspondant n'est pas capable de transférer le fichier"
+#: ../src/empathy-ft-manager.c:275
+#, c-format
+msgid "%s of %s at %s/s"
+msgstr "%s sur %s à %s/s"
 
-#: ../src/empathy-ft-manager.c:176
-msgid "Unknown reason"
-msgstr "Raison inconnue"
+#: ../src/empathy-ft-manager.c:276
+#, c-format
+msgid "%s of %s"
+msgstr "%s sur %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:224
+#: ../src/empathy-ft-manager.c:307
 #, c-format
 msgid "Receiving \"%s\" from %s"
-msgstr "Réception de « %s » de %s"
+msgstr "Réception de « %s » de la part de %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:227
+#: ../src/empathy-ft-manager.c:310
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Envoi de « %s » à %s"
 
-#: ../src/empathy-ft-manager.c:237
-msgctxt "file size"
-msgid "Unknown"
-msgstr "Inconnue"
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:340
+#, c-format
+msgid "Error receiving \"%s\" from %s"
+msgstr "Erreur lors de la réception de « %s » de la part de %s"
 
-#. translators: first %s is the transferred size, second %s is
-#. * the total file size
-#: ../src/empathy-ft-manager.c:245
+#: ../src/empathy-ft-manager.c:343
+msgid "Error receiving a file"
+msgstr "Erreur de réception de fichier"
+
+#: ../src/empathy-ft-manager.c:348
 #, c-format
-msgid "%s of %s"
-msgstr "%s sur %s"
+msgid "Error sending \"%s\" to %s"
+msgstr "Erreur lors de l'envoi de « %s » à %s"
 
-#: ../src/empathy-ft-manager.c:252
-msgid "Waiting the other participant's response"
-msgstr "Attente de la réponse du correspondant"
+#: ../src/empathy-ft-manager.c:351
+msgid "Error sending a file"
+msgstr "Erreur d'envoi de fichier"
 
-#: ../src/empathy-ft-manager.c:262
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:490
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "« %s » reçu de %s"
 
-#: ../src/empathy-ft-manager.c:268
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:495
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "« %s » envoyé à %s"
 
-#: ../src/empathy-ft-manager.c:271
+#: ../src/empathy-ft-manager.c:498
 msgid "File transfer completed"
 msgstr "Transfert de fichier terminé"
 
-#: ../src/empathy-ft-manager.c:280
-#, c-format
-msgid "\"%s\" receiving from %s"
-msgstr "Réception de « %s » de %s"
+#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784
+msgid "Waiting for the other participant's response"
+msgstr "Attente de la réponse du correspondant"
 
-#: ../src/empathy-ft-manager.c:286
+#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
 #, c-format
-msgid "\"%s\" sending to %s"
-msgstr "Envoi de « %s » à %s"
+msgid "Checking integrity of \"%s\""
+msgstr "Vérification de l'intégrité de « %s »"
 
-#: ../src/empathy-ft-manager.c:289
+#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684
 #, c-format
-msgid "File transfer canceled: %s"
-msgstr "Transfert de fichier annulé : %s"
-
-# remaining time
-#: ../src/empathy-ft-manager.c:304
-msgctxt "remaining time"
-msgid "Unknown"
-msgstr "Inconnu"
-
-#: ../src/empathy-ft-manager.c:364
-msgctxt "file transfer percent"
-msgid "Unknown"
-msgstr "Inconnu"
+msgid "Hashing \"%s\""
+msgstr "Création de la somme de contrôle pour « %s »"
 
-#: ../src/empathy-ft-manager.c:700
+#: ../src/empathy-ft-manager.c:1024
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:712
+#: ../src/empathy-ft-manager.c:1036
 msgid "File"
 msgstr "Fichier"
 
-#: ../src/empathy-ft-manager.c:734
+#: ../src/empathy-ft-manager.c:1058
 msgid "Remaining"
 msgstr "Restant"
 
-#: ../src/empathy-ft-manager.c:885
-msgid "Cannot save file to this location"
-msgstr "Impossible d'enregistrer ce fichier à cet emplacement"
-
-#: ../src/empathy-ft-manager.c:931
-msgid "Save file as..."
-msgstr "Enregistrer le fichier sous..."
-
-#: ../src/empathy-ft-manager.c:1001
-msgid "unknown size"
-msgstr "taille inconnue"
-
-#: ../src/empathy-ft-manager.c:1007
-#, c-format
-msgid "%s would like to send you a file"
-msgstr "%s souhaite vous envoyer un fichier"
-
-#: ../src/empathy-ft-manager.c:1012
-#, c-format
-msgid "Do you want to accept the file \"%s\" (%s)?"
-msgstr "Voulez-vous accepter le fichier « %s » (%s) ?"
-
-#. Accept button
-#: ../src/empathy-ft-manager.c:1030
-msgid "_Accept"
-msgstr "_Accepter"
-
-#: ../src/empathy-ft-manager.glade.h:1
-msgid "File transfers"
+#: ../src/empathy-ft-manager.ui.h:1
+msgid "File Transfers"
 msgstr "Transferts de fichiers"
 
-#: ../src/empathy-ft-manager.glade.h:2
+#: ../src/empathy-ft-manager.ui.h:2
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Enlever les transferts terminés, annulés et non réussis de la liste"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-dialog.c:255
+#: ../src/empathy-import-dialog.c:263
 msgid "Import"
 msgstr "Importer"
 
-#: ../src/empathy-import-dialog.c:264
+#: ../src/empathy-import-dialog.c:272
 msgid "Protocol"
 msgstr "Protocole"
 
-#: ../src/empathy-import-dialog.c:290
+#: ../src/empathy-import-dialog.c:298
 msgid "Source"
 msgstr "Source"
 
-#: ../src/empathy-import-dialog.c:378
+#: ../src/empathy-import-dialog.c:392
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -1898,138 +2112,196 @@ msgstr ""
 "Aucun compte à importer n'a été trouvé. Empathy n'est actuellement capable "
 "d'importer des comptes que de Pidgin."
 
-#: ../src/empathy-import-dialog.glade.h:1
+#: ../src/empathy-import-dialog.ui.h:1
 msgid "Import Accounts"
 msgstr "Importer des comptes"
 
-#: ../src/empathy-main-window.c:391
+#: ../src/empathy-main-window.c:396
+msgid "_Edit account"
+msgstr "Mo_difier le compte"
+
+#: ../src/empathy-main-window.c:499
 msgid "No error specified"
 msgstr "Aucune erreur indiquée"
 
-#: ../src/empathy-main-window.c:394
+#: ../src/empathy-main-window.c:502
 msgid "Network error"
 msgstr "Erreur réseau"
 
-#: ../src/empathy-main-window.c:397
+#: ../src/empathy-main-window.c:505
 msgid "Authentication failed"
 msgstr "L'authentification a échoué"
 
-#: ../src/empathy-main-window.c:400
+#: ../src/empathy-main-window.c:508
 msgid "Encryption error"
 msgstr "Erreur de chiffrement"
 
-#: ../src/empathy-main-window.c:403
+#: ../src/empathy-main-window.c:511
 msgid "Name in use"
 msgstr "Nom déjà utilisé"
 
-#: ../src/empathy-main-window.c:406
+#: ../src/empathy-main-window.c:514
 msgid "Certificate not provided"
 msgstr "Certificat non fourni"
 
-#: ../src/empathy-main-window.c:409
+#: ../src/empathy-main-window.c:517
 msgid "Certificate untrusted"
 msgstr "Certificat non validé"
 
-#: ../src/empathy-main-window.c:412
+#: ../src/empathy-main-window.c:520
 msgid "Certificate expired"
 msgstr "Le certificat a expiré"
 
-#: ../src/empathy-main-window.c:415
+#: ../src/empathy-main-window.c:523
 msgid "Certificate not activated"
 msgstr "Certificat non activé"
 
-#: ../src/empathy-main-window.c:418
+#: ../src/empathy-main-window.c:526
 msgid "Certificate hostname mismatch"
 msgstr "Le nom de l'hôte du certificat ne correspond pas"
 
-#: ../src/empathy-main-window.c:421
+#: ../src/empathy-main-window.c:529
 msgid "Certificate fingerprint mismatch"
 msgstr "L'empreinte du certificat ne correspond pas"
 
-#: ../src/empathy-main-window.c:424
+#: ../src/empathy-main-window.c:532
 msgid "Certificate self-signed"
 msgstr "Certificat auto-signé"
 
-#: ../src/empathy-main-window.c:427
+#: ../src/empathy-main-window.c:535
 msgid "Certificate error"
 msgstr "Erreur de certificat"
 
-#: ../src/empathy-main-window.c:430
+#: ../src/empathy-main-window.c:538
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#: ../src/empathy-main-window.c:594
+#: ../src/empathy-main-window.c:1218
 msgid "Show and edit accounts"
 msgstr "Afficher et modifier les comptes"
 
-#: ../src/empathy-main-window.c:974
-msgid "Contact"
-msgstr "Contact"
-
-#: ../src/empathy-main-window.c:1176
-msgid "_Edit account"
-msgstr "Mo_difier le compte"
-
-#: ../src/empathy-main-window.glade.h:1
+#: ../src/empathy-main-window.ui.h:1 ../src/empathy-preferences.ui.h:9
 msgid "Contact List"
 msgstr "Liste des contacts"
 
-#: ../src/empathy-main-window.glade.h:2
+#: ../src/empathy-main-window.ui.h:2
+msgid "Contacts on a _Map"
+msgstr "Contacts sur une _carte"
+
+#: ../src/empathy-main-window.ui.h:3
 msgid "Context"
 msgstr "Contexte"
 
-#: ../src/empathy-main-window.glade.h:3
+#: ../src/empathy-main-window.ui.h:4
 msgid "Join _Favorites"
 msgstr "Joindre les _favoris"
 
-#: ../src/empathy-main-window.glade.h:4
-msgid "Join _New..."
-msgstr "Rejoindre _nouveau"
-
-#: ../src/empathy-main-window.glade.h:5
+#: ../src/empathy-main-window.ui.h:5
 msgid "Manage Favorites"
 msgstr "Gérer les favoris"
 
-#: ../src/empathy-main-window.glade.h:6
-msgid "Show _Offline Contacts"
-msgstr "Afficher les contacts _déconnectés"
-
-#: ../src/empathy-main-window.glade.h:7
+#: ../src/empathy-main-window.ui.h:6
 msgid "_Accounts"
 msgstr "_Comptes"
 
-#: ../src/empathy-main-window.glade.h:8
+#: ../src/empathy-main-window.ui.h:7
 msgid "_Add Contact..."
 msgstr "A_jouter un contact..."
 
-#: ../src/empathy-main-window.glade.h:13 ../src/empathy-status-icon.glade.h:2
+#: ../src/empathy-main-window.ui.h:9
+msgid "_Contents"
+msgstr "_Sommaire"
+
+#: ../src/empathy-main-window.ui.h:10
+msgid "_Debug"
+msgstr "_Débogage"
+
+#: ../src/empathy-main-window.ui.h:12
+msgid "_File Transfers"
+msgstr "Transferts de _fichiers"
+
+#: ../src/empathy-main-window.ui.h:13
+msgid "_Help"
+msgstr "Aid_e"
+
+#: ../src/empathy-main-window.ui.h:14
+msgid "_Join..."
+msgstr "_Joindre..."
+
+#: ../src/empathy-main-window.ui.h:15 ../src/empathy-status-icon.ui.h:2
 msgid "_New Conversation..."
 msgstr "_Nouvelle conversation..."
 
-#: ../src/empathy-main-window.glade.h:14
+#: ../src/empathy-main-window.ui.h:16
+msgid "_Offline Contacts"
+msgstr "Contacts _déconnectés"
+
+#: ../src/empathy-main-window.ui.h:17
 msgid "_Personal Information"
 msgstr "_Informations personnelles"
 
-#: ../src/empathy-main-window.glade.h:16
+#: ../src/empathy-main-window.ui.h:19
+msgid "_Previous Conversations"
+msgstr "Conversations _précédentes"
+
+#: ../src/empathy-main-window.ui.h:20
 msgid "_Room"
 msgstr "_Salle"
 
-#: ../src/empathy-new-chatroom-dialog.c:291
-msgid "Chat Rooms"
-msgstr "Salles de discussion"
+#: ../src/empathy-new-chatroom-dialog.c:331
+msgid "Chat Room"
+msgstr "Salle de discussion"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:2
-msgid "Browse:"
-msgstr "Parcourir :"
+#: ../src/empathy-new-chatroom-dialog.c:347
+msgid "Members"
+msgstr "Membres"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:3
+#: ../src/empathy-new-chatroom-dialog.c:496
+#, c-format
+msgctxt ""
+"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
+"and a number."
+msgid ""
+"<b>%s</b>\n"
+"Invite required: %s\n"
+"Password required: %s\n"
+"Members: %s"
+msgstr ""
+"<b>%s</b>\n"
+"Invitation nécessaire : %s\n"
+"Mot de passe nécessaire : %s\n"
+"Membres : %s"
+
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
+msgid "Yes"
+msgstr "Oui"
+
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
+msgid "No"
+msgstr "Non"
+
+#: ../src/empathy-new-chatroom-dialog.c:526
+msgid "Could not start room listing"
+msgstr "Impossible de lancer la liste des salles"
+
+#: ../src/empathy-new-chatroom-dialog.c:536
+msgid "Could not stop room listing"
+msgstr "Impossible d'arrêter la liste des salles"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
+msgid "Couldn't load room list"
+msgstr "Le chargement de la liste des salles de discussion a échoué"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
 "Enter the room name to join here or click on one or more rooms in the list."
 msgstr ""
 "Saisissez le nom de salle à rejoindre ou cliquez sur une ou plusieurs salles "
 "dans la liste."
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:4
+#: ../src/empathy-new-chatroom-dialog.ui.h:4
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -2037,186 +2309,229 @@ msgstr ""
 "Saisissez le serveur qui héberge la salle ou laissez-le vide si la salle est "
 "sur le même serveur que le compte actuel"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:5
-msgid "Join"
-msgstr "Joindre"
-
-#: ../src/empathy-new-chatroom-dialog.glade.h:6
-msgid "Join New"
-msgstr "Joindre une nouvelle salle"
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
+msgid "Join Room"
+msgstr "Joindre la salle"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:7
-msgid "Re_fresh"
-msgstr "_Actualiser"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "Room List"
+msgstr "Liste des salles"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:8
-msgid ""
-"This list represents all chat rooms hosted on the server you have entered."
-msgstr ""
-"Cette liste représente toutes les salles de discussion hébergées sur le "
-"serveur actuel."
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "_Room:"
+msgstr "Sall_e :"
 
-#: ../src/empathy-preferences.c:157
+#: ../src/empathy-preferences.c:161
 msgid "Message received"
 msgstr "Message reçu"
 
-#: ../src/empathy-preferences.c:158
+#: ../src/empathy-preferences.c:162
 msgid "Message sent"
 msgstr "Message envoyé"
 
-#: ../src/empathy-preferences.c:159
+#: ../src/empathy-preferences.c:163
 msgid "New conversation"
 msgstr "Nouvelle conversation"
 
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:164
 msgid "Contact goes online"
 msgstr "Le contact est en ligne"
 
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:165
 msgid "Contact goes offline"
 msgstr "Le contact est hors ligne"
 
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:166
 msgid "Account connected"
 msgstr "Compte connecté"
 
-#: ../src/empathy-preferences.c:163
+#: ../src/empathy-preferences.c:167
 msgid "Account disconnected"
 msgstr "Compte déconnecté"
 
-#: ../src/empathy-preferences.c:397
+#: ../src/empathy-preferences.c:446
 msgid "Language"
 msgstr "Langue"
 
-#: ../src/empathy-preferences.glade.h:1
-msgid "<b>Appearance</b>"
-msgstr "<b>Apparence</b>"
-
-#: ../src/empathy-preferences.glade.h:2
-msgid "<b>Behavior</b>"
-msgstr "<b>Comportement</b>"
+#: ../src/empathy-preferences.ui.h:1
+msgid "Allow _GPS usage"
+msgstr "Autoriser l'utilisation du _GPS"
 
-#: ../src/empathy-preferences.glade.h:3
-msgid "<b>Contact List</b>"
-msgstr "<b>Liste des contacts</b>"
+#: ../src/empathy-preferences.ui.h:2
+msgid "Allow _cellphone usage"
+msgstr "Autoriser l'utilisation du téléphone _cellulaire"
 
-#: ../src/empathy-preferences.glade.h:4
-msgid "<b>Enable spell checking for languages:</b>"
-msgstr "<b>Activer la correction orthographique pour les langues :</b>"
+#: ../src/empathy-preferences.ui.h:3
+msgid "Allow _network usage"
+msgstr "Autoriser l'utilisation du _réseau"
 
-#: ../src/empathy-preferences.glade.h:5
-msgid "<b>Play sound for events</b>"
-msgstr "<b>Jouer un son lors des événements</b>"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Appearance"
+msgstr "Apparence"
 
-#: ../src/empathy-preferences.glade.h:6
-msgid ""
-"<small>The list of languages reflects only the languages for which you have "
-"a dictionary installed.</small>"
-msgstr ""
-"<small>La liste de langues ne contient que les langues pour lesquelles vous "
-"avez un dictionnaire installé.</small>"
-
-#: ../src/empathy-preferences.glade.h:7
+#: ../src/empathy-preferences.ui.h:5
 msgid "Automatically _connect on startup "
 msgstr "Se _connecter automatiquement au démarrage"
 
-#: ../src/empathy-preferences.glade.h:8
+#: ../src/empathy-preferences.ui.h:6
 msgid "Avatars are user chosen images shown in the contact list"
 msgstr ""
 "Les avatars sont des images choisies par l'utilisateur et visibles dans la "
 "liste de contacts"
 
-#: ../src/empathy-preferences.glade.h:9
+#: ../src/empathy-preferences.ui.h:7
+msgid "Behavior"
+msgstr "Comportement"
+
+#: ../src/empathy-preferences.ui.h:8
 msgid "Chat Th_eme:"
 msgstr "_Thème de la fenêtre de discussion :"
 
-#: ../src/empathy-preferences.glade.h:10
+#: ../src/empathy-preferences.ui.h:10
 msgid "Disable notifications when _away or busy"
 msgstr "Désactiver les notifications lorsque vous êtes _absent ou occupé"
 
-#: ../src/empathy-preferences.glade.h:11
+#: ../src/empathy-preferences.ui.h:11
 msgid "Disable sounds when _away or busy"
 msgstr "Désactiver les sons lorsque vous êtes _absent ou occupé"
 
-#: ../src/empathy-preferences.glade.h:12
+#: ../src/empathy-preferences.ui.h:12
+msgid "Enable notifications when a contact comes online"
+msgstr "Afficher des notifications quand un contact se connecte"
+
+#: ../src/empathy-preferences.ui.h:13
+msgid "Enable notifications when a contact goes offline"
+msgstr "Afficher des notifications quand un contact se déconnecte"
+
+#: ../src/empathy-preferences.ui.h:14
 msgid "Enable notifications when the _chat is not focused"
 msgstr ""
 "Afficher des notifications quand la discussion n'est pas au premier plan"
 
-#: ../src/empathy-preferences.glade.h:13
+#: ../src/empathy-preferences.ui.h:15
+msgid "Enable spell checking for languages:"
+msgstr "Activer la correction orthographique pour les langues :"
+
+#: ../src/empathy-preferences.ui.h:16
 msgid "General"
 msgstr "Général"
 
-#: ../src/empathy-preferences.glade.h:14
+#: ../src/empathy-preferences.ui.h:17
+msgid "Geoclue Settings"
+msgstr "Paramètres Geoclue"
+
+#: ../src/empathy-preferences.ui.h:18
+msgid "Location"
+msgstr "Emplacement"
+
+#: ../src/empathy-preferences.ui.h:19
 msgid "Notifications"
 msgstr "Notifications"
 
-#: ../src/empathy-preferences.glade.h:15
+#: ../src/empathy-preferences.ui.h:20
+msgid "Play sound for events"
+msgstr "Jouer un son lors des événements"
+
+#: ../src/empathy-preferences.ui.h:21
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../src/empathy-preferences.glade.h:16
+#: ../src/empathy-preferences.ui.h:22
+msgid "Privacy"
+msgstr "Confidentialité"
+
+#: ../src/empathy-preferences.ui.h:23
+msgid ""
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will have a random "
+"value added (&#xB1;0.25&#xB0;)."
+msgstr ""
+"Lorsque la précision de l'emplacement est réduite, les informations de "
+"géolocalisation publiées se limitent au pays, à la région ou à la ville. "
+"Une valeur aléatoire est appliquée aux coordonnées GPS (±0.25°)."
+
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _avatars"
 msgstr "Afficher les _avatars"
 
-#: ../src/empathy-preferences.glade.h:17
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show _smileys as images"
 msgstr "Convertir les _frimousses en images"
 
-#: ../src/empathy-preferences.glade.h:18
+#: ../src/empathy-preferences.ui.h:26
 msgid "Show co_mpact contact list"
 msgstr "Afficher la liste co_mpacte des contacts"
 
-#: ../src/empathy-preferences.glade.h:19
+#: ../src/empathy-preferences.ui.h:27
+msgid "Show contact _list in rooms"
+msgstr "Afficher la _liste des contacts dans les salles"
+
+#: ../src/empathy-preferences.ui.h:28
 msgid "Sort by _name"
 msgstr "Trié par _nom"
 
-#: ../src/empathy-preferences.glade.h:20
+#: ../src/empathy-preferences.ui.h:29
 msgid "Sort by s_tate"
 msgstr "Trié par é_tat"
 
-#: ../src/empathy-preferences.glade.h:21
+#: ../src/empathy-preferences.ui.h:30
 msgid "Sounds"
 msgstr "Sons"
 
-#: ../src/empathy-preferences.glade.h:22
+#: ../src/empathy-preferences.ui.h:31
 msgid "Spell Checking"
 msgstr "Correction orthographique"
 
-#: ../src/empathy-preferences.glade.h:23
+#: ../src/empathy-preferences.ui.h:32
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"La liste de langues ne contient que les langues pour lesquelles vous "
+"avez un dictionnaire installé."
+
+#: ../src/empathy-preferences.ui.h:33
 msgid "Themes"
 msgstr "Thèmes"
 
-#: ../src/empathy-preferences.glade.h:24
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable bubble notifications"
 msgstr "_Activer les bulles de notification"
 
-#: ../src/empathy-preferences.glade.h:25
+#: ../src/empathy-preferences.ui.h:35
 msgid "_Enable sound notifications"
 msgstr "_Activer les notifications sonores"
 
-#: ../src/empathy-preferences.glade.h:26
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Open new chats in separate windows"
 msgstr "_Ouvrir les nouvelles discussions dans des fenêtres séparées"
 
-#: ../src/empathy-status-icon.glade.h:1
+#: ../src/empathy-preferences.ui.h:37
+msgid "_Publish location to my contacts"
+msgstr "_Publier mon emplacement pour mes contacts"
+
+#: ../src/empathy-preferences.ui.h:38
+msgid "_Reduce location accuracy"
+msgstr "Réduire la précision de l'_emplacement"
+
+#: ../src/empathy-status-icon.ui.h:1
 msgid "Status"
 msgstr "État"
 
-#: ../src/empathy-status-icon.glade.h:3
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_Quit"
 msgstr "_Quitter"
 
-#: ../src/empathy-status-icon.glade.h:4
+#: ../src/empathy-status-icon.ui.h:4
 msgid "_Show Contact List"
 msgstr "_Afficher la liste des contacts"
 
-#: ../src/empathy-tube-dispatch.c:364
+#: ../src/empathy-tube-dispatch.c:375
 #, c-format
 msgid "Unable to start application for service %s: %s"
 msgstr "Impossible de démarrer l'application pour le service %s : %s"
 
-#: ../src/empathy-tube-dispatch.c:435
+#: ../src/empathy-tube-dispatch.c:446
 #, c-format
 msgid ""
 "An invitation was offered for service %s, but you don't have the needed "
@@ -2224,3 +2539,239 @@ msgid ""
 msgstr ""
 "Vous avez reçu une invitation pour le service %s, mais vous ne disposez pas "
 "de l'application nécessaire pour le gérer"
+
+#: ../src/empathy-call-window-fullscreen.ui.h:1
+msgid "gtk-leave-fullscreen"
+msgstr "gtk-leave-fullscreen"
+
+#: ../src/empathy-map-view.ui.h:1
+msgid "Contact Map View"
+msgstr "Carte des contacts"
+
+#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
+msgid "Error"
+msgstr "Erreur"
+
+#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
+msgid "Critical"
+msgstr "Critique"
+
+#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
+msgid "Warning"
+msgstr "Avertissement"
+
+#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065
+#: ../src/empathy-debug-dialog.c:1113
+msgid "Message"
+msgstr "Message"
+
+#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059
+msgid "Info"
+msgstr "Information"
+
+#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053
+msgid "Debug"
+msgstr "Débogage"
+
+# Titre de fenêtre
+#: ../src/empathy-debug-dialog.c:845
+msgid "Save"
+msgstr "Enregistrer"
+
+#: ../src/empathy-debug-dialog.c:948
+msgid "Debug Window"
+msgstr "Fenêtre de débogage"
+
+#: ../src/empathy-debug-dialog.c:1021
+msgid "Pause"
+msgstr "Pause"
+
+#: ../src/empathy-debug-dialog.c:1033
+msgid "Level "
+msgstr "Niveau "
+
+#: ../src/empathy-debug-dialog.c:1102
+msgid "Time"
+msgstr "Heure"
+
+#: ../src/empathy-debug-dialog.c:1104
+msgid "Domain"
+msgstr "Domaine"
+
+#: ../src/empathy-debug-dialog.c:1106
+msgid "Category"
+msgstr "Catégorie"
+
+#: ../src/empathy-debug-dialog.c:1108
+msgid "Level"
+msgstr "Niveau"
+
+#: ../src/empathy-debug-dialog.c:1140
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr ""
+"Le gestionnaire de connexions sélectionné ne prend pas en charge l'extension "
+"de débogage distant."
+
+#~ msgid "New message from %s"
+#~ msgstr "Nouveau message de %s"
+
+#~ msgctxt "file size"
+#~ msgid "Unknown"
+#~ msgstr "Inconnue"
+
+#~ msgctxt "remaining time"
+#~ msgid "Stalled"
+#~ msgstr "Bloqué"
+
+# remaining time
+#~ msgctxt "remaining time"
+#~ msgid "Unknown"
+#~ msgstr "Inconnu"
+
+#~ msgid "Cannot save file to this location"
+#~ msgstr "Impossible d'enregistrer ce fichier à cet emplacement"
+
+#~ msgid "Save file as..."
+#~ msgstr "Enregistrer le fichier sous..."
+
+#~ msgid "unknown size"
+#~ msgstr "taille inconnue"
+
+#~ msgid "%s would like to send you a file"
+#~ msgstr "%s souhaite vous envoyer un fichier"
+
+#~ msgid "Do you want to accept the file \"%s\" (%s)?"
+#~ msgstr "Voulez-vous accepter le fichier « %s » (%s) ?"
+
+#~ msgid "_Accept"
+#~ msgstr "_Accepter"
+
+#~ msgid "Show _File Transfers"
+#~ msgstr "Afficher les transferts de _fichiers"
+
+#~ msgid "Forget password and clear the entry."
+#~ msgstr "Oublier le mot de passe et effacer la zone."
+
+#~ msgid "Edit the selected IRC network"
+#~ msgstr "Modifie le réseau IRC sélectionné"
+
+#~ msgid "Remove the selected IRC network"
+#~ msgstr "Supprime le réseau IRC sélectionné"
+
+#~ msgid "_Check Word Spelling..."
+#~ msgstr "_Vérifier l'orthographe..."
+
+#~ msgid "Group Chat"
+#~ msgstr "Groupe de discussion"
+
+#~ msgid "Contact Information"
+#~ msgstr "Informations du contact"
+
+#~ msgid "I would like to add you to my contact list."
+#~ msgstr "Je voudrais vous ajouter à ma liste de contacts."
+
+#~ msgid "Sorry, I don't want you in my contact list anymore."
+#~ msgstr "Désolé, je ne te veux plus dans ma liste de contacts."
+
+#~ msgid "Contact information"
+#~ msgstr "Informations sur le contact"
+
+#~ msgid "Word"
+#~ msgstr "Mot"
+
+#~ msgid "Suggestions for the word"
+#~ msgstr "Suggestions pour le mot"
+
+#~ msgid "Spell Checker"
+#~ msgstr "Correcteur orthographique"
+
+#~ msgid "Suggestions for the word:"
+#~ msgstr "Suggestions pour le mot :"
+
+#~ msgid "C_lear"
+#~ msgstr "_Nettoyer"
+
+#~ msgid "Chat"
+#~ msgstr "Discuter"
+
+#~ msgid "Insert _Smiley"
+#~ msgstr "Insérer une _frimousse"
+
+#~ msgid "Invitation _message:"
+#~ msgstr "_Message d'invitation :"
+
+#~ msgid "Invite"
+#~ msgstr "Inviter"
+
+#~ msgid "Move Tab _Left"
+#~ msgstr "Déplacer l'onglet à _gauche"
+
+#~ msgid "Move Tab _Right"
+#~ msgstr "Déplacer l'onglet à _droite"
+
+#~ msgid "Select who would you like to invite:"
+#~ msgstr "Sélectionnez la personne à inviter :"
+
+#~ msgid "You have been invited to join a chat conference."
+#~ msgstr "Vous avez été invité(e) à joindre une salle de discussion"
+
+#~ msgid "_Contact"
+#~ msgstr "_Contact"
+
+#~ msgid "_Conversation"
+#~ msgstr "_Conversation"
+
+#~ msgid "_Detach Tab"
+#~ msgstr "_Détacher l'onglet"
+
+#~ msgid "_Favorite Chatroom"
+#~ msgstr "Salles de discussion _favorites"
+
+#~ msgid "_Next Tab"
+#~ msgstr "Onglet _suivant"
+
+#~ msgid "_Previous Tab"
+#~ msgstr "Onglet _précédent"
+
+#~ msgid "_Tabs"
+#~ msgstr "_Onglets"
+
+#~ msgid "Edit Favorite Room"
+#~ msgstr "Modifier les salles favorites"
+
+#~ msgid "Join room on start_up"
+#~ msgstr "Joindre la salle au _démarrage"
+
+#~ msgid "Join this chat room when Empathy starts and you are connected"
+#~ msgstr ""
+#~ "Joindre cette salle de discussion quand Empathy démarre et que vous êtes "
+#~ "connecté"
+
+#~ msgid "N_ame:"
+#~ msgstr "_Nom :"
+
+#~ msgid "S_erver:"
+#~ msgstr "_Serveur :"
+
+#~ msgid "Join _New..."
+#~ msgstr "Rejoindre _nouveau"
+
+#~ msgid "Browse:"
+#~ msgstr "Parcourir :"
+
+#~ msgid "Join"
+#~ msgstr "Joindre"
+
+#~ msgid "Join New"
+#~ msgstr "Joindre une nouvelle salle"
+
+#~ msgid "Re_fresh"
+#~ msgstr "_Actualiser"
+
+#~ msgid ""
+#~ "This list represents all chat rooms hosted on the server you have entered."
+#~ msgstr ""
+#~ "Cette liste représente toutes les salles de discussion hébergées sur le "
+#~ "serveur actuel."
diff --git a/po/gl.po b/po/gl.po
index 0ccc7bb71..68ef19633 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,22 +1,25 @@
-# translation of empathy.po to Galego
+# translation of empathy-master-po-gl.po to Galician
 # This file is distributed under the same license as the EMPATHY package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 #
-# Tagen Ata <localizacion@tagenata.com>, 2009.
+# Mancomún - Centro de Referencia e Servizos de Software Libre <g11n@mancomun.org>, 2009.
+# Suso Baleato <suso.baleato@xunta.es>, 2009.
+# Fran Diéguez <fran.dieguez@glug.es>,2009.
+# Antón Méixome <meixome@mancomun.org>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: gl\n"
+"Project-Id-Version: empathy-master-po-gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-21 17:25+0200\n"
-"PO-Revision-Date: 2009-03-02 10:39+0100\n"
-"Last-Translator: Suso Baleato <suso.baleato@xunta.es>\n"
-"Language-Team: Galego <proxecto@trasno.net>\n"
+"POT-Creation-Date: 2009-07-21 19:17+0200\n"
+"PO-Revision-Date: 2009-07-01 14:44+0200\n"
+"Last-Translator: Antón Méixome <meixome@mancomun.org>\n"
+"Language-Team: Galician <gnome@mancomun.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: gl\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 1.2.1\n"
+"Plural-Forms: Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 # rever
 #: ../data/empathy.desktop.in.in.h:1
@@ -53,7 +56,7 @@ msgid ""
 "Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
 msgstr ""
 "Unha lista separada por vírgulas dos verificadores ortográficos para usar "
-"(por exemplo, gl, pt, en)"
+"(por exemplo, gl, pt, en)."
 
 # rever
 #: ../data/empathy.schemas.in.h:5
@@ -68,8 +71,7 @@ msgstr "Criterio de ordenación da lista de contactos"
 # rever
 #: ../data/empathy.schemas.in.h:7
 msgid "Default directory to select an avatar image from"
-msgstr ""
-"O directorio predeterminado desde o que seleccionar unha imaxe de avatar"
+msgstr "O cartafol predeterminado desde o que seleccionar unha imaxe de avatar"
 
 # rever
 #: ../data/empathy.schemas.in.h:8
@@ -81,161 +83,239 @@ msgstr "Desactivar as notificacións emerxentes cando se está ausente"
 msgid "Disable sounds when away"
 msgstr "Desactivar os sons cando se está ausente"
 
-# rever
 #: ../data/empathy.schemas.in.h:10
+msgid "Empathy can publish the user's location"
+msgstr "Empathy pode publicar a localización dos usuarios"
+
+#: ../data/empathy.schemas.in.h:11
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy pode usar o GPS para seguir a localización"
+
+#: ../data/empathy.schemas.in.h:12
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy pode usar a rede de móbiles para seguir a localización"
+
+#: ../data/empathy.schemas.in.h:13
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy pode usar a rede para seguir a localización"
+
+# rever
+#: ../data/empathy.schemas.in.h:14
 msgid "Empathy default download folder"
 msgstr "Cartafol de descargas predeterminado do Empathy"
 
 # rever
-#: ../data/empathy.schemas.in.h:11
+#: ../data/empathy.schemas.in.h:15
 msgid "Empathy has asked about importing accounts"
 msgstr "O Empathy preguntou sobre a importación de contas"
 
 # rever
-#: ../data/empathy.schemas.in.h:12
+#: ../data/empathy.schemas.in.h:16
 msgid "Empathy should auto-connect on startup"
 msgstr "O Empathy debería conectarse automaticamente ao inicio"
 
 # rever
-#: ../data/empathy.schemas.in.h:13
+#: ../data/empathy.schemas.in.h:17
+msgid "Empathy should reduce the location's accuracy"
+msgstr "O Empathy debería reducir a precisión da localización"
+
+# rever
+#: ../data/empathy.schemas.in.h:18
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr ""
 "O Empathy debería usar o avatar do contacto como a icona da xanela de "
 "conversa"
 
+#: ../data/empathy.schemas.in.h:19
+msgid "Enable WebKit Developer Tools"
+msgstr ""
+
 # rever
-#: ../data/empathy.schemas.in.h:14
+#: ../data/empathy.schemas.in.h:20
 msgid "Enable popup notifications for new messages"
 msgstr "Activar as notificacións emerxentes para as mensaxes novas"
 
 # rever
-#: ../data/empathy.schemas.in.h:15
+#: ../data/empathy.schemas.in.h:21
 msgid "Enable spell checker"
 msgstr "Activar a verificación ortográfica"
 
 # rever
-#: ../data/empathy.schemas.in.h:16
+#: ../data/empathy.schemas.in.h:22
 msgid "Hide main window"
 msgstr "Ocultar a xanela principal"
 
 # rever
-#: ../data/empathy.schemas.in.h:17
+#: ../data/empathy.schemas.in.h:23
 msgid "Hide the main window."
 msgstr "Ocultar a xanela principal."
 
 # rever
-#: ../data/empathy.schemas.in.h:18
+#: ../data/empathy.schemas.in.h:24
 msgid "NetworkManager should be used"
 msgstr "Se se debería usar o NetworkManager"
 
 # rever
-#: ../data/empathy.schemas.in.h:19
+#: ../data/empathy.schemas.in.h:25
 msgid "Nick completed character"
 msgstr "Carácter de completado de alcume"
 
 # rever
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:26
 msgid "Open new chats in separate windows"
 msgstr "Abrir as conversas novas en xanelas separadas"
 
+#: ../data/empathy.schemas.in.h:27
+msgid "Path of the adium theme to use"
+msgstr "Camiño do tema adium para usar"
+
 # rever
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:28
+msgid "Path of the adium theme to use if the theme used for chat is adium."
+msgstr "Camiño do tema adium para usar se o tema usado para o chat é adium."
+
+# rever
+#: ../data/empathy.schemas.in.h:29
 msgid "Play a sound for incoming messages"
 msgstr "Reproducir un son para as mensaxes entrantes"
 
 # rever
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:30
 msgid "Play a sound for new conversations"
 msgstr "Reproducir un son para as conversas novas"
 
 # rever
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:31
 msgid "Play a sound for outgoing messages"
 msgstr "Reproducir un son para as mensaxes saíntes"
 
 # rever
-#: ../data/empathy.schemas.in.h:24
+#: ../data/empathy.schemas.in.h:32
 msgid "Play a sound when a contact logs in"
 msgstr "Reproducir un son cando un contacto inicia unha sesión"
 
 # rever
-#: ../data/empathy.schemas.in.h:25
+#: ../data/empathy.schemas.in.h:33
 msgid "Play a sound when a contact logs out"
 msgstr "Reproducir un son cando un contacto termina a sesión"
 
 # rever
-#: ../data/empathy.schemas.in.h:26
+#: ../data/empathy.schemas.in.h:34
 msgid "Play a sound when we log in"
-msgstr "Reproducir un son cando inicio a sesión"
+msgstr "Reproducir un son cando iniciamos a sesión"
 
 # rever
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:35
 msgid "Play a sound when we log out"
-msgstr "Reproducir un son cando termino a sesión"
+msgstr "Reproducir un son cando terminamos a sesión"
 
 # rever
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:36
 msgid "Popup notifications if the chat isn't focused"
 msgstr "Facer emerxer unha notificación cando a conversa non está enfocada"
 
 # rever
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:37
+msgid "Popup notifications when a contact sign in"
+msgstr "Facer emerxer unha notificación cando un contacto entra"
+
+# rever
+#: ../data/empathy.schemas.in.h:38
+msgid "Popup notifications when a contact sign out"
+msgstr "Facer emerxer unha notificación cando un contacto sae"
+
+# rever
+#: ../data/empathy.schemas.in.h:39
 msgid "Salut account is created"
 msgstr "A conta Salut foi creada"
 
 # rever
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:40
 msgid "Show avatars"
 msgstr "Mostrar os avatares"
 
 # rever
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:41
+msgid "Show contact list in rooms"
+msgstr "Mostrar a lista de contactos nas salas"
+
+# rever
+#: ../data/empathy.schemas.in.h:42
 msgid "Show hint about closing the main window"
 msgstr "Mostrar unha indicación sobre pechar a xanela principal"
 
 # rever
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:43
 msgid "Show offline contacts"
 msgstr "Mostrar os contactos desconectados"
 
 # rever
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:44
 msgid "Spell checking languages"
 msgstr "Idiomas para a verificación ortográfica"
 
 # rever
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:45
 msgid "The default folder to save file transfers in."
 msgstr ""
 "O cartafol predeterminado en que gardar as transferencias de ficheiros."
 
 # rever
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:46
 msgid "The last directory that an avatar image was chosen from."
-msgstr "O último directorio do que foi escollida unha imaxe de avatar."
+msgstr "O último cartafol do que foi escollida unha imaxe de avatar."
 
 # rever
-#: ../data/empathy.schemas.in.h:36
+#: ../data/empathy.schemas.in.h:47
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "O tema usado para mostrar as conversa nas xanelas de conversa."
 
 # rever
-#: ../data/empathy.schemas.in.h:37
+#: ../data/empathy.schemas.in.h:48
 msgid "Use graphical smileys"
 msgstr "Usar emoticonas gráficas"
 
 # rever
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:49
 msgid "Use notification sounds"
 msgstr "Usar sons de notificación"
 
 # rever
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:50
 msgid "Use theme for chat rooms"
 msgstr "Usar un tema para as salas de conversa"
 
+#: ../data/empathy.schemas.in.h:51
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr ""
+
 # rever
-#: ../data/empathy.schemas.in.h:40
+#: ../data/empathy.schemas.in.h:52
+msgid "Whether or not Empathy can publish the user's location to his contacts."
+msgstr ""
+"Se Empathy pode ou non publicar a localización do usuario aos seus contactos."
+
+# rever
+#: ../data/empathy.schemas.in.h:53
+msgid "Whether or not Empathy can use the GPS to guess the location."
+msgstr "Se o Empathy pode usar ou non o GPS para seguir a localización."
+
+# rever
+#: ../data/empathy.schemas.in.h:54
+msgid ""
+"Whether or not Empathy can use the cellular network to guess the location."
+msgstr ""
+"Se o Empathy pode ou non usar a rede de telefonía móbil para seguir a "
+"localización."
+
+# rever
+#: ../data/empathy.schemas.in.h:55
+msgid "Whether or not Empathy can use the network to guess the location."
+msgstr "Se o Empathy debería ou non usar a rede para seguir a localización."
+
+# rever
+#: ../data/empathy.schemas.in.h:56
 msgid ""
 "Whether or not Empathy has asked about importing accounts from other "
 "programs."
@@ -244,7 +324,7 @@ msgstr ""
 "non."
 
 # rever
-#: ../data/empathy.schemas.in.h:41
+#: ../data/empathy.schemas.in.h:57
 msgid ""
 "Whether or not Empathy should automatically log in to your accounts on "
 "startup."
@@ -253,7 +333,16 @@ msgstr ""
 "inicio ou non."
 
 # rever
-#: ../data/empathy.schemas.in.h:42
+#: ../data/empathy.schemas.in.h:58
+msgid ""
+"Whether or not Empathy should reduce the location's accuracy for privacy "
+"reasons."
+msgstr ""
+"Se o Empathy debería ou non reducir a precisión de localización por motivos "
+"de privacidade."
+
+# rever
+#: ../data/empathy.schemas.in.h:59
 msgid ""
 "Whether or not Empathy should use the avatar of the contact as the chat "
 "window icon."
@@ -262,14 +351,14 @@ msgstr ""
 "conversa ou non."
 
 # rever
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:60
 msgid ""
 "Whether or not the Salut account has been created on the first Empathy run."
 msgstr ""
 "Se a conta Salut debería ser creada na primeira execución do Empathy ou non."
 
 # rever
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:61
 msgid ""
 "Whether or not the network manager should be used to automatically "
 "disconnect/reconnect."
@@ -278,22 +367,22 @@ msgstr ""
 "automaticamente ou non."
 
 # rever
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:62
 msgid ""
 "Whether or not to check words typed against the languages you want to check "
 "with."
 msgstr ""
-"Se se deberían verificar as palabras escritas contra o idioma co que as "
-"quere verificar ou non."
+"Se se deberían verifica ou non as palabras escritas no idioma co que as "
+"quere verificar."
 
 # rever
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:63
 msgid ""
 "Whether or not to convert smileys into graphical images in conversations."
 msgstr "Se converter ou non as emoticonas en imaxes gráficas nas conversas."
 
 # rever
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:64
 msgid ""
 "Whether or not to play a sound to notify for contacts logging in the network."
 msgstr ""
@@ -301,7 +390,7 @@ msgstr ""
 "sesión na rede."
 
 # rever
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:65
 msgid ""
 "Whether or not to play a sound to notify for contacts logging off the "
 "network."
@@ -309,43 +398,58 @@ msgstr ""
 "Se reproducir ou non un son para notificar que os contactos terminan unha "
 "sesión na rede."
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:66
 msgid "Whether or not to play a sound to notify for events."
 msgstr "Se reproducir ou non un son para notificar os eventos."
 
 # rever
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:67
 msgid "Whether or not to play a sound to notify for incoming messages."
 msgstr "Se reproducir ou non un son para notificar as mensaxes entrantes."
 
 # rever
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:68
 msgid "Whether or not to play a sound to notify for new conversations."
 msgstr "Se reproducir ou non un son para notificar as conversas novas."
 
 # rever
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:69
 msgid "Whether or not to play a sound to notify for outgoing messages."
 msgstr "Se reproducir ou non un son para notificar as mensaxes saíntes."
 
 # rever
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:70
 msgid "Whether or not to play a sound when logging in a network."
 msgstr "Se reproducir ou non un son cando se inicia unha sesión na rede."
 
 # rever
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:71
 msgid "Whether or not to play a sound when logging off a network."
 msgstr "Se reproducir ou non un son cando se termina unha sesión na rede."
 
 # rever
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:72
 msgid "Whether or not to play sound notifications when away or busy."
 msgstr ""
 "Se reproducir ou non un son para notificar cando se está ocupado ou ausente."
 
 # rever
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:73
+msgid ""
+"Whether or not to show a popup notification when a contact goes offline."
+msgstr ""
+"Se mostrar ou non unha notificación emerxente cando un contacto está "
+"desconectado."
+
+# rever
+#: ../data/empathy.schemas.in.h:74
+msgid "Whether or not to show a popup notification when a contact goes online."
+msgstr ""
+"Se mostrar ou non unha notificación emerxente cando un contacto está "
+"conectado."
+
+# rever
+#: ../data/empathy.schemas.in.h:75
 msgid ""
 "Whether or not to show a popup notification when receiving a new message "
 "even if the chat is already opened, but not focused."
@@ -354,7 +458,7 @@ msgstr ""
 "nova, aínda cando a conversa xa estea aberta mais non estea enfocada."
 
 # rever
-#: ../data/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:76
 msgid ""
 "Whether or not to show a popup notification when receiving a new message."
 msgstr ""
@@ -362,7 +466,7 @@ msgstr ""
 "nova."
 
 # rever
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:77
 msgid ""
 "Whether or not to show avatars for contacts in the contact list and chat "
 "windows."
@@ -371,20 +475,25 @@ msgstr ""
 "xanelas de conversa."
 
 # rever
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:78
 msgid "Whether or not to show contacts that are offline in the contact list."
 msgstr ""
 "Se mostrar ou non os contactos que están desconectados na lista de contactos."
 
 # rever
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:79
 msgid "Whether or not to show popup notifications when away or busy."
 msgstr ""
 "Se mostrar ou non as notificacións emerxentes cando se está ausente ou "
 "ocupado."
 
 # rever
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:80
+msgid "Whether or not to show the contact list in chat rooms."
+msgstr "Se mostrar ou non a lista de contactos nas salas de chat."
+
+# rever
+#: ../data/empathy.schemas.in.h:81
 msgid ""
 "Whether or not to show the message dialog about closing the main window with "
 "the 'x' button in the title bar."
@@ -393,17 +502,17 @@ msgstr ""
 "botón 'x' da barra de título."
 
 # rever
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:82
 msgid "Whether to show the contact list in compact mode or not."
 msgstr "Se mostrar ou non a lista de contactos no modo compacto."
 
 # rever
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:83
 msgid "Whether to use the theme for chat rooms or not."
 msgstr "Se usar o tema para as salas de conversa ou non."
 
 # rever
-#: ../data/empathy.schemas.in.h:64
+#: ../data/empathy.schemas.in.h:84
 msgid ""
 "Which criterium to use when sorting the contact list. Default is to use sort "
 "by the contact's name with the value \"name\". A value of \"state\" will "
@@ -413,37 +522,137 @@ msgstr ""
 "usar a ordenación polo nome do contacto co valor \"name\". Un valor \"state"
 "\" ordenará a lista de contactos por estado."
 
+#: ../libempathy/empathy-ft-handler.c:838
+msgid "The hash of the received file and the sent one do not match"
+msgstr "O hash do ficheiro recibido e o enviado non coinciden"
+
+#: ../libempathy/empathy-ft-handler.c:1098
+msgid "File transfer not supported by remote contact"
+msgstr "A transferencia de ficheiro non é permitida polo contacto remoto"
+
+#: ../libempathy/empathy-ft-handler.c:1156
+msgid "The selected file is not a regular file"
+msgstr "O ficheiro seleccionado non é un ficheiro regular"
+
+#: ../libempathy/empathy-ft-handler.c:1165
+msgid "The selected file is empty"
+msgstr "O ficheiro seleccionado está baleiro"
+
 # rever
-#: ../libempathy/empathy-tp-contact-list.c:732 ../src/empathy.c:271
+#: ../libempathy/empathy-tp-contact-list.c:843 ../src/empathy.c:289
 msgid "People nearby"
 msgstr "Persoas próximas"
 
-#: ../libempathy/empathy-utils.c:252
+#: ../libempathy/empathy-tp-file.c:279
+msgid "Socket type not supported"
+msgstr "O tipo de socket non é compatíbel"
+
+# rever
+#: ../libempathy/empathy-tp-file.c:398
+msgid "No reason was specified"
+msgstr "Non se especificou un motivo"
+
+# rever
+#: ../libempathy/empathy-tp-file.c:401
+msgid "The change in state was requested"
+msgstr "Foi solicitado o cambio de estado"
+
+# rever
+#: ../libempathy/empathy-tp-file.c:404
+msgid "You canceled the file transfer"
+msgstr "Vostede cancelou a transferencia de ficheiros"
+
+# rever
+#: ../libempathy/empathy-tp-file.c:407
+msgid "The other participant canceled the file transfer"
+msgstr "O outro participante cancelou a transferencia de ficheiros"
+
+# rever
+#: ../libempathy/empathy-tp-file.c:410
+msgid "Error while trying to transfer the file"
+msgstr "Erro ao tentar transferir o ficheiro"
+
+# rever
+#: ../libempathy/empathy-tp-file.c:413
+msgid "The other participant is unable to transfer the file"
+msgstr "O outro participante non pode transferir o ficheiro"
+
+#: ../libempathy/empathy-tp-file.c:416
+msgid "Unknown reason"
+msgstr "Motivo descoñecido"
+
+#: ../libempathy/empathy-utils.c:265
 msgid "Available"
 msgstr "Dispoñíbel"
 
-#: ../libempathy/empathy-utils.c:254
+#: ../libempathy/empathy-utils.c:267
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../libempathy/empathy-utils.c:257
+#: ../libempathy/empathy-utils.c:270
 msgid "Away"
 msgstr "Ausente"
 
-#: ../libempathy/empathy-utils.c:259
+#: ../libempathy/empathy-utils.c:272
 msgid "Hidden"
 msgstr "Oculto"
 
-#: ../libempathy/empathy-utils.c:262
+#: ../libempathy/empathy-utils.c:274
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:325
+#: ../libempathy/empathy-time.c:137
+#, c-format
+msgid "%d second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "Hai %d segundo"
+msgstr[1] "Hai %d segundos"
+
+#: ../libempathy/empathy-time.c:142
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "Hai %d minuto"
+msgstr[1] "Hai %d minutos"
+
+#: ../libempathy/empathy-time.c:147
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "Hai %d hora"
+msgstr[1] "Hai %d horas"
+
+#: ../libempathy/empathy-time.c:152
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "Hai %d día"
+msgstr[1] "Hai %d días"
+
+#: ../libempathy/empathy-time.c:157
+#, c-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "Hai %d semana"
+msgstr[1] "Hai %d semanas"
+
+#: ../libempathy/empathy-time.c:162
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "Hai %d mes"
+msgstr[1] "Hai %d meses"
+
+#: ../libempathy/empathy-time.c:167
+msgid "in the future"
+msgstr "no futuro"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:426
 msgid "All"
 msgstr "Todo"
 
 #: ../libempathy-gtk/empathy-account-widget.c:302
-#: ../libempathy-gtk/empathy-account-widget.c:349
+#: ../libempathy-gtk/empathy-account-widget.c:354
 #, c-format
 msgid "%s:"
 msgstr "%s:"
@@ -457,8 +666,8 @@ msgstr "%s:"
 #: ../libempathy-gtk/empathy-account-widget-salut.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Advanced</b>"
-msgstr "<b>Avanzado</b>"
+msgid "Advanced"
+msgstr "Avanzado"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
@@ -490,13 +699,13 @@ msgstr "_Porto:"
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
 msgstr "_Servidor:"
 
 # rever
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "I_D de sesión:"
@@ -512,51 +721,47 @@ msgstr "_UIN ICQ:"
 msgid "_Charset:"
 msgstr "_Codificación de caracteres:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:244
+#: ../libempathy-gtk/empathy-account-widget-irc.c:240
 msgid "New Network"
 msgstr "Rede nova"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "<b>Network</b>"
-msgstr "<b>Rede</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-msgid "<b>Servers</b>"
-msgstr "<b>Servidores</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Charset:"
 msgstr "Codificación de caracteres:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Network"
 msgstr "Rede"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Network:"
 msgstr "Rede:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Nickname:"
-msgstr "_Alcume:"
+msgstr "Alcume:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Password:"
 msgstr "Contrasinal:"
 
 # rever
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Quit message:"
 msgstr "Mensaxe de saída:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Real name:"
 msgstr "Nome real:"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+msgid "Servers"
+msgstr "Servidores"
+
 # rever
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Override server settings</b>"
-msgstr "<b>Ignorar as configuracións do servidor</b>"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+msgid "Override server settings"
+msgstr "Ignorar as configuracións do servidor"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
 msgid "Pri_ority:"
@@ -574,7 +779,7 @@ msgstr "Usar o SS_L antigo"
 # rever
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "_Encryption required (TLS/SSL)"
-msgstr "Requírese unha c_odificación (TLS/SSL)"
+msgstr "Requírese un c_ifrado (TLS/SSL)"
 
 # rever
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
@@ -645,164 +850,198 @@ msgid "_Room List locale:"
 msgstr "Configuración da lista de _salas:"
 
 # rever
-#: ../libempathy-gtk/empathy-avatar-chooser.c:462
-#: ../libempathy-gtk/empathy-avatar-chooser.c:538
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:525
 msgid "Couldn't convert image"
 msgstr "Non se puido converter a imaxe"
 
 # rever
-#: ../libempathy-gtk/empathy-avatar-chooser.c:463
+#: ../libempathy-gtk/empathy-avatar-chooser.c:450
 msgid "None of the accepted image formats is supported on your system"
-msgstr "Ningún dos formatos aceptados de imaxe está soportado no seu sistema"
+msgstr "Ningún dos formatos aceptados de imaxe é compatíbel co seu sistema"
 
 # rever
-#: ../libempathy-gtk/empathy-avatar-chooser.c:957
+#: ../libempathy-gtk/empathy-avatar-chooser.c:933
 msgid "Select Your Avatar Image"
-msgstr "Seleccione a súa imaxe de avatar"
+msgstr "Seleccione a imaxe de avatar para si"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:960
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
 msgid "No Image"
 msgstr "Sen imaxe"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1022
+#: ../libempathy-gtk/empathy-avatar-chooser.c:998
 msgid "Images"
 msgstr "Imaxes"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1026
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
 msgid "All Files"
 msgstr "Todos os ficheiros"
 
 # rever
-#: ../libempathy-gtk/empathy-avatar-image.c:294
+#: ../libempathy-gtk/empathy-avatar-image.c:324
 msgid "Click to enlarge"
 msgstr "Prema para ampliar"
 
-#: ../libempathy-gtk/empathy-chat.c:180
+#: ../libempathy-gtk/empathy-chat.c:186
 msgid "Failed to reconnect this chat"
-msgstr ""
+msgstr "Ocorreu un fallo ao reconectar á conversa"
 
-#: ../libempathy-gtk/empathy-chat.c:398
+#: ../libempathy-gtk/empathy-chat.c:404
 msgid "Unsupported command"
-msgstr ""
+msgstr "Orde non compatíbel"
 
-#: ../libempathy-gtk/empathy-chat.c:533
+#: ../libempathy-gtk/empathy-chat.c:539
 msgid "offline"
 msgstr "desconectado"
 
-#: ../libempathy-gtk/empathy-chat.c:536
+#: ../libempathy-gtk/empathy-chat.c:542
 msgid "invalid contact"
 msgstr "contacto non válido"
 
-#: ../libempathy-gtk/empathy-chat.c:539
+#: ../libempathy-gtk/empathy-chat.c:545
 msgid "permission denied"
 msgstr "permiso denegado"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:542
+#: ../libempathy-gtk/empathy-chat.c:548
 msgid "too long message"
-msgstr "mensaxe demasiado longa"
+msgstr "a mensaxe é demasiado longa"
 
-#: ../libempathy-gtk/empathy-chat.c:545
+#: ../libempathy-gtk/empathy-chat.c:551
 msgid "not implemented"
 msgstr "non implementado"
 
-#: ../libempathy-gtk/empathy-chat.c:548
+#: ../libempathy-gtk/empathy-chat.c:554
 msgid "unknown"
 msgstr "descoñecido"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:552
+#: ../libempathy-gtk/empathy-chat.c:558
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Erro ao enviar a mensaxe '%s': %s"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:582
+#: ../libempathy-gtk/empathy-chat.c:588
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Cambiouse o asunto a: %s"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:584
+#: ../libempathy-gtk/empathy-chat.c:590
 msgid "No topic defined"
 msgstr "Non se definiu un asunto"
 
-#: ../libempathy-gtk/empathy-chat.c:977
+#: ../libempathy-gtk/empathy-chat.c:960
+msgid "(No Suggestions)"
+msgstr "(Sen suxestións)"
+
+#: ../libempathy-gtk/empathy-chat.c:1014
 msgid "Insert Smiley"
 msgstr "Inserir unha emoticona"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:995
-#: ../libempathy-gtk/empathy-ui-utils.c:1507
+#: ../libempathy-gtk/empathy-chat.c:1032
+#: ../libempathy-gtk/empathy-ui-utils.c:1480
 msgid "_Send"
 msgstr "_Enviar"
 
-# rever
-#: ../libempathy-gtk/empathy-chat.c:1029
-msgid "_Check Word Spelling..."
-msgstr "_Verificar a ortografía..."
+#: ../libempathy-gtk/empathy-chat.c:1066
+msgid "_Spelling Suggestions"
+msgstr "Suxestións de _ortografía"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:1147
+#: ../libempathy-gtk/empathy-chat.c:1181
+#, fuzzy, c-format
+msgid "%s has disconnected"
+msgstr "Contacto desconectado"
+
+#: ../libempathy-gtk/empathy-chat.c:1185
 #, c-format
-msgid "%s has joined the room"
-msgstr "%s uniuse á sala"
+msgid "%s was kicked by %s"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1188
+#, c-format
+msgid "%s was kicked"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1193
+#, c-format
+msgid "%s was banned by %s"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1196
+#, c-format
+msgid "%s was banned"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1150
+#: ../libempathy-gtk/empathy-chat.c:1200
 #, c-format
 msgid "%s has left the room"
-msgstr "%s saíu da sala"
+msgstr "%s deixou a sala"
+
+#. Note to translators: this string is appended to
+#. * notifications like "foo has left the room", with the message
+#. * given by the user living the room. If this poses a problem,
+#. * please let us know. :-)
+#.
+#: ../libempathy-gtk/empathy-chat.c:1209
+#, c-format
+msgid " (%s)"
+msgstr ""
+
+# rever
+#: ../libempathy-gtk/empathy-chat.c:1232
+#, c-format
+msgid "%s has joined the room"
+msgstr "%s uniuse á sala"
 
-#: ../libempathy-gtk/empathy-chat.c:1265 ../src/empathy-call-window.c:756
+#: ../libempathy-gtk/empathy-chat.c:1365 ../src/empathy-call-window.c:1225
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: ../libempathy-gtk/empathy-chat.c:1660
+#: ../libempathy-gtk/empathy-chat.c:1800
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../libempathy-gtk/empathy-chat.c:1710
-#: ../libempathy-gtk/empathy-log-window.c:501
+#: ../libempathy-gtk/empathy-chat.c:1850
+#: ../libempathy-gtk/empathy-log-window.c:502
 msgid "Conversation"
 msgstr "Conversa"
 
-# rever
-#: ../libempathy-gtk/empathy-chat.ui.h:1
-msgid "<b>Topic:</b>"
-msgstr "<b>Asunto:</b>"
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472
+msgid "Topic:"
+msgstr "Asunto:"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:323
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:316
+#: ../libempathy-gtk/empathy-theme-adium.c:264
 msgid "_Copy Link Address"
 msgstr "_Copiar o enderezo da ligazón"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:331
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:323
+#: ../libempathy-gtk/empathy-theme-adium.c:272
 msgid "_Open Link"
 msgstr "_Abrir ligazón"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:424
+#: ../libempathy-gtk/empathy-chat-text-view.c:421
 msgid "%A %B %d %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:181
-msgid "Personal Information"
-msgstr "Información persoal"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:184
+#: ../libempathy-gtk/empathy-contact-dialogs.c:179
+#: ../libempathy-gtk/empathy-contact-dialogs.c:238
 msgid "Edit Contact Information"
 msgstr "Editar a información de contacto"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:187
-msgid "Contact Information"
-msgstr "Información de contacto"
-
-# rever
-#: ../libempathy-gtk/empathy-contact-dialogs.c:269
-msgid "I would like to add you to my contact list."
-msgstr "Gustaríame engadilo á miña lista de contactos."
+#: ../libempathy-gtk/empathy-contact-dialogs.c:289
+msgid "Personal Information"
+msgstr "Información persoal"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:293
+#: ../libempathy-gtk/empathy-contact-dialogs.c:393
 msgid "New Contact"
 msgstr "Contacto novo"
 
@@ -814,141 +1053,259 @@ msgstr "Decidir máis _adiante"
 # rever
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
-msgstr "Pedido de subscrición"
+msgstr "Solicitude de subscrición"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-list-view.c:1255
+#: ../libempathy-gtk/empathy-contact-list-view.c:1400
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Está seguro de que quere eliminar o grupo '%s'?"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-list-view.c:1257
+#: ../libempathy-gtk/empathy-contact-list-view.c:1402
 msgid "Removing group"
 msgstr "Eliminando o grupo"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1304
-#: ../libempathy-gtk/empathy-contact-list-view.c:1383
+#. Remove
+#: ../libempathy-gtk/empathy-contact-list-view.c:1449
+#: ../libempathy-gtk/empathy-contact-list-view.c:1526
 msgid "_Remove"
 msgstr "_Eliminar"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-list-view.c:1334
+#: ../libempathy-gtk/empathy-contact-list-view.c:1479
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Está seguro de quere eliminar o contacto '%s'?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1336
+#: ../libempathy-gtk/empathy-contact-list-view.c:1481
 msgid "Removing contact"
 msgstr "Eliminando o contacto"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-list-view.c:1341
-msgid "Sorry, I don't want you in my contact list anymore."
-msgstr "Perdoe, non o quero máis na miña lista de contactos."
+#: ../libempathy-gtk/empathy-contact-menu.c:195
+#: ../src/empathy-main-window.ui.h:11
+msgid "_Add Contact..."
+msgstr "Eng_adir un contacto..."
 
-#: ../libempathy-gtk/empathy-contact-menu.c:130
-#: ../src/empathy-main-window.ui.h:8
+#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../src/empathy-main-window.ui.h:12
 msgid "_Chat"
 msgstr "_Conversa"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:161
-#, fuzzy
+#: ../libempathy-gtk/empathy-contact-menu.c:253
 msgctxt "menu item"
-msgid "_Call"
-msgstr "_Chamar"
+msgid "_Audio Call"
+msgstr "_Audiochamada"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:285
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Videochamada"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-menu.c:200
-#: ../src/empathy-main-window.ui.h:17
+#: ../libempathy-gtk/empathy-contact-menu.c:324
 msgid "_View Previous Conversations"
 msgstr "_Ver as conversas previas"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../libempathy-gtk/empathy-contact-menu.c:346
 msgid "Send file"
 msgstr "Enviar ficheiro"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:250
+#: ../libempathy-gtk/empathy-contact-menu.c:369
+msgid "Share my desktop"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-menu.c:397
 msgid "Infor_mation"
 msgstr "Infor_mación"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:277
-#: ../src/empathy-main-window.ui.h:10
+#: ../libempathy-gtk/empathy-contact-menu.c:441
+#: ../src/empathy-main-window.ui.h:16
 msgid "_Edit"
 msgstr "_Editar"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-menu.c:336
+#: ../libempathy-gtk/empathy-contact-menu.c:501
 msgid "Inviting to this room"
 msgstr "Convidando a esta sala"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-menu.c:367
+#: ../libempathy-gtk/empathy-contact-menu.c:532
 msgid "_Invite to chatroom"
 msgstr "Conv_idar á sala de conversa"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-selector.c:112
+#: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "Seleccione un contacto"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-widget.c:353
+#: ../libempathy-gtk/empathy-contact-widget.c:447
 msgid "Save Avatar"
 msgstr "Gardar o avatar"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-widget.c:409
+#: ../libempathy-gtk/empathy-contact-widget.c:503
 msgid "Unable to save avatar"
 msgstr "Non foi posíbel gardar o avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:904
+#: ../libempathy-gtk/empathy-contact-widget.c:992
 msgid "Select"
 msgstr "Seleccionar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../src/empathy-main-window.c:882
+#: ../libempathy-gtk/empathy-contact-widget.c:1001
+#: ../src/empathy-main-window.c:1023
 msgid "Group"
 msgstr "Grupo"
 
-# rever
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Client Information</b>"
-msgstr "<b>Información do cliente</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1252
+msgid "Country ISO Code:"
+msgstr "Código ISO de país:"
 
-# rever
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-msgid "<b>Contact Details</b>"
-msgstr "<b>Detalles do contacto</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1254
+msgid "Country:"
+msgstr "País:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-msgid "<b>Contact</b>"
-msgstr "<b>Contacto</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1256
+msgid "State:"
+msgstr "Rexión:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1258
+msgid "City:"
+msgstr "Cidade:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1260
+msgid "Area:"
+msgstr "Área:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1262
+msgid "Postal Code:"
+msgstr "Código postal:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1264
+msgid "Street:"
+msgstr "Rúa:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1266
+msgid "Building:"
+msgstr "Edificio:"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "<b>Groups</b>"
-msgstr "<b>Grupos</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1268
+msgid "Floor:"
+msgstr "_Andar:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+#: ../libempathy-gtk/empathy-contact-widget.c:1270
+msgid "Room:"
+msgstr "Sala:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1272
+msgid "Text:"
+msgstr "Texto:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1274
+msgid "Description:"
+msgstr "Descrición:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1276
+msgid "URI:"
+msgstr "URI:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1278
+msgid "Accuracy Level:"
+msgstr "Nivel de precisión:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1280
+msgid "Error:"
+msgstr "Erro:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1282
+msgid "Vertical Error (meters):"
+msgstr "Erro vertical (metros):"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1284
+msgid "Horizontal Error (meters):"
+msgstr "Erro horizontal (metros):"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1286
+msgid "Speed:"
+msgstr "Velocidade:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1288
+msgid "Bearing:"
+msgstr "Orientación:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1290
+msgid "Climb Speed:"
+msgstr "Velocidade de incremento:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1292
+msgid "Last Updated on:"
+msgstr "Última actualización:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1294
+msgid "Longitude:"
+msgstr "Lonxitude:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1296
+msgid "Latitude:"
+msgstr "Latitude:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1298
+msgid "Altitude:"
+msgstr "Altitude:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1345
+msgid "<b>Location</b>"
+msgstr "<b>Localización</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1358
+msgid "<b>Location</b>, "
+msgstr "<b>Localización</b>, "
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1408
+msgid "%B %e, %Y at %R UTC"
+msgstr "%B %e, %Y de %R UTC"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Localización</b> o (date)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
 #: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid "Account:"
 msgstr "Conta:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
 msgid "Alias:"
 msgstr "Alias:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
 msgid "Birthday:"
 msgstr "Aniversario:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+# rever
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "Client Information"
+msgstr "Información do cliente"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
 msgid "Client:"
 msgstr "Cliente:"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../src/empathy-main-window.c:1006
+msgid "Contact"
+msgstr "Contacto"
+
+# rever
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Contact Details"
+msgstr "Detalles do contacto"
+
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "Email:"
 msgstr "Correo electrónico:"
@@ -957,21 +1314,25 @@ msgstr "Correo electrónico:"
 msgid "Fullname:"
 msgstr "Nome completo:"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Groups"
+msgstr "Grupos"
+
 #. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
 msgid "Identifier:"
 msgstr "Identificador:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
 msgid "Information requested..."
-msgstr "Petición de información..."
+msgstr "Solicitude de información..."
 
 # rever
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
 msgid "OS:"
 msgstr "SO:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -979,15 +1340,15 @@ msgstr ""
 "Seleccione os grupos en que quere que aparezan estes contactos. Note que "
 "pode seleccionar máis dun grupo ou ningún."
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
 msgid "Version:"
 msgstr "Versión:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
 msgid "Web site:"
-msgstr "Sitio web"
+msgstr "Sitio web:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
 msgid "_Add Group"
 msgstr "Eng_adir grupo"
 
@@ -1008,12 +1369,12 @@ msgstr "Porto"
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:494
-#: ../src/empathy-import-dialog.c:281
+#: ../libempathy-gtk/empathy-log-window.c:495
+#: ../src/empathy-import-dialog.c:285
 msgid "Account"
 msgstr "Conta"
 
-#: ../libempathy-gtk/empathy-log-window.c:511
+#: ../libempathy-gtk/empathy-log-window.c:512
 msgid "Date"
 msgstr "Data"
 
@@ -1058,145 +1419,137 @@ msgstr "Conversa nova"
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:162
-#, fuzzy
+#: ../libempathy-gtk/empathy-presence-chooser.c:172
 msgid "Custom Message..."
-msgstr "Mensaxes personalizadas..."
+msgstr "Mensaxe personalizada..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:217
-#, fuzzy
+#: ../libempathy-gtk/empathy-presence-chooser.c:227
 msgid "Edit Custom Messages..."
-msgstr "Mensaxes personalizadas..."
+msgstr "Editar mensaxe personalizada..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:316
+#: ../libempathy-gtk/empathy-presence-chooser.c:326
 msgid "Click to remove this status as a favorite"
-msgstr ""
+msgstr "Faga clic para eliminar este estado como favorito"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:325
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
 msgid "Click to make this status a favorite"
-msgstr ""
+msgstr "Faga clic para facer este estado un dos favoritos"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:359
-#, fuzzy
+#: ../libempathy-gtk/empathy-presence-chooser.c:369
 msgid "Set status"
-msgstr "Estado"
+msgstr "Establecer status"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:766
+#: ../libempathy-gtk/empathy-presence-chooser.c:782
 msgid "Set your presence and current status"
-msgstr ""
+msgstr "Estableza a súa presenza e estado actual"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:987
+#: ../libempathy-gtk/empathy-presence-chooser.c:1017
 msgid "Custom messages..."
 msgstr "Mensaxes personalizadas..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.ui.h:1
-msgid "Custom message"
-msgstr "Mensaxe personalizada"
-
-#: ../libempathy-gtk/empathy-presence-chooser.ui.h:2
-msgid "Message:"
-msgstr "Mensaxe:"
-
-#: ../libempathy-gtk/empathy-presence-chooser.ui.h:3
-msgid "Save message"
-msgstr "Gardar a mensaxe"
-
-#: ../libempathy-gtk/empathy-presence-chooser.ui.h:4
-msgid "Status:"
-msgstr "Estado:"
-
-#: ../libempathy-gtk/empathy-spell-dialog.c:81
-msgid "Word"
-msgstr "Palabra"
-
-# rever
-#: ../libempathy-gtk/empathy-spell-dialog.c:255
-msgid "Suggestions for the word"
-msgstr "Suxestións para a palabra"
-
-#: ../libempathy-gtk/empathy-spell-dialog.ui.h:1
-msgid "Spell Checker"
-msgstr "Corrector ortográfico"
-
 # rever
-#: ../libempathy-gtk/empathy-spell-dialog.ui.h:2
-msgid "Suggestions for the word:"
-msgstr "Suxestións para a palabra:"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:60
-msgid "Classic"
-msgstr "Clásico"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:61
-msgid "Simple"
-msgstr "Simple"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:62
-msgid "Clean"
-msgstr "Limpo"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:63
-msgid "Blue"
-msgstr "Azul"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1354
-msgid "Unable to open URI"
-msgstr "Non foi posíbel abrir o URI"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1499
-msgid "Select a file"
-msgstr "Seleccione un ficheiro"
-
-# rever
-#: ../libempathy-gtk/empathy-ui-utils.c:1535
+#: ../libempathy-gtk/empathy-sound.c:51
 msgid "Received an instant message"
 msgstr "Recibir unha mensaxe instantánea"
 
 # rever
-#: ../libempathy-gtk/empathy-ui-utils.c:1537
+#: ../libempathy-gtk/empathy-sound.c:53
 msgid "Sent an instant message"
 msgstr "Enviar unha mensaxe instantánea"
 
 # rever
-#: ../libempathy-gtk/empathy-ui-utils.c:1539
+#: ../libempathy-gtk/empathy-sound.c:55
 msgid "Incoming chat request"
-msgstr "Pedido de conversa entrante"
+msgstr "Solicitude de conversa entrante"
 
 # rever
-#: ../libempathy-gtk/empathy-ui-utils.c:1541
+#: ../libempathy-gtk/empathy-sound.c:57
 msgid "Contact connected"
 msgstr "Contacto conectado"
 
 # rever
-#: ../libempathy-gtk/empathy-ui-utils.c:1543
+#: ../libempathy-gtk/empathy-sound.c:59
 msgid "Contact disconnected"
 msgstr "Contacto desconectado"
 
 # rever
-#: ../libempathy-gtk/empathy-ui-utils.c:1545
+#: ../libempathy-gtk/empathy-sound.c:61
 msgid "Connected to server"
 msgstr "Conectado co servidor"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1547
+#: ../libempathy-gtk/empathy-sound.c:63
 msgid "Disconnected from server"
 msgstr "Desconectado do servidor"
 
 # rever
-#: ../libempathy-gtk/empathy-ui-utils.c:1549
+#: ../libempathy-gtk/empathy-sound.c:65
 msgid "Incoming voice call"
 msgstr "Chamada de voz entrante"
 
 # rever
-#: ../libempathy-gtk/empathy-ui-utils.c:1551
+#: ../libempathy-gtk/empathy-sound.c:67
 msgid "Outgoing voice call"
 msgstr "Chamada de voz saínte"
 
 # rever
-#: ../libempathy-gtk/empathy-ui-utils.c:1553
+#: ../libempathy-gtk/empathy-sound.c:69
 msgid "Voice call ended"
 msgstr "Chamada de voz finalizada"
 
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
+msgid "Enter Custom Message"
+msgstr "Insira unha mensaxe personalizada"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
+msgid "Edit Custom Messages"
+msgstr "Editar mensaxes personalizadas"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+msgid "Add _New Preset"
+msgstr "Engada _nova configuración preestablecida"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
+msgid "Saved Presets"
+msgstr "Configuración personalizada gardada"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:3
+msgid "gtk-add"
+msgstr "gtk-add"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:4
+msgid "gtk-remove"
+msgstr "gtk-remove"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:67
+msgid "Classic"
+msgstr "Clásico"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:68
+msgid "Simple"
+msgstr "Simple"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:69
+msgid "Clean"
+msgstr "Limpo"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:70
+msgid "Blue"
+msgstr "Azul"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1382
+msgid "Unable to open URI"
+msgstr "Non foi posíbel abrir o URI"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1472
+msgid "Select a file"
+msgstr "Seleccione un ficheiro"
+
+# rever
+#: ../libempathy-gtk/empathy-ui-utils.c:1530
+msgid "Select a destination"
+msgstr "Seleccione un destinatario"
+
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
 msgstr "Configuración rexional actual"
@@ -1372,8 +1725,8 @@ msgstr "Vietnamita"
 msgid ""
 "The contact to display in the applet. Empty means no contact is displayed."
 msgstr ""
-"O contacto para mostrar na aplicación. Baleiro significa que non se mostra "
-"ningún contacto."
+"O contacto para mostrar no miniaplicativo. Baleiro significa que non se "
+"mostra ningún contacto."
 
 # rever
 #: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:2
@@ -1389,7 +1742,7 @@ msgstr "Megáfono"
 
 # rever
 #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:417
+#: ../megaphone/src/megaphone-applet.c:519
 msgid "Talk!"
 msgstr "Fale!"
 
@@ -1403,17 +1756,17 @@ msgid "_Information"
 msgstr "_Información"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window.ui.h:23
 msgid "_Preferences"
 msgstr "_Preferencias"
 
 # rever
-#: ../megaphone/src/megaphone-applet.c:255
+#: ../megaphone/src/megaphone-applet.c:168
 msgid "Please configure a contact."
 msgstr "Configure un contacto."
 
 # rever
-#: ../megaphone/src/megaphone-applet.c:348
+#: ../megaphone/src/megaphone-applet.c:258
 msgid "Select contact..."
 msgstr "Seleccionar un contacto..."
 
@@ -1428,22 +1781,22 @@ msgid "Set your own presence"
 msgstr "Defina a súa propia presenza"
 
 # rever
-#: ../src/empathy.c:430
+#: ../src/empathy.c:567
 msgid "Don't connect on startup"
 msgstr "Non se conectar ao inicio"
 
 # rever
-#: ../src/empathy.c:434
+#: ../src/empathy.c:571
 msgid "Don't show the contact list on startup"
 msgstr "Non mostrar a lista de contactos ao inicio"
 
 # rever
-#: ../src/empathy.c:438
+#: ../src/empathy.c:575
 msgid "Show the accounts dialog"
 msgstr "Mostra o diálogo de conta"
 
 # rever
-#: ../src/empathy.c:450
+#: ../src/empathy.c:587
 msgid "- Empathy Instant Messenger"
 msgstr "- Mensaxeiro instantáneo Empathy"
 
@@ -1469,7 +1822,7 @@ msgid ""
 "details."
 msgstr ""
 "O Empathy distribúese esperando que sexa útil, mais SEN NINGUNHA GARANTÍA; "
-"mesmo sen a garantía implícita de COMERCIALIZACIÓN ou ADECUACIÓN PARA UN "
+"mesmo sen a garantía implícita de VALOR COMERCIAL ou ADECUACIÓN PARA UN "
 "PROPÓSITO PARTICULAR. Para máis detalles vexa a Licenza pública xeral GNU."
 
 # rever
@@ -1486,39 +1839,39 @@ msgstr ""
 # rever
 #: ../src/empathy-about-dialog.c:119
 msgid "An Instant Messaging client for GNOME"
-msgstr "Un cliente de Mensaxería instantánea para o Gnome"
+msgstr "Un cliente de mensaxería instantánea para o Gnome"
 
 #: ../src/empathy-about-dialog.c:125
 msgid "translator-credits"
 msgstr "Suso Baleato <suso.baleato@xunta.es>"
 
-#: ../src/empathy-accounts-dialog.c:391
+#: ../src/empathy-accounts-dialog.c:392
 msgid "Enabled"
 msgstr "Activado"
 
-#: ../src/empathy-accounts-dialog.c:401 ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1
 msgid "Accounts"
 msgstr "Contas"
 
 # rever
 #. To translator: %s is the protocol name
-#: ../src/empathy-accounts-dialog.c:833
+#: ../src/empathy-accounts-dialog.c:837
 #, c-format
 msgid "New %s account"
 msgstr "Conta nova de %s"
 
 # rever
-#: ../src/empathy-accounts-dialog.c:943
+#: ../src/empathy-accounts-dialog.c:950
 #, c-format
 msgid ""
 "You are about to remove your %s account!\n"
 "Are you sure you want to proceed?"
 msgstr ""
-"Vai eliminar a súa conta de %s!\n"
+"Vai eliminar a súa conta %s!\n"
 "Está seguro de que quere proceder?"
 
 # rever
-#: ../src/empathy-accounts-dialog.c:949
+#: ../src/empathy-accounts-dialog.c:956
 msgid ""
 "Any associated conversations and chat rooms will NOT be removed if you "
 "decide to proceed.\n"
@@ -1532,33 +1885,32 @@ msgstr ""
 "Vostede podería decidir engadir a conta de novo máis adiante e elas estarán "
 "aínda dispoñíbeis."
 
-#: ../src/empathy-accounts-dialog.ui.h:1
-msgid "<b>New Account</b>"
-msgstr "<b>Conta nova</b>"
-
-# rever
 #: ../src/empathy-accounts-dialog.ui.h:2
-msgid "<b>No protocol installed</b>"
-msgstr "<b>Non hai ningún protocolo instalado</b>"
+msgid "Add Account"
+msgstr "Engadir conta"
 
-# rever
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "<b>Settings</b>"
-msgstr "<b>Configuracións</b>"
-
-#: ../src/empathy-accounts-dialog.ui.h:5
 msgid "Cr_eate"
 msgstr "Cr_ear"
 
+#: ../src/empathy-accounts-dialog.ui.h:4
+msgid "Gmail"
+msgstr "Gmail"
+
+# rever
+#: ../src/empathy-accounts-dialog.ui.h:5
+msgid "Import Accounts..."
+msgstr "Importar contas..."
+
 # rever
 #: ../src/empathy-accounts-dialog.ui.h:6
-msgid "I already have an account I want to use"
-msgstr "Xa teño unha conta que quero usar"
+msgid "No protocol installed"
+msgstr "Non hai ningún protocolo instalado"
 
 # rever
 #: ../src/empathy-accounts-dialog.ui.h:7
-msgid "Import Accounts..."
-msgstr "Importar contas..."
+msgid "Settings"
+msgstr "Configuracións"
 
 # rever
 #: ../src/empathy-accounts-dialog.ui.h:8
@@ -1573,98 +1925,115 @@ msgstr ""
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../src/empathy-call-window.c:319
+# rever
+#: ../src/empathy-accounts-dialog.ui.h:10
+msgid "_Add..."
+msgstr "Eng_adir..."
+
+#: ../src/empathy-accounts-dialog.ui.h:11
+msgid "_Create a new account"
+msgstr "_Crear unha nova conta"
+
+# rever
+#: ../src/empathy-accounts-dialog.ui.h:12
+msgid "_Reuse an existing account"
+msgstr "_Reusar unha conta existente"
+
+#: ../src/empathy-call-window.c:420
 msgid "Contrast"
 msgstr "Contraste"
 
-#: ../src/empathy-call-window.c:322
+#: ../src/empathy-call-window.c:423
 msgid "Brightness"
 msgstr "Brillo"
 
-#: ../src/empathy-call-window.c:325
+#: ../src/empathy-call-window.c:426
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-call-window.c:429
+#: ../src/empathy-call-window.c:531
 msgid "Volume"
 msgstr "Volume"
 
-#: ../src/empathy-call-window.c:532
+#: ../src/empathy-call-window.c:662
+msgid "Connecting..."
+msgstr "Conectando..."
+
+#: ../src/empathy-call-window.c:746
 msgid "_Sidebar"
 msgstr "Barra _lateral"
 
-#: ../src/empathy-call-window.c:550
+#: ../src/empathy-call-window.c:765
 msgid "Dialpad"
 msgstr "Marcador"
 
 # rever
-#: ../src/empathy-call-window.c:556
+#: ../src/empathy-call-window.c:771
 msgid "Audio input"
-msgstr "Entrada de son"
+msgstr "Entrada de audio"
 
 # rever
-#: ../src/empathy-call-window.c:560
+#: ../src/empathy-call-window.c:775
 msgid "Video input"
 msgstr "Entrada de vídeo"
 
-#: ../src/empathy-call-window.c:573
-msgid "Connecting..."
-msgstr "Conectando..."
+#: ../src/empathy-call-window.c:835
+#, c-format
+msgid "Call with %s"
+msgstr "Nunha chamada con %s"
+
+#: ../src/empathy-call-window.c:904
+msgid "Call"
+msgstr "Ch_amar"
 
 # rever
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:837
-#, fuzzy, c-format
+#: ../src/empathy-call-window.c:1335
+#, c-format
 msgid "Connected — %d:%02dm"
-msgstr "Conectado -- %d:%02dm"
+msgstr "Conectado — %d:%02dm"
 
 #: ../src/empathy-call-window.ui.h:1
 msgid "Hang up"
 msgstr "Colgar"
 
-# rever
 #: ../src/empathy-call-window.ui.h:2
-msgid "Send Audio"
-msgstr "Enviar son"
+msgid "Redial"
+msgstr "Redial"
 
 # rever
 #: ../src/empathy-call-window.ui.h:3
+msgid "Send Audio"
+msgstr "Enviar audio"
+
+# rever
+#: ../src/empathy-call-window.ui.h:4
 msgid "Send video"
 msgstr "Enviar vídeo"
 
-#: ../src/empathy-call-window.ui.h:4
+#: ../src/empathy-call-window.ui.h:5
 msgid "Video preview"
 msgstr "Previsualización de vídeo"
 
-#: ../src/empathy-call-window.ui.h:5
+#: ../src/empathy-call-window.ui.h:6
 msgid "_Call"
 msgstr "_Chamar"
 
-#: ../src/empathy-call-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
 msgid "_View"
 msgstr "_Ver"
 
 # rever
-#: ../src/empathy-chat-window.c:308
+#: ../src/empathy-chat-window.c:344
 #, c-format
 msgid "Conversations (%d)"
 msgstr "Conversas (%d)"
 
-#: ../src/empathy-chat-window.c:413
-msgid "Topic:"
-msgstr "Asunto:"
-
 # rever
-#: ../src/empathy-chat-window.c:418
+#: ../src/empathy-chat-window.c:476
 msgid "Typing a message."
 msgstr "Escribindo unha mensaxe."
 
-# rever
-#: ../src/empathy-chat-window.c:889 ../src/empathy-event-manager.c:429
-#, c-format
-msgid "New message from %s"
-msgstr "Mensaxe nova de %s"
-
 #: ../src/empathy-chatrooms-window.c:258
 msgid "Name"
 msgstr "Nome"
@@ -1684,85 +2053,84 @@ msgid "Manage Favorite Rooms"
 msgstr "Xestionar as salas preferidas"
 
 # rever
-#: ../src/empathy-event-manager.c:377
+#: ../src/empathy-event-manager.c:321
 msgid "Incoming call"
 msgstr "Chamada entrante"
 
 # rever
-#: ../src/empathy-event-manager.c:380
+#: ../src/empathy-event-manager.c:324
 #, c-format
 msgid "%s is calling you, do you want to answer?"
-msgstr "%s estao chamando. Quere responder?"
+msgstr "%s estao chamando. Quérelle responder?"
 
-#: ../src/empathy-event-manager.c:387
+#: ../src/empathy-event-manager.c:331
 msgid "_Reject"
 msgstr "_Rexeitar"
 
 # rever
-#: ../src/empathy-event-manager.c:393
+#: ../src/empathy-event-manager.c:337
 msgid "_Answer"
 msgstr "_Responder"
 
-#: ../src/empathy-event-manager.c:516
+#: ../src/empathy-event-manager.c:452
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Chamada entrante de %s"
 
 # rever
-#: ../src/empathy-event-manager.c:564
+#: ../src/empathy-event-manager.c:496
 #, c-format
 msgid "%s is offering you an invitation"
 msgstr "%s estalle a ofrecer un convite"
 
 # rever
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:502
 msgid "An external application will be started to handle it."
-msgstr "Unha aplicación externa será iniciada para manipulalo."
+msgstr "Un aplicativo externo será iniciada para manipulalo."
 
-#: ../src/empathy-event-manager.c:575
+#: ../src/empathy-event-manager.c:507
 msgid "You don't have the needed external application to handle it."
-msgstr "Non precisa dunha aplicación externa para manipulalo."
+msgstr "Non precisa dun aplicativo externo para manipulalo."
 
 # rever
-#: ../src/empathy-event-manager.c:698
+#: ../src/empathy-event-manager.c:634
 msgid "Room invitation"
 msgstr "Convite para unha sala"
 
 # rever
-#: ../src/empathy-event-manager.c:701
+#: ../src/empathy-event-manager.c:637
 #, c-format
 msgid "%s is inviting you to join %s"
-msgstr "%s está convidándoo a unirse a %s"
+msgstr "%s estao convidando a unirse a %s"
 
-#. Decline button
-#: ../src/empathy-event-manager.c:709 ../src/empathy-ft-manager.c:1031
+#: ../src/empathy-event-manager.c:645
 msgid "_Decline"
-msgstr "_Rexeitar"
+msgstr "_Declinar"
 
-#: ../src/empathy-event-manager.c:714
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-event-manager.c:650
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Unirse"
 
 # rever
-#: ../src/empathy-event-manager.c:744
+#: ../src/empathy-event-manager.c:689
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s convidouno a unirse a %s"
 
 # rever
-#: ../src/empathy-event-manager.c:867
+#: ../src/empathy-event-manager.c:715
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Transferencia de ficheiro entrante de %s"
 
 # rever
-#: ../src/empathy-event-manager.c:961
+#: ../src/empathy-event-manager.c:895
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "Subscrición solicitada por %s"
 
-#: ../src/empathy-event-manager.c:965
+#: ../src/empathy-event-manager.c:899
 #, c-format
 msgid ""
 "\n"
@@ -1771,173 +2139,133 @@ msgstr ""
 "\n"
 "Mensaxe: %s"
 
+#. someone is logging off
+#: ../src/empathy-event-manager.c:935
+#, c-format
+msgid "%s is now offline."
+msgstr "%s está agora desconectado."
+
+#. someone is logging in
+#: ../src/empathy-event-manager.c:951
+#, c-format
+msgid "%s is now online."
+msgstr "%s está agora conectado."
+
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:114
+#: ../src/empathy-ft-manager.c:101
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:117
+#: ../src/empathy-ft-manager.c:104
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-# rever
-#: ../src/empathy-ft-manager.c:166
-msgid "No reason was specified"
-msgstr "Non se especificou un motivo"
-
-# rever
-#: ../src/empathy-ft-manager.c:168
-msgid "The change in state was requested"
-msgstr "Foi solicitado o cambio de estado"
-
-# rever
-#: ../src/empathy-ft-manager.c:170
-msgid "You canceled the file transfer"
-msgstr "Vostede cancelou a transferencia de ficheiros"
-
-# rever
-#: ../src/empathy-ft-manager.c:172
-msgid "The other participant canceled the file transfer"
-msgstr "Outro participante cancelou a transferencia de ficheiros"
+#: ../src/empathy-ft-manager.c:180
+msgctxt "file transfer percent"
+msgid "Unknown"
+msgstr "Descoñecido"
 
 # rever
-#: ../src/empathy-ft-manager.c:174
-msgid "Error while trying to transfer the file"
-msgstr "Erro ao tentar transferir o ficheiro"
+#: ../src/empathy-ft-manager.c:275
+#, c-format
+msgid "%s of %s at %s/s"
+msgstr "%s de %s en %s/s"
 
 # rever
-#: ../src/empathy-ft-manager.c:176
-msgid "The other participant is unable to transfer the file"
-msgstr "O outro participante non pode transferir o ficheiro"
-
-#: ../src/empathy-ft-manager.c:178
-msgid "Unknown reason"
-msgstr "Motivo descoñecido"
+#: ../src/empathy-ft-manager.c:276
+#, c-format
+msgid "%s of %s"
+msgstr "%s de %s"
 
 # rever
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:226
+#: ../src/empathy-ft-manager.c:307
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Recibindo \"%s\" de %s"
 
 # rever
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:229
+#: ../src/empathy-ft-manager.c:310
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Enviando \"%s\" a %s"
 
-#: ../src/empathy-ft-manager.c:239
-msgctxt "file size"
-msgid "Unknown"
-msgstr "Descoñecido"
+# rever
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:340
+#, c-format
+msgid "Error receiving \"%s\" from %s"
+msgstr "Produciuse un erro ao recibir \"%s\" de %s"
+
+#: ../src/empathy-ft-manager.c:343
+msgid "Error receiving a file"
+msgstr "Erro ao recibir un ficheiro"
 
 # rever
-#. translators: first %s is the transferred size, second %s is
-#. * the total file size
-#: ../src/empathy-ft-manager.c:247
+#: ../src/empathy-ft-manager.c:348
 #, c-format
-msgid "%s of %s"
-msgstr "%s de %s"
+msgid "Error sending \"%s\" to %s"
+msgstr "Erro ao enviar \"%s\" a %s"
 
 # rever
-#: ../src/empathy-ft-manager.c:254
-#, fuzzy
-msgid "Waiting for the other participant's response"
-msgstr "Agardando pola resposta do outro participante"
+#: ../src/empathy-ft-manager.c:351
+msgid "Error sending a file"
+msgstr "Erro ao enviar un ficheiro"
 
 # rever
-#: ../src/empathy-ft-manager.c:264
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:490
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "recibiuse \"%s\" de %s"
 
 # rever
-#: ../src/empathy-ft-manager.c:270
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:495
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "enviado \"%s\" a %s"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:498
 msgid "File transfer completed"
 msgstr "Transferencia de ficheiros terminada"
 
 # rever
-#: ../src/empathy-ft-manager.c:282
-#, c-format
-msgid "\"%s\" receiving from %s"
-msgstr "recibindo \"%s\" de %s "
+#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784
+msgid "Waiting for the other participant's response"
+msgstr "Agardando pola resposta do outro participante"
 
-# rever
-#: ../src/empathy-ft-manager.c:288
+#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
 #, c-format
-msgid "\"%s\" sending to %s"
-msgstr "enviando \"%s\" a %s"
+msgid "Checking integrity of \"%s\""
+msgstr "Verificando a integridade de \"%s\""
 
-#: ../src/empathy-ft-manager.c:291
+#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684
 #, c-format
-msgid "File transfer canceled: %s"
-msgstr "Transferencia de ficheiros cancelada: %s"
-
-#: ../src/empathy-ft-manager.c:306
-msgctxt "remaining time"
-msgid "Unknown"
-msgstr "Descoñecido"
+msgid "Hashing \"%s\""
+msgstr "Hashing \"%s\""
 
-#: ../src/empathy-ft-manager.c:366
-msgctxt "file transfer percent"
-msgid "Unknown"
-msgstr "Descoñecida"
-
-#: ../src/empathy-ft-manager.c:662
+#: ../src/empathy-ft-manager.c:1024
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:674
+#: ../src/empathy-ft-manager.c:1036
 msgid "File"
 msgstr "Ficheiro"
 
-#: ../src/empathy-ft-manager.c:696
+#: ../src/empathy-ft-manager.c:1058
 msgid "Remaining"
 msgstr "Restantes"
 
-# rever
-#: ../src/empathy-ft-manager.c:894
-msgid "Cannot save file to this location"
-msgstr "Non é posíbel gardar o ficheiro nesta localización"
-
-#: ../src/empathy-ft-manager.c:940
-msgid "Save file as..."
-msgstr "Gardar ficheiro como..."
-
-#: ../src/empathy-ft-manager.c:1010
-msgid "unknown size"
-msgstr "tamaño descoñecido"
-
-# rever
-#: ../src/empathy-ft-manager.c:1016
-#, c-format
-msgid "%s would like to send you a file"
-msgstr "%s quérelle enviar un ficheiro"
-
-# rever
-#. Translators: the first %s is the file name, the second %s is the file size
-#: ../src/empathy-ft-manager.c:1022
-#, c-format
-msgid "Do you want to accept the file \"%s\" (%s)?"
-msgstr "Quere aceptar o ficheiro \"%s\" (%s)?"
-
-#. Accept button
-#: ../src/empathy-ft-manager.c:1040
-msgid "_Accept"
-msgstr "_Aceptar"
-
 #: ../src/empathy-ft-manager.ui.h:1
-msgid "File transfers"
+msgid "File Transfers"
 msgstr "Transferencias de ficheiros"
 
 # rever
@@ -1948,109 +2276,105 @@ msgstr ""
 "que fallaron"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-dialog.c:259
+#: ../src/empathy-import-dialog.c:263
 msgid "Import"
 msgstr "Importar"
 
-#: ../src/empathy-import-dialog.c:268
+#: ../src/empathy-import-dialog.c:272
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../src/empathy-import-dialog.c:294
+#: ../src/empathy-import-dialog.c:298
 msgid "Source"
 msgstr "Orixe"
 
 # rever
-#: ../src/empathy-import-dialog.c:388
+#: ../src/empathy-import-dialog.c:392
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr ""
-"Non foi posíbel encontrar contas para importar. O Empathy actualmente só "
-"soporta a importación de contas do Pidgin."
+"Non foi posíbel encontrar contas para importar. Actualmente o Empathy só "
+"permite a importación de contas do Pidgin."
 
 # rever
 #: ../src/empathy-import-dialog.ui.h:1
 msgid "Import Accounts"
 msgstr "Importar contas"
 
-#: ../src/empathy-main-window.c:393
+#: ../src/empathy-main-window.c:402
 msgid "_Edit account"
 msgstr "_Editar a conta"
 
 # rever
-#: ../src/empathy-main-window.c:496
+#: ../src/empathy-main-window.c:505
 msgid "No error specified"
 msgstr "Non se especificou ningún erro"
 
 # rever
-#: ../src/empathy-main-window.c:499
+#: ../src/empathy-main-window.c:508
 msgid "Network error"
 msgstr "Erro de rede"
 
-#: ../src/empathy-main-window.c:502
+#: ../src/empathy-main-window.c:511
 msgid "Authentication failed"
 msgstr "Fallou a autenticación"
 
 # rever
-#: ../src/empathy-main-window.c:505
+#: ../src/empathy-main-window.c:514
 msgid "Encryption error"
-msgstr "Erro de codificación"
+msgstr "Erro de cifrado"
 
 # rever
-#: ../src/empathy-main-window.c:508
+#: ../src/empathy-main-window.c:517
 msgid "Name in use"
 msgstr "Nome en uso"
 
 # rever
-#: ../src/empathy-main-window.c:511
+#: ../src/empathy-main-window.c:520
 msgid "Certificate not provided"
 msgstr "Non se proporcionou o certificado"
 
-#: ../src/empathy-main-window.c:514
+#: ../src/empathy-main-window.c:523
 msgid "Certificate untrusted"
 msgstr "Certificado non fiábel"
 
 # rever
-#: ../src/empathy-main-window.c:517
+#: ../src/empathy-main-window.c:526
 msgid "Certificate expired"
 msgstr "O certificado caducou"
 
 # rever
-#: ../src/empathy-main-window.c:520
+#: ../src/empathy-main-window.c:529
 msgid "Certificate not activated"
 msgstr "O certificado non está activado"
 
 # rever
-#: ../src/empathy-main-window.c:523
+#: ../src/empathy-main-window.c:532
 msgid "Certificate hostname mismatch"
 msgstr "O nome do host do certificado non coincide"
 
 # rever
-#: ../src/empathy-main-window.c:526
+#: ../src/empathy-main-window.c:535
 msgid "Certificate fingerprint mismatch"
 msgstr "A impresión dixital do certificado non coincide"
 
 # rever
-#: ../src/empathy-main-window.c:529
+#: ../src/empathy-main-window.c:538
 msgid "Certificate self-signed"
 msgstr "Certificado autoasinado"
 
 # rever
-#: ../src/empathy-main-window.c:532
+#: ../src/empathy-main-window.c:541
 msgid "Certificate error"
 msgstr "Erro de certificado"
 
-#: ../src/empathy-main-window.c:535
+#: ../src/empathy-main-window.c:544
 msgid "Unknown error"
 msgstr "Erro descoñecido"
 
-#: ../src/empathy-main-window.c:865
-msgid "Contact"
-msgstr "Contacto"
-
 # rever
-#: ../src/empathy-main-window.c:1205
+#: ../src/empathy-main-window.c:1293
 msgid "Show and edit accounts"
 msgstr "Mostrar e editar contas"
 
@@ -2059,70 +2383,103 @@ msgid "Contact List"
 msgstr "Lista de contactos"
 
 #: ../src/empathy-main-window.ui.h:2
+msgid "Contacts on a _Map"
+msgstr "Contactos no mapa"
+
+#: ../src/empathy-main-window.ui.h:3
 msgid "Context"
 msgstr "Contexto"
 
 # rever
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window.ui.h:4
 msgid "Join _Favorites"
 msgstr "Unirse a pre_feridas"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window.ui.h:5
 msgid "Manage Favorites"
 msgstr "Xestionar os preferidos"
 
+#: ../src/empathy-main-window.ui.h:6
+msgid "N_ormal Size"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:7
+msgid "Normal Size With _Avatars"
+msgstr ""
+
 # rever
-#: ../src/empathy-main-window.ui.h:5
-msgid "Show _Offline Contacts"
-msgstr "Mostrar os contactos _desconectados"
+#: ../src/empathy-main-window.ui.h:8
+#, fuzzy
+msgid "Sort by _Name"
+msgstr "Ordenar por _nome"
 
-#: ../src/empathy-main-window.ui.h:6
+# rever
+#: ../src/empathy-main-window.ui.h:9
+#, fuzzy
+msgid "Sort by _Status"
+msgstr "Ordenar por es_tado"
+
+#: ../src/empathy-main-window.ui.h:10
 msgid "_Accounts"
 msgstr "_Contas"
 
-# rever
-#: ../src/empathy-main-window.ui.h:7
-msgid "_Add Contact..."
-msgstr "Eng_adir un contacto..."
+#: ../src/empathy-main-window.ui.h:13
+msgid "_Compact Size"
+msgstr ""
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:14
 msgid "_Contents"
 msgstr "_Contidos"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window.ui.h:15
+msgid "_Debug"
+msgstr "_Depuración"
+
+#: ../src/empathy-main-window.ui.h:17
+msgid "_File Transfers"
+msgstr "Trans_ferencias de ficheiros"
+
+#: ../src/empathy-main-window.ui.h:18
 msgid "_Help"
 msgstr "A_xuda"
 
-#: ../src/empathy-main-window.ui.h:12
-#, fuzzy
+#: ../src/empathy-main-window.ui.h:19
 msgid "_Join..."
-msgstr "_Unirse"
+msgstr "_Unirse..."
 
 # rever
-#: ../src/empathy-main-window.ui.h:13 ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2
 msgid "_New Conversation..."
 msgstr "Conversa _nova..."
 
-#: ../src/empathy-main-window.ui.h:14
+# rever
+#: ../src/empathy-main-window.ui.h:21
+msgid "_Offline Contacts"
+msgstr "Mostrar os contactos _desconectados"
+
+#: ../src/empathy-main-window.ui.h:22
 msgid "_Personal Information"
 msgstr "Información _persoal"
 
-#: ../src/empathy-main-window.ui.h:16
+# rever
+#: ../src/empathy-main-window.ui.h:24
+msgid "_Previous Conversations"
+msgstr "Conversas _previas"
+
+#: ../src/empathy-main-window.ui.h:25
 msgid "_Room"
 msgstr "Sa_la"
 
 # rever
-#: ../src/empathy-new-chatroom-dialog.c:313
-#, fuzzy
+#: ../src/empathy-new-chatroom-dialog.c:331
 msgid "Chat Room"
 msgstr "Salas de conversa"
 
-#: ../src/empathy-new-chatroom-dialog.c:328
-#, fuzzy
+#: ../src/empathy-new-chatroom-dialog.c:347
 msgid "Members"
-msgstr "Temas"
+msgstr "Membros"
 
-#: ../src/empathy-new-chatroom-dialog.c:447
+#: ../src/empathy-new-chatroom-dialog.c:496
 #, c-format
 msgctxt ""
 "Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
@@ -2133,19 +2490,35 @@ msgid ""
 "Password required: %s\n"
 "Members: %s"
 msgstr ""
+"<b>%s</b>\n"
+"Convite requirido: %s\n"
+"Contrasinal requirido: %s\n"
+"Membros: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:449
-#: ../src/empathy-new-chatroom-dialog.c:450
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
 msgid "Yes"
-msgstr ""
+msgstr "Si"
 
-#: ../src/empathy-new-chatroom-dialog.c:449
-#: ../src/empathy-new-chatroom-dialog.c:450
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
 msgid "No"
-msgstr ""
+msgstr "Non"
+
+#: ../src/empathy-new-chatroom-dialog.c:526
+msgid "Could not start room listing"
+msgstr "Non se puido arrancar a lista da sala"
+
+#: ../src/empathy-new-chatroom-dialog.c:536
+msgid "Could not stop room listing"
+msgstr "Non se puido deter a lista da sala"
 
-# rever
 #: ../src/empathy-new-chatroom-dialog.ui.h:2
+msgid "Couldn't load room list"
+msgstr "Non se puido ler a lista da sala"
+
+# rever
+#: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
 "Enter the room name to join here or click on one or more rooms in the list."
 msgstr ""
@@ -2153,7 +2526,7 @@ msgstr ""
 "lista."
 
 # rever
-#: ../src/empathy-new-chatroom-dialog.ui.h:3
+#: ../src/empathy-new-chatroom-dialog.ui.h:4
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -2161,188 +2534,211 @@ msgstr ""
 "Introduza o servidor onde se aloxa a sala ou déixeo baleiro se a sala está "
 "na conta do servidor actual"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:4
-#, fuzzy
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid "Join Room"
-msgstr "Sala"
+msgstr "Unirse á sala"
 
 # rever
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-#, fuzzy
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Room List"
-msgstr "Configuración da lista de _salas:"
+msgstr "Lista de _salas"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
 msgid "_Room:"
 msgstr "Sa_la:"
 
-#: ../src/empathy-preferences.c:156
+#: ../src/empathy-preferences.c:147
 msgid "Message received"
 msgstr "Mensaxe recibida"
 
-#: ../src/empathy-preferences.c:157
+#: ../src/empathy-preferences.c:148
 msgid "Message sent"
 msgstr "Mensaxe enviada"
 
-#: ../src/empathy-preferences.c:158
+#: ../src/empathy-preferences.c:149
 msgid "New conversation"
 msgstr "Conversa nova"
 
 # rever
-#: ../src/empathy-preferences.c:159
+#: ../src/empathy-preferences.c:150
 msgid "Contact goes online"
 msgstr "O contacto conéctase"
 
 # rever
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:151
 msgid "Contact goes offline"
 msgstr "O contacto desconéctase"
 
 # rever
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:152
 msgid "Account connected"
 msgstr "Conta conectada"
 
 # rever
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:153
 msgid "Account disconnected"
 msgstr "Conta desconectada"
 
-#: ../src/empathy-preferences.c:397
+#: ../src/empathy-preferences.c:393
 msgid "Language"
 msgstr "Idioma"
 
 #: ../src/empathy-preferences.ui.h:1
-msgid "<b>Appearance</b>"
-msgstr "<b>Aparencia</b>"
+msgid "Allow _GPS usage"
+msgstr "Permitir o uso de _GPS"
 
 #: ../src/empathy-preferences.ui.h:2
-msgid "<b>Behavior</b>"
-msgstr "<b>Comportamento</b>"
+msgid "Allow _cellphone usage"
+msgstr "Permitir o uso de _móbiles"
 
-# rever
 #: ../src/empathy-preferences.ui.h:3
-msgid "<b>Contact List</b>"
-msgstr "<b>Lista de contactos</b>"
+msgid "Allow _network usage"
+msgstr "Permitir o uso da _rede"
 
-# rever
 #: ../src/empathy-preferences.ui.h:4
-msgid "<b>Enable spell checking for languages:</b>"
-msgstr "<b>Activar a verificación ortográfica para os idiomas:</b>"
+msgid "Appearance"
+msgstr "Aparencia"
 
 # rever
 #: ../src/empathy-preferences.ui.h:5
-msgid "<b>Play sound for events</b>"
-msgstr "<b>Reproducir un son para os eventos</b>"
+msgid "Automatically _connect on startup "
+msgstr "_Conectar automaticamente ao iniciar"
 
-# rever
 #: ../src/empathy-preferences.ui.h:6
-msgid ""
-"<small>The list of languages reflects only the languages for which you have "
-"a dictionary installed.</small>"
-msgstr ""
-"<small>A lista de idiomas reflicte só aqueles idiomas para os que ten un "
-"dicionario instalado.</small>"
+msgid "Behavior"
+msgstr "Comportamento"
 
 # rever
 #: ../src/empathy-preferences.ui.h:7
-msgid "Automatically _connect on startup "
-msgstr "_Conectar automaticamente ao iniciar"
+msgid "Chat Th_eme:"
+msgstr "T_ema da conversa:"
 
 # rever
 #: ../src/empathy-preferences.ui.h:8
-msgid "Avatars are user chosen images shown in the contact list"
-msgstr ""
-"Os avatares son imaxes escollidas polos usuarios que se mostran na lista de "
-"contactos"
+msgid "Disable notifications when _away or busy"
+msgstr "Desactivar as notificacións cando se estea _ausente ou ocupado"
 
 # rever
 #: ../src/empathy-preferences.ui.h:9
-msgid "Chat Th_eme:"
-msgstr "T_ema da conversa:"
+msgid "Disable sounds when _away or busy"
+msgstr "Desactivar os sons cando se estea _ausente ou ocupado"
 
 # rever
 #: ../src/empathy-preferences.ui.h:10
-msgid "Disable notifications when _away or busy"
-msgstr "Desactivar as notificacións cando se estea _ausente ou ocupado"
+msgid "Enable notifications when a contact comes online"
+msgstr "Activar as notificacións cando un contacto está conectado"
 
 # rever
 #: ../src/empathy-preferences.ui.h:11
-msgid "Disable sounds when _away or busy"
-msgstr "Desactivar os sons cando se estea _ausente ou ocupado"
+msgid "Enable notifications when a contact goes offline"
+msgstr "Activar as notificacións cando un contacto está desconectado"
 
 # rever
 #: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Activar as notificacións cando a _conversa non está enfocada"
 
+# rever
 #: ../src/empathy-preferences.ui.h:13
-msgid "General"
-msgstr "Xeral"
+msgid "Enable spell checking for languages:"
+msgstr "Activar a verificación ortográfica para os idiomas:"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "Notifications"
-msgstr "Notificacións"
+msgid "General"
+msgstr "Xeral"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Preferences"
-msgstr "Preferencias"
+msgid "Geoclue Settings"
+msgstr "Configuración de Geoclue"
 
-# rever
 #: ../src/empathy-preferences.ui.h:16
-msgid "Show _avatars"
-msgstr "Mostrar os _avatares"
+msgid "Location"
+msgstr "Localización"
 
-# rever
 #: ../src/empathy-preferences.ui.h:17
-msgid "Show _smileys as images"
-msgstr "Mostrar as _emoticonas como imaxes"
+msgid "Notifications"
+msgstr "Notificacións"
 
 # rever
 #: ../src/empathy-preferences.ui.h:18
-msgid "Show co_mpact contact list"
-msgstr "Mostrar a lista de contactos co_mpacta"
+msgid "Play sound for events"
+msgstr "Reproducir un son para os eventos"
 
-# rever
 #: ../src/empathy-preferences.ui.h:19
-msgid "Sort by _name"
-msgstr "Ordenar por _nome"
+msgid "Preferences"
+msgstr "Preferencias"
 
-# rever
 #: ../src/empathy-preferences.ui.h:20
-msgid "Sort by s_tate"
-msgstr "Ordenar por es_tado"
+msgid "Privacy"
+msgstr "Privacidade"
 
 #: ../src/empathy-preferences.ui.h:21
+msgid ""
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will have a random "
+"value added (&#xB1;0.25&#xB0;)."
+msgstr ""
+"Unha reducida precisión de localización significa que nada máis preciso que "
+"a súa cidade, rexión e país serán publicados. As coordenadas GPS terán un "
+"valor aleatorio engadido (&#xB1;0.25&#xB0;)."
+
+# rever
+#: ../src/empathy-preferences.ui.h:22
+msgid "Show _smileys as images"
+msgstr "Mostrar as _emoticonas como imaxes"
+
+# rever
+#: ../src/empathy-preferences.ui.h:23
+msgid "Show contact _list in rooms"
+msgstr "Mostrar a _lista de contactos nas salas"
+
+#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "Sons"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:25
 msgid "Spell Checking"
 msgstr "Verificación ortográfica"
 
-#: ../src/empathy-preferences.ui.h:23
+# rever
+#: ../src/empathy-preferences.ui.h:26
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"A lista de idiomas reflicte só aqueles idiomas para os que ten un dicionario "
+"instalado."
+
+#: ../src/empathy-preferences.ui.h:27
 msgid "Themes"
 msgstr "Temas"
 
 # rever
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:28
 msgid "_Enable bubble notifications"
 msgstr "_Activar as burbullas de notificación"
 
 # rever
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:29
 msgid "_Enable sound notifications"
 msgstr "_Activar as notificacións de son"
 
 # rever
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:30
 msgid "_Open new chats in separate windows"
 msgstr "A_brir as conversas novas en xanelas separadas"
 
+#: ../src/empathy-preferences.ui.h:31
+msgid "_Publish location to my contacts"
+msgstr "_Publicar localización aos meus contactos"
+
+#: ../src/empathy-preferences.ui.h:32
+msgid "_Reduce location accuracy"
+msgstr "_Reducir a precisión de localización"
+
 #: ../src/empathy-status-icon.ui.h:1
 msgid "Status"
-msgstr "Estado"
+msgstr "stado"
 
 #: ../src/empathy-status-icon.ui.h:3
 msgid "_Quit"
@@ -2357,7 +2753,7 @@ msgstr "Mo_strar a lista de contactos"
 #: ../src/empathy-tube-dispatch.c:375
 #, c-format
 msgid "Unable to start application for service %s: %s"
-msgstr "Non foi posíbel iniciar a aplicación para o servizo %s: %s"
+msgstr "Non foi posíbel iniciar o aplicativo para o servizo %s: %s"
 
 #: ../src/empathy-tube-dispatch.c:446
 #, c-format
@@ -2365,120 +2761,101 @@ msgid ""
 "An invitation was offered for service %s, but you don't have the needed "
 "application to handle it"
 msgstr ""
-"Foille ofrecido un convite para o servizo %s, mais non ten a aplicación "
-"necesaria para manipulalo"
-
-# rever
-#~ msgid "Forget password and clear the entry."
-#~ msgstr "Esquecer o contrasinal e limpar a entrada."
+"Foille ofrecido un convite para o servizo %s, mais non ten o aplicativo "
+"necesario para manipulalo"
 
-# rever
-#~ msgid "Create a new IRC network"
-#~ msgstr "Crear unha rede IRC nova"
+#: ../src/empathy-call-window-fullscreen.ui.h:1
+msgid "gtk-leave-fullscreen"
+msgstr "gtk-leave-fullscreen"
 
-#~ msgid "Edit the selected IRC network"
-#~ msgstr "Editar a rede IRC seleccionada"
+#: ../src/empathy-map-view.ui.h:1
+msgid "Contact Map View"
+msgstr "Vista de mapa de contactos"
 
-# rever
-#~ msgid "Remove the selected IRC network"
-#~ msgstr "Eliminar a rede IRC seleccionada"
+#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
+msgid "Error"
+msgstr "Erro"
 
-# rever
-#~ msgid "Group Chat"
-#~ msgstr "Grupo de conversa"
+#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
+msgid "Critical"
+msgstr "Crítico"
 
-#~ msgid "Contact information"
-#~ msgstr "Información de contacto"
+#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
+msgid "Warning"
+msgstr "Aviso"
 
-#~ msgid "C_lear"
-#~ msgstr "_Limpar"
+#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065
+#: ../src/empathy-debug-dialog.c:1113
+msgid "Message"
+msgstr "Mensaxe"
 
-#~ msgid "Chat"
-#~ msgstr "Conversa"
+#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059
+msgid "Info"
+msgstr "Info"
 
-#~ msgid "Insert _Smiley"
-#~ msgstr "Inserir _emoticona"
+#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053
+msgid "Debug"
+msgstr "Depuración"
 
-#~ msgid "Invitation _message:"
-#~ msgstr "_Mensaxe de convite:"
-
-#~ msgid "Invite"
-#~ msgstr "Convidar"
-
-#~ msgid "Move Tab _Left"
-#~ msgstr "Mover o separador á _esquerda"
-
-#~ msgid "Move Tab _Right"
-#~ msgstr "Mover o separador á _dereita"
-
-# rever
-#~ msgid "Select who would you like to invite:"
-#~ msgstr "Seleccione a quen lle gustaría convidar:"
+#: ../src/empathy-debug-dialog.c:845
+msgid "Save"
+msgstr "Gardar"
 
-# rever
-#~ msgid "You have been invited to join a chat conference."
-#~ msgstr "Vostede foi convidado a unirse a unha conferencia de conversa."
+#: ../src/empathy-debug-dialog.c:948
+msgid "Debug Window"
+msgstr "Depurar xanela"
 
-#~ msgid "_Contact"
-#~ msgstr "_Contacto"
+#: ../src/empathy-debug-dialog.c:1021
+msgid "Pause"
+msgstr "Pausa"
 
-#~ msgid "_Conversation"
-#~ msgstr "_Conversa"
+#: ../src/empathy-debug-dialog.c:1033
+msgid "Level "
+msgstr "Nivel"
 
-#~ msgid "_Detach Tab"
-#~ msgstr "_Desprender o separador"
+#: ../src/empathy-debug-dialog.c:1102
+msgid "Time"
+msgstr "Tempo"
 
-#~ msgid "_Favorite Chatroom"
-#~ msgstr "Sala de conversa pre_ferida"
+#: ../src/empathy-debug-dialog.c:1104
+msgid "Domain"
+msgstr "Dominio"
 
-#~ msgid "_Next Tab"
-#~ msgstr "Separador _seguinte"
+#: ../src/empathy-debug-dialog.c:1106
+msgid "Category"
+msgstr "Categoría"
 
-#~ msgid "_Previous Tab"
-#~ msgstr "Separador a_nterior"
+#: ../src/empathy-debug-dialog.c:1108
+msgid "Level"
+msgstr "Nivel"
 
-#~ msgid "_Tabs"
-#~ msgstr "_Separadores"
+#: ../src/empathy-debug-dialog.c:1140
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr ""
+"O xestor de conexión seleccionado non é compatíbel coa extensión de "
+"depuración remota."
 
-# rever
-#~ msgid "Edit Favorite Room"
-#~ msgstr "Editar a sala preferida"
+#~ msgid "Adium"
+#~ msgstr "Adium"
 
-# rever
-#~ msgid "Join room on start_up"
-#~ msgstr "Unirse á sala ao _inicio"
+#~ msgid "Adium theme to use:"
+#~ msgstr "Tema para usar Adium:"
 
 # rever
-#~ msgid "Join this chat room when Empathy starts and you are connected"
+#~ msgid "Avatars are user chosen images shown in the contact list"
 #~ msgstr ""
-#~ "Entrar nesta sala de conversa cando o Empathy comece e vostede estea "
-#~ "conectado"
-
-#~ msgid "N_ame:"
-#~ msgstr "N_ome:"
+#~ "Os avatares son imaxes escollidas polos usuarios que se mostran na lista "
+#~ "de contactos"
 
-#~ msgid "S_erver:"
-#~ msgstr "S_ervidor:"
+#~ msgid "Not a valid adium theme"
+#~ msgstr "Non é un modelo válido de adium"
 
 # rever
-#~ msgid "Join _New..."
-#~ msgstr "Unirse a unha _nova"
-
-#~ msgid "Browse:"
-#~ msgstr "Examinar:"
-
-#~ msgid "Join"
-#~ msgstr "Unirse"
-
-#~ msgid "Join New"
-#~ msgstr "Unirse a unha nova"
-
-#~ msgid "Re_fresh"
-#~ msgstr "Ac_tualizar"
+#~ msgid "Show _avatars"
+#~ msgstr "Mostrar os _avatares"
 
 # rever
-#~ msgid ""
-#~ "This list represents all chat rooms hosted on the server you have entered."
-#~ msgstr ""
-#~ "Esta lista representa todas as salas de conversa aloxadas no servidor en "
-#~ "que entrou."
+#~ msgid "Show co_mpact contact list"
+#~ msgstr "Mostrar a lista de contactos co_mpacta"
diff --git a/po/lt.po b/po/lt.po
index ccc76d8cc..60bf2f337 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -11,14 +11,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-29 14:20+0300\n"
-"PO-Revision-Date: 2009-06-29 20:10+0300\n"
+"POT-Creation-Date: 2009-07-27 15:03+0300\n"
+"PO-Revision-Date: 2009-07-27 15:10+0300\n"
 "Last-Translator: Žygimantas Beručka <zygis@gnome.org>\n"
 "Language-Team: Lithuanian <gnome-lt@lists.akl.lt>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
+"100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Empathy Instant Messenger"
@@ -109,244 +110,254 @@ msgstr ""
 "Empathy turėtų naudoti adresato pseudoportretą pokalbio lango piktogramai"
 
 #: ../data/empathy.schemas.in.h:19
+msgid "Enable WebKit Developer Tools"
+msgstr "Įjungti WebKit programuotojų įrankius"
+
+#: ../data/empathy.schemas.in.h:20
 msgid "Enable popup notifications for new messages"
 msgstr "Įjungti iškylančius pranešimus apie naujas žinutes"
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:21
 msgid "Enable spell checker"
 msgstr "Įjungti rašybos tikrinimą"
 
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:22
 msgid "Hide main window"
 msgstr "Paslėpti pagrindinį langą"
 
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:23
 msgid "Hide the main window."
 msgstr "Paslėpti pagrindinį langą."
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:24
 msgid "NetworkManager should be used"
 msgstr "Naudoti NetworkManager"
 
-#: ../data/empathy.schemas.in.h:24
+#: ../data/empathy.schemas.in.h:25
 msgid "Nick completed character"
 msgstr "Slapyvardžio užbaigimo simbolis"
 
-#: ../data/empathy.schemas.in.h:25
+#: ../data/empathy.schemas.in.h:26
 msgid "Open new chats in separate windows"
 msgstr "Atverti naujus pokalbius atskiruose languose"
 
-#: ../data/empathy.schemas.in.h:26
+#: ../data/empathy.schemas.in.h:27
 msgid "Path of the adium theme to use"
 msgstr "Naudotinos adium temos kelias"
 
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:28
 msgid "Path of the adium theme to use if the theme used for chat is adium."
 msgstr "Naudotinos adium temos kelias, jei pokalbiui naudojama tema yra adium."
 
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:29
 msgid "Play a sound for incoming messages"
 msgstr "Gavus žinutę sugroti garsą"
 
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:30
 msgid "Play a sound for new conversations"
 msgstr "Pradedant naują pokalbį sugroti garsą"
 
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:31
 msgid "Play a sound for outgoing messages"
 msgstr "Išsiunčiant žinutes sugroti garsą"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:32
 msgid "Play a sound when a contact logs in"
 msgstr "Prisijungus adresatui sugroti garsą"
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:33
 msgid "Play a sound when a contact logs out"
 msgstr "Atsijungus adresatui sugroti garsą"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:34
 msgid "Play a sound when we log in"
 msgstr "Jums prisijungus sugroti garsą"
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:35
 msgid "Play a sound when we log out"
 msgstr "Jums atsijungus sugroti garsą"
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:36
 msgid "Popup notifications if the chat isn't focused"
 msgstr "Rodyti iškylančius pranešimus, jei pokalbio langas nesuaktyvintas"
 
-#: ../data/empathy.schemas.in.h:36
+#: ../data/empathy.schemas.in.h:37
 msgid "Popup notifications when a contact sign in"
 msgstr "Rodyti iškylančius pranešimus, kai adresatas prisijungia"
 
-#: ../data/empathy.schemas.in.h:37
+#: ../data/empathy.schemas.in.h:38
 msgid "Popup notifications when a contact sign out"
 msgstr "Rodyti iškylančius pranešimus, kai adresatas atsijungia"
 
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:39
 msgid "Salut account is created"
 msgstr "Salut paskyra sukurta"
 
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:40
 msgid "Show avatars"
 msgstr "Rodyti pseudoportretus"
 
-#: ../data/empathy.schemas.in.h:40
+#: ../data/empathy.schemas.in.h:41
 msgid "Show contact list in rooms"
 msgstr "Rodyti adresatų sąrašą kambariuose"
 
-#: ../data/empathy.schemas.in.h:41
+#: ../data/empathy.schemas.in.h:42
 msgid "Show hint about closing the main window"
 msgstr "Perspėti apie pagrindinio lango užvėrimą"
 
-#: ../data/empathy.schemas.in.h:42
+#: ../data/empathy.schemas.in.h:43
 msgid "Show offline contacts"
 msgstr "Rodyti atsijungusius adresatus"
 
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:44
 msgid "Spell checking languages"
 msgstr "Kalbos, kurių rašyba tikrinama"
 
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:45
 msgid "The default folder to save file transfers in."
 msgstr "Numatytasis aplankas, kuriame įrašomi atsiųsti failai."
 
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:46
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Aplankas, kuriame praeitą kartą buvo pasirinktas pseudoportretas."
 
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:47
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Tema, naudojama pokalbio rodymui pokalbių languose."
 
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:48
 msgid "Use graphical smileys"
 msgstr "Naudoti grafines šypsenėles"
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:49
 msgid "Use notification sounds"
 msgstr "Naudoti pranešimų garsus"
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:50
 msgid "Use theme for chat rooms"
 msgstr "Naudoti temą pokalbių kambariams"
 
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:51
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr ""
+"Ar turėtų būti įjungti WebKit programuotojų įrankiai, pvz., Web Inspector."
+
+#: ../data/empathy.schemas.in.h:52
 msgid "Whether or not Empathy can publish the user's location to his contacts."
 msgstr "Ar Empathy gali rodyti naudotojo vietovę jo adresatams."
 
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:53
 msgid "Whether or not Empathy can use the GPS to guess the location."
 msgstr "Ar Empathy gali naudoti GPS vietovės spėjimui."
 
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:54
 msgid ""
 "Whether or not Empathy can use the cellular network to guess the location."
 msgstr "Ar Empathy gali naudoti mobiliojo ryšio tinklą vietovės spėjimui."
 
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:55
 msgid "Whether or not Empathy can use the network to guess the location."
 msgstr "Ar Empathy gali naudoti tinklą vietovės spėjimui."
 
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:56
 msgid ""
 "Whether or not Empathy has asked about importing accounts from other "
 "programs."
 msgstr "Ar Empathy klausė apie paskyrų importavimą iš kitų programų."
 
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:57
 msgid ""
 "Whether or not Empathy should automatically log in to your accounts on "
 "startup."
-msgstr ""
-"Ar Empathy turėtų automatiškai prisijungti prie paskyrų ją paleidus."
+msgstr "Ar Empathy turėtų automatiškai prisijungti prie paskyrų ją paleidus."
 
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:58
 msgid ""
 "Whether or not Empathy should reduce the location's accuracy for privacy "
 "reasons."
 msgstr ""
 "Ar Empathy turėtų sumažinti vietovės rodymo tikslumą privatumo sumetimais."
 
-#: ../data/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:59
 msgid ""
 "Whether or not Empathy should use the avatar of the contact as the chat "
 "window icon."
 msgstr "Ar naudoti adresato pseudoportretą kaip pokalbio lango piktogramą."
 
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:60
 msgid ""
 "Whether or not the Salut account has been created on the first Empathy run."
 msgstr "Ar pirmąkart paleidus Empathy buvo sukurta Salut paskyra."
 
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:61
 msgid ""
 "Whether or not the network manager should be used to automatically "
 "disconnect/reconnect."
-msgstr "Ar naudoti tinklo valdyklę automatiškai atsijungiant/vėl prisijungiant."
+msgstr ""
+"Ar naudoti tinklo valdyklę automatiškai atsijungiant/vėl prisijungiant."
 
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:62
 msgid ""
 "Whether or not to check words typed against the languages you want to check "
 "with."
 msgstr ""
 "Ar tikrinti įvedamų žodžių rašybą pasirenkant jūsų pageidaujamas kalbas."
 
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:63
 msgid ""
 "Whether or not to convert smileys into graphical images in conversations."
 msgstr "Ar pokalbiuose versti šypsenėles į grafinius paveikslėlius."
 
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:64
 msgid ""
 "Whether or not to play a sound to notify for contacts logging in the network."
 msgstr "Ar sugroti garsą adresatams prisijungiant prie tinklo."
 
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:65
 msgid ""
 "Whether or not to play a sound to notify for contacts logging off the "
 "network."
 msgstr "Ar sugroti garsą adresatams atsijungiant nuo tinklo."
 
-#: ../data/empathy.schemas.in.h:64
+#: ../data/empathy.schemas.in.h:66
 msgid "Whether or not to play a sound to notify for events."
 msgstr "Ar sugroti garsą pranešant apie įvykius."
 
-#: ../data/empathy.schemas.in.h:65
+#: ../data/empathy.schemas.in.h:67
 msgid "Whether or not to play a sound to notify for incoming messages."
 msgstr "Ar sugroti garsą, kai atsiunčiama nauja žinutė."
 
-#: ../data/empathy.schemas.in.h:66
+#: ../data/empathy.schemas.in.h:68
 msgid "Whether or not to play a sound to notify for new conversations."
 msgstr "Ar sugroti garsą pranešant apie naują pokalbį."
 
-#: ../data/empathy.schemas.in.h:67
+#: ../data/empathy.schemas.in.h:69
 msgid "Whether or not to play a sound to notify for outgoing messages."
 msgstr "Ar sugroti garsą, kai išsiunčiama žinutė."
 
-#: ../data/empathy.schemas.in.h:68
+#: ../data/empathy.schemas.in.h:70
 msgid "Whether or not to play a sound when logging in a network."
 msgstr "Ar groti garsą prisijungiant prie tinklo."
 
-#: ../data/empathy.schemas.in.h:69
+#: ../data/empathy.schemas.in.h:71
 msgid "Whether or not to play a sound when logging off a network."
 msgstr "Ar groti garsą atsijungiant nuo tinklo."
 
-#: ../data/empathy.schemas.in.h:70
+#: ../data/empathy.schemas.in.h:72
 msgid "Whether or not to play sound notifications when away or busy."
 msgstr "Ar groti garsinius pranešimus, kai esate pasitraukę ar užsiėmę."
 
-#: ../data/empathy.schemas.in.h:71
+#: ../data/empathy.schemas.in.h:73
 msgid ""
 "Whether or not to show a popup notification when a contact goes offline."
 msgstr "Ar rodyti iškeliamą pranešimą, kai adresatas atsijungia."
 
-#: ../data/empathy.schemas.in.h:72
+#: ../data/empathy.schemas.in.h:74
 msgid "Whether or not to show a popup notification when a contact goes online."
 msgstr "Ar rodyti iškeliamą pranešimą, kai adresatas prisijungia."
 
-#: ../data/empathy.schemas.in.h:73
+#: ../data/empathy.schemas.in.h:75
 msgid ""
 "Whether or not to show a popup notification when receiving a new message "
 "even if the chat is already opened, but not focused."
@@ -354,30 +365,30 @@ msgstr ""
 "Ar rodyti iškylantį pranešimo langą, kai gaunama nauja žinutė, net jei "
 "pokalbio langas yra jau atvertas, tačiau nesuaktyvintas."
 
-#: ../data/empathy.schemas.in.h:74
+#: ../data/empathy.schemas.in.h:76
 msgid ""
 "Whether or not to show a popup notification when receiving a new message."
 msgstr "Ar rodyti iškylantį pranešimą gavus naują žinutę."
 
-#: ../data/empathy.schemas.in.h:75
+#: ../data/empathy.schemas.in.h:77
 msgid ""
 "Whether or not to show avatars for contacts in the contact list and chat "
 "windows."
 msgstr "Ar rodyti adresatų sąraše ir pokalbių languose pseudoportretus."
 
-#: ../data/empathy.schemas.in.h:76
+#: ../data/empathy.schemas.in.h:78
 msgid "Whether or not to show contacts that are offline in the contact list."
 msgstr "Ar adresatų sąraše rodyti adresatus, kurie yra atsijungę."
 
-#: ../data/empathy.schemas.in.h:77
+#: ../data/empathy.schemas.in.h:79
 msgid "Whether or not to show popup notifications when away or busy."
 msgstr "Ar rodyti iškylančius pranešimus, kai esate pasitraukę ar užsiėmę."
 
-#: ../data/empathy.schemas.in.h:78
+#: ../data/empathy.schemas.in.h:80
 msgid "Whether or not to show the contact list in chat rooms."
 msgstr "Ar rodyti adresatų sąrašą pokalbių kambariuose."
 
-#: ../data/empathy.schemas.in.h:79
+#: ../data/empathy.schemas.in.h:81
 msgid ""
 "Whether or not to show the message dialog about closing the main window with "
 "the 'x' button in the title bar."
@@ -385,15 +396,15 @@ msgstr ""
 "Ar rodyti pranešimo apie pagrindinio lango uždarymą dialogą su mygtuku „x“ "
 "antraštės juostoje."
 
-#: ../data/empathy.schemas.in.h:80
+#: ../data/empathy.schemas.in.h:82
 msgid "Whether to show the contact list in compact mode or not."
 msgstr "Ar adresatų sąrašą rodyti glaudintą."
 
-#: ../data/empathy.schemas.in.h:81
+#: ../data/empathy.schemas.in.h:83
 msgid "Whether to use the theme for chat rooms or not."
 msgstr "Ar naudoti temą pokalbių kambariams."
 
-#: ../data/empathy.schemas.in.h:82
+#: ../data/empathy.schemas.in.h:84
 msgid ""
 "Which criterium to use when sorting the contact list. Default is to use sort "
 "by the contact's name with the value \"name\". A value of \"state\" will "
@@ -419,7 +430,7 @@ msgstr "Pasirinktas failas nėra normalus failas"
 msgid "The selected file is empty"
 msgstr "Pasirinktas failas yra tuščias"
 
-#: ../libempathy/empathy-tp-contact-list.c:757 ../src/empathy.c:288
+#: ../libempathy/empathy-tp-contact-list.c:843 ../src/empathy.c:289
 msgid "People nearby"
 msgstr "Žmonės netoliese"
 
@@ -455,23 +466,23 @@ msgstr "Kitas dalyvis negali persiųsti failo"
 msgid "Unknown reason"
 msgstr "Nežinoma priežastis"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:265
 msgid "Available"
 msgstr "Esu"
 
-#: ../libempathy/empathy-utils.c:276
+#: ../libempathy/empathy-utils.c:267
 msgid "Busy"
 msgstr "Užsiėmęs(-usi)"
 
-#: ../libempathy/empathy-utils.c:279
+#: ../libempathy/empathy-utils.c:270
 msgid "Away"
 msgstr "Pasitraukęs(-usi)"
 
-#: ../libempathy/empathy-utils.c:281
+#: ../libempathy/empathy-utils.c:272
 msgid "Hidden"
 msgstr "Pasislėpęs(-usi)"
 
-#: ../libempathy/empathy-utils.c:283
+#: ../libempathy/empathy-utils.c:274
 msgid "Offline"
 msgstr "Atsijungęs(-usi)"
 
@@ -527,7 +538,7 @@ msgstr[2] "prieš %d mėnesių"
 msgid "in the future"
 msgstr "ateityje"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:419
+#: ../libempathy-gtk/empathy-account-chooser.c:426
 msgid "All"
 msgstr "Visi"
 
@@ -597,7 +608,7 @@ msgstr "ICQ _UIN:"
 msgid "_Charset:"
 msgstr "_Koduotė:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:241
+#: ../libempathy-gtk/empathy-account-widget-irc.c:240
 msgid "New Network"
 msgstr "Naujas tinklas"
 
@@ -789,44 +800,79 @@ msgstr "Tema nustatyta į: %s"
 msgid "No topic defined"
 msgstr "Nenurodyta jokia tema"
 
-#: ../libempathy-gtk/empathy-chat.c:959
+#: ../libempathy-gtk/empathy-chat.c:960
 msgid "(No Suggestions)"
 msgstr "(Nėra pasiūlymų)"
 
-#: ../libempathy-gtk/empathy-chat.c:1013
+#: ../libempathy-gtk/empathy-chat.c:1014
 msgid "Insert Smiley"
 msgstr "Įterpti šypsenėlę"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1031
-#: ../libempathy-gtk/empathy-ui-utils.c:1475
+#: ../libempathy-gtk/empathy-chat.c:1032
+#: ../libempathy-gtk/empathy-ui-utils.c:1480
 msgid "_Send"
 msgstr "_Siųsti"
 
-#: ../libempathy-gtk/empathy-chat.c:1065
+#: ../libempathy-gtk/empathy-chat.c:1066
 msgid "_Spelling Suggestions"
 msgstr "_Rašybos pasiūlymai"
 
-#: ../libempathy-gtk/empathy-chat.c:1179
+#: ../libempathy-gtk/empathy-chat.c:1181
 #, c-format
-msgid "%s has joined the room"
-msgstr "%s prisijungė prie pokalbių kambario"
+msgid "%s has disconnected"
+msgstr "%s atsijungė"
+
+#: ../libempathy-gtk/empathy-chat.c:1185
+#, c-format
+msgid "%s was kicked by %s"
+msgstr "%s buvo išspirtas naudotojo %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1188
+#, c-format
+msgid "%s was kicked"
+msgstr "%s buvo išspirtas"
+
+#: ../libempathy-gtk/empathy-chat.c:1193
+#, c-format
+msgid "%s was banned by %s"
+msgstr "%s buvo užblokuotas naudotojo %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1182
+#: ../libempathy-gtk/empathy-chat.c:1196
+#, c-format
+msgid "%s was banned"
+msgstr "%s buvo užblokuotas"
+
+#: ../libempathy-gtk/empathy-chat.c:1200
 #, c-format
 msgid "%s has left the room"
 msgstr "%s paliko pokalbių kambarį"
 
-#: ../libempathy-gtk/empathy-chat.c:1313 ../src/empathy-call-window.c:1226
+#. Note to translators: this string is appended to
+#. * notifications like "foo has left the room", with the message
+#. * given by the user living the room. If this poses a problem,
+#. * please let us know. :-)
+#.
+#: ../libempathy-gtk/empathy-chat.c:1209
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#: ../libempathy-gtk/empathy-chat.c:1232
+#, c-format
+msgid "%s has joined the room"
+msgstr "%s prisijungė prie pokalbių kambario"
+
+#: ../libempathy-gtk/empathy-chat.c:1365 ../src/empathy-call-window.c:1225
 msgid "Disconnected"
 msgstr "Atsijungęs(-usi)"
 
-#: ../libempathy-gtk/empathy-chat.c:1742
+#: ../libempathy-gtk/empathy-chat.c:1800
 msgid "Connected"
 msgstr "Prisijungęs(-usi)"
 
-#: ../libempathy-gtk/empathy-chat.c:1792
-#: ../libempathy-gtk/empathy-log-window.c:501
+#: ../libempathy-gtk/empathy-chat.c:1850
+#: ../libempathy-gtk/empathy-log-window.c:502
 msgid "Conversation"
 msgstr "Pokalbis"
 
@@ -834,11 +880,15 @@ msgstr "Pokalbis"
 msgid "Topic:"
 msgstr "Tema:"
 
+#. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:316
+#: ../libempathy-gtk/empathy-theme-adium.c:264
 msgid "_Copy Link Address"
 msgstr "_Kopijuoti nuorodos adresą"
 
+#. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:323
+#: ../libempathy-gtk/empathy-theme-adium.c:272
 msgid "_Open Link"
 msgstr "_Atverti nuorodą"
 
@@ -857,7 +907,7 @@ msgstr "Taisyti adresato informaciją"
 msgid "Personal Information"
 msgstr "Asmeninė informacija"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:392
+#: ../libempathy-gtk/empathy-contact-dialogs.c:393
 msgid "New Contact"
 msgstr "Naujas adresatas"
 
@@ -869,66 +919,76 @@ msgstr "Nuspręsti _vėliau"
 msgid "Subscription Request"
 msgstr "Prenumeratos prašymas"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1378
+#: ../libempathy-gtk/empathy-contact-list-view.c:1400
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Ar tikrai norite pašalinti grupę „%s“?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1380
+#: ../libempathy-gtk/empathy-contact-list-view.c:1402
 msgid "Removing group"
 msgstr "Šalinama grupė"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1427
-#: ../libempathy-gtk/empathy-contact-list-view.c:1505
+#. Remove
+#: ../libempathy-gtk/empathy-contact-list-view.c:1449
+#: ../libempathy-gtk/empathy-contact-list-view.c:1526
 msgid "_Remove"
 msgstr "_Pašalinti"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1457
+#: ../libempathy-gtk/empathy-contact-list-view.c:1479
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Ar tikrai norite pašalinti adresatą „%s“?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1459
+#: ../libempathy-gtk/empathy-contact-list-view.c:1481
 msgid "Removing contact"
 msgstr "Šalinamas adresatas"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:135
-#: ../src/empathy-main-window.ui.h:8
+#: ../libempathy-gtk/empathy-contact-menu.c:195
+#: ../src/empathy-main-window.ui.h:11
+msgid "_Add Contact..."
+msgstr "_Pridėti adresatą..."
+
+#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../src/empathy-main-window.ui.h:12
 msgid "_Chat"
 msgstr "_Pokalbis"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:166
+#: ../libempathy-gtk/empathy-contact-menu.c:253
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Garsinis skambutis"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:198
+#: ../libempathy-gtk/empathy-contact-menu.c:285
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Vaizdinis skambutis"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:237
+#: ../libempathy-gtk/empathy-contact-menu.c:324
 msgid "_View Previous Conversations"
 msgstr "_Žiūrėti ankstesnius pokalbius"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:259
+#: ../libempathy-gtk/empathy-contact-menu.c:346
 msgid "Send file"
 msgstr "Siųsti failą"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:287
+#: ../libempathy-gtk/empathy-contact-menu.c:369
+msgid "Share my desktop"
+msgstr "Viešinti mano darbastalį"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:397
 msgid "Infor_mation"
 msgstr "Infor_macija"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:314
-#: ../src/empathy-main-window.ui.h:11
+#: ../libempathy-gtk/empathy-contact-menu.c:441
+#: ../src/empathy-main-window.ui.h:16
 msgid "_Edit"
 msgstr "_Taisyti"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:372
+#: ../libempathy-gtk/empathy-contact-menu.c:501
 msgid "Inviting to this room"
 msgstr "Kviečiamas į šį kambarį"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:403
+#: ../libempathy-gtk/empathy-contact-menu.c:532
 msgid "_Invite to chatroom"
 msgstr "_Pakviesti į pokalbių kambarį"
 
@@ -936,128 +996,128 @@ msgstr "_Pakviesti į pokalbių kambarį"
 msgid "Select a contact"
 msgstr "Pasirinkti adresatą"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:440
+#: ../libempathy-gtk/empathy-contact-widget.c:447
 msgid "Save Avatar"
 msgstr "Išsaugoti pseudoportretą"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:503
 msgid "Unable to save avatar"
 msgstr "Nepavyko išsaugoti pseudoportreto"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:979
+#: ../libempathy-gtk/empathy-contact-widget.c:992
 msgid "Select"
 msgstr "Pasirinkti"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:988
-#: ../src/empathy-main-window.c:906
+#: ../libempathy-gtk/empathy-contact-widget.c:1001
+#: ../src/empathy-main-window.c:1023
 msgid "Group"
 msgstr "Grupė"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1239
+#: ../libempathy-gtk/empathy-contact-widget.c:1252
 msgid "Country ISO Code:"
 msgstr "Šalies ISO kodas:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1241
+#: ../libempathy-gtk/empathy-contact-widget.c:1254
 msgid "Country:"
 msgstr "Šalis:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1243
+#: ../libempathy-gtk/empathy-contact-widget.c:1256
 msgid "State:"
 msgstr "Būsena:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1245
+#: ../libempathy-gtk/empathy-contact-widget.c:1258
 msgid "City:"
 msgstr "Miestas:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1247
+#: ../libempathy-gtk/empathy-contact-widget.c:1260
 msgid "Area:"
 msgstr "Sritis:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1249
+#: ../libempathy-gtk/empathy-contact-widget.c:1262
 msgid "Postal Code:"
 msgstr "Pašto kodas:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1251
+#: ../libempathy-gtk/empathy-contact-widget.c:1264
 msgid "Street:"
 msgstr "Gatvė:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1253
+#: ../libempathy-gtk/empathy-contact-widget.c:1266
 msgid "Building:"
 msgstr "Pastatas:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1255
+#: ../libempathy-gtk/empathy-contact-widget.c:1268
 msgid "Floor:"
 msgstr "Aukštas:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1257
+#: ../libempathy-gtk/empathy-contact-widget.c:1270
 msgid "Room:"
 msgstr "Kambarys:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1259
+#: ../libempathy-gtk/empathy-contact-widget.c:1272
 msgid "Text:"
 msgstr "Tekstas:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1261
+#: ../libempathy-gtk/empathy-contact-widget.c:1274
 msgid "Description:"
 msgstr "Aprašymas:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1263
+#: ../libempathy-gtk/empathy-contact-widget.c:1276
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1265
+#: ../libempathy-gtk/empathy-contact-widget.c:1278
 msgid "Accuracy Level:"
 msgstr "Tikslumo lygis:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1267
+#: ../libempathy-gtk/empathy-contact-widget.c:1280
 msgid "Error:"
 msgstr "Paklaida:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1269
+#: ../libempathy-gtk/empathy-contact-widget.c:1282
 msgid "Vertical Error (meters):"
 msgstr "Vertikali paklaida (metrais):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1271
+#: ../libempathy-gtk/empathy-contact-widget.c:1284
 msgid "Horizontal Error (meters):"
 msgstr "Horizontali paklaida (metrais):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1273
+#: ../libempathy-gtk/empathy-contact-widget.c:1286
 msgid "Speed:"
 msgstr "Greitis:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1275
+#: ../libempathy-gtk/empathy-contact-widget.c:1288
 msgid "Bearing:"
 msgstr "Azimutas:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1277
+#: ../libempathy-gtk/empathy-contact-widget.c:1290
 msgid "Climb Speed:"
 msgstr "Kilimo greitis:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1279
+#: ../libempathy-gtk/empathy-contact-widget.c:1292
 msgid "Last Updated on:"
 msgstr "Paskutinįkart atnaujinta:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1281
+#: ../libempathy-gtk/empathy-contact-widget.c:1294
 msgid "Longitude:"
 msgstr "Ilguma:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1283
+#: ../libempathy-gtk/empathy-contact-widget.c:1296
 msgid "Latitude:"
 msgstr "Platuma:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1285
+#: ../libempathy-gtk/empathy-contact-widget.c:1298
 msgid "Altitude:"
 msgstr "Altitudė:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1332
+#: ../libempathy-gtk/empathy-contact-widget.c:1345
 msgid "<b>Location</b>"
 msgstr "<b>Vietovė</b>"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1345
+#: ../libempathy-gtk/empathy-contact-widget.c:1358
 msgid "<b>Location</b>, "
 msgstr "<b>Vietovė</b>, "
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1395
+#: ../libempathy-gtk/empathy-contact-widget.c:1408
 msgid "%B %e, %Y at %R UTC"
 msgstr "%Y %B %e, %R UTC"
 
@@ -1089,7 +1149,7 @@ msgid "Client:"
 msgstr "Klientas:"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:889
+#: ../src/empathy-main-window.c:1006
 msgid "Contact"
 msgstr "Adresatas"
 
@@ -1158,12 +1218,12 @@ msgstr "Prievadas:"
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:494
-#: ../src/empathy-import-dialog.c:281
+#: ../libempathy-gtk/empathy-log-window.c:495
+#: ../src/empathy-import-dialog.c:285
 msgid "Account"
 msgstr "Paskyra"
 
-#: ../libempathy-gtk/empathy-log-window.c:511
+#: ../libempathy-gtk/empathy-log-window.c:512
 msgid "Date"
 msgstr "Data"
 
@@ -1298,35 +1358,31 @@ msgstr ""
 msgid "gtk-remove"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-theme-manager.c:66
+#: ../libempathy-gtk/empathy-theme-manager.c:67
 msgid "Classic"
 msgstr "Klasikinė"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-manager.c:68
 msgid "Simple"
 msgstr "Paprasta"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:69
 msgid "Clean"
 msgstr "Tvarkinga"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Blue"
 msgstr "Mėlyna"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:71
-msgid "Adium"
-msgstr "Adium"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1377
+#: ../libempathy-gtk/empathy-ui-utils.c:1382
 msgid "Unable to open URI"
 msgstr "Nepavyko atverti URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1467
+#: ../libempathy-gtk/empathy-ui-utils.c:1472
 msgid "Select a file"
 msgstr "Pasirinkite failą"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1525
+#: ../libempathy-gtk/empathy-ui-utils.c:1530
 msgid "Select a destination"
 msgstr "Pasirinkite paskirtį"
 
@@ -1514,7 +1570,7 @@ msgid "Megaphone"
 msgstr "Megafonas"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:527
+#: ../megaphone/src/megaphone-applet.c:519
 msgid "Talk!"
 msgstr "Kalbėk!"
 
@@ -1528,7 +1584,7 @@ msgid "_Information"
 msgstr "_Informacija"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-main-window.ui.h:23
 msgid "_Preferences"
 msgstr "_Nustatymai"
 
@@ -1549,19 +1605,19 @@ msgstr "Buvimas"
 msgid "Set your own presence"
 msgstr "Nustatyti savo buvimą"
 
-#: ../src/empathy.c:504
+#: ../src/empathy.c:567
 msgid "Don't connect on startup"
 msgstr "Paleidimo metu neprisijungti"
 
-#: ../src/empathy.c:508
+#: ../src/empathy.c:571
 msgid "Don't show the contact list on startup"
 msgstr "Paleidus nerodyti adresatų sąrašo"
 
-#: ../src/empathy.c:512
+#: ../src/empathy.c:575
 msgid "Show the accounts dialog"
 msgstr "Rodyti paskyrų dialogą"
 
-#: ../src/empathy.c:524
+#: ../src/empathy.c:587
 msgid "- Empathy Instant Messenger"
 msgstr "– Pokalbių programa Empathy"
 
@@ -1609,21 +1665,21 @@ msgstr ""
 "Justina Klingaitė\n"
 "Saulius Šopaga"
 
-#: ../src/empathy-accounts-dialog.c:393
+#: ../src/empathy-accounts-dialog.c:392
 msgid "Enabled"
 msgstr "Įjungta"
 
-#: ../src/empathy-accounts-dialog.c:403 ../src/empathy-accounts-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1
 msgid "Accounts"
 msgstr "Paskyros"
 
 #. To translator: %s is the protocol name
-#: ../src/empathy-accounts-dialog.c:838
+#: ../src/empathy-accounts-dialog.c:837
 #, c-format
 msgid "New %s account"
 msgstr "Nauja %s paskyra"
 
-#: ../src/empathy-accounts-dialog.c:951
+#: ../src/empathy-accounts-dialog.c:950
 #, c-format
 msgid ""
 "You are about to remove your %s account!\n"
@@ -1632,7 +1688,7 @@ msgstr ""
 "Ištrinsite savo paskyrą %s!\n"
 "Ar tikrai norite tęsti?"
 
-#: ../src/empathy-accounts-dialog.c:957
+#: ../src/empathy-accounts-dialog.c:956
 msgid ""
 "Any associated conversations and chat rooms will NOT be removed if you "
 "decide to proceed.\n"
@@ -1640,7 +1696,8 @@ msgid ""
 "Should you decide to add the account back at a later time, they will still "
 "be available."
 msgstr ""
-"Jei nuspręsite tęsti, susiję pokalbiai ir pokalbių kambariai NEBUS ištrinti.\n"
+"Jei nuspręsite tęsti, susiję pokalbiai ir pokalbių kambariai NEBUS "
+"ištrinti.\n"
 "\n"
 "Jei vėliau vėl pridėsite šią paskyrą, jie tebebus prieinami."
 
@@ -1728,17 +1785,17 @@ msgstr "Garso įvestis"
 msgid "Video input"
 msgstr "Vaizdo įvestis"
 
-#: ../src/empathy-call-window.c:836
+#: ../src/empathy-call-window.c:835
 #, c-format
 msgid "Call with %s"
 msgstr "Skambinti su %s"
 
-#: ../src/empathy-call-window.c:905
+#: ../src/empathy-call-window.c:904
 msgid "Call"
 msgstr "Skambutis"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1336
+#: ../src/empathy-call-window.c:1335
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Prisijunta – %d:%02dm"
@@ -1767,7 +1824,7 @@ msgstr "Vaizdo peržiūra"
 msgid "_Call"
 msgstr "_Skambutis"
 
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
 msgid "_View"
 msgstr "_Rodymas"
 
@@ -1874,13 +1931,13 @@ msgstr ""
 "Žinutė: %s"
 
 #. someone is logging off
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:935
 #, c-format
 msgid "%s is now offline."
 msgstr "%s dabar atsijungęs(-usi)."
 
 #. someone is logging in
-#: ../src/empathy-event-manager.c:958
+#: ../src/empathy-event-manager.c:951
 #, c-format
 msgid "%s is now online."
 msgstr "%s dabar prisijungęs(-usi)."
@@ -1997,19 +2054,19 @@ msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Pašalinti baigtus, atšauktus ir nepavykusius failų siuntimus iš sąrašo"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-dialog.c:259
+#: ../src/empathy-import-dialog.c:263
 msgid "Import"
 msgstr "Importuoti"
 
-#: ../src/empathy-import-dialog.c:268
+#: ../src/empathy-import-dialog.c:272
 msgid "Protocol"
 msgstr "Protokolas"
 
-#: ../src/empathy-import-dialog.c:294
+#: ../src/empathy-import-dialog.c:298
 msgid "Source"
 msgstr "Šaltinis"
 
-#: ../src/empathy-import-dialog.c:388
+#: ../src/empathy-import-dialog.c:392
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -2021,71 +2078,71 @@ msgstr ""
 msgid "Import Accounts"
 msgstr "Paskyrų importavimas"
 
-#: ../src/empathy-main-window.c:396
+#: ../src/empathy-main-window.c:402
 msgid "_Edit account"
 msgstr "_Taisyti paskyrą"
 
-#: ../src/empathy-main-window.c:499
+#: ../src/empathy-main-window.c:505
 msgid "No error specified"
 msgstr "Nenurodyta klaida"
 
-#: ../src/empathy-main-window.c:502
+#: ../src/empathy-main-window.c:508
 msgid "Network error"
 msgstr "Tinklo klaida"
 
-#: ../src/empathy-main-window.c:505
+#: ../src/empathy-main-window.c:511
 msgid "Authentication failed"
 msgstr "Nepavyko nustatyti tapatybės"
 
-#: ../src/empathy-main-window.c:508
+#: ../src/empathy-main-window.c:514
 msgid "Encryption error"
 msgstr "Šifravimo klaida"
 
-#: ../src/empathy-main-window.c:511
+#: ../src/empathy-main-window.c:517
 msgid "Name in use"
 msgstr "Vardas jau naudojamas"
 
-#: ../src/empathy-main-window.c:514
+#: ../src/empathy-main-window.c:520
 msgid "Certificate not provided"
 msgstr "Nepateiktas liudijimas"
 
-#: ../src/empathy-main-window.c:517
+#: ../src/empathy-main-window.c:523
 msgid "Certificate untrusted"
 msgstr "Liudijimas nepatikimas"
 
-#: ../src/empathy-main-window.c:520
+#: ../src/empathy-main-window.c:526
 msgid "Certificate expired"
 msgstr "Nebegaliojantis liudijimas"
 
-#: ../src/empathy-main-window.c:523
+#: ../src/empathy-main-window.c:529
 msgid "Certificate not activated"
 msgstr "Liudijimas neaktyvuotas"
 
-#: ../src/empathy-main-window.c:526
+#: ../src/empathy-main-window.c:532
 msgid "Certificate hostname mismatch"
 msgstr "Neatitinka liudijimo kompiuterio vardas"
 
-#: ../src/empathy-main-window.c:529
+#: ../src/empathy-main-window.c:535
 msgid "Certificate fingerprint mismatch"
 msgstr "Neatitinka liudijimo kontrolinis kodas"
 
-#: ../src/empathy-main-window.c:532
+#: ../src/empathy-main-window.c:538
 msgid "Certificate self-signed"
 msgstr "Paties pasirašytas liudijimas"
 
-#: ../src/empathy-main-window.c:535
+#: ../src/empathy-main-window.c:541
 msgid "Certificate error"
 msgstr "Liudijimo klaida"
 
-#: ../src/empathy-main-window.c:538
+#: ../src/empathy-main-window.c:544
 msgid "Unknown error"
 msgstr "Nežinoma klaida"
 
-#: ../src/empathy-main-window.c:1221
+#: ../src/empathy-main-window.c:1293
 msgid "Show and edit accounts"
 msgstr "Rodyti ir taisyti paskyras"
 
-#: ../src/empathy-main-window.ui.h:1 ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-main-window.ui.h:1
 msgid "Contact List"
 msgstr "Adresatų sąrašas"
 
@@ -2106,62 +2163,78 @@ msgid "Manage Favorites"
 msgstr "Tvarkyti mėgiamus"
 
 #: ../src/empathy-main-window.ui.h:6
-msgid "_Accounts"
-msgstr "P_askyros"
+msgid "N_ormal Size"
+msgstr "N_ormalus dydis"
 
 #: ../src/empathy-main-window.ui.h:7
-msgid "_Add Contact..."
-msgstr "_Pridėti adresatą..."
+msgid "Normal Size With _Avatars"
+msgstr "Normalus dydis su _pseudoportretais"
+
+#: ../src/empathy-main-window.ui.h:8
+msgid "Sort by _Name"
+msgstr "Rikiuoti pagal _vardą"
 
 #: ../src/empathy-main-window.ui.h:9
+msgid "Sort by _Status"
+msgstr "Rikiuoti pagal _būseną"
+
+#: ../src/empathy-main-window.ui.h:10
+msgid "_Accounts"
+msgstr "P_askyros"
+
+#: ../src/empathy-main-window.ui.h:13
+msgid "_Compact Size"
+msgstr "_Kompaktiškas dydis"
+
+#: ../src/empathy-main-window.ui.h:14
 msgid "_Contents"
 msgstr "_Turinys"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:15
 msgid "_Debug"
 msgstr "_Derinti"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:17
 msgid "_File Transfers"
 msgstr "_Failų siuntimai"
 
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:18
 msgid "_Help"
 msgstr "_Žinynas"
 
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window.ui.h:19
 msgid "_Join..."
 msgstr "_Prisijungti..."
 
-#: ../src/empathy-main-window.ui.h:15 ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2
 msgid "_New Conversation..."
 msgstr "_Naujas pokalbis..."
 
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window.ui.h:21
 msgid "_Offline Contacts"
 msgstr "_Atsijungę adresatai"
 
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window.ui.h:22
 msgid "_Personal Information"
 msgstr "_Asmeninė informacija"
 
-#: ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-main-window.ui.h:24
 msgid "_Previous Conversations"
 msgstr "_Ankstesni pokalbiai"
 
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window.ui.h:25
 msgid "_Room"
 msgstr "_Kambarys"
 
-#: ../src/empathy-new-chatroom-dialog.c:332
+#: ../src/empathy-new-chatroom-dialog.c:331
 msgid "Chat Room"
 msgstr "Pokalbių kambarys"
 
-#: ../src/empathy-new-chatroom-dialog.c:348
+#: ../src/empathy-new-chatroom-dialog.c:347
 msgid "Members"
 msgstr "Nariai"
 
-#: ../src/empathy-new-chatroom-dialog.c:492
+#: ../src/empathy-new-chatroom-dialog.c:496
 #, c-format
 msgctxt ""
 "Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
@@ -2177,21 +2250,21 @@ msgstr ""
 "Reikia slaptažodžio: %s\n"
 "Nariai: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:494
-#: ../src/empathy-new-chatroom-dialog.c:495
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
 msgid "Yes"
 msgstr "Taip"
 
-#: ../src/empathy-new-chatroom-dialog.c:494
-#: ../src/empathy-new-chatroom-dialog.c:495
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
 msgid "No"
 msgstr "Ne"
 
-#: ../src/empathy-new-chatroom-dialog.c:522
+#: ../src/empathy-new-chatroom-dialog.c:526
 msgid "Could not start room listing"
 msgstr "Nepavyko paleisti kambarių sąrašo"
 
-#: ../src/empathy-new-chatroom-dialog.c:532
+#: ../src/empathy-new-chatroom-dialog.c:536
 msgid "Could not stop room listing"
 msgstr "Nepavyko sustabdyti kambarių rodymo"
 
@@ -2226,133 +2299,119 @@ msgstr "Kambarių sąrašas"
 msgid "_Room:"
 msgstr "_Kambarys:"
 
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:147
 msgid "Message received"
 msgstr "Gauta žinutė"
 
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:148
 msgid "Message sent"
 msgstr "Žinutė išsiųsta"
 
-#: ../src/empathy-preferences.c:163
+#: ../src/empathy-preferences.c:149
 msgid "New conversation"
 msgstr "Naujas pokalbis"
 
-#: ../src/empathy-preferences.c:164
+#: ../src/empathy-preferences.c:150
 msgid "Contact goes online"
 msgstr "Adresatas prisijungė"
 
-#: ../src/empathy-preferences.c:165
+#: ../src/empathy-preferences.c:151
 msgid "Contact goes offline"
 msgstr "Adresatas atsijungė"
 
-#: ../src/empathy-preferences.c:166
+#: ../src/empathy-preferences.c:152
 msgid "Account connected"
 msgstr "Paskyra prijungta"
 
-#: ../src/empathy-preferences.c:167
+#: ../src/empathy-preferences.c:153
 msgid "Account disconnected"
 msgstr "Paskyra atjungta"
 
-#: ../src/empathy-preferences.c:446
+#: ../src/empathy-preferences.c:393
 msgid "Language"
 msgstr "Kalba"
 
 #: ../src/empathy-preferences.ui.h:1
-msgid "Adium theme to use:"
-msgstr "Naudotina Adium tema:"
-
-#: ../src/empathy-preferences.ui.h:2
 msgid "Allow _GPS usage"
 msgstr "Leisti naudoti _GPS"
 
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:2
 msgid "Allow _cellphone usage"
 msgstr "Leisti naudoti _mobilųjį telefoną"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:3
 msgid "Allow _network usage"
 msgstr "Leisti naudoti _tinklą"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:4
 msgid "Appearance"
 msgstr "Išvaizda"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:5
 msgid "Automatically _connect on startup "
 msgstr "Paleidus, automatiškai _prisijungti"
 
-#: ../src/empathy-preferences.ui.h:7
-msgid "Avatars are user chosen images shown in the contact list"
-msgstr ""
-"Pseudoportretai – tai adresatų sąraše rodomi naudotojų pasirinkti "
-"paveikslėliai"
-
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:6
 msgid "Behavior"
 msgstr "Elgsena"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:7
 msgid "Chat Th_eme:"
 msgstr "Pokalbio t_ema:"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:8
 msgid "Disable notifications when _away or busy"
 msgstr "Išjungti pranešimus, kai manęs _nėra ar užsiėmęs(-usi)"
 
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:9
 msgid "Disable sounds when _away or busy"
 msgstr "Išjungti garsus, kai manęs _nėra ar užsiėmęs(-usi)"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "Įjungti pranešimus, kai prisijungia adresatas"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "Įjungti pranešimus, kai atsijungia adresatas"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Įjungti pranešimus, kai _pokalbio langas nesuaktyvintas"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "Įjungti šių kalbų rašybos tikrinimą:"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "Bendra"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:15
 msgid "Geoclue Settings"
 msgstr "Geoclue parametrai"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:16
 msgid "Location"
 msgstr "Vietovė"
 
-#: ../src/empathy-preferences.ui.h:20
-msgid "Not a valid adium theme"
-msgstr "Tai nėra tinkama adium tema"
-
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:17
 msgid "Notifications"
 msgstr "Pranešimai"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:18
 msgid "Play sound for events"
 msgstr "Groti garsus įvykiams"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:19
 msgid "Preferences"
 msgstr "Nustatymai"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:20
 msgid "Privacy"
 msgstr "Privatumas"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:21
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will have a random "
@@ -2361,66 +2420,49 @@ msgstr ""
 "Sumažinus vietovės tikslumą, bus rodomas tik jūsų miestas, sritis ir šalis. "
 "GPS koordinatėms bus pridedama atsitiktinė reikšmė (&#xB1;0.25&#xB0;)."
 
-#: ../src/empathy-preferences.ui.h:26
-msgid "Show _avatars"
-msgstr "Rodyti _pseudoportretus"
-
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:22
 msgid "Show _smileys as images"
 msgstr "Rodyti š_ypsenelės kaip paveikslėlius"
 
-#: ../src/empathy-preferences.ui.h:28
-msgid "Show co_mpact contact list"
-msgstr "Rodyti _kompaktišką adresatų sąrašą"
-
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:23
 msgid "Show contact _list in rooms"
 msgstr "Rodyti adresatų _sąrašą kambariuose"
 
-#: ../src/empathy-preferences.ui.h:30
-msgid "Sort by _name"
-msgstr "Rikiuoti pagal _vardą"
-
-#: ../src/empathy-preferences.ui.h:31
-msgid "Sort by s_tate"
-msgstr "Rikiuoti pagal _būseną"
-
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "Garsai"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:25
 msgid "Spell Checking"
 msgstr "Rašybos tikrinimas"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:26
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
-msgstr ""
-"Šiame kalbų sąraše yra tik tos kalbos, kurių žodynus turite įdiegę."
+msgstr "Šiame kalbų sąraše yra tik tos kalbos, kurių žodynus turite įdiegę."
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:27
 msgid "Themes"
 msgstr "Temos"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:28
 msgid "_Enable bubble notifications"
 msgstr "Į_jungti burbulinius pranešimus"
 
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:29
 msgid "_Enable sound notifications"
 msgstr "Į_jungti garsinius pranešimus"
 
-#: ../src/empathy-preferences.ui.h:38
+#: ../src/empathy-preferences.ui.h:30
 msgid "_Open new chats in separate windows"
 msgstr "_Atverti naujus pokalbius atskiruose languose"
 
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Publish location to my contacts"
 msgstr "_Rodyti vietovę mano adresatams"
 
-#: ../src/empathy-preferences.ui.h:40
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Reduce location accuracy"
 msgstr "_Sumažinti vietovės tikslumą"
 
diff --git a/po/pa.po b/po/pa.po
index f5d251c15..d22f67fbc 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&component=general\n"
-"POT-Creation-Date: 2009-06-04 16:15+0000\n"
-"PO-Revision-Date: 2009-06-05 06:42+0530\n"
+"POT-Creation-Date: 2009-07-02 19:42+0000\n"
+"PO-Revision-Date: 2009-07-07 06:28+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi/Panjabi <punjabi-users@lists.sf.net>\n"
 "MIME-Version: 1.0\n"
@@ -31,7 +31,7 @@ msgstr "ਤੁਰੰਤ ਸੁਨੇਹੇ ਲਵੋ ਅਤੇ ਭੇਜੋ"
 
 #: ../data/empathy.schemas.in.h:1
 msgid "Always open a separate chat window for new chats."
-msgstr "ਨਵੀਂ ਗੱਲਬਾਤ ਲਈ ਇੱਕ ਵੱਖਰੀ ਗੱਲਬਾਤ ਝਰੋਖਾ ਵਰਤੋਂ।"
+msgstr "ਨਵੀਆਂ ਗੱਲਾਂ ਲਈ ਹਮੇਸ਼ਾ ਇੱਕ ਵੱਖਰੀ ਗੱਲਬਾਤ ਵਿੰਡੋ ਵਰਤੋਂ।"
 
 #: ../data/empathy.schemas.in.h:2
 msgid ""
@@ -41,7 +41,7 @@ msgstr "ਨਾਂ ਦੇ ਬਾਅਦ ਵਿੱਚ ਜੋੜਨ ਲਈ ਅੱਖ
 
 #: ../data/empathy.schemas.in.h:3
 msgid "Chat window theme"
-msgstr "ਗੱਲਬਾਤ ਝਰੋਖਾ ਸਰੂਪ"
+msgstr "ਗੱਲਬਾਤ ਵਿੰਡੋ ਥੀਮ"
 
 #: ../data/empathy.schemas.in.h:4
 msgid "Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
@@ -49,15 +49,15 @@ msgstr "ਸਪੈਲ ਚੈਕਰ ਭਾਸ਼ਾਵਾਂ ਦੀ ਕਾਮਿ�
 
 #: ../data/empathy.schemas.in.h:5
 msgid "Compact contact list"
-msgstr "ਸੰਖੇਪ ਸੰਪਰਕ ਸੂਚੀ"
+msgstr "ਸੰਖੇਪ ਸੰਪਰਕ ਲਿਸਟ"
 
 #: ../data/empathy.schemas.in.h:6
 msgid "Contact list sort criterium"
-msgstr "ਸੰਪਰਕ ਸੂਚੀ ਲੜੀਬੱਧ"
+msgstr "ਸੰਪਰਕ ਲਿਸਟ ਲੜੀਬੱਧ"
 
 #: ../data/empathy.schemas.in.h:7
 msgid "Default directory to select an avatar image from"
-msgstr "ਅਵਤਾਰ ਚਿੱਤਰ ਚੁਣਨ ਵਾਸਤੇ ਮੂਲ ਡਾਇਰੈਕਟਰੀ"
+msgstr "ਅਵਤਾਰ ਚਿੱਤਰ ਚੁਣਨ ਵਾਸਤੇ ਡਿਫਾਲਟ ਡਾਇਰੈਕਟਰੀ"
 
 #: ../data/empathy.schemas.in.h:8
 msgid "Disable popup notifications when away"
@@ -85,18 +85,17 @@ msgstr "ਇੰਪੈਂਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨੁਮਾਨ ਲ�
 
 #: ../data/empathy.schemas.in.h:14
 msgid "Empathy default download folder"
-msgstr "ਇੰਪੈਂਥੀ ਮੂਲ ਡਾਊਨਲੋਡ ਫੋਲਡਰ"
+msgstr "ਇੰਪੈਂਥੀ ਡਿਫਾਲਟ ਡਾਊਨਲੋਡ ਫੋਲਡਰ"
 
 #: ../data/empathy.schemas.in.h:15
 msgid "Empathy has asked about importing accounts"
-msgstr "ਇੰਪੈਂਥੀ ਖਾਤੇ ਆਯਾਤ ਕਰਨ ਲਈ ਪੁੱਛੇ"
+msgstr "ਇੰਪੈਂਥੀ ਅਕਾਊਂਟ ਇੰਪੋਰਟ ਕਰਨ ਲਈ ਪੁੱਛੇ"
 
 #: ../data/empathy.schemas.in.h:16
 msgid "Empathy should auto-connect on startup"
-msgstr "ਇੰਪੈਂਥੀ ਸ਼ੁਰੂ ਸਮੇਂ ਸਵੈ-ਚਾਲਤ ਜੁੜੇ"
+msgstr "ਇੰਪੈਂਥੀ ਸ਼ੁਰੂ ਸਮੇਂ ਆਟੋਮੈਟਿਕ ਕੁਨੈਕਟ ਹੋਵੇ"
 
 #: ../data/empathy.schemas.in.h:17
-#| msgid "Empathy should auto-connect on startup"
 msgid "Empathy should reduce the location's accuracy"
 msgstr "ਇੰਪੈਂਥੀ ਟਿਕਾਣੇ ਦੀ ਸ਼ੁੱਧਤਾ ਘਟਾਵੇ"
 
@@ -114,11 +113,11 @@ msgstr "ਸ਼ਬਦ-ਜੋੜ ਯੋਗ"
 
 #: ../data/empathy.schemas.in.h:21
 msgid "Hide main window"
-msgstr "ਮੁੱਖ ਝਰੋਖਾ ਓਹਲੇ"
+msgstr "ਮੁੱਖ ਵਿੰਡੋ ਓਹਲੇ"
 
 #: ../data/empathy.schemas.in.h:22
 msgid "Hide the main window."
-msgstr "ਮੁੱਖ ਝਰੋਖਾ ਓਹਲੇ ਕਰੋ"
+msgstr "ਮੁੱਖ ਵਿੰਡੋ ਓਹਲੇ ਕਰੋ"
 
 #: ../data/empathy.schemas.in.h:23
 msgid "NetworkManager should be used"
@@ -130,230 +129,269 @@ msgstr "ਨਾਂ ਪੂਰਾ ਅੱਖਰ"
 
 #: ../data/empathy.schemas.in.h:25
 msgid "Open new chats in separate windows"
-msgstr "ਵੱਖਰੇ ਝਰੋਖਿਆਂ ਵਿੱਚ ਨਵੀਆਂ ਗੱਲਬਾਤਾਂ ਖੋਲ੍ਹੋ"
+msgstr "ਨਵੀਆਂ ਗੱਲਬਾਤਾਂ ਵੱਖ ਵੱਖ ਵਿੰਡੋ ਵਿੱਚ ਖੋਲ੍ਹੋ"
 
 #: ../data/empathy.schemas.in.h:26
+msgid "Path of the adium theme to use"
+msgstr "ਵਰਤਣ ਵਾਸਤੀ ਅਡੀਓਮ ਥੀਮ ਲਈ ਪਾਥ"
+
+#: ../data/empathy.schemas.in.h:27
+#| msgid "Whether to use the theme for chat rooms or not."
+msgid "Path of the adium theme to use if the theme used for chat is adium."
+msgstr "ਅਡੀਓਮ ਥੀਮ ਲਈ ਪਾਥ, ਜੋ ਕਿ ਵਰਤਣਾ ਹੈ, ਜਦੋਂ ਗੱਲਬਾਤ ਲਈ ਅਡੀਓਮ ਥੀਮ ਚੁਣਿਆ ਹੋਵੇ।"
+
+#: ../data/empathy.schemas.in.h:28
 msgid "Play a sound for incoming messages"
 msgstr "ਆ ਰਹੇ ਸੁਨੇਹਿਆਂ ਲਈ ਇੱਕ ਧੁਨੀ ਚਲਾਓ"
 
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:29
 msgid "Play a sound for new conversations"
 msgstr "ਨਵੀਆਂ ਗੱਲਾਂਬਾਤਾਂ ਲਈ ਧੁਨੀ ਚਲਾਓ"
 
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:30
 msgid "Play a sound for outgoing messages"
 msgstr "ਬਾਹਰ ਜਾ ਰਹੇ ਸੁਨੇਹਿਆਂ ਲਈ ਆਵਾਜ਼ ਚਲਾਓ"
 
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:31
 msgid "Play a sound when a contact logs in"
 msgstr "ਜਦੋਂ ਸੰਪਰਕ ਲਾਗਇਨ ਕਰੇ ਤਾਂ ਧੁਨੀ ਚਲਾਓ"
 
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:32
 msgid "Play a sound when a contact logs out"
 msgstr "ਜਦੋਂ ਸੰਪਰਕ ਲਾਗ-ਆਉਟ ਕਰੇ ਤਾਂ ਧੁਨੀ ਚਲਾਓ"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:33
 msgid "Play a sound when we log in"
 msgstr "ਜਦੋਂ ਅਸੀਂ ਲਾਗਇਨ ਕਰੀਏ ਤਾਂ ਧੁਨੀ ਚਲਾਓ"
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:34
 msgid "Play a sound when we log out"
 msgstr "ਜਦੋਂ ਅਸੀਂ ਲਾਗ-ਆਉਟ ਕਰਨਾ ਹੋਵੇ ਤਾਂ ਧੁਨੀ ਚਲਾਓ"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:35
 msgid "Popup notifications if the chat isn't focused"
 msgstr "ਜੇ ਗੱਲਬਾਤ ਫੋਕਸ ਨਾ ਹੋਵੇ ਤਾਂ ਸੂਚਨਾ ਪੋਪਅੱਪ ਕਰੋ"
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:36
+#| msgid "Popup notifications if the chat isn't focused"
+msgid "Popup notifications when a contact sign in"
+msgstr "ਜੇ ਸੰਪਰਕ ਸਾਇਨ ਇਨ ਕਰੇ ਤਾਂ ਸੂਚਨਾ ਪੋਪਅੱਪ ਕਰੋ"
+
+#: ../data/empathy.schemas.in.h:37
+#| msgid "Popup notifications if the chat isn't focused"
+msgid "Popup notifications when a contact sign out"
+msgstr "ਜੇ ਸੰਪਰਕ ਸਾਈਨ-ਆਉਟ ਕਰੇ ਤਾਂ ਸੂਚਨਾ ਪੋਪਅੱਪ ਕਰੋ"
+
+#: ../data/empathy.schemas.in.h:38
 msgid "Salut account is created"
 msgstr "ਸਲਾਉਟ ਅਕਾਊਂਟ ਬਣਾਇਆ"
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:39
 msgid "Show avatars"
 msgstr "ਅਵਤਾਰ ਵੇਖੋ"
 
-#: ../data/empathy.schemas.in.h:36
+#: ../data/empathy.schemas.in.h:40
+#| msgid "_Show Contact List"
+msgid "Show contact list in rooms"
+msgstr "ਰੂਮ ਵਿੱਚ ਸੰਪਰਕ ਲਿਸਟ ਵੇਖੋ"
+
+#: ../data/empathy.schemas.in.h:41
 msgid "Show hint about closing the main window"
-msgstr "ਮੁੱਖ ਝਰੋਖਾ ਬੰਦ ਕਰਨ ਦੌਰਾਨ ਸੰਕੇਤ ਵੇਖੋ"
+msgstr "ਮੁੱਖ ਵਿੰਡੋ ਬੰਦ ਕਰਨ ਦੌਰਾਨ ਸੰਕੇਤ ਵੇਖੋ"
 
-#: ../data/empathy.schemas.in.h:37
+#: ../data/empathy.schemas.in.h:42
 msgid "Show offline contacts"
 msgstr "ਆਫਲਾਈਨ ਸੰਪਰਕ ਵੇਖੋ"
 
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:43
 msgid "Spell checking languages"
 msgstr "ਸ਼ਬਦ-ਜੋੜ ਭਾਸ਼ਾਵਾਂ"
 
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:44
 msgid "The default folder to save file transfers in."
 msgstr "ਫਾਇਲ ਸੰਚਾਰ ਸੰਭਾਲਣ ਲਈ ਡਿਫਾਲਟ ਫੋਲਡਰ ਹੈ।"
 
-#: ../data/empathy.schemas.in.h:40
+#: ../data/empathy.schemas.in.h:45
 msgid "The last directory that an avatar image was chosen from."
 msgstr "ਆਖਰੀ ਡਾਇਰੈਕਟਰੀ, ਜਿੱਥੇ ਅਵਤਾਰ ਚਿੱਤਰ ਚੁਣਿਆ ਗਿਆ ਸੀ।"
 
-#: ../data/empathy.schemas.in.h:41
+#: ../data/empathy.schemas.in.h:46
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "ਥੀਮ, ਜੋ ਕਿ ਗੱਲਬਾਤ ਵਿੰਡੋ ਵਿੱਚ ਗੱਲਾਂ ਵੇਖਾਉਣ ਲਈ ਵਰਤਿਆ ਜਾਵੇ।"
 
-#: ../data/empathy.schemas.in.h:42
+#: ../data/empathy.schemas.in.h:47
 msgid "Use graphical smileys"
 msgstr "ਗਰਾਫਿਕਸ ਚਿਹਰੇ ਵਰਤੋਂ"
 
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:48
 msgid "Use notification sounds"
 msgstr "ਸਾਊਂਡ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵਰਤੋਂ"
 
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:49
 msgid "Use theme for chat rooms"
 msgstr "ਗੱਲਬਾਤ ਰੂਮ ਲਈ ਥੀਮ ਵਰਤੋਂ"
 
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:50
 msgid "Whether or not Empathy can publish the user's location to his contacts."
 msgstr "ਕੀ ਇੰਪੈਂਥੀ ਯੂਜ਼ਰ ਦਾ ਟਿਕਾਣਾ ਉਸ ਦੇ ਸੰਪਰਕਾਂ ਲਈ ਦੇਵੇ।"
 
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:51
 msgid "Whether or not Empathy can use the GPS to guess the location."
 msgstr "ਕੀ ਇੰਪੈਂਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨੁਮਾਨ ਲਗਾਉਣ ਲਈ GPS ਵਰਤੇ।"
 
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:52
 msgid "Whether or not Empathy can use the cellular network to guess the location."
 msgstr "ਕੀ ਇੰਪੈਂਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨੁਮਾਨ ਲਗਾਉਣ ਲਈ ਸੈਲੂਲਰ ਨੈੱਟਵਰਕ ਵਰਤੇ।"
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:53
 msgid "Whether or not Empathy can use the network to guess the location."
 msgstr "ਕੀ ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨੁਮਾਨ ਲਾਉਣ ਲਈ ਨੈੱਟਵਰਕ ਵਰਤ ਸਕਦਾ ਹੈ।"
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:54
 msgid ""
 "Whether or not Empathy has asked about importing accounts from other "
 "programs."
 msgstr "ਕੀ ਇੰਪੈਂਥੀ ਹੋਰ ਪਰੋਗਰਾਮਾਂ ਤੋਂ ਅਕਾਊਂਟ ਇੰਪੋਰਟ ਕਰਨ ਲਈ ਪੁੱਛੇ।"
 
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:55
 msgid ""
 "Whether or not Empathy should automatically log in to your accounts on "
 "startup."
 msgstr "ਕੀ ਇੰਪੈਂਥੀ ਸ਼ੁਰੂ ਸਮੇਂ ਆਟੋਮੈਟਿਕ ਹੀ ਤੁਹਾਡੇ ਅਕਾਊਂਟਾਂ ਵਿੱਚ ਲਾਗਇਨ ਕਰੇ।"
 
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:56
 msgid ""
 "Whether or not Empathy should reduce the location's accuracy for privacy "
 "reasons."
 msgstr "ਕੀ ਇੰਪੈਂਥੀ ਪਰਾਈਵੇਸੀ ਕਾਰਨਾਂ ਕਰਕੇ ਟਿਕਾਣੇ ਦੀ ਸ਼ੁੱਧਤਾ ਘਟਾਵੇ।"
 
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:57
 msgid ""
 "Whether or not Empathy should use the avatar of the contact as the chat "
 "window icon."
 msgstr "ਕੀ ਇੰਪੈਂਥੀ ਗੱਲਬਾਤ ਵਿੰਡੋ ਆਈਕਾਨ ਵਜੋਂ ਸੰਪਰਕ ਦੇ ਅਵਤਾਰ ਨੂੰ ਵਰਤੇ"
 
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:58
 msgid "Whether or not the Salut account has been created on the first Empathy run."
 msgstr "ਕੀ ਪਹਿਲੀ ਵਾਰ ਇੰਪੈਂਥੀ ਚਲਾਉਣ ਲਈ ਲਾਉਟ ਅਕਾਊਂਟ ਬਣਾਇਆ ਜਾਵੇ"
 
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:59
 msgid ""
 "Whether or not the network manager should be used to automatically "
 "disconnect/reconnect."
 msgstr "ਕੀ ਨੈੱਟਵਰਕ ਮੈਨੇਜਰ ਆਟੋਮੈਟਿਕ ਡਿਸ-ਕੁਨੈਕਟ/ਮੁੜ-ਕੁਨਕੈਟ ਲਈ ਵਰਤਿਆ ਜਾਵੇ"
 
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:60
 msgid ""
 "Whether or not to check words typed against the languages you want to check "
 "with."
 msgstr "ਕੀ ਜਦੋਂ ਤੁਸੀਂ ਲਿਖੋ ਤਾਂ ਸ਼ਬਦਾਂ ਨੂੰ ਭਾਸ਼ਾ ਲਈ ਚੈੱਕ ਕੀਤਾ ਜਾਵੇ"
 
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:61
 msgid "Whether or not to convert smileys into graphical images in conversations."
 msgstr "ਕੀ ਸਮਾਈਲੀ ਨੂੰ ਗੱਲਬਾਤ ਵਿੱਚ ਗਰਾਫਿਕਲ ਚਿੱਤਰਾਂ ਵਿੱਚ ਬਦਲਿਆ ਜਾਵੇ"
 
-#: ../data/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:62
 msgid "Whether or not to play a sound to notify for contacts logging in the network."
 msgstr "ਕੀ ਨੈੱਟਵਰਕ ਉੱਤੇ ਸੰਪਰਕ ਦੇ ਲਾਗਇਨ ਕਰਨ ਸਮੇਂ ਸੂਚਨਾ ਲਈ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ"
 
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:63
 msgid ""
 "Whether or not to play a sound to notify for contacts logging off the "
 "network."
 msgstr "ਕੀ ਨੈੱਟਵਰਕ ਉੱਤੇ ਸੰਪਰਕ ਦੇ ਲਾਗਆਫ਼ ਕਰਨ ਸਮੇਂ ਸੂਚਨਾ ਲਈ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ"
 
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:64
 msgid "Whether or not to play a sound to notify for events."
 msgstr "ਕੀ ਈਵੈਂਟਾਂ ਲਈ ਸੂਚਨਾ ਵਾਸਤੇ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ"
 
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:65
 msgid "Whether or not to play a sound to notify for incoming messages."
 msgstr "ਕੀ ਆ ਰਹੇ ਸੁਨੇਹਿਆਂ ਲਈ ਸੂਚਨਾ ਵਾਸਤੇ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ।"
 
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:66
 msgid "Whether or not to play a sound to notify for new conversations."
 msgstr "ਕੀ ਨਵੀਆਂ ਗੱਲਾਬਾਤਾਂ ਦੀ ਸੂਚਨਾ ਲਈ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ।"
 
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:67
 msgid "Whether or not to play a sound to notify for outgoing messages."
 msgstr "ਕੀ ਬਾਹਰ ਜਾ ਰਹੇ ਸੁਨੇਹਿਆਂ ਲਈ ਸੂਚਨਾ ਵਾਸਤੇ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ।"
 
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:68
 msgid "Whether or not to play a sound when logging in a network."
 msgstr "ਕੀ ਨੈੱਟਵਰਕ ਉੱਤੇ ਲਾਗਇਨ ਕਰਨ ਦੌਰਾਨ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ।"
 
-#: ../data/empathy.schemas.in.h:64
+#: ../data/empathy.schemas.in.h:69
 msgid "Whether or not to play a sound when logging off a network."
 msgstr "ਕੀ ਨੈੱਟਵਰਕ ਤੋਂ ਲਾਗ-ਆਫ਼ ਕਰਨ ਦੌਰਾਨ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ"
 
-#: ../data/empathy.schemas.in.h:65
+#: ../data/empathy.schemas.in.h:70
 msgid "Whether or not to play sound notifications when away or busy."
 msgstr "ਜਦੋਂ ਦੂਰ ਜਾਂ ਰੁੱਝੇ ਹੋਵੇ ਤਾਂ ਕੀ ਸਾਊਂਡ ਸੂਚਨਾਵਾਂ ਚਲਾਉਣੀਆਂ ਹਨ ਜਾਂ ਨਹੀਂ।"
 
-#: ../data/empathy.schemas.in.h:66
+#: ../data/empathy.schemas.in.h:71
+#| msgid "Whether or not to show popup notifications when away or busy."
+msgid "Whether or not to show a popup notification when a contact goes offline."
+msgstr "ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਏ ਜਾਣ, ਜਦੋਂ ਸੰਪਰਕ ਆਫਲਾਈਨ ਹੋਵੇ।"
+
+#: ../data/empathy.schemas.in.h:72
+#| msgid "Whether or not to show popup notifications when away or busy."
+msgid "Whether or not to show a popup notification when a contact goes online."
+msgstr "ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਏ ਜਾਣ, ਜਦੋਂ ਸੰਪਰਕ ਆਨਲਾਈਨ ਹੋਵੇ।"
+
+#: ../data/empathy.schemas.in.h:73
 msgid ""
 "Whether or not to show a popup notification when receiving a new message "
 "even if the chat is already opened, but not focused."
 msgstr ""
-"ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਇਆ ਜਾਵੇ, ਜਦੋਂ ਇੱਕ ਨਵਾਂ ਸੁਨੇਹਾ ਮਿਲੇ, ਭਾਵੇਂ ਗੱਲਬਾਤ ਪਹਿਲਾਂ ਖੁੱਲ੍ਹੀ ਹੋਵੇ, "
-"ਪਰ ਫੋਕਸ ਨਾ ਹੋਵੇ।"
+"ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਇਆ ਜਾਵੇ, ਜਦੋਂ ਇੱਕ ਨਵਾਂ ਸੁਨੇਹਾ ਮਿਲੇ, ਭਾਵੇਂ ਗੱਲਬਾਤ ਪਹਿਲਾਂ ਖੁੱਲ੍ਹੀ ਹੋਵੇ, ਪਰ "
+"ਫੋਕਸ ਨਾ ਹੋਵੇ।"
 
-#: ../data/empathy.schemas.in.h:67
+#: ../data/empathy.schemas.in.h:74
 msgid "Whether or not to show a popup notification when receiving a new message."
 msgstr "ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਇਆ ਜਾਵੇ, ਜਦੋਂ ਨਵਾਂ ਸੁਨੇਹਾ ਮਿਲੇ।"
 
-#: ../data/empathy.schemas.in.h:68
+#: ../data/empathy.schemas.in.h:75
 msgid ""
 "Whether or not to show avatars for contacts in the contact list and chat "
 "windows."
 msgstr "ਕੀ ਸੰਪਰਕ ਲਿਸਟ ਅਤੇ ਗੱਲਬਾਤ ਵਿੰਡੋਜ਼ ਵਿੱਚ ਸੰਪਰਕਾਂ ਲਈ ਅਵਤਾਰ ਵੇਖਾਏ ਜਾਣ।"
 
-#: ../data/empathy.schemas.in.h:69
+#: ../data/empathy.schemas.in.h:76
 msgid "Whether or not to show contacts that are offline in the contact list."
 msgstr "ਕੀ ਸੰਪਰਕ, ਜੋ ਕਿ ਆਫਲਾਈਨ ਹਨ, ਸੰਪਰਕ ਲਿਸਟ ਵਿੱਚ ਵੇਖਾਏ ਜਾਣ"
 
-#: ../data/empathy.schemas.in.h:70
+#: ../data/empathy.schemas.in.h:77
 msgid "Whether or not to show popup notifications when away or busy."
 msgstr "ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਏ ਜਾਣ, ਜਦੋਂ ਦੂਰ ਰੁੱਝੇ ਹੋਵੋ"
 
-#: ../data/empathy.schemas.in.h:71
+#: ../data/empathy.schemas.in.h:78
+#| msgid "Whether to show the contact list in compact mode or not."
+msgid "Whether or not to show the contact list in chat rooms."
+msgstr "ਕੀ ਗਲੱਬਾਤ ਰੂਮ ਵਿੱਚ ਸੰਪਰਕ ਲਿਸਟ ਵੇਖਣੀ ਹੈ ਜਾਂ ਨਹੀਂ।"
+
+#: ../data/empathy.schemas.in.h:79
 msgid ""
 "Whether or not to show the message dialog about closing the main window with "
 "the 'x' button in the title bar."
 msgstr "ਕੀ ਟਾਈਟਲ ਬਾਰ ਵਿੱਚ 'x' ਬਟਨ ਦਬਾਉਣ ਨਾਲ ਮੁੱਖ ਵਿੰਡੋ ਬੰਦ ਕਰਨ ਬਾਰੇ ਸੁਨੇਹਾ ਡਾਈਲਾਗ ਵੇਖਾਇਆ ਜਾਵੇ।"
 
-#: ../data/empathy.schemas.in.h:72
+#: ../data/empathy.schemas.in.h:80
 msgid "Whether to show the contact list in compact mode or not."
 msgstr "ਕੀ ਸੰਪਰਕ ਲਿਸਟ ਨੂੰ ਸੰਖੇਪ ਮੋਡ ਵਿੱਚ ਵੇਖਣਾ ਹੈ।"
 
-#: ../data/empathy.schemas.in.h:73
+#: ../data/empathy.schemas.in.h:81
 msgid "Whether to use the theme for chat rooms or not."
 msgstr "ਕੀ ਗੱਲਬਾਤ ਰੂਮ ਲਈ ਥੀਮ ਵਰਤਣਾ ਹੈ।"
 
-#: ../data/empathy.schemas.in.h:74
+#: ../data/empathy.schemas.in.h:82
 msgid ""
 "Which criterium to use when sorting the contact list. Default is to use sort "
 "by the contact's name with the value \"name\". A value of \"state\" will "
 "sort the contact list by state."
 msgstr ""
-"ਜਦੋਂ ਸੰਪਰਕ ਲਿਸਟ ਲੜੀਬੱਧ ਕਰਨੀ ਹੋਵੇ ਤਾਂ ਕਿਹੜਾ ਮਾਪ-ਢੰਡ ਵਰਤਣਾ ਹੈ। ਲੜੀਬੱਧ ਕਰਨ ਲਈ ਡਿਫਾਲਟ "
-"ਸੰਪਰਕ ਦੇ ਨਾਂ ਨਾਲ \"name (ਨਾਂ)\" ਹੈ। \"state (ਹਾਲਤ)\" ਨੂੰ ਸੰਪਰਕ ਦੀ ਹਾਲਤ ਮੁਤਾਬਕ ਲੜੀਬੱਧ ਕਰੋ"
+"ਜਦੋਂ ਸੰਪਰਕ ਲਿਸਟ ਲੜੀਬੱਧ ਕਰਨੀ ਹੋਵੇ ਤਾਂ ਕਿਹੜਾ ਮਾਪ-ਢੰਡ ਵਰਤਣਾ ਹੈ। ਲੜੀਬੱਧ ਕਰਨ ਲਈ ਡਿਫਾਲਟ ਸੰਪਰਕ "
+"ਦੇ ਨਾਂ ਨਾਲ \"name (ਨਾਂ)\" ਹੈ। \"state (ਹਾਲਤ)\" ਨੂੰ ਸੰਪਰਕ ਦੀ ਹਾਲਤ ਮੁਤਾਬਕ ਲੜੀਬੱਧ ਕਰੋ"
 
 #: ../libempathy/empathy-ft-handler.c:838
 msgid "The hash of the received file and the sent one do not match"
@@ -363,55 +401,67 @@ msgstr "ਮਿਲੀ ਫਾਇਲ ਅਤੇ ਭੇਜੀ ਦਾ ਹੈਸ਼ ਰ
 msgid "File transfer not supported by remote contact"
 msgstr "ਰਿਮੋਟ ਸੰਪਰਕ ਵਲੋਂ ਫਾਇਲ ਟਰਾਂਸਫਰ ਸਹਾਇਕ ਨਹੀਂ"
 
-#: ../libempathy/empathy-tp-contact-list.c:727 ../src/empathy.c:286
+#: ../libempathy/empathy-ft-handler.c:1156
+msgid "The selected file is not a regular file"
+msgstr "ਚੁਣੀ ਫਾਇਲ ਨਿਯਮਤ ਫਾਇਲ ਨਹੀਂ ਹੈ"
+
+#: ../libempathy/empathy-ft-handler.c:1165
+msgid "The selected file is empty"
+msgstr "ਚੁਣੀ ਫਾਇਲ ਖਾਲੀ ਹੈ"
+
+#: ../libempathy/empathy-tp-contact-list.c:757 ../src/empathy.c:289
 msgid "People nearby"
 msgstr "ਨੇੜਲੇ ਲੋਕ"
 
-#: ../libempathy/empathy-tp-file.c:300
+#: ../libempathy/empathy-tp-file.c:279
+msgid "Socket type not supported"
+msgstr "ਸਾਕਟ ਟਾਈਪ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
+
+#: ../libempathy/empathy-tp-file.c:398
 msgid "No reason was specified"
 msgstr "ਕੋਈ ਕਾਰਨ ਨਹੀਂ ਦਿੱਤਾ"
 
-#: ../libempathy/empathy-tp-file.c:303
+#: ../libempathy/empathy-tp-file.c:401
 msgid "The change in state was requested"
 msgstr "ਹਾਲਤ ਬਦਲਣ ਲਈ ਮੰਗ ਹੈ"
 
-#: ../libempathy/empathy-tp-file.c:306
+#: ../libempathy/empathy-tp-file.c:404
 msgid "You canceled the file transfer"
 msgstr "ਤੁਸੀਂ ਫਾਇਲ ਸੰਚਾਰ ਰੱਦ ਕੀਤਾ"
 
-#: ../libempathy/empathy-tp-file.c:309
+#: ../libempathy/empathy-tp-file.c:407
 msgid "The other participant canceled the file transfer"
 msgstr "ਹੋਰ ਯੋਗਦਾਨੀ ਨੇ ਫਾਇਲ ਸੰਚਾਰ ਰੱਦ ਕੀਤਾ"
 
-#: ../libempathy/empathy-tp-file.c:312
+#: ../libempathy/empathy-tp-file.c:410
 msgid "Error while trying to transfer the file"
 msgstr "ਫਾਇਲ ਸੰਚਾਰ ਦੀ ਕੋਸ਼ਿਸ਼ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: ../libempathy/empathy-tp-file.c:315
+#: ../libempathy/empathy-tp-file.c:413
 msgid "The other participant is unable to transfer the file"
 msgstr "ਹੋਰ ਯੋਗਦਾਨੀ ਫਾਇਲ ਸੰਚਾਰ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
-#: ../libempathy/empathy-tp-file.c:318
+#: ../libempathy/empathy-tp-file.c:416
 msgid "Unknown reason"
 msgstr "ਅਣਜਾਣ ਕਾਰਨ"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:265
 msgid "Available"
 msgstr "ਉਪਲੱਬਧ"
 
-#: ../libempathy/empathy-utils.c:276
+#: ../libempathy/empathy-utils.c:267
 msgid "Busy"
 msgstr "ਰੁਝੇ"
 
-#: ../libempathy/empathy-utils.c:279
+#: ../libempathy/empathy-utils.c:270
 msgid "Away"
 msgstr "ਦੂਰ"
 
-#: ../libempathy/empathy-utils.c:281
+#: ../libempathy/empathy-utils.c:272
 msgid "Hidden"
 msgstr "ਓਹਲੇ"
 
-#: ../libempathy/empathy-utils.c:283
+#: ../libempathy/empathy-utils.c:274
 msgid "Offline"
 msgstr "ਆਫਲਾਈਨ"
 
@@ -443,14 +493,22 @@ msgid_plural "%d days ago"
 msgstr[0] "%d ਦਿਨ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਦਿਨ ਪਹਿਲਾਂ"
 
-#: ../libempathy/empathy-time.c:157
+#: ../libempathy/empathy-time.c:157, c-format
+#| msgid "%d second ago"
+#| msgid_plural "%d seconds ago"
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "%d ਹਫ਼ਤਾ ਪਹਿਲਾਂ"
+msgstr[1] "%d ਹਫ਼ਤੇ ਪਹਿਲਾਂ"
+
+#: ../libempathy/empathy-time.c:162
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d ਮਹੀਨਾ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਮਹੀਨੇ ਪਹਿਲਾਂ"
 
-#: ../libempathy/empathy-time.c:162
+#: ../libempathy/empathy-time.c:167
 msgid "in the future"
 msgstr "ਭਵਿੱਖ ਵਿੱਚ"
 
@@ -473,8 +531,9 @@ msgstr "%s:"
 #: ../libempathy-gtk/empathy-account-widget-salut.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Advanced</b>"
-msgstr "<b>ਤਕਨੀਕੀ</b>"
+#| msgid "<b>Advanced</b>"
+msgid "Advanced"
+msgstr "ਤਕਨੀਕੀ"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
@@ -510,7 +569,7 @@ msgid "_Server:"
 msgstr "ਸਰਵਰ(_S):"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "ਲਾਗਇਨ I_D:"
@@ -524,49 +583,47 @@ msgstr "ICQ _UIN:"
 msgid "_Charset:"
 msgstr "ਅੱਖਰ-ਸੈੱਟ(_C):"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:241
+#: ../libempathy-gtk/empathy-account-widget-irc.c:240
 msgid "New Network"
 msgstr "ਨਵਾਂ ਨੈੱਟਵਰਕ"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "<b>Network</b>"
-msgstr "<b>ਨੈੱਟਵਰਕ</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-msgid "<b>Servers</b>"
-msgstr "<b>ਸਰਵਰ</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Charset:"
 msgstr "ਅੱਖਰਸੈੱਟ:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Network"
 msgstr "ਨੈੱਟਵਰਕ"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Network:"
 msgstr "ਨੈੱਟਵਰਕ:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Nickname:"
 msgstr "ਨਾਂ:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Password:"
 msgstr "ਪਾਸਵਰਡ:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Quit message:"
 msgstr "ਬੰਦ ਕਰਨ ਸੁਨੇਹਾ:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Real name:"
 msgstr "ਅਸਲੀ ਨਾਂ:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Override server settings</b>"
-msgstr "<b>ਸਰਵਰ ਸੈਟਿੰਗ ਅਣਡਿੱਠਾ</b>"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#| msgid "Server"
+msgid "Servers"
+msgstr "ਸਰਵਰ"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#| msgid "<b>Override server settings</b>"
+msgid "Override server settings"
+msgstr "ਸਰਵਰ ਸੈਟਿੰਗ ਅਣਡਿੱਠੀ"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
 msgid "Pri_ority:"
@@ -643,7 +700,7 @@ msgstr "ਕਨਫਰੰਸ ਅਤੇ ਗੱਲਬਾਤ-ਰੂਮ ਸੱਦੇ �
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
 msgid "_Room List locale:"
-msgstr "ਰੂਮ ਸੂਚੀ ਭਾਸ਼ਾ(_R):"
+msgstr "ਰੂਮ ਲਿਸਟ ਭਾਸ਼ਾ(_R):"
 
 #: ../libempathy-gtk/empathy-avatar-chooser.c:449
 #: ../libempathy-gtk/empathy-avatar-chooser.c:525
@@ -674,108 +731,143 @@ msgstr "ਸਭ ਫਾਇਲਾਂ"
 msgid "Click to enlarge"
 msgstr "ਵੱਡਾ ਕਰਨ ਲਈ ਕਲਿੱਕ ਕਰੋ"
 
-#: ../libempathy-gtk/empathy-chat.c:178
+#: ../libempathy-gtk/empathy-chat.c:186
 msgid "Failed to reconnect this chat"
 msgstr "ਇਸ ਗੱਲ ਨਾਲ ਫੇਰ-ਕੁਨੈਕਟ ਹੋਣ ਲਈ ਫੇਲ੍ਹ"
 
-#: ../libempathy-gtk/empathy-chat.c:396
+#: ../libempathy-gtk/empathy-chat.c:404
 msgid "Unsupported command"
 msgstr "ਗ਼ੈਰ-ਸਹਾਇਕ ਕਮਾਂਡ"
 
-#: ../libempathy-gtk/empathy-chat.c:531
+#: ../libempathy-gtk/empathy-chat.c:539
 msgid "offline"
 msgstr "ਆਫਲਾਈਨ"
 
-#: ../libempathy-gtk/empathy-chat.c:534
+#: ../libempathy-gtk/empathy-chat.c:542
 msgid "invalid contact"
 msgstr "ਗਲਤ ਸੰਪਰਕ"
 
-#: ../libempathy-gtk/empathy-chat.c:537
+#: ../libempathy-gtk/empathy-chat.c:545
 msgid "permission denied"
 msgstr "ਅਧਿਕਾਰ ਪਾਬੰਦੀ"
 
-#: ../libempathy-gtk/empathy-chat.c:540
+#: ../libempathy-gtk/empathy-chat.c:548
 msgid "too long message"
 msgstr "ਬਹੁਤ ਲੰਮਾ ਸੁਨੇਹਾ"
 
-#: ../libempathy-gtk/empathy-chat.c:543
+#: ../libempathy-gtk/empathy-chat.c:551
 msgid "not implemented"
 msgstr "ਸਥਾਪਤ ਨਹੀਂ"
 
-#: ../libempathy-gtk/empathy-chat.c:546
+#: ../libempathy-gtk/empathy-chat.c:554
 msgid "unknown"
 msgstr "ਅਣਜਾਣ"
 
-#: ../libempathy-gtk/empathy-chat.c:550
+#: ../libempathy-gtk/empathy-chat.c:558
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "ਸੁਨੇਹਾ '%s' ਭੇਜਣ ਦੌਰਾਨ ਗਲਤੀ: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:580
+#: ../libempathy-gtk/empathy-chat.c:588
 #, c-format
 msgid "Topic set to: %s"
 msgstr "ਵਿਸ਼ਾ ਨਹੀਂ ਕੀਤਾ: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:582
+#: ../libempathy-gtk/empathy-chat.c:590
 msgid "No topic defined"
 msgstr "ਕੋਈ ਵਿਸ਼ਾ ਨਹੀਂ ਦਿੱਤਾ"
 
-#: ../libempathy-gtk/empathy-chat.c:951
+#: ../libempathy-gtk/empathy-chat.c:959
 msgid "(No Suggestions)"
 msgstr "(ਕੋਈ ਸੁਝਾਅ ਨਹੀਂ)"
 
-#: ../libempathy-gtk/empathy-chat.c:1005
+#: ../libempathy-gtk/empathy-chat.c:1013
 msgid "Insert Smiley"
 msgstr "ਚਿਹਰਾ ਸ਼ਾਮਲ ਕਰੋ"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1023
-#: ../libempathy-gtk/empathy-ui-utils.c:1453
+#: ../libempathy-gtk/empathy-chat.c:1031
+#: ../libempathy-gtk/empathy-ui-utils.c:1475
 msgid "_Send"
 msgstr "ਭੇਜੋ(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1057
+#: ../libempathy-gtk/empathy-chat.c:1065
 msgid "_Spelling Suggestions"
 msgstr "ਸਪੈਲਿੰਗ ਸੁਝਾਅ(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1171
+#: ../libempathy-gtk/empathy-chat.c:1180, c-format
+#| msgid "Contact disconnected"
+msgid "%s has disconnected"
+msgstr "%s ਡਿਸ-ਕੁਨੈਕਟ ਹੋ ਗਿਆ ਹੈ"
+
+#: ../libempathy-gtk/empathy-chat.c:1184
 #, c-format
-msgid "%s has joined the room"
-msgstr "%s ਰੂਮ ਵਿੱਚ ਦਾਖਲ ਹੋਇਆ"
+msgid "%s was kicked by %s"
+msgstr "%s ਨੂੰ %s ਨੇ ਕਿੱਕ ਮਾਰੀ"
 
-#: ../libempathy-gtk/empathy-chat.c:1174
+#: ../libempathy-gtk/empathy-chat.c:1187
+#, c-format
+msgid "%s was kicked"
+msgstr "%s ਨੂੰ ਕਿੱਕ ਮਾਰੀ"
+
+#: ../libempathy-gtk/empathy-chat.c:1192
+#, c-format
+msgid "%s was banned by %s"
+msgstr "%s ਉੱਤੇ %s ਵਲੋਂ ਪਾਬੰਦੀ ਲਾਈ"
+
+#: ../libempathy-gtk/empathy-chat.c:1195
+#, c-format
+msgid "%s was banned"
+msgstr "%s ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਈ"
+
+#: ../libempathy-gtk/empathy-chat.c:1199
 #, c-format
 msgid "%s has left the room"
 msgstr "%s ਨੇ ਰੂਮ ਛੱਡਿਆ"
 
-#: ../libempathy-gtk/empathy-chat.c:1289 ../src/empathy-call-window.c:1014
+#. Note to translators: this string is appended to
+#. * notifications like "foo has left the room", with the message
+#. * given by the user living the room. If this poses a problem,
+#. * please let us know. :-)
+#.
+#: ../libempathy-gtk/empathy-chat.c:1208
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#: ../libempathy-gtk/empathy-chat.c:1231
+#, c-format
+msgid "%s has joined the room"
+msgstr "%s ਰੂਮ ਵਿੱਚ ਦਾਖਲ ਹੋਇਆ"
+
+#: ../libempathy-gtk/empathy-chat.c:1364 ../src/empathy-call-window.c:1226
 msgid "Disconnected"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਖਤਮ"
 
-#: ../libempathy-gtk/empathy-chat.c:1700
+#: ../libempathy-gtk/empathy-chat.c:1793
 msgid "Connected"
 msgstr "ਕੁਨੈਕਟ ਕੀਤਾ"
 
-#: ../libempathy-gtk/empathy-chat.c:1750
-#: ../libempathy-gtk/empathy-log-window.c:501
+#: ../libempathy-gtk/empathy-chat.c:1843
+#: ../libempathy-gtk/empathy-log-window.c:502
 msgid "Conversation"
 msgstr "ਗੱਲਬਾਤ"
 
-#: ../libempathy-gtk/empathy-chat.ui.h:1
-msgid "<b>Topic:</b>"
-msgstr "<b>ਵਿਸ਼ਾ:</b>"
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472
+msgid "Topic:"
+msgstr "ਵਿਸ਼ਾ:"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:323
+#: ../libempathy-gtk/empathy-chat-text-view.c:316
 msgid "_Copy Link Address"
-msgstr "ਲਿੰਕ ਸਿਰਨਾਵਾਂ ਨਕਲ ਕਰੋ(_C)"
+msgstr "ਲਿੰਕ ਐਡਰੈੱਸ ਕਾਪੀ ਕਰੋ(_C)"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:331
+#: ../libempathy-gtk/empathy-chat-text-view.c:323
 msgid "_Open Link"
 msgstr "ਲਿੰਕ ਖੋਲ੍ਹੋ(_O)"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:424
+#: ../libempathy-gtk/empathy-chat-text-view.c:421
 msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
@@ -788,7 +880,7 @@ msgstr "ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਸੋਧ"
 msgid "Personal Information"
 msgstr "ਨਿੱਜੀ ਜਾਣਕਾਰੀ"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:392
+#: ../libempathy-gtk/empathy-contact-dialogs.c:384
 msgid "New Contact"
 msgstr "ਨਵਾਂ ਸੰਪਰਕ"
 
@@ -800,26 +892,26 @@ msgstr "ਬਾਅਦ 'ਚ ਸੋਚੂ(_L)"
 msgid "Subscription Request"
 msgstr "ਮੈਂਬਰੀ ਮੰਗ"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1378
+#: ../libempathy-gtk/empathy-contact-list-view.c:1375
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "ਕੀ ਤੁਸੀਂ ਗਰੁੱਪ '%s' ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1380
+#: ../libempathy-gtk/empathy-contact-list-view.c:1377
 msgid "Removing group"
 msgstr "ਗਰੁੱਪ ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1427
-#: ../libempathy-gtk/empathy-contact-list-view.c:1505
+#: ../libempathy-gtk/empathy-contact-list-view.c:1424
+#: ../libempathy-gtk/empathy-contact-list-view.c:1502
 msgid "_Remove"
 msgstr "ਹਟਾਓ(_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1457
+#: ../libempathy-gtk/empathy-contact-list-view.c:1454
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "ਕੀ ਤੁਸੀਂ ਸੰਪਰਕ '%s' ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1459
+#: ../libempathy-gtk/empathy-contact-list-view.c:1456
 msgid "Removing contact"
 msgstr "ਸੰਪਰਕ ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
 
@@ -880,7 +972,7 @@ msgid "Select"
 msgstr "ਚੁਣੋ"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:988
-#: ../src/empathy-main-window.c:905
+#: ../src/empathy-main-window.c:903
 msgid "Group"
 msgstr "ਗਰੁੱਪ"
 
@@ -990,55 +1082,59 @@ msgstr "<b>ਟਿਕਾਣਾ</b>, "
 
 #: ../libempathy-gtk/empathy-contact-widget.c:1395
 msgid "%B %e, %Y at %R UTC"
-msgstr "%B %e, %Y at %R UTC"
+msgstr "%R UTC %e %B %Y ਨੂੰ"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Client Information</b>"
-msgstr "<b>ਕਲਾਇਟ ਜਾਣਕਾਰੀ</b>"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-msgid "<b>Contact Details</b>"
-msgstr "<b>ਸੰਪਰਕ ਵੇਰਵਾ</b>"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-msgid "<b>Contact</b>"
-msgstr "<b>ਸੰਪਰਕ</b>"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "<b>Groups</b>"
-msgstr "<b>ਗਰੁੱਪ</b>"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
 msgid "<b>Location</b> at (date)\t"
 msgstr "<b>ਟਿਕਾਣਾ</b> (date) ਨੂੰ\t"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
 #: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid "Account:"
 msgstr "ਅਕਾਊਂਟ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
 msgid "Alias:"
 msgstr "ਉਪ-ਨਾਂ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
 msgid "Birthday:"
 msgstr "ਜਨਮਦਿਨ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+#| msgid "<b>Client Information</b>"
+msgid "Client Information"
+msgstr "ਕਲਾਇਟ ਜਾਣਕਾਰੀ"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
 msgid "Client:"
 msgstr "ਕਲਾਇਟ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../src/empathy-main-window.c:886
+msgid "Contact"
+msgstr "ਸੰਪਰਕ"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+#| msgid "<b>Contact Details</b>"
+msgid "Contact Details"
+msgstr "ਸੰਪਰਕ ਵੇਰਵਾ"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "Email:"
 msgstr "ਈਮੇਲ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Fullname:"
 msgstr "ਪੂਰਾ ਨਾਂ:"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#| msgid "Group"
+msgid "Groups"
+msgstr "ਗਰੁੱਪ"
+
 #. Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:13
 msgid "Identifier:"
@@ -1057,8 +1153,7 @@ msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 msgstr ""
-"ਗਰੁੱਪ ਚੁਣੋ, ਜਿਸ ਵਿੱਚ ਤੁਸੀਂ ਇਹ ਸੰਪਰਕ ਨੂੰ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ। ਯਾਦ ਰੱਖੋ ਕਿ ਤੁਸੀਂ ਇੱਕ ਤੋਂ ਵੱਧ ਗਰੁੱਪ "
-"ਜਾਂ ਕੋਈ "
+"ਗਰੁੱਪ ਚੁਣੋ, ਜਿਸ ਵਿੱਚ ਤੁਸੀਂ ਇਹ ਸੰਪਰਕ ਨੂੰ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ। ਯਾਦ ਰੱਖੋ ਕਿ ਤੁਸੀਂ ਇੱਕ ਤੋਂ ਵੱਧ ਗਰੁੱਪ ਜਾਂ ਕੋਈ "
 "ਗਰੁੱਪ ਨਹੀਂ ਵੀ ਚੁਣ ਸਕਦੇ ਹੋ।"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:17
@@ -1089,12 +1184,12 @@ msgstr "ਪੋਰਟ"
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:494
-#: ../src/empathy-import-dialog.c:281
+#: ../libempathy-gtk/empathy-log-window.c:495
+#: ../src/empathy-import-dialog.c:285
 msgid "Account"
 msgstr "ਅਕਾਊਂਟ"
 
-#: ../libempathy-gtk/empathy-log-window.c:511
+#: ../libempathy-gtk/empathy-log-window.c:512
 msgid "Date"
 msgstr "ਮਿਤੀ"
 
@@ -1156,15 +1251,55 @@ msgstr "ਇਹ ਹਾਲਤ ਨੂੰ ਪਸੰਦੀਦਾ ਬਣਾਉਣ ਲ�
 msgid "Set status"
 msgstr "ਹਾਲਤ ਸੈੱਟ ਕਰੋ"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:778
+#: ../libempathy-gtk/empathy-presence-chooser.c:782
 msgid "Set your presence and current status"
 msgstr "ਆਪਣੀ ਮੌਜੂਦਗੀ ਅਤੇ ਮੌਜੂਦਾ ਹਾਲਤ ਸੈੱਟ ਕਰੋ"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1013
+#: ../libempathy-gtk/empathy-presence-chooser.c:1017
 msgid "Custom messages..."
 msgstr "ਪਸੰਦੀਦਾ ਸੁਨੇਹੇ..."
 
+#: ../libempathy-gtk/empathy-sound.c:51
+msgid "Received an instant message"
+msgstr "ਇੱਕ ਤੁਰੰਤ ਸੁਨੇਹੇ ਮਿਲਿਆ"
+
+#: ../libempathy-gtk/empathy-sound.c:53
+msgid "Sent an instant message"
+msgstr "ਇੱਕ ਤੁਰੰਤ ਸੁਨੇਹੇ ਭੇਜਿਆ"
+
+#: ../libempathy-gtk/empathy-sound.c:55
+msgid "Incoming chat request"
+msgstr "ਆ ਰਹੀ ਗੱਲਬਾਤ ਮੰਗ"
+
+#: ../libempathy-gtk/empathy-sound.c:57
+msgid "Contact connected"
+msgstr "ਸੰਪਰਕ ਕੁਨੈਕਟ ਹੋਇਆ"
+
+#: ../libempathy-gtk/empathy-sound.c:59
+msgid "Contact disconnected"
+msgstr "ਸੰਪਰਕ ਨੇ ਕੁਨੈਕਸ਼ਨ ਖਤਮ"
+
+#: ../libempathy-gtk/empathy-sound.c:61
+msgid "Connected to server"
+msgstr "ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਟ ਕੀਤਾ"
+
+#: ../libempathy-gtk/empathy-sound.c:63
+msgid "Disconnected from server"
+msgstr "ਸਰਵਰ ਤੋਂ ਕੁਨੈਕਸ਼ਨ ਖਤਮ"
+
+#: ../libempathy-gtk/empathy-sound.c:65
+msgid "Incoming voice call"
+msgstr "ਆ ਰਹੀ ਆਵਾਜ਼ ਕਾਲ"
+
+#: ../libempathy-gtk/empathy-sound.c:67
+msgid "Outgoing voice call"
+msgstr "ਜਾ ਰਹੀ ਆਵਾਜ਼ ਕਾਲ"
+
+#: ../libempathy-gtk/empathy-sound.c:69
+msgid "Voice call ended"
+msgstr "ਆਵਾਜ਼ ਕਾਲ ਖਤਮ ਕੀਤੀ"
+
 #: ../libempathy-gtk/empathy-status-preset-dialog.c:362
 msgid "Enter Custom Message"
 msgstr "ਪਸੰਦੀਦਾ ਸੁਨੇਹਾ ਦਿਓ"
@@ -1189,75 +1324,34 @@ msgstr "gtk-add"
 msgid "gtk-remove"
 msgstr "gtk-remove"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:60
+#: ../libempathy-gtk/empathy-theme-manager.c:67
 msgid "Classic"
 msgstr "ਕਲਾਸਿਕ"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:61
+#: ../libempathy-gtk/empathy-theme-manager.c:68
 msgid "Simple"
 msgstr "ਸਧਾਰਨ"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:62
+#: ../libempathy-gtk/empathy-theme-manager.c:69
 msgid "Clean"
 msgstr "ਸਾਫ਼"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:63
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Blue"
 msgstr "ਨੀਲਾ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1355
+#: ../libempathy-gtk/empathy-ui-utils.c:1377
 msgid "Unable to open URI"
 msgstr "URI ਖੋਲ੍ਹਣ ਲਈ ਅਸਮਰੱਥ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1445
+#: ../libempathy-gtk/empathy-ui-utils.c:1467
 msgid "Select a file"
 msgstr "ਇੱਕ ਫਾਇਲ ਚੁਣੋ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1503
-#| msgid "Select a contact"
+#: ../libempathy-gtk/empathy-ui-utils.c:1525
 msgid "Select a destination"
 msgstr "ਟਿਕਾਣਾ ਚੁਣੋ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1532
-msgid "Received an instant message"
-msgstr "ਇੱਕ ਤੁਰੰਤ ਸੁਨੇਹੇ ਮਿਲਿਆ"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1534
-msgid "Sent an instant message"
-msgstr "ਇੱਕ ਤੁਰੰਤ ਸੁਨੇਹੇ ਭੇਜਿਆ"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1536
-msgid "Incoming chat request"
-msgstr "ਆ ਰਹੀ ਗੱਲਬਾਤ ਮੰਗ"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1538
-msgid "Contact connected"
-msgstr "ਸੰਪਰਕ ਕੁਨੈਕਟ ਹੋਇਆ"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1540
-msgid "Contact disconnected"
-msgstr "ਸੰਪਰਕ ਨੇ ਕੁਨੈਕਸ਼ਨ ਖਤਮ"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1542
-msgid "Connected to server"
-msgstr "ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਟ ਕੀਤਾ"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1544
-msgid "Disconnected from server"
-msgstr "ਸਰਵਰ ਤੋਂ ਕੁਨੈਕਸ਼ਨ ਖਤਮ"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1546
-msgid "Incoming voice call"
-msgstr "ਆ ਰਹੀ ਆਵਾਜ਼ ਕਾਲ"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1548
-msgid "Outgoing voice call"
-msgstr "ਜਾ ਰਹੀ ਆਵਾਜ਼ ਕਾਲ"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1550
-msgid "Voice call ended"
-msgstr "ਆਵਾਜ਼ ਕਾਲ ਖਤਮ ਕੀਤੀ"
-
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
 msgstr "ਮੌਜੂਦਾ ਲੋਕੇਲ"
@@ -1441,7 +1535,7 @@ msgid "Megaphone"
 msgstr "ਮੇਗਾਫੋਨ"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:527
+#: ../megaphone/src/megaphone-applet.c:519
 msgid "Talk!"
 msgstr "ਗੱਲ!"
 
@@ -1476,79 +1570,79 @@ msgstr "ਮੌਜੂਦਗੀ"
 msgid "Set your own presence"
 msgstr "ਆਪਣੀ ਮੌਜੂਦਗੀ ਦਿਓ"
 
-#: ../src/empathy.c:476
+#: ../src/empathy.c:506
 msgid "Don't connect on startup"
 msgstr "ਸ਼ੁਰੂ ਸਮੇਂ ਕੁਨੈਕਟ ਨਾ ਕਰੋ"
 
-#: ../src/empathy.c:480
+#: ../src/empathy.c:510
 msgid "Don't show the contact list on startup"
 msgstr "ਸ਼ੁਰੂ ਸਮੇਂ ਸੰਪਰਕ ਸੂਚੀ ਨਾ ਵੇਖਾਓ"
 
-#: ../src/empathy.c:484
+#: ../src/empathy.c:514
 msgid "Show the accounts dialog"
 msgstr "ਅਕਾਊਂਟ ਡਾਈਲਾਗ ਵੇਖੋ"
 
-#: ../src/empathy.c:496
+#: ../src/empathy.c:526
 msgid "- Empathy Instant Messenger"
 msgstr "- ਇੰਪਥੀ ਤੁਰੰਤ ਸੁਨੇਹੇਦਾਰ"
 
-#: ../src/empathy-about-dialog.c:84
+#: ../src/empathy-about-dialog.c:83
 msgid ""
 "Empathy is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU General Public License as published by the Free Software "
 "Foundation; either version 2 of the License, or (at your option) any later "
 "version."
 msgstr ""
-"ਇੰਪੈਂਥੀ ਪਰੋਗਰਾਮ ਇੱਕ ਮੁਫਤ ਸਾਫਟਵੇਅਰ ਹੈ, ਜਿਸ ਨੂੰ ਤੁਸੀਂ ਗਨੂ ਜਰਨਲ ਪਬਲਿਕ ਲਾਈਸੈਂਸ, "
-"ਜਿਸ ਨੂੰ ਫਰੀ ਸਾਫਟਵੇਅਰ ਫਾਊਨਡੇਸ਼ਨ ਨੇ ਤਿਆਰ ਕੀਤਾ ਹੈ, ਦੇ ਵਰਜਨ ੨ ਜਾਂ ਨਵੇਂ ਦੀਆਂ ਸ਼ਰਤਾਂ "
-"(ਉਹ ਤੁਹਾਡੀ ਆਪਣੀ ਮਰਜ਼ੀ ਹੈ) ਅਧੀਨ ਵੰਡ ਅਤੇ/ਜਾਂ ਸੋਧ ਸਕਦੇ ਹੋ।"
+"ਇੰਪੈਂਥੀ ਪਰੋਗਰਾਮ ਇੱਕ ਮੁਫਤ ਸਾਫਟਵੇਅਰ ਹੈ, ਜਿਸ ਨੂੰ ਤੁਸੀਂ ਗਨੂ ਜਰਨਲ ਪਬਲਿਕ ਲਾਈਸੈਂਸ, ਜਿਸ ਨੂੰ ਫਰੀ "
+"ਸਾਫਟਵੇਅਰ ਫਾਊਨਡੇਸ਼ਨ ਨੇ ਤਿਆਰ ਕੀਤਾ ਹੈ, ਦੇ ਵਰਜਨ ੨ ਜਾਂ ਨਵੇਂ ਦੀਆਂ ਸ਼ਰਤਾਂ (ਉਹ ਤੁਹਾਡੀ ਆਪਣੀ ਮਰਜ਼ੀ "
+"ਹੈ) ਅਧੀਨ ਵੰਡ ਅਤੇ/ਜਾਂ ਸੋਧ ਸਕਦੇ ਹੋ।"
 
-#: ../src/empathy-about-dialog.c:88
+#: ../src/empathy-about-dialog.c:87
 msgid ""
 "Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
 "FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
 "details."
 msgstr ""
-"ਇੰਪੈਂਥੀ ਪਰੋਗਰਾਮ ਨੂੰ ਇਹ ਮੰਨ ਕੇ ਵੰਡਿਆ ਜਾ ਰਿਹਾ ਹੈ ਕਿ ਇਹ ਫਾਇਦੇਮੰਦ ਰਹੇਗਾ, "
-"ਪਰ ਇਸ ਦੀ ਕੋਈ ਵਾਰੰਟੀ ਨਹੀਂ ਲਈ ਜਾ ਰਹੀ ਹੈ, ਕਿਸੇ ਖਾਸ ਕੰਮ ਲਈ ਅਨੁਕੂਲ ਹੋਣ "
-"ਜਾਂ ਠੀਕ ਤਰ੍ਹਾਂ ਕੰਮ ਕਰਨ ਦੀ ਵੀ ਕੋਈ ਗਾਰੰਟੀ ਨਹੀਂ ਹੈ। ਹੋਰ ਵੇਰਵੇ ਲਈ ਗਨੂ ਜਰਨਲ ਪਬਲਿਕ ਲਾਇਸੈਂਸ ਨੂੰ ਪੜ੍ਹੋ।"
+"ਇੰਪੈਂਥੀ ਪਰੋਗਰਾਮ ਨੂੰ ਇਹ ਮੰਨ ਕੇ ਵੰਡਿਆ ਜਾ ਰਿਹਾ ਹੈ ਕਿ ਇਹ ਫਾਇਦੇਮੰਦ ਰਹੇਗਾ, ਪਰ ਇਸ ਦੀ ਕੋਈ ਵਾਰੰਟੀ "
+"ਨਹੀਂ ਲਈ ਜਾ ਰਹੀ ਹੈ, ਕਿਸੇ ਖਾਸ ਕੰਮ ਲਈ ਅਨੁਕੂਲ ਹੋਣ ਜਾਂ ਠੀਕ ਤਰ੍ਹਾਂ ਕੰਮ ਕਰਨ ਦੀ ਵੀ ਕੋਈ ਗਾਰੰਟੀ ਨਹੀਂ "
+"ਹੈ। ਹੋਰ ਵੇਰਵੇ ਲਈ ਗਨੂ ਜਰਨਲ ਪਬਲਿਕ ਲਾਇਸੈਂਸ ਨੂੰ ਪੜ੍ਹੋ।"
 
-#: ../src/empathy-about-dialog.c:92
+#: ../src/empathy-about-dialog.c:91
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-130159 USA"
 msgstr ""
 "ਇੰਪੈਂਥੀ ਨਾਲ ਤੁਸੀਂ ਗਨੂ ਜਰਨਲ ਪਬਲਿਕ ਲਾਇਸੈਂਸ ਦੀ ਕਾਪੀ ਪ੍ਰਾਪਤ ਕਰੋਗੇ, ਜੇਕਰ ਤੁਹਾਨੂੰ ਨਹੀਂ ਮਿਲੀ ਹੈ ਤਾਂ "
-"ਫਰੀ ਸਾਫਟਵੇਅਰ ਫਾਊਨਡੇਸ਼ਨ, ੫੧ ਫਰਾਕਲਿੰਨ ਸਟਰੀਟ, ਪੰਜਵੀਂ ਮੰਜ਼ਲ,ਬੋਸਟਨ, ਐਮ ਏ "
-"੦੨੧੧੦-੧੩੦੧੫੯, ਅਮਰੀਕਾ ਨੂੰ ਲਿਖੋ।"
+"ਫਰੀ ਸਾਫਟਵੇਅਰ ਫਾਊਨਡੇਸ਼ਨ, ੫੧ ਫਰਾਕਲਿੰਨ ਸਟਰੀਟ, ਪੰਜਵੀਂ ਮੰਜ਼ਲ,ਬੋਸਟਨ, ਐਮ ਏ ੦੨੧੧੦-੧੩੦੧੫੯, "
+"ਅਮਰੀਕਾ ਨੂੰ ਲਿਖੋ।"
 
-#: ../src/empathy-about-dialog.c:120
+#: ../src/empathy-about-dialog.c:119
 msgid "An Instant Messaging client for GNOME"
 msgstr "ਗਨੋਮ ਲਈ ਤੁਰੰਤ ਸੁਨੇਹੇਦਾਰ ਕਲਾਇਟ"
 
-#: ../src/empathy-about-dialog.c:126
+#: ../src/empathy-about-dialog.c:125
 msgid "translator-credits"
 msgstr ""
 "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ <aalam@users.sf.net) 2007, 2008, 2009\n"
 "http://www.satluj.com/"
 
-#: ../src/empathy-accounts-dialog.c:391
+#: ../src/empathy-accounts-dialog.c:392
 msgid "Enabled"
 msgstr "ਚਾਲੂ"
 
-#: ../src/empathy-accounts-dialog.c:401 ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1
 msgid "Accounts"
 msgstr "ਅਕਾਊਂਟ"
 
 #. To translator: %s is the protocol name
-#: ../src/empathy-accounts-dialog.c:834
+#: ../src/empathy-accounts-dialog.c:837
 #, c-format
 msgid "New %s account"
 msgstr "ਨਵਾਂ %s ਅਕਾਊਂਟ"
 
-#: ../src/empathy-accounts-dialog.c:944
+#: ../src/empathy-accounts-dialog.c:950
 #, c-format
 msgid ""
 "You are about to remove your %s account!\n"
@@ -1557,7 +1651,7 @@ msgstr ""
 "ਤੁਸੀਂ %s ਅਕਾਊਂਟ ਹਟਾਉਣ ਲਈ ਤਿਆਰ ਹੋ!\n"
 "ਕੀ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../src/empathy-accounts-dialog.c:950
+#: ../src/empathy-accounts-dialog.c:956
 msgid ""
 "Any associated conversations and chat rooms will NOT be removed if you "
 "decide to proceed.\n"
@@ -1569,30 +1663,34 @@ msgstr ""
 "\n"
 "ਕੀ ਤੁਸੀਂ ਬਾਅਦ ਵਿੱਚ ਅਕਾਊਂਟ ਸ਼ਾਮਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ, ਉਹ ਤਾਂ ਵੀ ਉਪਲੱਬਧ ਰਹਿਣਗੇ।"
 
-#: ../src/empathy-accounts-dialog.ui.h:1
-msgid "<b>New Account</b>"
-msgstr "<b>ਨਵਾਂ ਅਕਾਊਂਟ</b>"
-
 #: ../src/empathy-accounts-dialog.ui.h:2
-msgid "<b>No protocol installed</b>"
-msgstr "<b>ਕੋਈ ਪਰੋਟੋਕਾਲ ਇੰਸਟਾਲ ਨਹੀਂ</b>"
+#| msgid "Account"
+msgid "Add Account"
+msgstr "ਅਕਾਊਂਟ ਸ਼ਾਮਲ"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "<b>Settings</b>"
-msgstr "<b>ਸੈਟਿੰਗ</b>"
-
-#: ../src/empathy-accounts-dialog.ui.h:5
 msgid "Cr_eate"
 msgstr "ਬਣਾਓ(_e)"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
-msgid "I already have an account I want to use"
-msgstr "ਮੇਰੇ ਕੋਲ ਪਹਿਲਾਂ ਹੀ ਅਕਾਊਂਟ ਹੈ, ਜੋ ਮੈਂ ਵਰਤਣਾ ਚਾਹੁੰਦਾ ਹਾਂ"
+#: ../src/empathy-accounts-dialog.ui.h:4
+#| msgid "Email:"
+msgid "Gmail"
+msgstr "ਜੀਮੇਲ"
 
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid "Import Accounts..."
 msgstr "ਅਕਾਊਂਟ ਇੰਪੋਰਟ ਕਰੋ..."
 
+#: ../src/empathy-accounts-dialog.ui.h:6
+#| msgid "<b>No protocol installed</b>"
+msgid "No protocol installed"
+msgstr "ਕੋਈ ਪਰੋਟੋਕਾਲ ਇੰਸਟਾਲ ਨਹੀਂ"
+
+#: ../src/empathy-accounts-dialog.ui.h:7
+#| msgid "<b>Settings</b>"
+msgid "Settings"
+msgstr "ਸੈਟਿੰਗ"
+
 #: ../src/empathy-accounts-dialog.ui.h:8
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
@@ -1609,53 +1707,63 @@ msgstr "ਕਿਸਮ:"
 msgid "_Add..."
 msgstr "ਸ਼ਾਮਲ(_A)..."
 
-#: ../src/empathy-call-window.c:382
+#: ../src/empathy-accounts-dialog.ui.h:11
+#| msgid "Create a new IRC network"
+msgid "_Create a new account"
+msgstr "ਨਵਾਂ ਅਕਾਊਂਟ ਬਣਾਓ(_C)"
+
+#: ../src/empathy-accounts-dialog.ui.h:12
+#| msgid "Show and edit accounts"
+msgid "_Reuse an existing account"
+msgstr "ਮੌਜੂਦਾ ਅਕਾਊਂਟ ਨੂੰ ਵਰਤੋਂ(_R)"
+
+#: ../src/empathy-call-window.c:420
 msgid "Contrast"
 msgstr "ਕਨਟਰਾਸਟ"
 
-#: ../src/empathy-call-window.c:385
+#: ../src/empathy-call-window.c:423
 msgid "Brightness"
 msgstr "ਚਮਕ"
 
-#: ../src/empathy-call-window.c:388
+#: ../src/empathy-call-window.c:426
 msgid "Gamma"
 msgstr "ਗਾਮਾ"
 
-#: ../src/empathy-call-window.c:492
+#: ../src/empathy-call-window.c:531
 msgid "Volume"
 msgstr "ਆਵਾਜ਼"
 
-#: ../src/empathy-call-window.c:638
+#: ../src/empathy-call-window.c:662
+msgid "Connecting..."
+msgstr "ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
+
+#: ../src/empathy-call-window.c:746
 msgid "_Sidebar"
 msgstr "ਬਾਹੀ(_S)"
 
-#: ../src/empathy-call-window.c:657
+#: ../src/empathy-call-window.c:765
 msgid "Dialpad"
 msgstr "ਡਾਇਲ-ਪੈਡ"
 
-#: ../src/empathy-call-window.c:663
+#: ../src/empathy-call-window.c:771
 msgid "Audio input"
 msgstr "ਆਡੀਓ ਆਉਟਪੁੱਟ"
 
-#: ../src/empathy-call-window.c:667
+#: ../src/empathy-call-window.c:775
 msgid "Video input"
 msgstr "ਵੀਡਿਓ ਆਉਟਪੁੱਟ"
 
-#: ../src/empathy-call-window.c:691
-msgid "Connecting..."
-msgstr "ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#: ../src/empathy-call-window.c:730
+#: ../src/empathy-call-window.c:836
 #, c-format
 msgid "Call with %s"
 msgstr "%s ਲਈ ਕਾਲ ਕਰੋ"
 
-#: ../src/empathy-call-window.c:801
+#: ../src/empathy-call-window.c:905
 msgid "Call"
 msgstr "ਕਾਲ ਕਰੋ"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1096
+#: ../src/empathy-call-window.c:1336
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "ਕੁਨੈਕਟ ਹੈ -- %d:%02dm"
@@ -1665,43 +1773,38 @@ msgid "Hang up"
 msgstr "ਬੰਦ ਕਰੋ"
 
 #: ../src/empathy-call-window.ui.h:2
+msgid "Redial"
+msgstr "ਰੀ-ਡਾਇਲ"
+
+#: ../src/empathy-call-window.ui.h:3
 msgid "Send Audio"
 msgstr "ਆਡੀਓ ਭੇਜੋ"
 
-#: ../src/empathy-call-window.ui.h:3
+#: ../src/empathy-call-window.ui.h:4
 msgid "Send video"
 msgstr "ਵੀਡਿਓ ਭੇਜੋ"
 
-#: ../src/empathy-call-window.ui.h:4
+#: ../src/empathy-call-window.ui.h:5
 msgid "Video preview"
 msgstr "ਵੀਡਿਓ ਝਲਕ"
 
-#: ../src/empathy-call-window.ui.h:5
+#: ../src/empathy-call-window.ui.h:6
 msgid "_Call"
 msgstr "ਕਾਲ ਕਰੋ(_C)"
 
-#: ../src/empathy-call-window.ui.h:6 ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:21
 msgid "_View"
 msgstr "ਵੇਖੋ(_V)"
 
-#: ../src/empathy-chat-window.c:342
+#: ../src/empathy-chat-window.c:344
 #, c-format
 msgid "Conversations (%d)"
 msgstr "ਗੱਲਬਾਤ (%d)"
 
-#: ../src/empathy-chat-window.c:449
-msgid "Topic:"
-msgstr "ਵਿਸ਼ਾ:"
-
-#: ../src/empathy-chat-window.c:454
+#: ../src/empathy-chat-window.c:476
 msgid "Typing a message."
 msgstr "ਸੁਨੇਹਾ ਲਿਖਦਾ/ਲਿਖਦੀ ਹੈ।"
 
-#: ../src/empathy-chat-window.c:917 ../src/empathy-event-manager.c:429
-#, c-format
-msgid "New message from %s"
-msgstr "%s ਵਲੋਂ ਨਵਾਂ ਸੁਨੇਹਾ"
-
 #: ../src/empathy-chatrooms-window.c:258
 msgid "Name"
 msgstr "ਨਾਂ"
@@ -1718,75 +1821,75 @@ msgstr "ਆਟੋ-ਕੁਨੈਕਟ"
 msgid "Manage Favorite Rooms"
 msgstr "ਪਸੰਦੀਦਾ ਰੂਮ ਪਰਬੰਧ"
 
-#: ../src/empathy-event-manager.c:377
+#: ../src/empathy-event-manager.c:321
 msgid "Incoming call"
 msgstr "ਆ ਰਹੀ ਕਾਲ"
 
-#: ../src/empathy-event-manager.c:380
+#: ../src/empathy-event-manager.c:324
 #, c-format
 msgid "%s is calling you, do you want to answer?"
 msgstr "%s ਤੁਹਾਨੂੰ ਕਾਲ ਕਰ ਰਿਹਾ ਹੈ, ਕੀ ਤੁਸੀਂ ਜਵਾਬ ਦੇਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../src/empathy-event-manager.c:387
+#: ../src/empathy-event-manager.c:331
 msgid "_Reject"
 msgstr "ਰੱਦ ਕਰੋ(_R)"
 
-#: ../src/empathy-event-manager.c:393
+#: ../src/empathy-event-manager.c:337
 msgid "_Answer"
 msgstr "ਜਵਾਬ ਦਿਓ(_A)"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:452
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s ਤੋਂ ਕਾਲ ਆ ਰਹੀ ਹੈ"
 
-#: ../src/empathy-event-manager.c:547
+#: ../src/empathy-event-manager.c:496
 #, c-format
 msgid "%s is offering you an invitation"
 msgstr "%s ਤੁਹਾਨੂੰ ਇੱਕ ਸੱਦਾ ਦੇ ਰਿਹਾ ਹੈ"
 
-#: ../src/empathy-event-manager.c:553
+#: ../src/empathy-event-manager.c:502
 msgid "An external application will be started to handle it."
 msgstr "ਇਸ ਨੂੰ ਵਰਤਣ ਲਈ ਇੱਕ ਬਾਹਰੀ ਐਪਲੀਕੇਸ਼ਨ ਵਰਤੀ ਜਾਵੇਗੀ।"
 
-#: ../src/empathy-event-manager.c:558
+#: ../src/empathy-event-manager.c:507
 msgid "You don't have the needed external application to handle it."
-msgstr "ਤੁਹਾਨੂੰ ਇਹ ਹੈਂਡਲ ਕਰਨ ਲਈ ਬਾਹਰੀ ਕਾਰਜ ਦੀ ਲੋੜ ਨਹੀਂ ਹੈ।"
+msgstr "ਤੁਹਾਨੂੰ ਇਹ ਹੈਂਡਲ ਕਰਨ ਲਈ ਬਾਹਰੀ ਐਪਲੀਕੇਸ਼ਨ ਦੀ ਲੋੜ ਨਹੀਂ ਹੈ।"
 
-#: ../src/empathy-event-manager.c:685
+#: ../src/empathy-event-manager.c:634
 msgid "Room invitation"
 msgstr "ਰੂਮ ਸੱਦਾ"
 
-#: ../src/empathy-event-manager.c:688
+#: ../src/empathy-event-manager.c:637
 #, c-format
 msgid "%s is inviting you to join %s"
-msgstr "%s ਤੁਹਾਨੂੰ %s ਦਾਖਲ ਹੋਣ ਲਈ ਸੱਦ ਰਿਹਾ ਹੈ"
+msgstr "%s ਤੁਹਾਨੂੰ %s ਜੁਆਇੰਨ ਕਰਨ ਲਈ ਸੱਦ ਰਿਹਾ ਹੈ"
 
-#: ../src/empathy-event-manager.c:696
+#: ../src/empathy-event-manager.c:645
 msgid "_Decline"
 msgstr "ਇਨਕਾਰ(_D)"
 
-#: ../src/empathy-event-manager.c:701
+#: ../src/empathy-event-manager.c:650
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "ਦਾਖਲ(_J)"
 
-#: ../src/empathy-event-manager.c:740
+#: ../src/empathy-event-manager.c:689
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s ਨੇ ਤੁਹਾਨੂੰ %s ਦਾਖਲ ਹੋਣ ਲਈ ਸੱਦਿਆ"
 
-#: ../src/empathy-event-manager.c:766
+#: ../src/empathy-event-manager.c:715
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "%s ਤੋਂ ਆ ਰਿਹਾ ਫਾਇਲ ਸੰਚਾਰ"
 
-#: ../src/empathy-event-manager.c:946
+#: ../src/empathy-event-manager.c:895
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "%s ਵਲੋਂ ਮੈਂਬਰੀ ਚਾਹੀਦੀ ਹੈ"
 
-#: ../src/empathy-event-manager.c:950
+#: ../src/empathy-event-manager.c:899
 #, c-format
 msgid ""
 "\n"
@@ -1795,6 +1898,18 @@ msgstr ""
 "\n"
 "ਸੁਨੇਹਾ: %s"
 
+#. someone is logging off
+#: ../src/empathy-event-manager.c:935
+#, c-format
+msgid "%s is now offline."
+msgstr "%s ਹੁਣ ਆਫਲਾਈਨ ਹੈ।"
+
+#. someone is logging in
+#: ../src/empathy-event-manager.c:951
+#, c-format
+msgid "%s is now online."
+msgstr "%s ਹੁਣ ਆਨਲਾਈਨ ਹੈ।"
+
 #. Translators: time left, when it is more than one hour
 #: ../src/empathy-ft-manager.c:101
 #, c-format
@@ -1817,8 +1932,8 @@ msgstr "ਅਣਜਾਣ"
 msgid "%s of %s at %s/s"
 msgstr "%3$s/s ਨਾਲ %2$s ਵਿੱਚੋਂ %1$s"
 
-#: ../src/empathy-ft-manager.c:276, c-format
-#| msgid "%s of %s at %s/s"
+#: ../src/empathy-ft-manager.c:276
+#, c-format
 msgid "%s of %s"
 msgstr "%2$s ਵਿੱਚੋਂ %1$s"
 
@@ -1837,21 +1952,20 @@ msgstr "\"%s\" %s ਨੂੰ ਭੇਜੀ ਜਾ ਰਹੀ ਹੈ"
 #. translators: first %s is filename, second %s
 #. * is the contact name
 #: ../src/empathy-ft-manager.c:340, c-format
-#| msgid "Receiving \"%s\" from %s"
+#| msgid "Error receiving \"%s\" from %s"
 msgid "Error receiving \"%s\" from %s"
-msgstr "%2$s ਤੋਂ \"%s\"  ਲੈਣ ਦੌਰਾਨ ਗਲਤੀ"
+msgstr "%2$s ਤੋਂ \"%1$s\"  ਲੈਣ ਦੌਰਾਨ ਗਲਤੀ"
 
 #: ../src/empathy-ft-manager.c:343
 msgid "Error receiving a file"
 msgstr "ਫਾਇਲ ਲੈਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: ../src/empathy-ft-manager.c:348, c-format
-#| msgid "Sending \"%s\" to %s"
+#: ../src/empathy-ft-manager.c:348
+#, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "\"%s\" %s ਨੂੰ ਭੇਜਣ ਦੌਰਾਨ ਗਲਤੀ"
 
 #: ../src/empathy-ft-manager.c:351
-#| msgid "Error sending message '%s': %s"
 msgid "Error sending a file"
 msgstr "ਫਾਇਲ ਭੇਜਣ ਦੌਰਾਨ ਗਲਤੀ"
 
@@ -1900,27 +2014,28 @@ msgid "Remaining"
 msgstr "ਬਾਕੀ"
 
 #: ../src/empathy-ft-manager.ui.h:1
-msgid "File transfers"
-msgstr "ਫਾਇਲ ਸੰਚਾਰ"
+#| msgid "_File Transfers"
+msgid "File Transfers"
+msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ"
 
 #: ../src/empathy-ft-manager.ui.h:2
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "ਲਿਸਟ ਵਿੱਚੋਂ ਪੂਰੇ ਹੋਏ, ਰੱਦ ਕੀਤੇ ਅਤੇ ਫੇਲ੍ਹ ਹੋਏ ਫਾਇਲ ਸੰਚਾਰ ਹਟਾਓ"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-dialog.c:259
+#: ../src/empathy-import-dialog.c:263
 msgid "Import"
 msgstr "ਇੰਪੋਰਟ"
 
-#: ../src/empathy-import-dialog.c:268
+#: ../src/empathy-import-dialog.c:272
 msgid "Protocol"
 msgstr "ਪਰੋਟੋਕਾਲ"
 
-#: ../src/empathy-import-dialog.c:294
+#: ../src/empathy-import-dialog.c:298
 msgid "Source"
 msgstr "ਸਰੋਤ"
 
-#: ../src/empathy-import-dialog.c:388
+#: ../src/empathy-import-dialog.c:392
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -1932,80 +2047,75 @@ msgstr ""
 msgid "Import Accounts"
 msgstr "ਅਕਾਊਂਟ ਇੰਪੋਰਟ"
 
-#: ../src/empathy-main-window.c:395
+#: ../src/empathy-main-window.c:396
 msgid "_Edit account"
 msgstr "ਅਕਾਊਂਟ ਸੋਧ(_E)"
 
-#: ../src/empathy-main-window.c:498
+#: ../src/empathy-main-window.c:499
 msgid "No error specified"
 msgstr "ਕੋਈ ਗਲਤੀ ਨਹੀਂ ਦਿੱਤੀ"
 
-#: ../src/empathy-main-window.c:501
+#: ../src/empathy-main-window.c:502
 msgid "Network error"
 msgstr "ਨੈੱਟਵਰਕ ਗਲਤੀ"
 
-#: ../src/empathy-main-window.c:504
+#: ../src/empathy-main-window.c:505
 msgid "Authentication failed"
 msgstr "ਪਰਮਾਣਕਿਤਾ ਫੇਲ੍ਹ ਹੈ"
 
-#: ../src/empathy-main-window.c:507
+#: ../src/empathy-main-window.c:508
 msgid "Encryption error"
 msgstr "ਇੰਕ੍ਰਿਪਸ਼ਨ ਗਲਤੀ"
 
-#: ../src/empathy-main-window.c:510
+#: ../src/empathy-main-window.c:511
 msgid "Name in use"
 msgstr "ਵਰਤਣ ਲਈ ਨਾਂ"
 
-#: ../src/empathy-main-window.c:513
+#: ../src/empathy-main-window.c:514
 msgid "Certificate not provided"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਦਿੱਤਾ"
 
-#: ../src/empathy-main-window.c:516
+#: ../src/empathy-main-window.c:517
 msgid "Certificate untrusted"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਬੇਭਰੋਸੇਯੋਗ"
 
-#: ../src/empathy-main-window.c:519
+#: ../src/empathy-main-window.c:520
 msgid "Certificate expired"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਦੀ ਮਿਆਦ ਪੁੱਗੀ"
 
-#: ../src/empathy-main-window.c:522
+#: ../src/empathy-main-window.c:523
 msgid "Certificate not activated"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਸਰਗਰਮ ਨਹੀਂ ਹੈ"
 
-#: ../src/empathy-main-window.c:525
+#: ../src/empathy-main-window.c:526
 msgid "Certificate hostname mismatch"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਹੋਸਟ-ਨਾਂ ਨਹੀਂ ਮਿਲਦਾ"
 
-#: ../src/empathy-main-window.c:528
+#: ../src/empathy-main-window.c:529
 msgid "Certificate fingerprint mismatch"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਫਿੰਗਰ-ਪਰਿੰਟ ਮਿਲਦਾ ਨਹੀਂ"
 
-#: ../src/empathy-main-window.c:531
+#: ../src/empathy-main-window.c:532
 msgid "Certificate self-signed"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਖੁਦ-ਦਸਤਖਤੀ ਹੈ"
 
-#: ../src/empathy-main-window.c:534
+#: ../src/empathy-main-window.c:535
 msgid "Certificate error"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਗਲਤੀ"
 
-#: ../src/empathy-main-window.c:537
+#: ../src/empathy-main-window.c:538
 msgid "Unknown error"
 msgstr "ਅਣਜਾਣ ਗਲਤੀ"
 
-#: ../src/empathy-main-window.c:888
-msgid "Contact"
-msgstr "ਸੰਪਰਕ"
-
-#: ../src/empathy-main-window.c:1220
+#: ../src/empathy-main-window.c:1218
 msgid "Show and edit accounts"
 msgstr "ਅਕਾਊਂਟ ਵੇਖੋ ਅਤੇ ਸੋਧੋ"
 
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-main-window.ui.h:1 ../src/empathy-preferences.ui.h:9
 msgid "Contact List"
 msgstr "ਸੰਪਰਕ ਲਿਸਟ"
 
 #: ../src/empathy-main-window.ui.h:2
-#| msgid "Show Contacts on a Map"
 msgid "Contacts on a _Map"
 msgstr "ਨਕਸ਼ੇ ਉੱਤੇ ਸੰਪਰਕ(_M)"
 
@@ -2038,7 +2148,6 @@ msgid "_Debug"
 msgstr "ਡੀਬੱਗ(_D)"
 
 #: ../src/empathy-main-window.ui.h:12
-#| msgid "File transfers"
 msgid "_File Transfers"
 msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ(_F)"
 
@@ -2048,14 +2157,13 @@ msgstr "ਮੱਦਦ(_H)"
 
 #: ../src/empathy-main-window.ui.h:14
 msgid "_Join..."
-msgstr "ਦਾਖਲ(_J)..."
+msgstr "ਜੁਆਇੰਨ(_J)..."
 
 #: ../src/empathy-main-window.ui.h:15 ../src/empathy-status-icon.ui.h:2
 msgid "_New Conversation..."
 msgstr "ਨਵੀਂ ਗੱਲਬਾਤ(_N)..."
 
 #: ../src/empathy-main-window.ui.h:16
-#| msgid "Show _Offline Contacts"
 msgid "_Offline Contacts"
 msgstr "ਆਫਲਾਈਨ ਸੰਪਰਕ(_O)"
 
@@ -2064,7 +2172,6 @@ msgid "_Personal Information"
 msgstr "ਨਿੱਜੀ ਜਾਣਕਾਰੀ(_P)"
 
 #: ../src/empathy-main-window.ui.h:19
-#| msgid "Previous Conversations"
 msgid "_Previous Conversations"
 msgstr "ਪਿਛਲੀ ਗੱਲਬਾਤ(_P)"
 
@@ -2072,15 +2179,15 @@ msgstr "ਪਿਛਲੀ ਗੱਲਬਾਤ(_P)"
 msgid "_Room"
 msgstr "ਰੂਮ(_R)"
 
-#: ../src/empathy-new-chatroom-dialog.c:332
+#: ../src/empathy-new-chatroom-dialog.c:331
 msgid "Chat Room"
 msgstr "ਗੱਲਬਾਤ ਰੂਮ"
 
-#: ../src/empathy-new-chatroom-dialog.c:348
+#: ../src/empathy-new-chatroom-dialog.c:347
 msgid "Members"
 msgstr "ਮੈਂਬਰ"
 
-#: ../src/empathy-new-chatroom-dialog.c:492
+#: ../src/empathy-new-chatroom-dialog.c:496
 #, c-format
 msgctxt ""
 "Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
@@ -2096,21 +2203,21 @@ msgstr ""
 "ਪਾਸਵਰਡ ਲੋੜੀਦਾ: %s\n"
 "ਮੈਂਬਰ: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:494
-#: ../src/empathy-new-chatroom-dialog.c:495
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
 msgid "Yes"
 msgstr "ਹਾਂ"
 
-#: ../src/empathy-new-chatroom-dialog.c:494
-#: ../src/empathy-new-chatroom-dialog.c:495
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
 msgid "No"
 msgstr "ਨਹੀਂ"
 
-#: ../src/empathy-new-chatroom-dialog.c:522
+#: ../src/empathy-new-chatroom-dialog.c:526
 msgid "Could not start room listing"
 msgstr "ਰੂਮ ਲਿਸਟ ਕਰਨਾ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
 
-#: ../src/empathy-new-chatroom-dialog.c:532
+#: ../src/empathy-new-chatroom-dialog.c:536
 msgid "Could not stop room listing"
 msgstr "ਰੂਮ ਲਿਸਟ ਕਰਨਾ ਰੋਕਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
@@ -2140,185 +2247,206 @@ msgstr "ਰੂਮ ਲਿਸਟ"
 msgid "_Room:"
 msgstr "ਰੂਮ(_R):"
 
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:161
 msgid "Message received"
 msgstr "ਸੁਨੇਹਾ ਮਿਲਿਆ"
 
-#: ../src/empathy-preferences.c:163
+#: ../src/empathy-preferences.c:162
 msgid "Message sent"
 msgstr "ਸੁਨੇਹਾ ਭੇਜਿਆ"
 
-#: ../src/empathy-preferences.c:164
+#: ../src/empathy-preferences.c:163
 msgid "New conversation"
 msgstr "ਨਵੀਂ ਗੱਲਬਾਤ"
 
-#: ../src/empathy-preferences.c:165
+#: ../src/empathy-preferences.c:164
 msgid "Contact goes online"
 msgstr "ਸੰਪਰਕ ਆਨਲਾਈਨ ਹੋਇਆ"
 
-#: ../src/empathy-preferences.c:166
+#: ../src/empathy-preferences.c:165
 msgid "Contact goes offline"
 msgstr "ਸੰਪਰਕ ਬੰਦ ਕਰ ਗਿਆ"
 
-#: ../src/empathy-preferences.c:167
+#: ../src/empathy-preferences.c:166
 msgid "Account connected"
 msgstr "ਅਕਾਊਂਟ ਕੁਨੈਕਟ ਕੀਤਾ"
 
-#: ../src/empathy-preferences.c:168
+#: ../src/empathy-preferences.c:167
 msgid "Account disconnected"
 msgstr "ਅਕਾਊਂਟ ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਹੋਇਆ"
 
-#: ../src/empathy-preferences.c:435
+#: ../src/empathy-preferences.c:446
 msgid "Language"
 msgstr "ਭਾਸ਼ਾ"
 
 #: ../src/empathy-preferences.ui.h:1
-msgid "<b>Appearance</b>"
-msgstr "<b>ਦਿੱਖ</b>"
+msgid "Allow _GPS usage"
+msgstr "_GPS ਵਰਤੋਂ ਮਨਜ਼ੂਰ"
 
 #: ../src/empathy-preferences.ui.h:2
-msgid "<b>Behavior</b>"
-msgstr "<b>ਰਵੱਈਆ</b>"
+msgid "Allow _cellphone usage"
+msgstr "ਸੈਲ-ਫੋਨ ਵਰਤੋਂ ਮਨਜ਼ੂਰ(_C)"
 
 #: ../src/empathy-preferences.ui.h:3
-msgid "<b>Contact List</b>"
-msgstr "<b>ਸੰਪਰਕ ਲਿਸਟ</b>"
+msgid "Allow _network usage"
+msgstr "ਨੈੱਟਵਰਕ ਵਰਤੋਂ ਮਨਜ਼ੂਰ(_N)"
 
 #: ../src/empathy-preferences.ui.h:4
-msgid "<b>Enable spell checking for languages:</b>"
-msgstr "<b>ਭਾਸ਼ਾਵਾਂ ਲਈ ਸ਼ਬਦ-ਜੋੜ ਚੈੱਕ ਕਰਨਾ ਯੋਗ:</b>"
+#| msgid "<b>Appearance</b>"
+msgid "Appearance"
+msgstr "ਦਿੱਖ"
 
 #: ../src/empathy-preferences.ui.h:5
-#| msgid "<b>Settings</b>"
-msgid "<b>Geoclue Settings</b>"
-msgstr "<b>ਜੀਓ-ਕਲੂ ਸੈਟਿੰਗ</b>"
+msgid "Automatically _connect on startup "
+msgstr "ਸ਼ੁਰੂ ਸਮੇਂ ਆਟੋਮੈਟਿਕ ਹੀ ਕੁਨੈਕਟ ਕਰੋ(_c)"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "<b>Play sound for events</b>"
-msgstr "<b>ਘਟਨਾਵਾਂ ਲਈ ਸਾਊਂਡ ਚਲਾਓ</b>"
+msgid "Avatars are user chosen images shown in the contact list"
+msgstr "ਅਵਤਾਰ ਯੂਜ਼ਰਾਂ ਲਈ ਸੰਪਰਕ ਸੂਚੀ ਵਿੱਚੋਂ ਚੁਣੇ ਚਿੱਤਰ ਹਨ"
 
 #: ../src/empathy-preferences.ui.h:7
-#| msgid "<b>Advanced</b>"
-msgid "<b>Privacy</b>"
-msgstr "<b>ਪਰਾਈਵੇਸੀ</b>"
+#| msgid "<b>Behavior</b>"
+msgid "Behavior"
+msgstr "ਰਵੱਈਆ"
 
 #: ../src/empathy-preferences.ui.h:8
-msgid ""
-"<small>Reduced location accuracy means that nothing more precise than your "
-"city, state and country will be published.  GPS coordinates will have a "
-"random value added (&#xB1;0.25&#xB0;).</small>"
-msgstr ""
-"<small>ਟਿਕਾਣਾ ਸ਼ੁੱਧਤਾ ਘਟਾਉਣ ਦਾ ਮਤਲਬ ਹੈ ਕਿ ਤੁਹਾਡੇ ਸ਼ਹਿਰ, ਸੂਬਾ ਅਤੇ ਦੇਸ਼ ਤੋਂ ਵੱਧ ਕੁਝ ਵੀ ਵੇਖਾਇਆ "
-"ਨਹੀਂ ਜਾਵੇਗਾ। GPS ਧੁਰੇ ਵਿੱਚ ਕੁਝ ਰਲਵੇਂ ਮੁੱਲ ਸ਼ਾਮਲ ਕੀਤੇ ਜਾਣਗੇ (&#xB1;0.25&#xB0;)।</small>"
-
-#: ../src/empathy-preferences.ui.h:9
-msgid ""
-"<small>The list of languages reflects only the languages for which you have "
-"a dictionary installed.</small>"
-msgstr "<small>ਭਾਸ਼ਾ ਦੀ ਲਿਸਟ ਵੇਖਾ ਰਿਹਾ ਹੈ, ਜਿੰਨ੍ਹਾਂ ਲਈ ਤੁਹਾਡੇ ਕੋਲ ਸ਼ਬਦ-ਕੋਸ਼ ਇੰਸਟਾਲ ਹੈ।</small>"
+msgid "Chat Th_eme:"
+msgstr "ਗੱਲਬਾਤ ਥੀਮ(_e):"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Allow _GPS usage"
-msgstr "_GPS ਵਰਤੋਂ ਮਨਜ਼ੂਰ"
+msgid "Disable notifications when _away or busy"
+msgstr "ਜਦੋਂ ਦੂਰ ਜਾਂ ਰੁੱਝਿਆ/ਰੁਝੀ ਤਾਂ ਨੋਟੀਫਿਕੇਸ਼ਨ ਬੰਦ ਰੱਖੋ(_a)"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Allow _cellphone usage"
-msgstr "ਸੈਲ-ਫੋਨ ਵਰਤੋਂ ਮਨਜ਼ੂਰ(_C)"
+msgid "Disable sounds when _away or busy"
+msgstr "ਜਦੋਂ ਦੂਰ ਜਾਂ ਰੁਝਿਆ/ਰੁਝੀ ਹੋਵਾਂ ਤਾਂ ਸਾਊਂਡ ਬੰਦ ਰੱਖੋ(_a)"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Allow _network usage"
-msgstr "ਨੈੱਟਵਰਕ ਵਰਤੋਂ ਮਨਜ਼ੂਰ(_N)"
+#| msgid "Enable notifications when the _chat is not focused"
+msgid "Enable notifications when a contact comes online"
+msgstr "ਜਦੋਂ ਸੰਪਰਕ ਆਨਲਾਈਨ ਆਵੇ ਤਾਂ ਸੂਚਨਾ ਦਿਓ"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Automatically _connect on startup "
-msgstr "ਸ਼ੁਰੂ ਸਮੇਂ ਆਟੋਮੈਟਿਕ ਹੀ ਕੁਨੈਕਟ ਕਰੋ(_c)"
+#| msgid "Enable notifications when the _chat is not focused"
+msgid "Enable notifications when a contact goes offline"
+msgstr "ਜਦੋਂ ਸੰਪਰਕ ਆਫਲਾਈਨ ਜਾਵੇ ਤਾਂ ਸੂਚਨਾ ਦਿਓ"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "Avatars are user chosen images shown in the contact list"
-msgstr "ਅਵਤਾਰ ਯੂਜ਼ਰਾਂ ਲਈ ਸੰਪਰਕ ਸੂਚੀ ਵਿੱਚੋਂ ਚੁਣੇ ਚਿੱਤਰ ਹਨ"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "ਜਦੋਂ ਗੱਲਬਾਤ ਫੋਕਸ ਨਾ ਹੋਵੇ ਤਾਂ ਸੂਚਨਾ ਦਿਓ(_c)"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Chat Th_eme:"
-msgstr "ਗੱਲਬਾਤ ਥੀਮ(_e):"
+#| msgid "<b>Enable spell checking for languages:</b>"
+msgid "Enable spell checking for languages:"
+msgstr "ਭਾਸ਼ਾਵਾਂ ਲਈ ਸ਼ਬਦ-ਜੋੜ ਚੈੱਕ ਕਰਨਾ ਯੋਗ:"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Disable notifications when _away or busy"
-msgstr "ਜਦੋਂ ਦੂਰ ਜਾਂ ਰੁੱਝਿਆ/ਰੁਝੀ ਤਾਂ ਨੋਟੀਫਿਕੇਸ਼ਨ ਬੰਦ ਰੱਖੋ(_a)"
+msgid "General"
+msgstr "ਆਮ"
 
 #: ../src/empathy-preferences.ui.h:17
-msgid "Disable sounds when _away or busy"
-msgstr "ਜਦੋਂ ਦੂਰ ਜਾਂ ਰੁਝਿਆ/ਰੁਝੀ ਹੋਵਾਂ ਤਾਂ ਸਾਊਂਡ ਬੰਦ ਰੱਖੋ(_a)"
+#| msgid "<b>Geoclue Settings</b>"
+msgid "Geoclue Settings"
+msgstr "ਭੂਗੋਲਿਕ-ਸੁਰਾਗ ਸੈਟਿੰਗ"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Enable notifications when the _chat is not focused"
-msgstr "ਜਦੋਂ ਗੱਲਬਾਤ ਫੋਕਸ ਨਾ ਹੋਵੇ ਤਾਂ ਨੋਟੀਫਿਕੇਸ਼ਨ ਦਿਓ(_c)"
-
-#: ../src/empathy-preferences.ui.h:19
-msgid "General"
-msgstr "ਆਮ"
-
-#: ../src/empathy-preferences.ui.h:20
-#| msgid "<b>Location</b>"
 msgid "Location"
 msgstr "ਟਿਕਾਣਾ"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:19
 msgid "Notifications"
 msgstr "ਨੋਟੀਫਿਕੇਸ਼ਨ"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:20
+#| msgid "<b>Play sound for events</b>"
+msgid "Play sound for events"
+msgstr "ਘਟਨਾਵਾਂ ਲਈ ਸਾਊਂਡ ਚਲਾਓ"
+
+#: ../src/empathy-preferences.ui.h:21
 msgid "Preferences"
 msgstr "ਪਸੰਦ"
 
+#: ../src/empathy-preferences.ui.h:22
+#| msgid "<b>Privacy</b>"
+msgid "Privacy"
+msgstr "ਪਰਾਈਵੇਸੀ"
+
 #: ../src/empathy-preferences.ui.h:23
+#| msgid ""
+#| "<small>Reduced location accuracy means that nothing more precise than "
+#| "your city, state and country will be published.  GPS coordinates will "
+#| "have a random value added (&#xB1;0.25&#xB0;).</small>"
+msgid ""
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will have a random "
+"value added (&#xB1;0.25&#xB0;)."
+msgstr ""
+"ਟਿਕਾਣਾ ਸ਼ੁੱਧਤਾ ਘਟਾਉਣ ਦਾ ਮਤਲਬ ਹੈ ਕਿ ਤੁਹਾਡੇ ਸ਼ਹਿਰ, ਸੂਬਾ ਅਤੇ ਦੇਸ਼ ਤੋਂ ਵੱਧ ਕੁਝ ਵੀ ਵੇਖਾਇਆ "
+"ਨਹੀਂ ਜਾਵੇਗਾ। GPS ਧੁਰੇ ਵਿੱਚ ਕੁਝ ਰਲਵੇਂ ਮੁੱਲ ਸ਼ਾਮਲ ਕੀਤੇ ਜਾਣਗੇ (&#xB1;0.25&#xB0;)।"
+
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _avatars"
 msgstr "ਅਵਤਾਰ ਵੇਖੋ(_a)"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show _smileys as images"
 msgstr "ਖੁਸ਼ ਚਿੱਤਰਾਂ ਵਾਂਗ ਵੇਖੋ(_s)"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:26
 msgid "Show co_mpact contact list"
 msgstr "ਸੰਖੇਪ ਸੰਪਰਕ ਲਿਸਟ ਵੇਖੋ(_m)"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:27
+#| msgid "_Show Contact List"
+msgid "Show contact _list in rooms"
+msgstr "ਰੂਮ ਵਿੱਚ ਸੰਪਰਕ ਲਿਸਟ ਵੇਖੋ(_l)"
+
+#: ../src/empathy-preferences.ui.h:28
 msgid "Sort by _name"
 msgstr "ਨਾਂ ਨਾਲ ਲੜੀਬੱਧ(_n)"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:29
 msgid "Sort by s_tate"
 msgstr "ਹਾਲਤ ਨਾਲ ਲੜੀਬੱਧ(_t)"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:30
 msgid "Sounds"
 msgstr "ਸਾਊਂਡ"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:31
 msgid "Spell Checking"
 msgstr "ਸ਼ਬਦਜੋੜ ਜਾਂਚ"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:32
+#| msgid ""
+#| "<small>The list of languages reflects only the languages for which you "
+#| "have a dictionary installed.</small>"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr "ਭਾਸ਼ਾ ਦੀ ਲਿਸਟ ਵੇਖਾ ਰਿਹਾ ਹੈ, ਜਿੰਨ੍ਹਾਂ ਲਈ ਤੁਹਾਡੇ ਕੋਲ ਸ਼ਬਦ-ਕੋਸ਼ ਇੰਸਟਾਲ ਹੈ।"
+
+#: ../src/empathy-preferences.ui.h:33
 msgid "Themes"
 msgstr "ਥੀਮ"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable bubble notifications"
 msgstr "ਬੁਲਬੁਲਾ ਨੋਟੀਫਿਕੇਸ਼ਨ ਚਾਲੂ(_E)"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:35
 msgid "_Enable sound notifications"
 msgstr "ਸਾਊਂਡ ਨੋਟੀਫਿਕੇਸ਼ਨ ਚਾਲੂ(_E)"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Open new chats in separate windows"
 msgstr "ਨਵੀਆਂ ਗੱਲਾਬਾਤਾਂ ਵੱਖ ਵੱਖ ਵਿੰਡੋ ਵਿੱਚ ਖੋਲ੍ਹੋ(_O)"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Publish location to my contacts"
 msgstr "ਮੇਰੇ ਸੰਪਰਕਾਂ ਲਈ ਟਿਕਾਣਾ ਦੱਸੋ(_P)"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Reduce location accuracy"
 msgstr "ਟਿਕਾਣਾ ਸ਼ੁੱਧਤਾ ਘਟਾਓ(_R)"
 
@@ -2354,76 +2482,99 @@ msgstr "gtk-leave-fullscreen"
 msgid "Contact Map View"
 msgstr "ਸੰਪਰਕ ਮੈਪ ਝਲਕ"
 
-#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1075
-#| msgid "Error:"
+#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
 msgid "Error"
 msgstr "ਗਲਤੀ"
 
-#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1069
-#| msgid "Croatian"
+#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
 msgid "Critical"
 msgstr "ਨਾਜ਼ੁਕ"
 
-#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1063
-#| msgid "Bearing:"
+#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
 msgid "Warning"
 msgstr "ਚੇਤਾਵਨੀ"
 
-#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1057
-#: ../src/empathy-debug-dialog.c:1105
-#| msgid "Message:"
+#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065
+#: ../src/empathy-debug-dialog.c:1113
 msgid "Message"
 msgstr "ਸੁਨੇਹਾ"
 
-#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1051
+#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059
 msgid "Info"
 msgstr "ਜਾਣਕਾਰੀ"
 
-#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1045
+#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053
 msgid "Debug"
 msgstr "ਡੀਬੱਗ"
 
-#: ../src/empathy-debug-dialog.c:836
-#| msgid "State:"
+#: ../src/empathy-debug-dialog.c:845
 msgid "Save"
 msgstr "ਸੰਭਾਲੋ"
 
-#: ../src/empathy-debug-dialog.c:939
+#: ../src/empathy-debug-dialog.c:948
 msgid "Debug Window"
 msgstr "ਡੀਬੱਗ ਵਿੰਡੋ"
 
-#: ../src/empathy-debug-dialog.c:1013
+#: ../src/empathy-debug-dialog.c:1021
 msgid "Pause"
 msgstr "ਵਿਰਾਮ"
 
-#: ../src/empathy-debug-dialog.c:1025
+#: ../src/empathy-debug-dialog.c:1033
 msgid "Level "
 msgstr "ਲੈਵਲ "
 
-#: ../src/empathy-debug-dialog.c:1094
-#| msgid "Simple"
+#: ../src/empathy-debug-dialog.c:1102
 msgid "Time"
 msgstr "ਸਮਾਂ"
 
-#: ../src/empathy-debug-dialog.c:1096
-#| msgid "Romanian"
+#: ../src/empathy-debug-dialog.c:1104
 msgid "Domain"
 msgstr "ਡੋਮੇਨ"
 
-#: ../src/empathy-debug-dialog.c:1098
+#: ../src/empathy-debug-dialog.c:1106
 msgid "Category"
 msgstr "ਕੈਟਾਗਰੀ"
 
-#: ../src/empathy-debug-dialog.c:1100
+#: ../src/empathy-debug-dialog.c:1108
 msgid "Level"
 msgstr "ਲੈਵਲ"
 
-#: ../src/empathy-debug-dialog.c:1133
+#: ../src/empathy-debug-dialog.c:1140
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr "ਚੁਣਿਆ ਕੁਨੈਕਸ਼ਨ ਮੈਨੇਜਰ ਰਿਮੋਟ ਡੀਬੱਗ ਇਕਸਟੈਨਸ਼ਨ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
 
+#~ msgid "<b>Network</b>"
+#~ msgstr "<b>ਨੈੱਟਵਰਕ</b>"
+
+#~ msgid "<b>Servers</b>"
+#~ msgstr "<b>ਸਰਵਰ</b>"
+
+#~ msgid "<b>Topic:</b>"
+#~ msgstr "<b>ਵਿਸ਼ਾ:</b>"
+
+#~ msgid "<b>Contact</b>"
+#~ msgstr "<b>ਸੰਪਰਕ</b>"
+
+#~ msgid "<b>Groups</b>"
+#~ msgstr "<b>ਗਰੁੱਪ</b>"
+
+#~ msgid "<b>New Account</b>"
+#~ msgstr "<b>ਨਵਾਂ ਅਕਾਊਂਟ</b>"
+
+#~ msgid "I already have an account I want to use"
+#~ msgstr "ਮੇਰੇ ਕੋਲ ਪਹਿਲਾਂ ਹੀ ਅਕਾਊਂਟ ਹੈ, ਜੋ ਮੈਂ ਵਰਤਣਾ ਚਾਹੁੰਦਾ ਹਾਂ"
+
+#~ msgid "New message from %s"
+#~ msgstr "%s ਵਲੋਂ ਨਵਾਂ ਸੁਨੇਹਾ"
+
+#~ msgid "File transfers"
+#~ msgstr "ਫਾਇਲ ਸੰਚਾਰ"
+
+#~ msgid "<b>Contact List</b>"
+#~ msgstr "<b>ਸੰਪਰਕ ਲਿਸਟ</b>"
+
 #~ msgctxt "file size"
 #~ msgid "Unknown"
 #~ msgstr "ਅਣਜਾਣ"
@@ -2470,9 +2621,6 @@ msgstr "ਚੁਣਿਆ ਕੁਨੈਕਸ਼ਨ ਮੈਨੇਜਰ ਰਿਮੋ
 #~ msgid "Forget password and clear the entry."
 #~ msgstr "ਪਾਸਵਰਡ ਭੁੱਲੋ ਅਤੇ ਐਂਟਰੀ ਸਾਫ਼ ਕਰੋ।"
 
-#~ msgid "Create a new IRC network"
-#~ msgstr "ਇੱਕ ਨਵਾਂ IRC ਨੈੱਟਵਰਕ ਬਣਾਓ"
-
 #~ msgid "Edit the selected IRC network"
 #~ msgstr "ਚੁਣੇ IRC ਨੈੱਟਵਰਕ ਸੋਧੋ"
 
diff --git a/po/sv.po b/po/sv.po
index 9967adfb4..007755526 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-19 20:27+0100\n"
-"PO-Revision-Date: 2009-02-19 00:38+0100\n"
+"POT-Creation-Date: 2009-07-22 23:53+0200\n"
+"PO-Revision-Date: 2009-07-22 23:53+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "MIME-Version: 1.0\n"
@@ -32,23 +32,16 @@ msgid "Always open a separate chat window for new chats."
 msgstr "Öppna alltid ett separat fönster för nya chattar."
 
 #: ../data/empathy.schemas.in.h:2
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"Tecken att lägga till efter smeknamn när smeknamnskomplettering (tab) "
-"används i gruppchatt."
+msgid "Character to add after nickname when using nick completion (tab) in group chat."
+msgstr "Tecken att lägga till efter smeknamn när smeknamnskomplettering (tab) används i gruppchatt."
 
 #: ../data/empathy.schemas.in.h:3
 msgid "Chat window theme"
 msgstr "Chattfönstertema"
 
 #: ../data/empathy.schemas.in.h:4
-msgid ""
-"Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
-msgstr ""
-"Kommaseparerad lista av språk att använda för stavningskontroll (tex en, fr, "
-"nl)."
+msgid "Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
+msgstr "Kommaseparerad lista av språk att använda för stavningskontroll (tex en, fr, nl)."
 
 #: ../data/empathy.schemas.in.h:5
 msgid "Compact contact list"
@@ -71,1002 +64,1275 @@ msgid "Disable sounds when away"
 msgstr "Inaktivera ljud under frånvaro"
 
 #: ../data/empathy.schemas.in.h:10
+msgid "Empathy can publish the user's location"
+msgstr "Empathy kan publicera användarens plats"
+
+#: ../data/empathy.schemas.in.h:11
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy kan använda GPS:en för att gissa platsen"
+
+#: ../data/empathy.schemas.in.h:12
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy kan använda mobiltelefonnätet för att gissa platsen"
+
+#: ../data/empathy.schemas.in.h:13
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy kan använda nätverket för att gissa platsen"
+
+#: ../data/empathy.schemas.in.h:14
 msgid "Empathy default download folder"
 msgstr "Standardhämtningsmapp för Empathy"
 
-#: ../data/empathy.schemas.in.h:11
+#: ../data/empathy.schemas.in.h:15
 msgid "Empathy has asked about importing accounts"
 msgstr "Empathy har frågat om att importera konton"
 
-#: ../data/empathy.schemas.in.h:12
+#: ../data/empathy.schemas.in.h:16
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy ska ansluta automatiskt vid uppstart"
 
-#: ../data/empathy.schemas.in.h:13
+#: ../data/empathy.schemas.in.h:17
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy bör minska precisionen för platsen"
+
+#: ../data/empathy.schemas.in.h:18
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy ska använda avataren för kontakten som chattfönsterikon"
 
-#: ../data/empathy.schemas.in.h:14
+#: ../data/empathy.schemas.in.h:19
+msgid "Enable WebKit Developer Tools"
+msgstr "Aktivera utvecklingsverktyg för WebKit"
+
+#: ../data/empathy.schemas.in.h:20
 msgid "Enable popup notifications for new messages"
 msgstr "Aktivera popupnotifieringar för nya meddelanden"
 
-#: ../data/empathy.schemas.in.h:15
+#: ../data/empathy.schemas.in.h:21
 msgid "Enable spell checker"
 msgstr "Aktivera stavningskontroll"
 
 # Vi översätter "hide" med "dölj" i GNOME. Gömmer gör man något för att det
 # inte ska hittas, döljer gör man för att det inte ska synas.
-#: ../data/empathy.schemas.in.h:16
+#: ../data/empathy.schemas.in.h:22
 msgid "Hide main window"
 msgstr "Dölj huvudfönstret"
 
 # Vi översätter "hide" med "dölj" i GNOME. Gömmer gör man något för att det
 # inte ska hittas, döljer gör man för att det inte ska synas.
-#: ../data/empathy.schemas.in.h:17
+#: ../data/empathy.schemas.in.h:23
 msgid "Hide the main window."
 msgstr "Dölj huvudfönstret."
 
-#: ../data/empathy.schemas.in.h:18
+#: ../data/empathy.schemas.in.h:24
 msgid "NetworkManager should be used"
 msgstr "NetworkManager ska användas"
 
-#: ../data/empathy.schemas.in.h:19
+#: ../data/empathy.schemas.in.h:25
 msgid "Nick completed character"
 msgstr "Tecken för smeknamnskomplettering"
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:26
 msgid "Open new chats in separate windows"
 msgstr "Öppna nya chattar i separata fönster"
 
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:27
+msgid "Path of the adium theme to use"
+msgstr "Sökväg för adium-temat att använda"
+
+#: ../data/empathy.schemas.in.h:28
+msgid "Path of the adium theme to use if the theme used for chat is adium."
+msgstr "Sökväg för adium-temat som ska användas om temat som används för chatt är adium."
+
+#: ../data/empathy.schemas.in.h:29
 msgid "Play a sound for incoming messages"
 msgstr "Spela upp ljud för inkommande meddelanden"
 
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:30
 msgid "Play a sound for new conversations"
 msgstr "Spela upp ett ljud för nya samtal"
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:31
 msgid "Play a sound for outgoing messages"
 msgstr "Spela upp ljud för utgående meddelanden"
 
-#: ../data/empathy.schemas.in.h:24
+#: ../data/empathy.schemas.in.h:32
 msgid "Play a sound when a contact logs in"
 msgstr "Spela upp ljud när en kontakt loggar in"
 
-#: ../data/empathy.schemas.in.h:25
+#: ../data/empathy.schemas.in.h:33
 msgid "Play a sound when a contact logs out"
 msgstr "Spela upp ett ljud när en kontakt loggar ut"
 
-#: ../data/empathy.schemas.in.h:26
+#: ../data/empathy.schemas.in.h:34
 msgid "Play a sound when we log in"
 msgstr "Spela upp ljud när vi loggar in"
 
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:35
 msgid "Play a sound when we log out"
 msgstr "Spela upp ljud när vi loggar ut"
 
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:36
 msgid "Popup notifications if the chat isn't focused"
 msgstr "Visa popupnotifieringar om chatten inte är fokuserad"
 
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:37
+msgid "Popup notifications when a contact sign in"
+msgstr "Visa popupnotifieringar när en kontakt loggar in"
+
+#: ../data/empathy.schemas.in.h:38
+msgid "Popup notifications when a contact sign out"
+msgstr "Visa popupnotifieringar när en kontakt loggar ut"
+
+#: ../data/empathy.schemas.in.h:39
 msgid "Salut account is created"
 msgstr "Salut-konto har skapats"
 
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:40
 msgid "Show avatars"
 msgstr "Visa avatarer"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:41
+msgid "Show contact list in rooms"
+msgstr "Visa kontaktlista i rum"
+
+#: ../data/empathy.schemas.in.h:42
 msgid "Show hint about closing the main window"
 msgstr "Visa tips om att stänga huvudfönstret"
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:43
 msgid "Show offline contacts"
 msgstr "Visa frånkopplade kontakter"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:44
 msgid "Spell checking languages"
 msgstr "Rättstavningsspråk"
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:45
 msgid "The default folder to save file transfers in."
 msgstr "Standardmappen att spara filöverföringar i."
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:46
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Den senaste katalogen som en avatarbild valdes från."
 
-#: ../data/empathy.schemas.in.h:36
+#: ../data/empathy.schemas.in.h:47
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Det tema som används för att visa samtal i chattfönster."
 
-#: ../data/empathy.schemas.in.h:37
+#: ../data/empathy.schemas.in.h:48
 msgid "Use graphical smileys"
 msgstr "Använd grafiska smilisar"
 
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:49
 msgid "Use notification sounds"
 msgstr "Använd notifieringsljud"
 
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:50
 msgid "Use theme for chat rooms"
 msgstr "Använd tema för chattrum"
 
-#: ../data/empathy.schemas.in.h:40
-msgid ""
-"Whether or not Empathy has asked about importing accounts from other "
-"programs."
-msgstr ""
-"Huruvida Empathy har frågat om att importera konton från andra program eller "
-"inte."
+#: ../data/empathy.schemas.in.h:51
+msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "Huruvida utvecklingsverktyg för WebKit, såsom Webbinspekteraren, ska aktiveras."
 
-#: ../data/empathy.schemas.in.h:41
-msgid ""
-"Whether or not Empathy should automatically log in to your accounts on "
-"startup."
-msgstr ""
-"Huruvida Empathy automatiskt ska logga in med dina konton vid uppstart eller "
-"inte."
+#: ../data/empathy.schemas.in.h:52
+msgid "Whether or not Empathy can publish the user's location to his contacts."
+msgstr "Huruvida Empathy kan publicera användarens plats till kontakter eller inte."
 
-#: ../data/empathy.schemas.in.h:42
-msgid ""
-"Whether or not Empathy should use the avatar of the contact as the chat "
-"window icon."
-msgstr ""
-"Huruvida Empathy ska använda avataren för kontakten som chattfönsterikon "
-"eller inte."
+#: ../data/empathy.schemas.in.h:53
+msgid "Whether or not Empathy can use the GPS to guess the location."
+msgstr "Huruvida Empathy kan använda GPS:en för att gissa platsen eller inte."
 
-#: ../data/empathy.schemas.in.h:43
-msgid ""
-"Whether or not the Salut account has been created on the first Empathy run."
-msgstr ""
-"Huruvida Salut-kontot har skapats eller inte vid första starten av Empathy."
+#: ../data/empathy.schemas.in.h:54
+msgid "Whether or not Empathy can use the cellular network to guess the location."
+msgstr "Huruvida Empathy kan använda mobiltelefonnätet för att gissa platsen eller inte."
 
-#: ../data/empathy.schemas.in.h:44
-msgid ""
-"Whether or not the network manager should be used to automatically "
-"disconnect/reconnect."
-msgstr ""
-"Huruvida nätverkshanteraren ska användas för att automatiskt koppla från/"
-"återansluta eller inte."
+#: ../data/empathy.schemas.in.h:55
+msgid "Whether or not Empathy can use the network to guess the location."
+msgstr "Huruvida Empathy kan använda nätverket för att gissa platsen eller inte."
 
-#: ../data/empathy.schemas.in.h:45
-msgid ""
-"Whether or not to check words typed against the languages you want to check "
-"with."
+#: ../data/empathy.schemas.in.h:56
+msgid "Whether or not Empathy has asked about importing accounts from other programs."
+msgstr "Huruvida Empathy har frågat om att importera konton från andra program eller inte."
+
+#: ../data/empathy.schemas.in.h:57
+msgid "Whether or not Empathy should automatically log in to your accounts on startup."
+msgstr "Huruvida Empathy automatiskt ska logga in med dina konton vid uppstart eller inte."
+
+#: ../data/empathy.schemas.in.h:58
+msgid "Whether or not Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "Huruvida Empathy ska minska platsens precision av integritetsskäl eller inte."
+
+#: ../data/empathy.schemas.in.h:59
+msgid "Whether or not Empathy should use the avatar of the contact as the chat window icon."
+msgstr "Huruvida Empathy ska använda avataren för kontakten som chattfönsterikon eller inte."
+
+#: ../data/empathy.schemas.in.h:60
+msgid "Whether or not the Salut account has been created on the first Empathy run."
+msgstr "Huruvida Salut-kontot har skapats eller inte vid första starten av Empathy."
+
+#: ../data/empathy.schemas.in.h:61
+msgid "Whether or not the network manager should be used to automatically disconnect/reconnect."
+msgstr "Huruvida nätverkshanteraren ska användas för att automatiskt koppla från/återansluta eller inte."
+
+#: ../data/empathy.schemas.in.h:62
+msgid "Whether or not to check words typed against the languages you want to check with."
 msgstr "Huruvida ord som skrivs ska kontrolleras mot språken du valt."
 
-#: ../data/empathy.schemas.in.h:46
-msgid ""
-"Whether or not to convert smileys into graphical images in conversations."
-msgstr ""
-"Huruvida smilisar ska omvandlas till grafiska bilder eller inte i samtal."
+#: ../data/empathy.schemas.in.h:63
+msgid "Whether or not to convert smileys into graphical images in conversations."
+msgstr "Huruvida smilisar ska omvandlas till grafiska bilder eller inte i samtal."
 
-#: ../data/empathy.schemas.in.h:47
-msgid ""
-"Whether or not to play a sound to notify for contacts logging in the network."
-msgstr ""
-"Huruvida ett ljud ska spelas upp eller inte för kontakter som loggar in i "
-"nätverket."
+#: ../data/empathy.schemas.in.h:64
+msgid "Whether or not to play a sound to notify for contacts logging in the network."
+msgstr "Huruvida ett ljud ska spelas upp eller inte för kontakter som loggar in i nätverket."
 
-#: ../data/empathy.schemas.in.h:48
-msgid ""
-"Whether or not to play a sound to notify for contacts logging off the "
-"network."
-msgstr ""
-"Huruvida ett ljud ska spelas upp eller inte för kontakter som loggar ut från "
-"nätverket."
+#: ../data/empathy.schemas.in.h:65
+msgid "Whether or not to play a sound to notify for contacts logging off the network."
+msgstr "Huruvida ett ljud ska spelas upp eller inte för kontakter som loggar ut från nätverket."
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:66
 msgid "Whether or not to play a sound to notify for events."
-msgstr ""
-"Huruvida ett ljud ska spelas upp eller inte för att notifiera om händelser."
+msgstr "Huruvida ett ljud ska spelas upp eller inte för att notifiera om händelser."
 
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:67
 msgid "Whether or not to play a sound to notify for incoming messages."
-msgstr ""
-"Huruvida ett ljud ska spelas upp eller inte för inkommande meddelanden."
+msgstr "Huruvida ett ljud ska spelas upp eller inte för inkommande meddelanden."
 
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:68
 msgid "Whether or not to play a sound to notify for new conversations."
 msgstr "Huruvida ett ljud ska spelas upp eller inte för nya samtal."
 
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:69
 msgid "Whether or not to play a sound to notify for outgoing messages."
 msgstr "Huruvida ett ljud ska spelas upp eller inte för utgående meddelanden."
 
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:70
 msgid "Whether or not to play a sound when logging in a network."
-msgstr ""
-"Huruvida ett ljud ska spelas upp eller inte vid inloggning i ett nätverk."
+msgstr "Huruvida ett ljud ska spelas upp eller inte vid inloggning i ett nätverk."
 
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:71
 msgid "Whether or not to play a sound when logging off a network."
-msgstr ""
-"Huruvida ett ljud ska spelas upp eller inte vid utloggning från ett nätverk."
+msgstr "Huruvida ett ljud ska spelas upp eller inte vid utloggning från ett nätverk."
 
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:72
 msgid "Whether or not to play sound notifications when away or busy."
-msgstr ""
-"Huruvida ljudnotifieringar ska spelas upp eller inte vid frånvaro eller "
-"upptagen."
+msgstr "Huruvida ljudnotifieringar ska spelas upp eller inte vid frånvaro eller upptagen."
 
-#: ../data/empathy.schemas.in.h:56
-msgid ""
-"Whether or not to show a popup notification when receiving a new message "
-"even if the chat is already opened, but not focused."
-msgstr ""
-"Huruvida en popupnotifiering ska visas när ett nytt meddelande tas emot, "
-"även om chatten redan är öppnad, men inte fokuserad."
+#: ../data/empathy.schemas.in.h:73
+msgid "Whether or not to show a popup notification when a contact goes offline."
+msgstr "Huruvida popupnotifieringar ska visas eller inte när en kontakt kopplar från."
 
-#: ../data/empathy.schemas.in.h:57
-msgid ""
-"Whether or not to show a popup notification when receiving a new message."
-msgstr ""
-"Huruvida en popupnotifiering ska visas eller inte när ett nytt meddelande "
-"tas emot."
+#: ../data/empathy.schemas.in.h:74
+msgid "Whether or not to show a popup notification when a contact goes online."
+msgstr "Huruvida popupnotifieringar ska visas eller inte när en kontakt ansluter."
 
-#: ../data/empathy.schemas.in.h:58
-msgid ""
-"Whether or not to show avatars for contacts in the contact list and chat "
-"windows."
-msgstr ""
-"Huruvida avatarer ska visas i kontaktlistan och chattfönster eller inte."
+#: ../data/empathy.schemas.in.h:75
+msgid "Whether or not to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
+msgstr "Huruvida en popupnotifiering ska visas när ett nytt meddelande tas emot, även om chatten redan är öppnad, men inte fokuserad."
 
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:76
+msgid "Whether or not to show a popup notification when receiving a new message."
+msgstr "Huruvida en popupnotifiering ska visas eller inte när ett nytt meddelande tas emot."
+
+#: ../data/empathy.schemas.in.h:77
+msgid "Whether or not to show avatars for contacts in the contact list and chat windows."
+msgstr "Huruvida avatarer ska visas i kontaktlistan och chattfönster eller inte."
+
+#: ../data/empathy.schemas.in.h:78
 msgid "Whether or not to show contacts that are offline in the contact list."
 msgstr "Huruvida frånkopplade kontakter ska visas i kontaktlistan eller inte."
 
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:79
 msgid "Whether or not to show popup notifications when away or busy."
-msgstr ""
-"Huruvida popupnotifieringar ska visas eller inte under frånvaro eller "
-"upptagen."
+msgstr "Huruvida popupnotifieringar ska visas eller inte under frånvaro eller upptagen."
 
-#: ../data/empathy.schemas.in.h:61
-msgid ""
-"Whether or not to show the message dialog about closing the main window with "
-"the 'x' button in the title bar."
-msgstr ""
-"Huruvida meddelandedialogen om att stänga huvudfönstret ska visas eller inte "
-"när man klickar på \"x\"-knappen i titelraden."
+#: ../data/empathy.schemas.in.h:80
+msgid "Whether or not to show the contact list in chat rooms."
+msgstr "Huruvida kontaktlistan ska visas i chattrum eller inte."
 
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:81
+msgid "Whether or not to show the message dialog about closing the main window with the 'x' button in the title bar."
+msgstr "Huruvida meddelandedialogen om att stänga huvudfönstret ska visas eller inte när man klickar på \"x\"-knappen i titelraden."
+
+#: ../data/empathy.schemas.in.h:82
 msgid "Whether to show the contact list in compact mode or not."
 msgstr "Huruvida kontaktlistan ska visas i kompakt läge eller inte."
 
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:83
 msgid "Whether to use the theme for chat rooms or not."
 msgstr "Huruvida tema ska användas för chattrum eller inte."
 
-#: ../data/empathy.schemas.in.h:64
-msgid ""
-"Which criterium to use when sorting the contact list. Default is to use sort "
-"by the contact's name with the value \"name\". A value of \"state\" will "
-"sort the contact list by state."
-msgstr ""
-"Vilket kriteria som ska användas när kontaktlistan sorteras. Standard är att "
-"sortera efter kontaktens namn med värdet \"name\". Värdet \"state\" kommer "
-"att sortera kontaktlistan efter tillstånd."
+#: ../data/empathy.schemas.in.h:84
+msgid "Which criterium to use when sorting the contact list. Default is to use sort by the contact's name with the value \"name\". A value of \"state\" will sort the contact list by state."
+msgstr "Vilket kriteria som ska användas när kontaktlistan sorteras. Standard är att sortera efter kontaktens namn med värdet \"name\". Värdet \"state\" kommer att sortera kontaktlistan efter tillstånd."
+
+#: ../libempathy/empathy-ft-handler.c:838
+msgid "The hash of the received file and the sent one do not match"
+msgstr "Hashsumman för den mottagna filen och den som skickades stämmer inte överens"
 
-#: ../libempathy/empathy-tp-contact-list.c:731 ../src/empathy.c:269
+#: ../libempathy/empathy-ft-handler.c:1098
+msgid "File transfer not supported by remote contact"
+msgstr "Filöverföringar stöds inte fjärrkontakten"
+
+#: ../libempathy/empathy-ft-handler.c:1156
+msgid "The selected file is not a regular file"
+msgstr "Den valda filen är inte en vanlig fil"
+
+#: ../libempathy/empathy-ft-handler.c:1165
+msgid "The selected file is empty"
+msgstr "Den valda filen är tom"
+
+#: ../libempathy/empathy-tp-contact-list.c:843
+#: ../src/empathy.c:289
 msgid "People nearby"
 msgstr "Personer i närheten"
 
-#: ../libempathy/empathy-utils.c:252
+#: ../libempathy/empathy-tp-file.c:279
+msgid "Socket type not supported"
+msgstr "Uttagstypen stöds inte"
+
+#: ../libempathy/empathy-tp-file.c:398
+msgid "No reason was specified"
+msgstr "Ingen anledning angavs"
+
+#: ../libempathy/empathy-tp-file.c:401
+msgid "The change in state was requested"
+msgstr "Ändring i tillstånd begärdes"
+
+#: ../libempathy/empathy-tp-file.c:404
+msgid "You canceled the file transfer"
+msgstr "Du avbröt filöverföringen"
+
+#: ../libempathy/empathy-tp-file.c:407
+msgid "The other participant canceled the file transfer"
+msgstr "Den andra deltagaren avbröt filöverföringen"
+
+#: ../libempathy/empathy-tp-file.c:410
+msgid "Error while trying to transfer the file"
+msgstr "Fel vid försök att överföra filen"
+
+#: ../libempathy/empathy-tp-file.c:413
+msgid "The other participant is unable to transfer the file"
+msgstr "Den andra deltagaren kunde inte överföra filen"
+
+#: ../libempathy/empathy-tp-file.c:416
+msgid "Unknown reason"
+msgstr "Okänd anledning"
+
+#: ../libempathy/empathy-utils.c:265
 msgid "Available"
 msgstr "Tillgänglig"
 
-#: ../libempathy/empathy-utils.c:254
+#: ../libempathy/empathy-utils.c:267
 msgid "Busy"
 msgstr "Upptagen"
 
-#: ../libempathy/empathy-utils.c:257
+#: ../libempathy/empathy-utils.c:270
 msgid "Away"
 msgstr "Frånvarande"
 
-#: ../libempathy/empathy-utils.c:259
+#: ../libempathy/empathy-utils.c:272
 msgid "Hidden"
 msgstr "Dold"
 
-#: ../libempathy/empathy-utils.c:262
+#: ../libempathy/empathy-utils.c:274
 msgid "Offline"
 msgstr "Frånkopplad"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:326
+#: ../libempathy/empathy-time.c:137
+#, c-format
+msgid "%d second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "%d sekund sedan"
+msgstr[1] "%d sekunder sedan"
+
+#: ../libempathy/empathy-time.c:142
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "%d minut sedan"
+msgstr[1] "%d minuter sedan"
+
+#: ../libempathy/empathy-time.c:147
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "%d timme sedan"
+msgstr[1] "%d timmar sedan"
+
+#: ../libempathy/empathy-time.c:152
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d dag sedan"
+msgstr[1] "%d dagar sedan"
+
+#: ../libempathy/empathy-time.c:157
+#, c-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "%d vecka sedan"
+msgstr[1] "%d veckor sedan"
+
+#: ../libempathy/empathy-time.c:162
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "%d månad sedan"
+msgstr[1] "%d månader sedan"
+
+#: ../libempathy/empathy-time.c:167
+msgid "in the future"
+msgstr "i framtiden"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:426
 msgid "All"
 msgstr "Alla"
 
 #: ../libempathy-gtk/empathy-account-widget.c:302
-#: ../libempathy-gtk/empathy-account-widget.c:347
+#: ../libempathy-gtk/empathy-account-widget.c:354
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-generic.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:1
-msgid "<b>Advanced</b>"
-msgstr "<b>Avancerat</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:2
-msgid "Forget password and clear the entry."
-msgstr "Glöm lösenordet och töm inmatningen."
-
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Advanced"
+msgstr "Avancerat"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
 msgid "Pass_word:"
 msgstr "L_ösenord:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
 msgid "Screen _Name:"
 msgstr "Skärm_namn:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:11
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:12
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:10
-#: ../src/empathy-new-chatroom-dialog.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "Inloggningsi_d:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
 msgid "ICQ _UIN:"
 msgstr "ICQ _UIN:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "_Charset:"
 msgstr "Tec_kenuppsättning:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:245
+#: ../libempathy-gtk/empathy-account-widget-irc.c:240
 msgid "New Network"
 msgstr "Nytt nätverk"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:1
-msgid "<b>Network</b>"
-msgstr "<b>Nätverk</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:2
-msgid "<b>Servers</b>"
-msgstr "<b>Servrar</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 msgid "Charset:"
 msgstr "Teckenuppsättning:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:4
-msgid "Create a new IRC network"
-msgstr "Skapa ett nytt irc-nätverk"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:5
-msgid "Edit the selected IRC network"
-msgstr "Redigera markerat irc-nätverk"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Network"
 msgstr "Nätverk"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Network:"
 msgstr "Nätverk:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Nickname:"
 msgstr "Smeknamn:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Quit message:"
 msgstr "Avslutningsmeddelande:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:11
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Real name:"
 msgstr "Verkligt namn:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:12
-msgid "Remove the selected IRC network"
-msgstr "Ta bort markerat irc-nätverk"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+msgid "Servers"
+msgstr "Servrar"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:2
-msgid "<b>Override server settings</b>"
-msgstr "<b>Åsidosätt serverinställningar</b>"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+msgid "Override server settings"
+msgstr "Åsidosätt serverinställningar"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
 msgid "Pri_ority:"
 msgstr "Pri_oritet:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "Reso_urce:"
 msgstr "_Resurs:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 msgid "Use old SS_L"
 msgstr "Använd gammal SS_L"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "_Encryption required (TLS/SSL)"
 msgstr "_Kryptering krävs (TLS/SSL)"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
 msgid "_Ignore SSL certificate errors"
 msgstr "_Ignorera SSL-certifikatfel"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:2
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:2
 msgid "_Email:"
 msgstr "_E-post:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3
 msgid "_First Name:"
 msgstr "_Förnamn:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:4
 msgid "_Jabber ID:"
 msgstr "_Jabber-id:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:5
 msgid "_Last Name:"
 msgstr "_Efternamn:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:6
-#: ../src/empathy-chatrooms-window.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:6
 msgid "_Nickname:"
 msgstr "Smek_namn:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:7
 msgid "_Published Name:"
 msgstr "_Publikt namn:"
 
 #. look up the DNS SRV record at the service's domain for the host name of a STUN server.
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "Discover STUN"
 msgstr "Upptäck STUN"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 msgid "STUN Server:"
 msgstr "STUN-server:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
 msgid "STUN port:"
 msgstr "STUN-port:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "_Username:"
 msgstr "A_nvändarnamn:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
 msgid "Use _Yahoo Japan"
 msgstr "Använd _Yahoo Japan"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
 msgid "Yahoo I_D:"
 msgstr "Yahoo-I_D:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 msgid "_Ignore conference and chatroom invitations"
 msgstr "_Ignorera inbjudningar till konferenser och chattrum"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
 msgid "_Room List locale:"
 msgstr "Lokalanpassning för _rumslista:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:462
-#: ../libempathy-gtk/empathy-avatar-chooser.c:537
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:525
 msgid "Couldn't convert image"
 msgstr "Kunde inte konvertera bild"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:463
+#: ../libempathy-gtk/empathy-avatar-chooser.c:450
 msgid "None of the accepted image formats is supported on your system"
 msgstr "Inga av de accepterade bildformaten stöds på ditt system"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:956
+#: ../libempathy-gtk/empathy-avatar-chooser.c:933
 msgid "Select Your Avatar Image"
 msgstr "Välj din avatarbild"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:959
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
 msgid "No Image"
 msgstr "Ingen bild"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
+#: ../libempathy-gtk/empathy-avatar-chooser.c:998
 msgid "Images"
 msgstr "Bilder"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1025
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
 msgid "All Files"
 msgstr "Alla filer"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:294
+#: ../libempathy-gtk/empathy-avatar-image.c:324
 msgid "Click to enlarge"
 msgstr "Klicka för att förstora"
 
-#: ../libempathy-gtk/empathy-chat.c:507
+#: ../libempathy-gtk/empathy-chat.c:186
+msgid "Failed to reconnect this chat"
+msgstr "Misslyckades med att återansluta till denna chatt"
+
+#: ../libempathy-gtk/empathy-chat.c:404
+msgid "Unsupported command"
+msgstr "Kommandot stöds inte"
+
+#: ../libempathy-gtk/empathy-chat.c:539
 msgid "offline"
 msgstr "frånkopplad"
 
-#: ../libempathy-gtk/empathy-chat.c:510
+#: ../libempathy-gtk/empathy-chat.c:542
 msgid "invalid contact"
 msgstr "ogiltig kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:513
+#: ../libempathy-gtk/empathy-chat.c:545
 msgid "permission denied"
 msgstr "åtkomst nekad"
 
-#: ../libempathy-gtk/empathy-chat.c:516
+#: ../libempathy-gtk/empathy-chat.c:548
 msgid "too long message"
 msgstr "för långt meddelande"
 
-#: ../libempathy-gtk/empathy-chat.c:519
+#: ../libempathy-gtk/empathy-chat.c:551
 msgid "not implemented"
 msgstr "inte implementerat"
 
-#: ../libempathy-gtk/empathy-chat.c:522
+#: ../libempathy-gtk/empathy-chat.c:554
 msgid "unknown"
 msgstr "okänt"
 
-#: ../libempathy-gtk/empathy-chat.c:526
+#: ../libempathy-gtk/empathy-chat.c:558
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Fel vid sändning av meddelandet \"%s\": %s"
 
-#: ../libempathy-gtk/empathy-chat.c:556
+#: ../libempathy-gtk/empathy-chat.c:588
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Ämnet inställt till: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:558
+#: ../libempathy-gtk/empathy-chat.c:590
 msgid "No topic defined"
 msgstr "Inget ämne definierat"
 
-#: ../libempathy-gtk/empathy-chat.c:973
+#: ../libempathy-gtk/empathy-chat.c:960
+msgid "(No Suggestions)"
+msgstr "(Inga förslag)"
+
+#: ../libempathy-gtk/empathy-chat.c:1014
 msgid "Insert Smiley"
 msgstr "Infoga smilis"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:991
-#: ../libempathy-gtk/empathy-ui-utils.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1032
+#: ../libempathy-gtk/empathy-ui-utils.c:1480
 msgid "_Send"
 msgstr "_Skicka"
 
-#: ../libempathy-gtk/empathy-chat.c:1025
-msgid "_Check Word Spelling..."
-msgstr "_Kontrollera stavning..."
+#: ../libempathy-gtk/empathy-chat.c:1066
+msgid "_Spelling Suggestions"
+msgstr "Sta_vningsförslag"
 
-#: ../libempathy-gtk/empathy-chat.c:1131
+#: ../libempathy-gtk/empathy-chat.c:1181
 #, c-format
-msgid "%s has joined the room"
-msgstr "%s har gått in i rummet"
+msgid "%s has disconnected"
+msgstr "%s har kopplat från"
+
+#: ../libempathy-gtk/empathy-chat.c:1185
+#, c-format
+msgid "%s was kicked by %s"
+msgstr "%s sparkades ut av %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1188
+#, c-format
+msgid "%s was kicked"
+msgstr "%s sparkades ut"
+
+#: ../libempathy-gtk/empathy-chat.c:1193
+#, c-format
+msgid "%s was banned by %s"
+msgstr "%s blev bannlyst av %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1196
+#, c-format
+msgid "%s was banned"
+msgstr "%s blev bannlyst"
 
-#: ../libempathy-gtk/empathy-chat.c:1134
+#: ../libempathy-gtk/empathy-chat.c:1200
 #, c-format
 msgid "%s has left the room"
 msgstr "%s har lämnat rummet"
 
-#: ../libempathy-gtk/empathy-chat.c:1248 ../src/empathy-call-window.c:548
+#. Note to translators: this string is appended to
+#. * notifications like "foo has left the room", with the message
+#. * given by the user living the room. If this poses a problem,
+#. * please let us know. :-)
+#.
+#: ../libempathy-gtk/empathy-chat.c:1209
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#: ../libempathy-gtk/empathy-chat.c:1232
+#, c-format
+msgid "%s has joined the room"
+msgstr "%s har gått in i rummet"
+
+#: ../libempathy-gtk/empathy-chat.c:1365
+#: ../src/empathy-call-window.c:1225
 msgid "Disconnected"
 msgstr "Frånkopplad"
 
-#: ../libempathy-gtk/empathy-chat.c:1644
+#: ../libempathy-gtk/empathy-chat.c:1800
 msgid "Connected"
 msgstr "Ansluten"
 
-#: ../libempathy-gtk/empathy-chat.c:1694
-#: ../libempathy-gtk/empathy-log-window.c:505
+#: ../libempathy-gtk/empathy-chat.c:1850
+#: ../libempathy-gtk/empathy-log-window.c:502
 msgid "Conversation"
 msgstr "Samtal"
 
-#: ../libempathy-gtk/empathy-chat.glade.h:1
-msgid "<b>Topic:</b>"
-msgstr "<b>Ämne:</b>"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:2
-msgid "Group Chat"
-msgstr "Gruppchatt"
+#: ../libempathy-gtk/empathy-chat.ui.h:1
+#: ../src/empathy-chat-window.c:472
+msgid "Topic:"
+msgstr "Ämne:"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:340
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:316
+#: ../libempathy-gtk/empathy-theme-adium.c:264
 msgid "_Copy Link Address"
 msgstr "_Kopiera länkadress"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:348
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:323
+#: ../libempathy-gtk/empathy-theme-adium.c:272
 msgid "_Open Link"
 msgstr "_Öppna länk"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:439
+#. Translators: timestamp displayed between conversations in
+#. * chat windows (strftime format string)
+#: ../libempathy-gtk/empathy-chat-text-view.c:421
 msgid "%A %B %d %Y"
 msgstr "%A %e %B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:180
-msgid "Personal Information"
-msgstr "Personlig information"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:183
+#: ../libempathy-gtk/empathy-contact-dialogs.c:179
+#: ../libempathy-gtk/empathy-contact-dialogs.c:238
 msgid "Edit Contact Information"
 msgstr "Redigera kontaktinformation"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:186
-msgid "Contact Information"
-msgstr "Kontaktinformation"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:267
-msgid "I would like to add you to my contact list."
-msgstr "Jag vill lägga till dig i min kontaktlista."
+#: ../libempathy-gtk/empathy-contact-dialogs.c:289
+msgid "Personal Information"
+msgstr "Personlig information"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:291
+#: ../libempathy-gtk/empathy-contact-dialogs.c:393
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:1
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
 msgid "Decide _Later"
 msgstr "Bestäm _senare"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:2
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Prenumerationsbegäran"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1249
+#: ../libempathy-gtk/empathy-contact-list-view.c:1400
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Vill du verkligen ta bort gruppen \"%s\"?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1251
+#: ../libempathy-gtk/empathy-contact-list-view.c:1402
 msgid "Removing group"
 msgstr "Tar bort grupp"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1298
-#: ../libempathy-gtk/empathy-contact-list-view.c:1377
+#. Remove
+#: ../libempathy-gtk/empathy-contact-list-view.c:1449
+#: ../libempathy-gtk/empathy-contact-list-view.c:1526
 msgid "_Remove"
 msgstr "_Ta bort"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1328
+#: ../libempathy-gtk/empathy-contact-list-view.c:1479
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Vill du verkligen ta bort kontakten \"%s\"?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1330
+#: ../libempathy-gtk/empathy-contact-list-view.c:1481
 msgid "Removing contact"
 msgstr "Tar bort kontakt"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1335
-msgid "Sorry, I don't want you in my contact list anymore."
-msgstr "Tyvärr, jag vill inte längre ha dig i min kontaktlista."
+#: ../libempathy-gtk/empathy-contact-menu.c:195
+#: ../src/empathy-main-window.ui.h:11
+msgid "_Add Contact..."
+msgstr "_Lägg till kontakt..."
 
-#: ../libempathy-gtk/empathy-contact-menu.c:130
-#: ../src/empathy-main-window.glade.h:9
+#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../src/empathy-main-window.ui.h:12
 msgid "_Chat"
 msgstr "_Chatt"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:161
-#: ../src/empathy-call-window.glade.h:5
-msgid "_Call"
-msgstr "_Ring"
+#: ../libempathy-gtk/empathy-contact-menu.c:253
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Ljudsamtal"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:200
-#: ../src/empathy-main-window.glade.h:17
+#: ../libempathy-gtk/empathy-contact-menu.c:285
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Videosamtal"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:324
 msgid "_View Previous Conversations"
 msgstr "_Visa tidigare samtal"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../libempathy-gtk/empathy-contact-menu.c:346
 msgid "Send file"
 msgstr "Skicka fil"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:250
+#: ../libempathy-gtk/empathy-contact-menu.c:369
+msgid "Share my desktop"
+msgstr "Dela ut mitt skrivbord"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:397
 msgid "Infor_mation"
 msgstr "Infor_mation"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:277
-#: ../src/empathy-chat-window.glade.h:14 ../src/empathy-main-window.glade.h:11
+#: ../libempathy-gtk/empathy-contact-menu.c:441
+#: ../src/empathy-main-window.ui.h:16
 msgid "_Edit"
 msgstr "R_edigera"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:336
+#: ../libempathy-gtk/empathy-contact-menu.c:501
 msgid "Inviting to this room"
 msgstr "Bjuder in till detta rum"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:369
+#: ../libempathy-gtk/empathy-contact-menu.c:532
 msgid "_Invite to chatroom"
 msgstr "_Bjud in till chattrum"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:111
+#: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "Välj en kontakt"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:358
+#: ../libempathy-gtk/empathy-contact-widget.c:447
 msgid "Save Avatar"
 msgstr "Spara avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:414
+#: ../libempathy-gtk/empathy-contact-widget.c:503
 msgid "Unable to save avatar"
 msgstr "Kunde inte spara avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:895
+#: ../libempathy-gtk/empathy-contact-widget.c:992
 msgid "Select"
 msgstr "Markera"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:904
-#: ../src/empathy-main-window.c:991
+#: ../libempathy-gtk/empathy-contact-widget.c:1001
+#: ../src/empathy-main-window.c:1023
 msgid "Group"
 msgstr "Grupp"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:1
-msgid "<b>Client Information</b>"
-msgstr "<b>Klientinformation</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1252
+msgid "Country ISO Code:"
+msgstr "Landets ISO-kod:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1254
+msgid "Country:"
+msgstr "Land:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1256
+msgid "State:"
+msgstr "Län:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:2
-msgid "<b>Contact Details</b>"
-msgstr "<b>Kontaktdetaljer</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1258
+msgid "City:"
+msgstr "Stad:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:3
-msgid "<b>Contact</b>"
-msgstr "<b>Kontakt</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1260
+msgid "Area:"
+msgstr "Område:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:4
-msgid "<b>Groups</b>"
-msgstr "<b>Grupper</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1262
+msgid "Postal Code:"
+msgstr "Postnummer:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:5
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:1
-#: ../src/empathy-chatrooms-window.glade.h:1
-#: ../src/empathy-new-chatroom-dialog.glade.h:1
+#: ../libempathy-gtk/empathy-contact-widget.c:1264
+msgid "Street:"
+msgstr "Gata:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1266
+msgid "Building:"
+msgstr "Byggnad:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1268
+msgid "Floor:"
+msgstr "Våning:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1270
+msgid "Room:"
+msgstr "Rum:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1272
+msgid "Text:"
+msgstr "Text:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1274
+msgid "Description:"
+msgstr "Beskrivning:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1276
+msgid "URI:"
+msgstr "URI:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1278
+msgid "Accuracy Level:"
+msgstr "Precisionsnivå:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1280
+msgid "Error:"
+msgstr "Fel:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1282
+msgid "Vertical Error (meters):"
+msgstr "Vertikalt fel (meter):"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1284
+msgid "Horizontal Error (meters):"
+msgstr "Horisontellt fel (meter):"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1286
+msgid "Speed:"
+msgstr "Hastighet:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1288
+msgid "Bearing:"
+msgstr "Riktning:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1290
+msgid "Climb Speed:"
+msgstr "Höjdökning:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1292
+msgid "Last Updated on:"
+msgstr "Senast uppdaterad:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1294
+msgid "Longitude:"
+msgstr "Longitud:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1296
+msgid "Latitude:"
+msgstr "Latitud:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1298
+msgid "Altitude:"
+msgstr "Höjd:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1345
+msgid "<b>Location</b>"
+msgstr "<b>Plats</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1358
+msgid "<b>Location</b>, "
+msgstr "<b>Plats</b>, "
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1408
+msgid "%B %e, %Y at %R UTC"
+msgstr "%e %B, %Y klockan %H.%M UTC"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Plats</b> den (datum)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid "Account:"
 msgstr "Konto:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:6
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
 msgid "Alias:"
 msgstr "Alias:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:7
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
 msgid "Birthday:"
 msgstr "Födelsedag:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:8
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "Client Information"
+msgstr "Klientinformation"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
 msgid "Client:"
 msgstr "Klient:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:9
-msgid "Contact information"
-msgstr "Kontaktinformation"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../src/empathy-main-window.c:1006
+msgid "Contact"
+msgstr "Kontakt"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Contact Details"
+msgstr "Kontaktdetaljer"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "Email:"
 msgstr "E-post:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Fullname:"
 msgstr "Fullständigt namn:"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Groups"
+msgstr "Grupper"
+
 #. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
 msgid "Identifier:"
 msgstr "Identifierare:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:14
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
 msgid "Information requested..."
 msgstr "Information begärd..."
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:16
-msgid ""
-"Select the groups you want this contact to appear in.  Note that you can "
-"select more than one group or no groups."
-msgstr ""
-"Välj de grupper som du vill att denna kontakt ska finnas i. Observera att du "
-"kan välja fler än en grupp eller inga grupper alls."
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
+msgid "Select the groups you want this contact to appear in.  Note that you can select more than one group or no groups."
+msgstr "Välj de grupper som du vill att denna kontakt ska finnas i. Observera att du kan välja fler än en grupp eller inga grupper alls."
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:17
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
 msgid "Version:"
 msgstr "Version:"
 
 # "Web site" är "webbplats". "Web page" är "webbsida".
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:18
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
 msgid "Web site:"
 msgstr "Webbplats:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:19
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
 msgid "_Add Group"
 msgstr "_Lägg till grupp"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:284
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:283
 msgid "new server"
 msgstr "ny server"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:513
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:510
 msgid "Server"
 msgstr "Server"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:528
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:525
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:541
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:498
-#: ../src/empathy-import-dialog.c:277
+#: ../libempathy-gtk/empathy-log-window.c:495
+#: ../src/empathy-import-dialog.c:285
 msgid "Account"
 msgstr "Konto"
 
-#: ../libempathy-gtk/empathy-log-window.c:515
+#: ../libempathy-gtk/empathy-log-window.c:512
 msgid "Date"
 msgstr "Datum"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.glade.h:2
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
 msgid "Conversations"
 msgstr "Samtal"
 
-#: ../libempathy-gtk/empathy-log-window.glade.h:3
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
 msgid "Previous Conversations"
 msgstr "Tidigare samtal"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.glade.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Search"
 msgstr "Sök"
 
-#. Searching *for* something
-#: ../libempathy-gtk/empathy-log-window.glade.h:7
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "_For:"
 msgstr "_För:"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:2
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
 msgid "C_all"
 msgstr "Rin_g"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:3
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
 msgid "C_hat"
 msgstr "C_hatta"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:4
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
 msgid "Contact ID:"
 msgstr "Kontakt-id:"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:5
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
 msgid "New Conversation"
 msgstr "Nytt samtal"
 
-#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:685
-msgid "Custom messages..."
-msgstr "Anpassade meddelanden..."
+#. COL_STATE_ICON_NAME
+#. COL_STATE
+#. COL_STATUS_TEXT
+#. COL_DISPLAY_MARKUP
+#. COL_STATUS_CUSTOMISABLE
+#. COL_TYPE
+#: ../libempathy-gtk/empathy-presence-chooser.c:172
+msgid "Custom Message..."
+msgstr "Anpassat meddelande..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:1
-msgid "Custom message"
-msgstr "Anpassat meddelande"
+#: ../libempathy-gtk/empathy-presence-chooser.c:227
+msgid "Edit Custom Messages..."
+msgstr "Redigera anpassade meddelanden..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:2
-msgid "Message:"
-msgstr "Meddelande:"
+#: ../libempathy-gtk/empathy-presence-chooser.c:326
+msgid "Click to remove this status as a favorite"
+msgstr "Klicka för att ta bort denna status som favorit"
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:3
-msgid "Save message"
-msgstr "Spara meddelande"
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
+msgid "Click to make this status a favorite"
+msgstr "Klicka för att göra denna status till favorit"
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:4
-msgid "Status:"
-msgstr "Status:"
+#: ../libempathy-gtk/empathy-presence-chooser.c:369
+msgid "Set status"
+msgstr "Ange status"
 
-#: ../libempathy-gtk/empathy-spell-dialog.c:88
-msgid "Word"
-msgstr "Ord"
+#: ../libempathy-gtk/empathy-presence-chooser.c:782
+msgid "Set your presence and current status"
+msgstr "Ange din närvaro och aktuell status"
 
-#: ../libempathy-gtk/empathy-spell-dialog.c:265
-msgid "Suggestions for the word"
-msgstr "Förslag för ordet"
-
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:1
-msgid "Spell Checker"
-msgstr "Stavningskontroll"
-
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:2
-msgid "Suggestions for the word:"
-msgstr "Förslag för ordet:"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:60
-msgid "Classic"
-msgstr "Klassiskt"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:61
-msgid "Simple"
-msgstr "Enkelt"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:62
-msgid "Clean"
-msgstr "Rent"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:63
-msgid "Blue"
-msgstr "Blått"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1385
-msgid "Unable to open URI"
-msgstr "Kunde inte öppna uri"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1530
-msgid "Select a file"
-msgstr "Välj en fil"
+#. Custom messages
+#: ../libempathy-gtk/empathy-presence-chooser.c:1017
+msgid "Custom messages..."
+msgstr "Anpassade meddelanden..."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1566
+#: ../libempathy-gtk/empathy-sound.c:51
 msgid "Received an instant message"
 msgstr "Tog emot ett snabbmeddelande"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1568
+#: ../libempathy-gtk/empathy-sound.c:53
 msgid "Sent an instant message"
 msgstr "Skickade ett snabbmeddelande"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1570
+#: ../libempathy-gtk/empathy-sound.c:55
 msgid "Incoming chat request"
 msgstr "Inkommande chattbegäran"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1572
+#: ../libempathy-gtk/empathy-sound.c:57
 msgid "Contact connected"
 msgstr "Kontakten ansluten"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1574
+#: ../libempathy-gtk/empathy-sound.c:59
 msgid "Contact disconnected"
 msgstr "Kontakten frånkopplad"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1576
+#: ../libempathy-gtk/empathy-sound.c:61
 msgid "Connected to server"
 msgstr "Ansluten till server"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1578
+#: ../libempathy-gtk/empathy-sound.c:63
 msgid "Disconnected from server"
 msgstr "Frånkopplad från server"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1580
+#: ../libempathy-gtk/empathy-sound.c:65
 msgid "Incoming voice call"
 msgstr "Inkommande röstsamtal"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1582
+#: ../libempathy-gtk/empathy-sound.c:67
 msgid "Outgoing voice call"
 msgstr "Utgående röstsamtal"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1584
+#: ../libempathy-gtk/empathy-sound.c:69
 msgid "Voice call ended"
 msgstr "Röstsamtal avslutat"
 
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
+msgid "Enter Custom Message"
+msgstr "Ange anpassat meddelande"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
+msgid "Edit Custom Messages"
+msgstr "Redigera anpassade meddelanden"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+msgid "Add _New Preset"
+msgstr "Lägg till _nytt förval"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
+msgid "Saved Presets"
+msgstr "Sparade förval"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:3
+msgid "gtk-add"
+msgstr "Lägg till"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:4
+msgid "gtk-remove"
+msgstr "Ta bort"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:67
+msgid "Classic"
+msgstr "Klassiskt"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:68
+msgid "Simple"
+msgstr "Enkelt"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:69
+msgid "Clean"
+msgstr "Rent"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:70
+msgid "Blue"
+msgstr "Blått"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1382
+msgid "Unable to open URI"
+msgstr "Kunde inte öppna uri"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1472
+msgid "Select a file"
+msgstr "Välj en fil"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1530
+msgid "Select a destination"
+msgstr "Välj ett mål"
+
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
 msgstr "Aktuell lokal"
@@ -1239,10 +1505,8 @@ msgstr "Vietnamesisk"
 #. * vim: sw=2 ts=8 cindent noai bs=2
 #.
 #: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:1
-msgid ""
-"The contact to display in the applet. Empty means no contact is displayed."
-msgstr ""
-"Kontakten att visa i panelprogrammet. Tom betyder att ingen kontakt visas."
+msgid "The contact to display in the applet. Empty means no contact is displayed."
+msgstr "Kontakten att visa i panelprogrammet. Tom betyder att ingen kontakt visas."
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:2
 msgid "The contact's avatar token. Empty means contact has no avatar."
@@ -1253,7 +1517,7 @@ msgid "Megaphone"
 msgstr "Megaphone"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:417
+#: ../megaphone/src/megaphone-applet.c:519
 msgid "Talk!"
 msgstr "Prata!"
 
@@ -1267,15 +1531,15 @@ msgid "_Information"
 msgstr "_Information"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.glade.h:15
+#: ../src/empathy-main-window.ui.h:23
 msgid "_Preferences"
 msgstr "In_ställningar"
 
-#: ../megaphone/src/megaphone-applet.c:255
+#: ../megaphone/src/megaphone-applet.c:168
 msgid "Please configure a contact."
 msgstr "Konfigurera en kontakt."
 
-#: ../megaphone/src/megaphone-applet.c:348
+#: ../megaphone/src/megaphone-applet.c:258
 msgid "Select contact..."
 msgstr "Välj kontakt..."
 
@@ -1288,60 +1552,39 @@ msgstr "Närvaro"
 msgid "Set your own presence"
 msgstr "Ställ in din egna närvaro"
 
-#: ../src/empathy.c:426
+#: ../src/empathy.c:567
 msgid "Don't connect on startup"
 msgstr "Anslut inte vid uppstart"
 
-#: ../src/empathy.c:430
+#: ../src/empathy.c:571
 msgid "Don't show the contact list on startup"
 msgstr "Visa inte kontaktlistan vid uppstart"
 
-#: ../src/empathy.c:434
+#: ../src/empathy.c:575
 msgid "Show the accounts dialog"
 msgstr "Visa kontodialogrutan"
 
-#: ../src/empathy.c:446
+#: ../src/empathy.c:587
 msgid "- Empathy Instant Messenger"
 msgstr "- Empathy snabbmeddelandeklient"
 
-#: ../src/empathy-about-dialog.c:84
-msgid ""
-"Empathy is free software; you can redistribute it and/or modify it under the "
-"terms of the GNU General Public License as published by the Free Software "
-"Foundation; either version 2 of the License, or (at your option) any later "
-"version."
-msgstr ""
-"Empathy är fri programvara. Du kan distribuera det och/eller modifiera det "
-"under villkoren i GNU General Public License, publicerad av Free Software "
-"Foundation, antingen version 2 eller (om du så vill) någon senare version."
+#: ../src/empathy-about-dialog.c:83
+msgid "Empathy is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version."
+msgstr "Empathy är fri programvara. Du kan distribuera det och/eller modifiera det under villkoren i GNU General Public License, publicerad av Free Software Foundation, antingen version 2 eller (om du så vill) någon senare version."
 
-#: ../src/empathy-about-dialog.c:88
-msgid ""
-"Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
-"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
-"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
-"details."
-msgstr ""
-"Empathy distribueras i hopp om att det ska vara användbart, men UTAN NÅGON "
-"SOM HELST GARANTI, även utan underförstådd garanti om SÄLJBARHET eller "
-"LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. Se GNU General Public License för "
-"ytterligare information."
+#: ../src/empathy-about-dialog.c:87
+msgid "Empathy is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details."
+msgstr "Empathy distribueras i hopp om att det ska vara användbart, men UTAN NÅGON SOM HELST GARANTI, även utan underförstådd garanti om SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. Se GNU General Public License för ytterligare information."
 
-#: ../src/empathy-about-dialog.c:92
-msgid ""
-"You should have received a copy of the GNU General Public License along with "
-"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
-"Street, Fifth Floor, Boston, MA 02110-130159 USA"
-msgstr ""
-"Du bör ha fått en kopia av GNU General Public License tillsammans med "
-"Empathy. Om inte, skriv till Free Software Foundation, Inc., 51 Franklin "
-"Street, Fifth Floor, Boston, MA 02110-130159 USA"
+#: ../src/empathy-about-dialog.c:91
+msgid "You should have received a copy of the GNU General Public License along with Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
+msgstr "Du bör ha fått en kopia av GNU General Public License tillsammans med Empathy. Om inte, skriv till Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:120
+#: ../src/empathy-about-dialog.c:119
 msgid "An Instant Messaging client for GNOME"
 msgstr "En snabbmeddelandeklient för GNOME"
 
-#: ../src/empathy-about-dialog.c:126
+#: ../src/empathy-about-dialog.c:125
 msgid "translator-credits"
 msgstr ""
 "Daniel Nylander\n"
@@ -1351,22 +1594,22 @@ msgstr ""
 "Skicka synpunkter på översättningen till\n"
 "tp-sv@listor.tp-sv.se"
 
-#: ../src/empathy-accounts-dialog.c:391
+#: ../src/empathy-accounts-dialog.c:392
 msgid "Enabled"
 msgstr "Aktiverad"
 
-#: ../src/empathy-accounts-dialog.c:401
-#: ../src/empathy-accounts-dialog.glade.h:4
+#: ../src/empathy-accounts-dialog.c:402
+#: ../src/empathy-accounts-dialog.ui.h:1
 msgid "Accounts"
 msgstr "Konton"
 
 #. To translator: %s is the protocol name
-#: ../src/empathy-accounts-dialog.c:833
+#: ../src/empathy-accounts-dialog.c:837
 #, c-format
 msgid "New %s account"
 msgstr "Nytt %s-konto"
 
-#: ../src/empathy-accounts-dialog.c:943
+#: ../src/empathy-accounts-dialog.c:950
 #, c-format
 msgid ""
 "You are about to remove your %s account!\n"
@@ -1375,316 +1618,234 @@ msgstr ""
 "Du håller på att ta bort kontot %s!\n"
 "Är du säker att du vill fortsätta?"
 
-#: ../src/empathy-accounts-dialog.c:949
+#: ../src/empathy-accounts-dialog.c:956
 msgid ""
-"Any associated conversations and chat rooms will NOT be removed if you "
-"decide to proceed.\n"
+"Any associated conversations and chat rooms will NOT be removed if you decide to proceed.\n"
 "\n"
-"Should you decide to add the account back at a later time, they will still "
-"be available."
+"Should you decide to add the account back at a later time, they will still be available."
 msgstr ""
 "Eventuella samtal och chattrum kommer inte tas bort.\n"
 "\n"
-"Om du senare lägger till kontot igen, kommer dessa fortfarande vara "
-"tillgängliga."
+"Om du senare lägger till kontot igen, kommer dessa fortfarande vara tillgängliga."
 
-#: ../src/empathy-accounts-dialog.glade.h:1
-msgid "<b>New Account</b>"
-msgstr "<b>Nytt konto</b>"
+#: ../src/empathy-accounts-dialog.ui.h:2
+msgid "Add Account"
+msgstr "Lägg till konto"
 
-#: ../src/empathy-accounts-dialog.glade.h:2
-msgid "<b>No protocol installed</b>"
-msgstr "<b>Inga protokoll installerade</b>"
-
-#: ../src/empathy-accounts-dialog.glade.h:3
-msgid "<b>Settings</b>"
-msgstr "<b>Inställningar</b>"
-
-#: ../src/empathy-accounts-dialog.glade.h:5
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "Cr_eate"
 msgstr "Ska_pa"
 
-#: ../src/empathy-accounts-dialog.glade.h:6
-msgid "I already have an account I want to use"
-msgstr "Jag har redan ett konto som jag vill använda"
+#: ../src/empathy-accounts-dialog.ui.h:4
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/empathy-accounts-dialog.glade.h:7
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid "Import Accounts..."
 msgstr "Importera konton..."
 
-#: ../src/empathy-accounts-dialog.glade.h:8
-msgid ""
-"To add a new account, you first have to install a backend for each protocol "
-"you want to use."
-msgstr ""
-"För att lägga till ett nytt konto måste du först installera en bakände för "
-"varje protokoll som du vill använda."
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol installed"
+msgstr "Inga protokoll installerade"
 
-#: ../src/empathy-accounts-dialog.glade.h:9
+#: ../src/empathy-accounts-dialog.ui.h:7
+msgid "Settings"
+msgstr "Inställningar"
+
+#: ../src/empathy-accounts-dialog.ui.h:8
+msgid "To add a new account, you first have to install a backend for each protocol you want to use."
+msgstr "För att lägga till ett nytt konto måste du först installera en bakände för varje protokoll som du vill använda."
+
+#: ../src/empathy-accounts-dialog.ui.h:9
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../src/empathy-call-window.c:258
+#: ../src/empathy-accounts-dialog.ui.h:10
+msgid "_Add..."
+msgstr "_Lägg till..."
+
+#: ../src/empathy-accounts-dialog.ui.h:11
+msgid "_Create a new account"
+msgstr "_Skapa ett nytt konto"
+
+#: ../src/empathy-accounts-dialog.ui.h:12
+msgid "_Reuse an existing account"
+msgstr "_Återanvänd ett befintligt konto"
+
+#: ../src/empathy-call-window.c:420
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: ../src/empathy-call-window.c:258
+#: ../src/empathy-call-window.c:423
 msgid "Brightness"
 msgstr "Ljusstyrka"
 
-#: ../src/empathy-call-window.c:258
+#: ../src/empathy-call-window.c:426
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-call-window.c:290
+#: ../src/empathy-call-window.c:531
 msgid "Volume"
 msgstr "Volym"
 
-#: ../src/empathy-call-window.c:366
+#: ../src/empathy-call-window.c:662
+msgid "Connecting..."
+msgstr "Ansluter..."
+
+#: ../src/empathy-call-window.c:746
 msgid "_Sidebar"
 msgstr "_Sidopanel"
 
-#: ../src/empathy-call-window.c:384
+#: ../src/empathy-call-window.c:765
 msgid "Dialpad"
 msgstr "Knappsats"
 
-#: ../src/empathy-call-window.c:390
+#: ../src/empathy-call-window.c:771
 msgid "Audio input"
 msgstr "Ljudingång"
 
-#: ../src/empathy-call-window.c:394
+#: ../src/empathy-call-window.c:775
 msgid "Video input"
 msgstr "Videoingång"
 
-#: ../src/empathy-call-window.c:407
-msgid "Connecting..."
-msgstr "Ansluter..."
+#: ../src/empathy-call-window.c:835
+#, c-format
+msgid "Call with %s"
+msgstr "Ring med %s"
 
-#: ../src/empathy-call-window.c:572
+#: ../src/empathy-call-window.c:904
+msgid "Call"
+msgstr "Ring"
+
+#. Translators: number of minutes:seconds the caller has been connected
+#: ../src/empathy-call-window.c:1335
 #, c-format
-msgid "Connected -- %d:%02dm"
-msgstr "Ansluten -- %d:%02dm"
+msgid "Connected — %d:%02dm"
+msgstr "Ansluten — %d:%02dm"
 
-#: ../src/empathy-call-window.glade.h:1
+#: ../src/empathy-call-window.ui.h:1
 msgid "Hang up"
 msgstr "Lägg på"
 
-#: ../src/empathy-call-window.glade.h:2
+#: ../src/empathy-call-window.ui.h:2
+msgid "Redial"
+msgstr "Ring igen"
+
+#: ../src/empathy-call-window.ui.h:3
 msgid "Send Audio"
 msgstr "Skicka ljud"
 
-#: ../src/empathy-call-window.glade.h:3
+#: ../src/empathy-call-window.ui.h:4
 msgid "Send video"
 msgstr "Skicka video"
 
-#: ../src/empathy-call-window.glade.h:4
+#: ../src/empathy-call-window.ui.h:5
 msgid "Video preview"
 msgstr "Videoförhandsvisning"
 
-#: ../src/empathy-call-window.glade.h:6
+#: ../src/empathy-call-window.ui.h:6
+msgid "_Call"
+msgstr "_Ring"
+
+#: ../src/empathy-call-window.ui.h:7
+#: ../src/empathy-main-window.ui.h:26
 msgid "_View"
 msgstr "_Visa"
 
-#: ../src/empathy-chat-window.c:313
+#: ../src/empathy-chat-window.c:344
 #, c-format
 msgid "Conversations (%d)"
 msgstr "Samtal (%d)"
 
-#: ../src/empathy-chat-window.c:418
-msgid "Topic:"
-msgstr "Ämne:"
-
-#: ../src/empathy-chat-window.c:423
+#: ../src/empathy-chat-window.c:476
 msgid "Typing a message."
 msgstr "Skriver ett meddelande."
 
-#: ../src/empathy-chat-window.c:892 ../src/empathy-event-manager.c:424
-#, c-format
-msgid "New message from %s"
-msgstr "Nytt meddelande från %s"
-
-#: ../src/empathy-chat-window.glade.h:1
-msgid "C_lear"
-msgstr "T_öm"
-
-#: ../src/empathy-chat-window.glade.h:2
-msgid "Chat"
-msgstr "Chatta"
-
-#: ../src/empathy-chat-window.glade.h:3
-msgid "Insert _Smiley"
-msgstr "Infoga _smilis"
-
-#: ../src/empathy-chat-window.glade.h:4
-msgid "Invitation _message:"
-msgstr "Inbjudnings_meddelande:"
-
-#: ../src/empathy-chat-window.glade.h:5
-msgid "Invite"
-msgstr "Bjud in"
-
-#: ../src/empathy-chat-window.glade.h:6
-msgid "Move Tab _Left"
-msgstr "Flytta flik till _vänster"
-
-#: ../src/empathy-chat-window.glade.h:7
-msgid "Move Tab _Right"
-msgstr "Flytta flik till _höger"
-
-#: ../src/empathy-chat-window.glade.h:8
-msgid "Select who would you like to invite:"
-msgstr "Välj vem du vill bjuda in:"
-
-#: ../src/empathy-chat-window.glade.h:9
-msgid "You have been invited to join a chat conference."
-msgstr "Du har blivit inbjuden till en chattkonferens."
-
-#: ../src/empathy-chat-window.glade.h:10
-msgid "_Contact"
-msgstr "_Kontakt"
-
-#: ../src/empathy-chat-window.glade.h:11 ../src/empathy-main-window.glade.h:10
-msgid "_Contents"
-msgstr "I_nnehåll"
-
-#: ../src/empathy-chat-window.glade.h:12
-msgid "_Conversation"
-msgstr "_Samtal"
-
-#: ../src/empathy-chat-window.glade.h:13
-msgid "_Detach Tab"
-msgstr "_Koppla loss flik"
-
-#: ../src/empathy-chat-window.glade.h:15
-msgid "_Favorite Chatroom"
-msgstr "_Favoritchattrum"
-
-#: ../src/empathy-chat-window.glade.h:16 ../src/empathy-main-window.glade.h:12
-msgid "_Help"
-msgstr "_Hjälp"
-
-#: ../src/empathy-chat-window.glade.h:17
-msgid "_Next Tab"
-msgstr "_Nästa flik"
-
-#: ../src/empathy-chat-window.glade.h:18
-msgid "_Previous Tab"
-msgstr "_Föregående flik"
-
-#: ../src/empathy-chat-window.glade.h:19
-msgid "_Tabs"
-msgstr "_Flikar"
-
-#: ../src/empathy-chatrooms-window.c:262
+#: ../src/empathy-chatrooms-window.c:258
 msgid "Name"
 msgstr "Namn"
 
-#: ../src/empathy-chatrooms-window.c:280
+#: ../src/empathy-chatrooms-window.c:276
 msgid "Room"
 msgstr "Rum"
 
-#: ../src/empathy-chatrooms-window.c:289
+#: ../src/empathy-chatrooms-window.c:285
 msgid "Auto-Connect"
 msgstr "Anslut automatiskt"
 
-#: ../src/empathy-chatrooms-window.glade.h:2
-msgid "Edit Favorite Room"
-msgstr "Redigera favoritrum"
-
-#: ../src/empathy-chatrooms-window.glade.h:3
-msgid "Join room on start_up"
-msgstr "Gå in i rummet vid _uppstart"
-
-#: ../src/empathy-chatrooms-window.glade.h:4
-msgid "Join this chat room when Empathy starts and you are connected"
-msgstr "Gå in i detta chattrum när Empathy startar och du är ansluten"
-
-#: ../src/empathy-chatrooms-window.glade.h:5
+#: ../src/empathy-chatrooms-window.ui.h:2
 msgid "Manage Favorite Rooms"
 msgstr "Hantera favoritrum"
 
-#: ../src/empathy-chatrooms-window.glade.h:6
-msgid "N_ame:"
-msgstr "N_amn:"
-
-#: ../src/empathy-chatrooms-window.glade.h:7
-msgid "S_erver:"
-msgstr "S_erver:"
-
-#: ../src/empathy-chatrooms-window.glade.h:9
-#: ../src/empathy-new-chatroom-dialog.glade.h:9
-msgid "_Room:"
-msgstr "_Rum:"
-
-#: ../src/empathy-event-manager.c:372
+#: ../src/empathy-event-manager.c:321
 msgid "Incoming call"
 msgstr "Inkommande samtal"
 
-#: ../src/empathy-event-manager.c:375
+#: ../src/empathy-event-manager.c:324
 #, c-format
 msgid "%s is calling you, do you want to answer?"
 msgstr "%s ringer dig. Vill du svara?"
 
-#: ../src/empathy-event-manager.c:382
+#: ../src/empathy-event-manager.c:331
 msgid "_Reject"
 msgstr "Avv_isa"
 
-#: ../src/empathy-event-manager.c:388
+#: ../src/empathy-event-manager.c:337
 msgid "_Answer"
 msgstr "_Svara"
 
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:452
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Inkommande samtal från %s"
 
-#: ../src/empathy-event-manager.c:559
+#: ../src/empathy-event-manager.c:496
 #, c-format
 msgid "%s is offering you an invitation"
 msgstr "%s erbjuder dig en inbjudan"
 
-#: ../src/empathy-event-manager.c:565
+#: ../src/empathy-event-manager.c:502
 msgid "An external application will be started to handle it."
 msgstr "Ett externt program kommer att startas för att hantera den."
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:507
 msgid "You don't have the needed external application to handle it."
 msgstr "Du har inte det nödvändiga externa programmet att hantera den med."
 
-#: ../src/empathy-event-manager.c:692
+#: ../src/empathy-event-manager.c:634
 msgid "Room invitation"
 msgstr "Rumsinbjudan"
 
-#: ../src/empathy-event-manager.c:695
+#: ../src/empathy-event-manager.c:637
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s bjuder in dig till %s"
 
-#. Decline button
-#: ../src/empathy-event-manager.c:703 ../src/empathy-ft-manager.c:1021
+#: ../src/empathy-event-manager.c:645
 msgid "_Decline"
 msgstr "_Neka"
 
-#: ../src/empathy-event-manager.c:708
+#: ../src/empathy-event-manager.c:650
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Gå in"
 
-#: ../src/empathy-event-manager.c:738
+#: ../src/empathy-event-manager.c:689
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s har bjudit in dig till %s"
 
-#: ../src/empathy-event-manager.c:860
+#: ../src/empathy-event-manager.c:715
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Inkommande filöverföring från %s"
 
-#: ../src/empathy-event-manager.c:954
+#: ../src/empathy-event-manager.c:895
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "Prenumeration begärd av %s"
 
-#: ../src/empathy-event-manager.c:958
+#: ../src/empathy-event-manager.c:899
 #, c-format
 msgid ""
 "\n"
@@ -1693,631 +1854,847 @@ msgstr ""
 "\n"
 "Meddelande: %s"
 
-#: ../src/empathy-ft-manager.c:113
+#. someone is logging off
+#: ../src/empathy-event-manager.c:935
+#, c-format
+msgid "%s is now offline."
+msgstr "%s är nu frånkopplad."
+
+#. someone is logging in
+#: ../src/empathy-event-manager.c:951
+#, c-format
+msgid "%s is now online."
+msgstr "%s är nu ansluten."
+
+#. Translators: time left, when it is more than one hour
+#: ../src/empathy-ft-manager.c:101
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:115
+#. Translators: time left, when is is less than one hour
+#: ../src/empathy-ft-manager.c:104
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:164
-msgid "No reason was specified"
-msgstr "Ingen anledning angavs"
-
-#: ../src/empathy-ft-manager.c:166
-msgid "The change in state was requested"
-msgstr "Ändring i tillstånd begärdes"
-
-#: ../src/empathy-ft-manager.c:168
-msgid "You canceled the file transfer"
-msgstr "Du avbröt filöverföringen"
-
-#: ../src/empathy-ft-manager.c:170
-msgid "The other participant canceled the file transfer"
-msgstr "Den andra deltagaren avbröt filöverföringen"
-
-#: ../src/empathy-ft-manager.c:172
-msgid "Error while trying to transfer the file"
-msgstr "Fel vid försök att överföra filen"
+#: ../src/empathy-ft-manager.c:180
+msgctxt "file transfer percent"
+msgid "Unknown"
+msgstr "Okänt"
 
-#: ../src/empathy-ft-manager.c:174
-msgid "The other participant is unable to transfer the file"
-msgstr "Den andra deltagaren kunde inte överföra filen"
+#: ../src/empathy-ft-manager.c:275
+#, c-format
+msgid "%s of %s at %s/s"
+msgstr "%s av %s i %s/s"
 
-#: ../src/empathy-ft-manager.c:176
-msgid "Unknown reason"
-msgstr "Okänd anledning"
+#: ../src/empathy-ft-manager.c:276
+#, c-format
+msgid "%s of %s"
+msgstr "%s av %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:224
+#: ../src/empathy-ft-manager.c:307
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Tar emot \"%s\" från %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:227
+#: ../src/empathy-ft-manager.c:310
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Skickar \"%s\" till %s"
 
-#: ../src/empathy-ft-manager.c:237
-msgctxt "file size"
-msgid "Unknown"
-msgstr "Okänt"
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:340
+#, c-format
+msgid "Error receiving \"%s\" from %s"
+msgstr "Fel vid mottagning av \"%s\" från %s"
+
+#: ../src/empathy-ft-manager.c:343
+msgid "Error receiving a file"
+msgstr "Fel vid mottagning av en fil"
 
-#. translators: first %s is the transferred size, second %s is
-#. * the total file size
-#: ../src/empathy-ft-manager.c:245
+#: ../src/empathy-ft-manager.c:348
 #, c-format
-msgid "%s of %s"
-msgstr "%s av %s"
+msgid "Error sending \"%s\" to %s"
+msgstr "Fel vid sändning av \"%s\" till %s"
 
-#: ../src/empathy-ft-manager.c:252
-msgid "Waiting the other participant's response"
-msgstr "Väntar på svar från den andra deltagaren"
+#: ../src/empathy-ft-manager.c:351
+msgid "Error sending a file"
+msgstr "Fel vid sändning av en fil"
 
-#: ../src/empathy-ft-manager.c:262
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:490
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" togs emot från %s"
 
-#: ../src/empathy-ft-manager.c:268
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:495
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" skickades till %s"
 
-#: ../src/empathy-ft-manager.c:271
+#: ../src/empathy-ft-manager.c:498
 msgid "File transfer completed"
 msgstr "Filöverföringen är färdig"
 
-#: ../src/empathy-ft-manager.c:280
-#, c-format
-msgid "\"%s\" receiving from %s"
-msgstr "\"%s\" tas emot från %s"
+#: ../src/empathy-ft-manager.c:617
+#: ../src/empathy-ft-manager.c:784
+msgid "Waiting for the other participant's response"
+msgstr "Väntar på svar från den andra deltagaren"
 
-#: ../src/empathy-ft-manager.c:286
+#: ../src/empathy-ft-manager.c:643
+#: ../src/empathy-ft-manager.c:681
 #, c-format
-msgid "\"%s\" sending to %s"
-msgstr "\"%s\" skickas till %s"
+msgid "Checking integrity of \"%s\""
+msgstr "Kontrollerar integritet för \"%s\""
 
-#: ../src/empathy-ft-manager.c:289
+#: ../src/empathy-ft-manager.c:646
+#: ../src/empathy-ft-manager.c:684
 #, c-format
-msgid "File transfer canceled: %s"
-msgstr "Filöverföringen avbröts: %s"
+msgid "Hashing \"%s\""
+msgstr "Hashar \"%s\""
 
-#: ../src/empathy-ft-manager.c:304
-msgctxt "remaining time"
-msgid "Unknown"
-msgstr "Okänt"
-
-#: ../src/empathy-ft-manager.c:364
-msgctxt "file transfer percent"
-msgid "Unknown"
-msgstr "Okänt"
-
-#: ../src/empathy-ft-manager.c:700
+#: ../src/empathy-ft-manager.c:1024
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:712
+#: ../src/empathy-ft-manager.c:1036
 msgid "File"
 msgstr "Fil"
 
-#: ../src/empathy-ft-manager.c:734
+#: ../src/empathy-ft-manager.c:1058
 msgid "Remaining"
 msgstr "Återstår"
 
-#: ../src/empathy-ft-manager.c:885
-msgid "Cannot save file to this location"
-msgstr "Kan inte spara fil till denna plats"
-
-#: ../src/empathy-ft-manager.c:931
-msgid "Save file as..."
-msgstr "Spara fil som..."
-
-#: ../src/empathy-ft-manager.c:1001
-msgid "unknown size"
-msgstr "okänd storlek"
-
-#: ../src/empathy-ft-manager.c:1007
-#, c-format
-msgid "%s would like to send you a file"
-msgstr "%s vill skicka en fil till dig"
-
-#: ../src/empathy-ft-manager.c:1012
-#, c-format
-msgid "Do you want to accept the file \"%s\" (%s)?"
-msgstr "Vill du ta emot filen \"%s\" (%s)?"
-
-#. Accept button
-#: ../src/empathy-ft-manager.c:1030
-msgid "_Accept"
-msgstr "_Acceptera"
-
-#: ../src/empathy-ft-manager.glade.h:1
-msgid "File transfers"
+#: ../src/empathy-ft-manager.ui.h:1
+msgid "File Transfers"
 msgstr "Filöverföringar"
 
-#: ../src/empathy-ft-manager.glade.h:2
+#: ../src/empathy-ft-manager.ui.h:2
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Ta bort färdiga, avbrutna och misslyckade filöverföringar från listan"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-dialog.c:255
+#: ../src/empathy-import-dialog.c:263
 msgid "Import"
 msgstr "Importera"
 
-#: ../src/empathy-import-dialog.c:264
+#: ../src/empathy-import-dialog.c:272
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../src/empathy-import-dialog.c:290
+#: ../src/empathy-import-dialog.c:298
 msgid "Source"
 msgstr "Källa"
 
-#: ../src/empathy-import-dialog.c:378
-msgid ""
-"No accounts to import could be found. Empathy currently only supports "
-"importing accounts from Pidgin."
-msgstr ""
-"Inga konton att importera kunde hittas. Empathy har för närvarande endast "
-"stöd för att importera konton från Pidgin."
+#: ../src/empathy-import-dialog.c:392
+msgid "No accounts to import could be found. Empathy currently only supports importing accounts from Pidgin."
+msgstr "Inga konton att importera kunde hittas. Empathy har för närvarande endast stöd för att importera konton från Pidgin."
 
-#: ../src/empathy-import-dialog.glade.h:1
+#: ../src/empathy-import-dialog.ui.h:1
 msgid "Import Accounts"
 msgstr "Importera konton"
 
-#: ../src/empathy-main-window.c:391
+#: ../src/empathy-main-window.c:402
+msgid "_Edit account"
+msgstr "_Redigera konto"
+
+#: ../src/empathy-main-window.c:505
 msgid "No error specified"
 msgstr "Inget fel angivet"
 
-#: ../src/empathy-main-window.c:394
+#: ../src/empathy-main-window.c:508
 msgid "Network error"
 msgstr "Nätverksfel"
 
-#: ../src/empathy-main-window.c:397
+#: ../src/empathy-main-window.c:511
 msgid "Authentication failed"
 msgstr "Autentisering misslyckades"
 
-#: ../src/empathy-main-window.c:400
+#: ../src/empathy-main-window.c:514
 msgid "Encryption error"
 msgstr "Krypteringsfel"
 
-#: ../src/empathy-main-window.c:403
+#: ../src/empathy-main-window.c:517
 msgid "Name in use"
 msgstr "Namnet används"
 
-#: ../src/empathy-main-window.c:406
+#: ../src/empathy-main-window.c:520
 msgid "Certificate not provided"
 msgstr "Certifikat inte tillhandahållet"
 
-#: ../src/empathy-main-window.c:409
+#: ../src/empathy-main-window.c:523
 msgid "Certificate untrusted"
 msgstr "Certifikatet är inte betrott"
 
-#: ../src/empathy-main-window.c:412
+#: ../src/empathy-main-window.c:526
 msgid "Certificate expired"
 msgstr "Certifikatet har gått ut"
 
-#: ../src/empathy-main-window.c:415
+#: ../src/empathy-main-window.c:529
 msgid "Certificate not activated"
 msgstr "Certifikatet är inte aktiverat"
 
-#: ../src/empathy-main-window.c:418
+#: ../src/empathy-main-window.c:532
 msgid "Certificate hostname mismatch"
 msgstr "Värdnamnet i certifikatet stämmer inte"
 
-#: ../src/empathy-main-window.c:421
+#: ../src/empathy-main-window.c:535
 msgid "Certificate fingerprint mismatch"
 msgstr "Certifikatets fingeravtryck stämmer inte"
 
-#: ../src/empathy-main-window.c:424
+#: ../src/empathy-main-window.c:538
 msgid "Certificate self-signed"
 msgstr "Självsignerat certifikat"
 
-#: ../src/empathy-main-window.c:427
+#: ../src/empathy-main-window.c:541
 msgid "Certificate error"
 msgstr "Certifikatfel"
 
-#: ../src/empathy-main-window.c:430
+#: ../src/empathy-main-window.c:544
 msgid "Unknown error"
 msgstr "Okänt fel"
 
-#: ../src/empathy-main-window.c:594
+#: ../src/empathy-main-window.c:1293
 msgid "Show and edit accounts"
 msgstr "Visa och redigera konton"
 
-#: ../src/empathy-main-window.c:974
-msgid "Contact"
-msgstr "Kontakt"
-
-#: ../src/empathy-main-window.c:1176
-msgid "_Edit account"
-msgstr "_Redigera konto"
-
-#: ../src/empathy-main-window.glade.h:1
+#: ../src/empathy-main-window.ui.h:1
 msgid "Contact List"
 msgstr "Kontaktlista"
 
+#: ../src/empathy-main-window.ui.h:2
+msgid "Contacts on a _Map"
+msgstr "Kontakter på en ka_rta"
+
 # Hm?
-#: ../src/empathy-main-window.glade.h:2
+#: ../src/empathy-main-window.ui.h:3
 msgid "Context"
 msgstr "Sammanhang"
 
-#: ../src/empathy-main-window.glade.h:3
+#: ../src/empathy-main-window.ui.h:4
 msgid "Join _Favorites"
 msgstr "Gå in i _favoriter"
 
-#: ../src/empathy-main-window.glade.h:4
-msgid "Join _New..."
-msgstr "Gå in i _nytt..."
-
-#: ../src/empathy-main-window.glade.h:5
+#: ../src/empathy-main-window.ui.h:5
 msgid "Manage Favorites"
 msgstr "Hantera favoriter"
 
-#: ../src/empathy-main-window.glade.h:6
-msgid "Show _Offline Contacts"
-msgstr "Visa _frånkopplade kontakter"
+#: ../src/empathy-main-window.ui.h:6
+msgid "N_ormal Size"
+msgstr "N_ormal storlek"
 
-#: ../src/empathy-main-window.glade.h:7
+#: ../src/empathy-main-window.ui.h:7
+msgid "Normal Size With _Avatars"
+msgstr "Normal storlek med _avatarer"
+
+#: ../src/empathy-main-window.ui.h:8
+msgid "Sort by _Name"
+msgstr "Sortera efter _namn"
+
+#: ../src/empathy-main-window.ui.h:9
+msgid "Sort by _Status"
+msgstr "Sortera efter _status"
+
+#: ../src/empathy-main-window.ui.h:10
 msgid "_Accounts"
 msgstr "_Konton"
 
-#: ../src/empathy-main-window.glade.h:8
-msgid "_Add Contact..."
-msgstr "_Lägg till kontakt..."
+#: ../src/empathy-main-window.ui.h:13
+msgid "_Compact Size"
+msgstr "_Kompakt storlek"
+
+#: ../src/empathy-main-window.ui.h:14
+msgid "_Contents"
+msgstr "I_nnehåll"
+
+#: ../src/empathy-main-window.ui.h:15
+msgid "_Debug"
+msgstr "_Felsökning"
+
+#: ../src/empathy-main-window.ui.h:17
+msgid "_File Transfers"
+msgstr "Fi_löverföringar"
+
+#: ../src/empathy-main-window.ui.h:18
+msgid "_Help"
+msgstr "_Hjälp"
+
+#: ../src/empathy-main-window.ui.h:19
+msgid "_Join..."
+msgstr "_Gå in..."
 
-#: ../src/empathy-main-window.glade.h:13 ../src/empathy-status-icon.glade.h:2
+#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-status-icon.ui.h:2
 msgid "_New Conversation..."
 msgstr "_Nytt samtal..."
 
-#: ../src/empathy-main-window.glade.h:14
+#: ../src/empathy-main-window.ui.h:21
+msgid "_Offline Contacts"
+msgstr "_Frånkopplade kontakter"
+
+#: ../src/empathy-main-window.ui.h:22
 msgid "_Personal Information"
 msgstr "_Personlig information"
 
-#: ../src/empathy-main-window.glade.h:16
+#: ../src/empathy-main-window.ui.h:24
+msgid "_Previous Conversations"
+msgstr "Ti_digare samtal"
+
+#: ../src/empathy-main-window.ui.h:25
 msgid "_Room"
 msgstr "_Rum"
 
-#: ../src/empathy-new-chatroom-dialog.c:291
-msgid "Chat Rooms"
+#: ../src/empathy-new-chatroom-dialog.c:331
+msgid "Chat Room"
 msgstr "Chattrum"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:2
-msgid "Browse:"
-msgstr "Bläddra:"
-
-#: ../src/empathy-new-chatroom-dialog.glade.h:3
-msgid ""
-"Enter the room name to join here or click on one or more rooms in the list."
-msgstr ""
-"Ange rumsnamnet för att gå in i eller klicka på ett eller flera rum i listan."
-
-#: ../src/empathy-new-chatroom-dialog.glade.h:4
-msgid ""
-"Enter the server which hosts the room, or leave it empty if the room is on "
-"the current account's server"
-msgstr ""
-"Ange servern som tillhandahåller rummet, eller lämna den tom om rummet finns "
-"på servern för det aktuella kontot"
+#: ../src/empathy-new-chatroom-dialog.c:347
+msgid "Members"
+msgstr "Medlemmar"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:5
-msgid "Join"
-msgstr "Gå in"
-
-#: ../src/empathy-new-chatroom-dialog.glade.h:6
-msgid "Join New"
-msgstr "Gå in i nytt"
-
-#: ../src/empathy-new-chatroom-dialog.glade.h:7
-msgid "Re_fresh"
-msgstr "Uppda_tera"
-
-#: ../src/empathy-new-chatroom-dialog.glade.h:8
+#: ../src/empathy-new-chatroom-dialog.c:496
+#, c-format
+msgctxt "Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no and a number."
 msgid ""
-"This list represents all chat rooms hosted on the server you have entered."
+"<b>%s</b>\n"
+"Invite required: %s\n"
+"Password required: %s\n"
+"Members: %s"
 msgstr ""
-"Den här listan representerar alla chattrum som finns på servern som du har "
-"gått in på."
+"<b>%s</b>\n"
+"Inbjudan krävs: %s\n"
+"Lösenord krävs: %s\n"
+"Medlemmar: %s"
+
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
+msgid "Yes"
+msgstr "Ja"
+
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
+msgid "No"
+msgstr "Nej"
+
+#: ../src/empathy-new-chatroom-dialog.c:526
+msgid "Could not start room listing"
+msgstr "Kunde inte starta rumslistningen"
+
+#: ../src/empathy-new-chatroom-dialog.c:536
+msgid "Could not stop room listing"
+msgstr "Kunde inte stoppa rumslistningen"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
+msgid "Couldn't load room list"
+msgstr "Kunde inte läsa in rumslistan"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:3
+msgid "Enter the room name to join here or click on one or more rooms in the list."
+msgstr "Ange rumsnamnet för att gå in i eller klicka på ett eller flera rum i listan."
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "Enter the server which hosts the room, or leave it empty if the room is on the current account's server"
+msgstr "Ange servern som tillhandahåller rummet, eller lämna den tom om rummet finns på servern för det aktuella kontot"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
+msgid "Join Room"
+msgstr "Gå in i rum"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "Room List"
+msgstr "Rumslista"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "_Room:"
+msgstr "_Rum:"
 
-#: ../src/empathy-preferences.c:157
+#: ../src/empathy-preferences.c:147
 msgid "Message received"
 msgstr "Meddelande togs emot"
 
-#: ../src/empathy-preferences.c:158
+#: ../src/empathy-preferences.c:148
 msgid "Message sent"
 msgstr "Meddelandet skickat"
 
-#: ../src/empathy-preferences.c:159
+#: ../src/empathy-preferences.c:149
 msgid "New conversation"
 msgstr "Nytt samtal"
 
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:150
 msgid "Contact goes online"
 msgstr "Kontakt ansluts"
 
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:151
 msgid "Contact goes offline"
 msgstr "Kontakt kopplas ner"
 
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:152
 msgid "Account connected"
 msgstr "Kontot anslutet"
 
-#: ../src/empathy-preferences.c:163
+#: ../src/empathy-preferences.c:153
 msgid "Account disconnected"
 msgstr "Kontot frånkopplat"
 
-#: ../src/empathy-preferences.c:397
+#: ../src/empathy-preferences.c:393
 msgid "Language"
 msgstr "Språk"
 
-#: ../src/empathy-preferences.glade.h:1
-msgid "<b>Appearance</b>"
-msgstr "<b>Utseende</b>"
+#: ../src/empathy-preferences.ui.h:1
+msgid "Allow _GPS usage"
+msgstr "Tillåt _GPS-användning"
 
-#: ../src/empathy-preferences.glade.h:2
-msgid "<b>Behavior</b>"
-msgstr "<b>Beteende</b>"
+#: ../src/empathy-preferences.ui.h:2
+msgid "Allow _cellphone usage"
+msgstr "Tillåt användning av _mobiltelefon"
 
-#: ../src/empathy-preferences.glade.h:3
-msgid "<b>Contact List</b>"
-msgstr "<b>Kontaktlista</b>"
+#: ../src/empathy-preferences.ui.h:3
+msgid "Allow _network usage"
+msgstr "Tillåt _nätverksanvändning"
 
-#: ../src/empathy-preferences.glade.h:4
-msgid "<b>Enable spell checking for languages:</b>"
-msgstr "<b>Aktivera rättstavning för språk:</b>"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Appearance"
+msgstr "Utseende"
 
-#: ../src/empathy-preferences.glade.h:5
-msgid "<b>Play sound for events</b>"
-msgstr "<b>Spela upp ljud för händelser</b>"
-
-#: ../src/empathy-preferences.glade.h:6
-msgid ""
-"<small>The list of languages reflects only the languages for which you have "
-"a dictionary installed.</small>"
-msgstr ""
-"<small>Listan visar endast språk du har en ordlista installerad för.</small>"
-
-#: ../src/empathy-preferences.glade.h:7
+#: ../src/empathy-preferences.ui.h:5
 msgid "Automatically _connect on startup "
 msgstr "Anslut _automatiskt vid uppstart"
 
-#: ../src/empathy-preferences.glade.h:8
-msgid "Avatars are user chosen images shown in the contact list"
-msgstr "Avatarer är användarvalda bilder som visas i kontaktlistan"
+#: ../src/empathy-preferences.ui.h:6
+msgid "Behavior"
+msgstr "Beteende"
 
-#: ../src/empathy-preferences.glade.h:9
+#: ../src/empathy-preferences.ui.h:7
 msgid "Chat Th_eme:"
 msgstr "Chatt_ema:"
 
-#: ../src/empathy-preferences.glade.h:10
+#: ../src/empathy-preferences.ui.h:8
 msgid "Disable notifications when _away or busy"
 msgstr "Inaktivera notifieringar under fr_ånvaro eller upptagen"
 
-#: ../src/empathy-preferences.glade.h:11
+#: ../src/empathy-preferences.ui.h:9
 msgid "Disable sounds when _away or busy"
 msgstr "Inaktivera ljud under fr_ånvaro eller upptagen"
 
-#: ../src/empathy-preferences.glade.h:12
+#: ../src/empathy-preferences.ui.h:10
+msgid "Enable notifications when a contact comes online"
+msgstr "Aktivera notifieringar när en kontakt ansluter"
+
+#: ../src/empathy-preferences.ui.h:11
+msgid "Enable notifications when a contact goes offline"
+msgstr "Aktivera notifieringar när en kontakt kopplar från"
+
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Aktivera notifieringar när _chatten inte är fokuserad"
 
-#: ../src/empathy-preferences.glade.h:13
+#: ../src/empathy-preferences.ui.h:13
+msgid "Enable spell checking for languages:"
+msgstr "Aktivera rättstavning för språk:"
+
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "Allmänt"
 
-#: ../src/empathy-preferences.glade.h:14
+#: ../src/empathy-preferences.ui.h:15
+msgid "Geoclue Settings"
+msgstr "Inställningar för Geoclue"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Location"
+msgstr "Plats"
+
+#: ../src/empathy-preferences.ui.h:17
 msgid "Notifications"
 msgstr "Notifieringar"
 
-#: ../src/empathy-preferences.glade.h:15
+#: ../src/empathy-preferences.ui.h:18
+msgid "Play sound for events"
+msgstr "Spela upp ljud för händelser"
+
+#: ../src/empathy-preferences.ui.h:19
 msgid "Preferences"
 msgstr "Inställningar"
 
-#: ../src/empathy-preferences.glade.h:16
-msgid "Show _avatars"
-msgstr "Visa _avatarer"
+#: ../src/empathy-preferences.ui.h:20
+msgid "Privacy"
+msgstr "Integritet"
+
+#: ../src/empathy-preferences.ui.h:21
+msgid "Reduced location accuracy means that nothing more precise than your city, state and country will be published.  GPS coordinates will have a random value added (&#xB1;0.25&#xB0;)."
+msgstr "Minskad precision för platsen betyder att ingenting mer informativt än din stad, län och land kommer att publiceras. GPS-koordinater kommer att få ett slumpmässigt värde (&#xB1;0.25&#xB0;)."
 
-#: ../src/empathy-preferences.glade.h:17
+#: ../src/empathy-preferences.ui.h:22
 msgid "Show _smileys as images"
 msgstr "Visa _smilisar som bilder"
 
-#: ../src/empathy-preferences.glade.h:18
-msgid "Show co_mpact contact list"
-msgstr "Visa ko_mpakt kontaktlista"
-
-#: ../src/empathy-preferences.glade.h:19
-msgid "Sort by _name"
-msgstr "Sortera efter _namn"
-
-#: ../src/empathy-preferences.glade.h:20
-msgid "Sort by s_tate"
-msgstr "Sortera efter _tillstånd"
+#: ../src/empathy-preferences.ui.h:23
+msgid "Show contact _list in rooms"
+msgstr "Visa kontakt_lista i rum"
 
-#: ../src/empathy-preferences.glade.h:21
+#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "Ljud"
 
-#: ../src/empathy-preferences.glade.h:22
+#: ../src/empathy-preferences.ui.h:25
 msgid "Spell Checking"
 msgstr "Stavningskontroll"
 
-#: ../src/empathy-preferences.glade.h:23
+#: ../src/empathy-preferences.ui.h:26
+msgid "The list of languages reflects only the languages for which you have a dictionary installed."
+msgstr "Listan visar endast språk som du har en ordlista installerad för."
+
+#: ../src/empathy-preferences.ui.h:27
 msgid "Themes"
 msgstr "Teman"
 
-#: ../src/empathy-preferences.glade.h:24
+#: ../src/empathy-preferences.ui.h:28
 msgid "_Enable bubble notifications"
 msgstr "_Aktivera bubbelnotifieringar"
 
-#: ../src/empathy-preferences.glade.h:25
+#: ../src/empathy-preferences.ui.h:29
 msgid "_Enable sound notifications"
 msgstr "_Aktivera ljudnotifieringar"
 
-#: ../src/empathy-preferences.glade.h:26
+#: ../src/empathy-preferences.ui.h:30
 msgid "_Open new chats in separate windows"
 msgstr "_Öppna nya chattar i separata fönster"
 
-#: ../src/empathy-status-icon.glade.h:1
+#: ../src/empathy-preferences.ui.h:31
+msgid "_Publish location to my contacts"
+msgstr "_Publicera platsen till mina kontakter"
+
+#: ../src/empathy-preferences.ui.h:32
+msgid "_Reduce location accuracy"
+msgstr "_Minska precision för plats"
+
+#: ../src/empathy-status-icon.ui.h:1
 msgid "Status"
 msgstr "Status"
 
-#: ../src/empathy-status-icon.glade.h:3
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_Quit"
 msgstr "_Avsluta"
 
-#: ../src/empathy-status-icon.glade.h:4
+#: ../src/empathy-status-icon.ui.h:4
 msgid "_Show Contact List"
 msgstr "_Visa kontaktlista"
 
-#: ../src/empathy-tube-dispatch.c:364
+#: ../src/empathy-tube-dispatch.c:375
 #, c-format
 msgid "Unable to start application for service %s: %s"
 msgstr "Kunde inte starta program för tjänsten %s: %s"
 
-#: ../src/empathy-tube-dispatch.c:435
+#: ../src/empathy-tube-dispatch.c:446
 #, c-format
-msgid ""
-"An invitation was offered for service %s, but you don't have the needed "
-"application to handle it"
-msgstr ""
-"Du blev erbjuden en inbjudan för tjänsten %s, men du har inte det nödvändiga "
-"programmet att hantera den med"
+msgid "An invitation was offered for service %s, but you don't have the needed application to handle it"
+msgstr "Du blev erbjuden en inbjudan för tjänsten %s, men du har inte det nödvändiga programmet att hantera den med"
+
+#: ../src/empathy-call-window-fullscreen.ui.h:1
+msgid "gtk-leave-fullscreen"
+msgstr "Lämna helskärmsläge"
+
+#: ../src/empathy-map-view.ui.h:1
+msgid "Contact Map View"
+msgstr "Kartvy för kontakter"
+
+#: ../src/empathy-debug-dialog.c:111
+#: ../src/empathy-debug-dialog.c:1083
+msgid "Error"
+msgstr "Fel"
+
+#: ../src/empathy-debug-dialog.c:114
+#: ../src/empathy-debug-dialog.c:1077
+msgid "Critical"
+msgstr "Kritiskt"
+
+#: ../src/empathy-debug-dialog.c:117
+#: ../src/empathy-debug-dialog.c:1071
+msgid "Warning"
+msgstr "Varning"
+
+#: ../src/empathy-debug-dialog.c:120
+#: ../src/empathy-debug-dialog.c:1065
+#: ../src/empathy-debug-dialog.c:1113
+msgid "Message"
+msgstr "Meddelande"
+
+#: ../src/empathy-debug-dialog.c:123
+#: ../src/empathy-debug-dialog.c:1059
+msgid "Info"
+msgstr "Info"
+
+#: ../src/empathy-debug-dialog.c:126
+#: ../src/empathy-debug-dialog.c:1053
+msgid "Debug"
+msgstr "Felsökning"
+
+#: ../src/empathy-debug-dialog.c:845
+msgid "Save"
+msgstr "Spara"
+
+#: ../src/empathy-debug-dialog.c:948
+msgid "Debug Window"
+msgstr "Felsökningsfönster"
+
+#: ../src/empathy-debug-dialog.c:1021
+msgid "Pause"
+msgstr "Gör paus"
+
+#: ../src/empathy-debug-dialog.c:1033
+msgid "Level "
+msgstr "Nivå "
+
+#: ../src/empathy-debug-dialog.c:1102
+msgid "Time"
+msgstr "Tid"
+
+#: ../src/empathy-debug-dialog.c:1104
+msgid "Domain"
+msgstr "Domän"
+
+#: ../src/empathy-debug-dialog.c:1106
+msgid "Category"
+msgstr "Kategori"
+
+#: ../src/empathy-debug-dialog.c:1108
+msgid "Level"
+msgstr "Nivå"
+
+#: ../src/empathy-debug-dialog.c:1140
+msgid "The selected connection manager does not support the remote debugging extension."
+msgstr "Den valda anslutningshanteraren saknar stöd för tillägg för fjärrfelsökning."
+
+#~ msgid "Avatars are user chosen images shown in the contact list"
+#~ msgstr "Avatarer är användarvalda bilder som visas i kontaktlistan"
+#~ msgid "Show _avatars"
+#~ msgstr "Visa _avatarer"
+#~ msgid "Show co_mpact contact list"
+#~ msgstr "Visa ko_mpakt kontaktlista"
+#~ msgid "<b>Network</b>"
+#~ msgstr "<b>Nätverk</b>"
+#~ msgid "<b>Servers</b>"
+#~ msgstr "<b>Servrar</b>"
+#~ msgid "<b>Topic:</b>"
+#~ msgstr "<b>Ämne:</b>"
+#~ msgid "<b>Contact</b>"
+#~ msgstr "<b>Kontakt</b>"
+#~ msgid "<b>Groups</b>"
+#~ msgstr "<b>Grupper</b>"
 
+#, fuzzy
+#~ msgid "<b>Add Account</b>"
+#~ msgstr "<b>Konto</b>"
+#~ msgid "New message from %s"
+#~ msgstr "Nytt meddelande från %s"
+#~ msgid "File transfers"
+#~ msgstr "Filöverföringar"
+#~ msgid "<b>Contact List</b>"
+#~ msgstr "<b>Kontaktlista</b>"
+#~ msgid "Forget password and clear the entry."
+#~ msgstr "Glöm lösenordet och töm inmatningen."
+#~ msgid "Edit the selected IRC network"
+#~ msgstr "Redigera markerat irc-nätverk"
+#~ msgid "Remove the selected IRC network"
+#~ msgstr "Ta bort markerat irc-nätverk"
+#~ msgid "_Check Word Spelling..."
+#~ msgstr "_Kontrollera stavning..."
+#~ msgid "Group Chat"
+#~ msgstr "Gruppchatt"
+#~ msgid "Contact Information"
+#~ msgstr "Kontaktinformation"
+#~ msgid "I would like to add you to my contact list."
+#~ msgstr "Jag vill lägga till dig i min kontaktlista."
+#~ msgid "Sorry, I don't want you in my contact list anymore."
+#~ msgstr "Tyvärr, jag vill inte längre ha dig i min kontaktlista."
+#~ msgid "Contact information"
+#~ msgstr "Kontaktinformation"
+#~ msgid "Word"
+#~ msgstr "Ord"
+#~ msgid "Suggestions for the word"
+#~ msgstr "Förslag för ordet"
+#~ msgid "Spell Checker"
+#~ msgstr "Stavningskontroll"
+#~ msgid "Suggestions for the word:"
+#~ msgstr "Förslag för ordet:"
+#~ msgid "<b>New Account</b>"
+#~ msgstr "<b>Nytt konto</b>"
+#~ msgid "I already have an account I want to use"
+#~ msgstr "Jag har redan ett konto som jag vill använda"
+#~ msgid "C_lear"
+#~ msgstr "T_öm"
+#~ msgid "Chat"
+#~ msgstr "Chatta"
+#~ msgid "Insert _Smiley"
+#~ msgstr "Infoga _smilis"
+#~ msgid "Invitation _message:"
+#~ msgstr "Inbjudnings_meddelande:"
+#~ msgid "Invite"
+#~ msgstr "Bjud in"
+#~ msgid "Move Tab _Left"
+#~ msgstr "Flytta flik till _vänster"
+#~ msgid "Move Tab _Right"
+#~ msgstr "Flytta flik till _höger"
+#~ msgid "Select who would you like to invite:"
+#~ msgstr "Välj vem du vill bjuda in:"
+#~ msgid "You have been invited to join a chat conference."
+#~ msgstr "Du har blivit inbjuden till en chattkonferens."
+#~ msgid "_Contact"
+#~ msgstr "_Kontakt"
+#~ msgid "_Conversation"
+#~ msgstr "_Samtal"
+#~ msgid "_Detach Tab"
+#~ msgstr "_Koppla loss flik"
+#~ msgid "_Favorite Chatroom"
+#~ msgstr "_Favoritchattrum"
+#~ msgid "_Next Tab"
+#~ msgstr "_Nästa flik"
+#~ msgid "_Previous Tab"
+#~ msgstr "_Föregående flik"
+#~ msgid "_Tabs"
+#~ msgstr "_Flikar"
+#~ msgid "Edit Favorite Room"
+#~ msgstr "Redigera favoritrum"
+#~ msgid "Join room on start_up"
+#~ msgstr "Gå in i rummet vid _uppstart"
+#~ msgid "Join this chat room when Empathy starts and you are connected"
+#~ msgstr "Gå in i detta chattrum när Empathy startar och du är ansluten"
+#~ msgid "N_ame:"
+#~ msgstr "N_amn:"
+#~ msgid "S_erver:"
+#~ msgstr "S_erver:"
+#~ msgctxt "file size"
+#~ msgid "Unknown"
+#~ msgstr "Okänt"
+#~ msgid "\"%s\" receiving from %s"
+#~ msgstr "\"%s\" tas emot från %s"
+#~ msgid "\"%s\" sending to %s"
+#~ msgstr "\"%s\" skickas till %s"
+#~ msgid "File transfer canceled: %s"
+#~ msgstr "Filöverföringen avbröts: %s"
+#~ msgctxt "remaining time"
+#~ msgid "Unknown"
+#~ msgstr "Okänt"
+#~ msgid "Cannot save file to this location"
+#~ msgstr "Kan inte spara fil till denna plats"
+#~ msgid "Save file as..."
+#~ msgstr "Spara fil som..."
+#~ msgid "unknown size"
+#~ msgstr "okänd storlek"
+#~ msgid "%s would like to send you a file"
+#~ msgstr "%s vill skicka en fil till dig"
+#~ msgid "Do you want to accept the file \"%s\" (%s)?"
+#~ msgstr "Vill du ta emot filen \"%s\" (%s)?"
+#~ msgid "_Accept"
+#~ msgstr "_Acceptera"
+#~ msgid "Join _New..."
+#~ msgstr "Gå in i _nytt..."
+#~ msgid "Chat Rooms"
+#~ msgstr "Chattrum"
+#~ msgid "Browse:"
+#~ msgstr "Bläddra:"
+#~ msgid "Join"
+#~ msgstr "Gå in"
+#~ msgid "Join New"
+#~ msgstr "Gå in i nytt"
+#~ msgid "Re_fresh"
+#~ msgstr "Uppda_tera"
+#~ msgid ""
+#~ "This list represents all chat rooms hosted on the server you have entered."
+#~ msgstr ""
+#~ "Den här listan representerar alla chattrum som finns på servern som du "
+#~ "har gått in på."
 #~ msgid "menuitem2"
 #~ msgstr "menyobjekt2"
-
 #~ msgid "Closed"
 #~ msgstr "Stängd"
-
 #~ msgid "End this call?"
 #~ msgstr "Avsluta samtalet?"
-
 #~ msgid "Closing this window will end the call in progress."
 #~ msgstr "Stängning av detta fönster gör att alla pågående samtal avslutas."
-
-#~ msgid "_End Call"
-#~ msgstr "A_vsluta samtal"
-
 #~ msgid "Empathy Call"
 #~ msgstr "Empathy-samtal"
-
 #~ msgid "Readying"
 #~ msgstr "Förbereder"
-
 #~ msgid "%s - Empathy Call"
 #~ msgstr "%s - Empathy-samtal"
-
 #~ msgid "Ringing"
 #~ msgstr "Ringer"
-
 #~ msgid "Connecting"
 #~ msgstr "Ansluter"
-
 #~ msgid ""
 #~ "Incoming call from %s rejected because there is already a running call."
 #~ msgstr ""
 #~ "Inkommande samtal från %s avvisades därför att det redan finns ett "
 #~ "pågående samtal."
-
 #~ msgid "#"
 #~ msgstr "#"
-
 #~ msgid "*"
 #~ msgstr "*"
-
 #~ msgid "0"
 #~ msgstr "0"
-
 #~ msgid "1"
 #~ msgstr "1"
-
 #~ msgid "2"
 #~ msgstr "2"
-
 #~ msgid "3"
 #~ msgstr "3"
-
 #~ msgid "4"
 #~ msgstr "4"
-
 #~ msgid "5"
 #~ msgstr "5"
-
 #~ msgid "6"
 #~ msgstr "6"
-
 #~ msgid "7"
 #~ msgstr "7"
-
 #~ msgid "8"
 #~ msgstr "8"
-
 #~ msgid "9"
 #~ msgstr "9"
-
 #~ msgid "<b>Keypad</b>"
 #~ msgstr "<b>Knappsats</b>"
-
 #~ msgid "<b>Volume</b>"
 #~ msgstr "<b>Volym</b>"
-
 #~ msgid "Enable popup when contact is available"
 #~ msgstr "Aktivera popup när kontakt är tillgänglig"
-
 #~ msgid "Whether or not to show a popup when a contact becomes available."
 #~ msgstr ""
 #~ "Huruvida en popup ska visas eller inte när en kontakt blir tillgänglig."
-
 #~ msgid ""
 #~ "%s is offering you an invitation, but you don't have the needed external "
 #~ "application to handle it."
 #~ msgstr ""
 #~ "%s erbjuder dig en inbjudan men du har inte det nödvändiga externa "
 #~ "programmet för att hantera den."
-
 #~ msgid "Invitation Error"
 #~ msgstr "Inbjudningsfel"
-
-#~ msgid "gtk-clear"
-#~ msgstr "Töm"
-
 #~ msgid "gtk-cancel"
 #~ msgstr "Avbryt"
-
-#~ msgid "gtk-ok"
-#~ msgstr "OK"
-
 #~ msgid "Enable sound when busy"
 #~ msgstr "Aktivera ljud under upptagetläge"
-
 #~ msgid "<b>Audio</b>"
 #~ msgstr "<b>Ljud</b>"
-
 #~ msgid "<b>Visual</b>"
 #~ msgstr "<b>Visuellt</b>"
-
 #~ msgid "Enable sounds when _busy"
 #~ msgstr "Aktivera ljud under _upptagetläge"
-
 #~ msgid "Configure Telepathy account settings"
 #~ msgstr "Konfigurera inställningar för Telepathy-konto"
-
 #~ msgid "Empathy accounts"
 #~ msgstr "Empathy-konton"
-
 #~ msgid ""
 #~ "To add a new account, you can click on the 'Add' button and a new entry "
 #~ "will be created for you to start configuring."
 #~ msgstr ""
 #~ "För att lägga till ett nytt konto, klicka på knappen \"Lägg till\" och en "
 #~ "ny post kommer att skapas för dig att börja konfigurera."
-
 #~ msgid ""
 #~ "\n"
 #~ "\n"
@@ -2328,46 +2705,30 @@ msgstr ""
 #~ "\n"
 #~ "Om du inte vill lägga till ett konto, kan du helt enkelt klicka på "
 #~ "kontot, i listan till vänster, som du vill konfigurera."
-
 #~ msgid "<b>No Accounts Configured</b>"
 #~ msgstr "<b>Inga konton konfigurerade</b>"
-
 #~ msgid "J_apan server:"
 #~ msgstr "J_apansk server:"
-
 #~ msgid "Invalid handle"
 #~ msgstr "Ogiltig hanterare"
-
 #~ msgid "No matching connection"
 #~ msgstr "Ingen matchande anslutning"
-
 #~ msgid "Invalid account"
 #~ msgstr "Ogiltigt konto"
-
 #~ msgid "Presence failure"
 #~ msgstr "Närvarofel"
-
-#~ msgid "Contact does not support voice"
-#~ msgstr "Kontakten saknar stöd för röstsamtal"
-
 #~ msgid "Lowmem"
 #~ msgstr "Lågminne"
-
 #~ msgid "Channel request generic error"
 #~ msgstr "Allmänt fel vid kanalbegäran"
-
 #~ msgid "Channel banned"
 #~ msgstr "Bannlyst från kanalen"
-
 #~ msgid "Channel full"
 #~ msgstr "Kanalen är full"
-
 #~ msgid "Channel invite only"
 #~ msgstr "Kanalen är endast för inbjudna"
-
 #~ msgid "Unknown error code"
 #~ msgstr "Okänd felkod"
-
 #~ msgid ""
 #~ "To add a new account, you can click on the 'Add' button and a new entry "
 #~ "will be created for you to started configuring.\n"
@@ -2380,272 +2741,177 @@ msgstr ""
 #~ "\n"
 #~ "Om du inte vill lägga till ett konto, kan du helt enkelt klicka på "
 #~ "kontot, i listan till vänster, som du vill konfigurera."
-
 #~ msgid "Chat with contact"
 #~ msgstr "Chatta med kontakten"
-
 #~ msgid "View contact information"
 #~ msgstr "Visa kontaktinformation"
-
 #~ msgid "Re_name"
 #~ msgstr "Byt _namn"
-
 #~ msgid "Rename"
 #~ msgstr "Byt namn"
-
 #~ msgid "Edit the groups and name for this contact"
 #~ msgstr "Redigera grupper och namn för kontakten"
-
 #~ msgid "Invite to a currently open chat room"
 #~ msgstr "Bjud in till ett för tillfället öppet chattrum"
-
 #~ msgid "View previous conversations with this contact"
 #~ msgstr "Visa tidigare samtal med denna kontakt"
-
 #~ msgid "Start a voice or video conversation with this contact"
 #~ msgstr "Starta röst- eller videosamtal med denna kontakt"
-
 #~ msgid "Start Call"
 #~ msgstr "Påbörja samtal"
-
 #~ msgid "gtk-cut"
 #~ msgstr "Klipp ut"
-
 #~ msgid "gtk-paste"
 #~ msgstr "Klistra in"
-
 #~ msgid "gtk-about"
 #~ msgstr "Om"
-
 #~ msgid "gtk-quit"
 #~ msgstr "Avsluta"
-
 #~ msgid "ICQ account settings"
 #~ msgstr "Inställningar för ICQ-konto"
-
 #~ msgid "jabber account settings"
 #~ msgstr "inställningar för jabberkonto"
-
 #~ msgid "msn account settings"
 #~ msgstr "inställningar för msn-konto"
-
 #~ msgid "salut account settings"
 #~ msgstr "inställningar för salut-konto"
-
 #~ msgid "Yahoo! account settings"
 #~ msgstr "Inställningar för Yahoo!-konto"
-
 #~ msgid "Input"
 #~ msgstr "Ingång"
-
 #~ msgid "Mute"
 #~ msgstr "Tyst"
 
 # Det måste finnas ett bättre ord
 #~ msgid "Output"
 #~ msgstr "Utgång"
-
 #~ msgid "Ca_ll"
 #~ msgstr "R_ing"
-
 #~ msgid "Change _Topic..."
 #~ msgstr "Ändra _ämne..."
-
 #~ msgid "Contact Infor_mation"
 #~ msgstr "Kontaktinfor_mation"
-
 #~ msgid "Cu_t"
 #~ msgstr "Klipp _ut"
-
 #~ msgid "In_vite..."
 #~ msgstr "_Bjud in..."
-
 #~ msgid "_Add To Favorites"
 #~ msgstr "_Lägg till i favoriter"
-
 #~ msgid "_Copy"
 #~ msgstr "_Kopiera"
-
-#~ msgid "_Paste"
-#~ msgstr "Klistra _in"
-
 #~ msgid "_Show Contacts"
 #~ msgstr "_Visa kontakter"
-
 #~ msgid "Enter the new topic you want to set for this room:"
 #~ msgstr "Ange det nya ämnet som du vill ställa in för det här rummet:"
-
-#~ msgid "<b>Options</b>"
-#~ msgstr "<b>Alternativ</b>"
-
 #~ msgid "_Use for chat rooms"
 #~ msgstr "Använd för _chattrum"
-
 #~ msgid "%s went offline"
 #~ msgstr "%s kopplade från"
-
-#~ msgid "%s has come online"
-#~ msgstr "%s anslöt sig"
-
 #~ msgid "Disable"
 #~ msgstr "Inaktivera"
-
-#~ msgid "Call from %s"
-#~ msgstr "Samtal från %s"
-
 #~ msgid "Edit Account _Details"
 #~ msgstr "Redigera konto_detaljer"
-
 #~ msgid "_New Message..."
 #~ msgstr "_Nytt meddelande..."
-
 #~ msgid "New message"
 #~ msgstr "Nytt meddelande"
-
 #~ msgid "A unique name for this account to identify it personally to you."
 #~ msgstr ""
 #~ "Ett unikt namn på kontot för att personligen identifiera det till dig."
-
-#~ msgid "Chat Room"
-#~ msgstr "Chattrum"
-
 #~ msgid "Contact List - Empathy"
 #~ msgstr "Kontaktlista - Empathy"
-
 #~ msgid "<b>Languages</b>"
 #~ msgstr "<b>Språk</b>"
-
 #~ msgid "_Enable spell checking"
 #~ msgstr "_Aktivera stavningskontroll"
-
 #~ msgid "Clear List..."
 #~ msgstr "Töm listan..."
-
 #~ msgid "Are you sure you want to clear the list?"
 #~ msgstr "Är du säker på att du vill tömma listan?"
-
 #~ msgid ""
 #~ "This will remove any custom messages you have added to the list of preset "
 #~ "status messages."
 #~ msgstr ""
 #~ "Detta kommer att ta bort de meddelanden du har lagt till i listan med "
 #~ "förinställda statusmeddelanden"
-
 #~ msgid "Clear List"
 #~ msgstr "Töm listan"
-
 #~ msgid "Enter status message:"
 #~ msgstr "Ange statusmeddelande:"
-
 #~ msgid "Status Message Presets"
 #~ msgstr "Förinställda statusmeddelanden"
-
 #~ msgid "_Add to status message list"
 #~ msgstr "_Lägg till i statusmeddelandelistan"
-
 #~ msgid ""
 #~ "Subscription requested for %s\n"
 #~ "Message: %s"
 #~ msgstr ""
 #~ "Prenumerationsförfrågan för %s\n"
 #~ "Meddelande: %s"
-
 #~ msgid "Instant Messenger"
 #~ msgstr "Snabbmeddelandeklient"
-
 #~ msgid "Sorry, I don't want you in my contact list."
 #~ msgstr "Tyvärr, jag vill inte ha dig i min kontaktlista."
-
-#~ msgid "<b>Account</b>"
-#~ msgstr "<b>Konto</b>"
-
 #~ msgid "Imendio "
 #~ msgstr "Imendio "
-
 #~ msgid "Jabber"
 #~ msgstr "Jabber"
-
 #~ msgid "Create"
 #~ msgstr "Skapa"
-
 #~ msgid ""
 #~ "<small><b><span foreground=\"#555\">Example: user@jabber.org</span></b></"
 #~ "small>"
 #~ msgstr ""
 #~ "<small><b><span foreground=\"#555\">Exempel: användare@jabber.org</span></"
 #~ "b></small>"
-
 #~ msgid "Gnome Instant Messaging Client"
 #~ msgstr "Snabbmeddelandeklient för Gnome"
-
 #~ msgid "-"
 #~ msgstr "-"
-
 #~ msgid "<b>Personal Details</b>"
 #~ msgstr "<b>Personliga detaljer</b>"
-
 #~ msgid "<b>Status</b>"
 #~ msgstr "<b>Status</b>"
-
 #~ msgid "<b>Subscription</b>"
 #~ msgstr "<b>Prenumeration</b>"
-
 #~ msgid "<span size=\"smaller\">Example: Mikael or user@server.org</span>"
 #~ msgstr ""
 #~ "<span size=\"smaller\">Exempel: Mikael eller användare@server.org</span>"
-
 #~ msgid ""
 #~ "<span size=\"smaller\">Note: You must select an account if the contact is "
 #~ "unknown</span>"
 #~ msgstr ""
 #~ "<span size=\"smaller\">Observera: Du måste välja ett konto om kontakten "
 #~ "är okänd</span>"
-
 #~ msgid "Accou_nt:"
 #~ msgstr "Ko_nto:"
-
 #~ msgid "Add Contact"
 #~ msgstr "Lägg till kontakt"
-
 #~ msgid "C_hange"
 #~ msgstr "_Ändra"
-
 #~ msgid "Ch_at"
 #~ msgstr "Ch_atta"
-
 #~ msgid "Con_tact:"
 #~ msgstr "_Kontakt:"
-
 #~ msgid "Contact List - Gossip"
 #~ msgstr "Kontaktlista - Gossip"
-
-#~ msgid "Country:"
-#~ msgstr "Land:"
-
 #~ msgid "Edit Contact"
 #~ msgstr "Redigera kontakt"
-
 #~ msgid "Edit Groups"
 #~ msgstr "Redigera grupper"
-
 #~ msgid "ID:"
 #~ msgstr "Id:"
-
 #~ msgid ""
 #~ "If you chose to decide later you will be asked the next time you log on."
 #~ msgstr ""
 #~ "Om du väljer att bestämma dig senare kommer du att bli frågad nästa gång "
 #~ "du logga in."
-
 #~ msgid "Name:"
 #~ msgstr "Namn:"
-
 #~ msgid "Personal Details"
 #~ msgstr "Personliga detaljer"
-
 #~ msgid "R_egister"
 #~ msgstr "Re_gistrera"
-
 #~ msgid ""
 #~ "Set the alias you want to use for:\n"
 #~ "<b>foo@bar.baz</b>\n"
@@ -2656,7 +2922,6 @@ msgstr ""
 #~ "<b>foo@bar.baz</b>\n"
 #~ "\n"
 #~ "Du kan hämta kontaktinformation från servern."
-
 #~ msgid ""
 #~ "This acts as a filter to the contact list below.\n"
 #~ "\n"
@@ -2673,7 +2938,6 @@ msgstr ""
 #~ "\n"
 #~ "Du kan även använda namnet på en grupp för att endast visa kontakterna i "
 #~ "en specifik grupp."
-
 #~ msgid ""
 #~ "This acts as a filter to the contact list below. You can use segments of "
 #~ "contact's name or ID, for example, \"jabber.org\" will list everyone "
@@ -2682,289 +2946,196 @@ msgstr ""
 #~ "Detta fungerar som ett filter till kontaktlistan nedan. Du kan använda "
 #~ "delar av kontaktens namn eller id, till exempel \"jabber.org\" kommer att "
 #~ "lista alla som använder den servern"
-
 #~ msgid "This is the name that will be used on your roster for this contact"
 #~ msgstr ""
 #~ "Detta är namnet som kommer att användas på din kontaktlista för denna "
 #~ "kontakt"
-
 #~ msgid "This name will be used to identify you in chat windows"
 #~ msgstr ""
 #~ "Detta namn kommer att användas för att identifiera dig i chattfönster"
-
 #~ msgid ""
 #~ "This name will be used to identify you when new contacts lookup your "
 #~ "details"
 #~ msgstr ""
 #~ "Detta namn kommer att användas för att identifiera dig när nya kontakter "
 #~ "kontrollerar din information"
-
 #~ msgid "Use default name here from the contact's VCard."
 #~ msgstr "Använd standardnamnet här från kontaktens VCard."
-
 #~ msgid "Use system pro_xy"
 #~ msgstr "Använd systemets pro_xyinställningar"
-
 #~ msgid "You are not subscribed to this contact."
 #~ msgstr "Du prenumererar inte på denna kontakt."
-
 #~ msgid "_Birthday:"
 #~ msgstr "_Födelsedag:"
-
 #~ msgid "_Connect"
 #~ msgstr "An_slut"
-
 #~ msgid "_Deny"
 #~ msgstr "_Neka"
-
-#~ msgid "_Description:"
-#~ msgstr "_Beskrivning:"
-
 #~ msgid "_Disconnect"
 #~ msgstr "_Koppla ifrån"
-
 #~ msgid ""
 #~ "_Enter the name or contact ID of the person you want to chat to below:"
 #~ msgstr "Ange _namnet eller kontakt-id för den person du vill chatta med:"
-
 #~ msgid "_Group:"
 #~ msgstr "_Grupp:"
-
 #~ msgid "_Password:"
 #~ msgstr "_Lösenord:"
-
 #~ msgid "_Retrieve"
 #~ msgstr "_Hämta"
-
 #~ msgid "_Subscribe"
 #~ msgstr "_Prenumerera"
-
 # "Web site" är "webbplats". "Web page" är "webbsida".
 #~ msgid "_Web site:"
 #~ msgstr "_Webbplats:"
-
 #~ msgid "Gossip Instant Messenger"
 #~ msgstr "Snabbmeddelandeklienten Gossip"
-
-#~ msgid "Normal"
-#~ msgstr "Normalt"
-
 #~ msgid "Active"
 #~ msgstr "Aktivt"
-
 #~ msgid "Inactive"
 #~ msgstr "Inaktivt"
-
-#~ msgid "Error"
-#~ msgstr "Fel"
-
 #~ msgid "Moderator"
 #~ msgid_plural "Moderators"
 #~ msgstr[0] "Moderator"
 #~ msgstr[1] "Moderatorer"
-
 #~ msgid "Participant"
 #~ msgid_plural "Participants"
 #~ msgstr[0] "Deltagare"
 #~ msgstr[1] "Deltagare"
-
 #~ msgid "Visitor"
 #~ msgid_plural "Visitors"
 #~ msgstr[0] "Besökare"
 #~ msgstr[1] "Besökare"
-
 #~ msgid "No role"
 #~ msgstr "Ingen roll"
-
 #~ msgid "Owner"
 #~ msgid_plural "Owners"
 #~ msgstr[0] "Ägare"
 #~ msgstr[1] "Ägare"
-
 #~ msgid "Administrator"
 #~ msgid_plural "Administrators"
 #~ msgstr[0] "Administrator"
 #~ msgstr[1] "Administratörer"
-
-#~ msgid "Member"
-#~ msgid_plural "Members"
-#~ msgstr[0] "Medlem"
-#~ msgstr[1] "Medlemmar"
-
 #~ msgid "The nickname you have chosen is already in use."
 #~ msgstr "Smeknamnet du har valt är upptaget."
-
 #~ msgid "The chat room you tried to join requires a password."
 #~ msgstr "Chattrummet du försökte gå in i kräver ett lösenord."
-
 #~ msgid "The remote conference server did not respond in a sensible time."
 #~ msgstr "Fjärrkonferensservern svarade inte inom en rimlig tid."
-
 #~ msgid "The conference server you tried to join could not be found."
 #~ msgstr "Konferensservern du försökte gå in på kunde inte hittas."
-
 #~ msgid "An unknown error occurred, check your details are correct."
 #~ msgstr ""
 #~ "Ett okänt fel har inträffat, kontrollera att dina detaljer är korrekta."
-
 #~ msgid "Joining the chatroom was canceled."
 #~ msgstr "Gå in i chattrummet avbröts."
-
 #~ msgid "Unavailable"
 #~ msgstr "Otillgänglig"
-
 #~ msgid "An unknown error occurred."
 #~ msgstr "Ett okänt fel inträffade."
-
 #~ msgid "Connection refused."
 #~ msgstr "Anslutning vägrades."
-
 #~ msgid "Server address could not be resolved."
 #~ msgstr "Serverns address kunde inte slås upp."
-
 #~ msgid "Connection timed out."
 #~ msgstr "Anslutning timade ut."
-
 #~ msgid "Authentication failed."
 #~ msgstr "Autentisering misslyckades."
-
 #~ msgid "The username you are trying already exists."
 #~ msgstr "Användarnamnet du försöker använda existerar redan."
-
 #~ msgid "The username you are trying is not valid."
 #~ msgstr "Användarnamnet du försöker använda är inte giltigt."
-
 #~ msgid "This feature is unavailable."
 #~ msgstr "Denna funktion är inte tillgänglig."
-
 #~ msgid "This feature is unauthorized."
 #~ msgstr "Denna funktion är inte auktoriserad."
-
 #~ msgid "A specific protocol error occurred that was unexpected."
 #~ msgstr "Ett oväntat specifikt protokollfel inträffade."
-
 #~ msgid "Connection could not be opened"
 #~ msgstr "Anslutning kunde inte öppnas"
-
 #~ msgid "Service has gone and is no longer available"
 #~ msgstr "Tjänsten ar försvunnit och finns inte längre tillgänglig"
-
 #~ msgid "Bad or malformed request to this service"
 #~ msgstr "Felaktig eller felformulerad begäran till den här tjänsten"
-
 #~ msgid "Unauthorized request to this service"
 #~ msgstr "Obehörig begäran till den här tjänsten"
-
 #~ msgid "Payment is required for this service"
 #~ msgstr "Betalning krävs för den här tjänsten"
-
 #~ msgid "This service is forbidden"
 #~ msgstr "Den här tjänsten är förbjuden"
-
 #~ msgid "This service is unavailable or not found"
 #~ msgstr "Den här tjänsten är inte tillgänglig eller hittades inte"
-
 #~ msgid "Unacceptable request sent to this services"
 #~ msgstr "Oaccepterbar begäran skickades till den här tjänsten"
-
 #~ msgid "Registration is required"
 #~ msgstr "Registrering krävs"
-
 #~ msgid "There was a conflict of interest trying to use this service"
 #~ msgstr ""
 #~ "Det inträffade en intressekonflikt vid försök att använda den här "
 #~ "tjänsten "
-
 #~ msgid "There was an internal service error"
 #~ msgstr "Det inträffade ett internt fel i tjänsten"
-
 #~ msgid "This feature is not implemented"
 #~ msgstr "Den här funktionen är inte implementerad"
-
 #~ msgid "The remote service timed out"
 #~ msgstr "Tidsgränsen för fjärrtjänsten överstegs"
-
 #~ msgid "Using the %s backend"
 #~ msgstr "Använder bakänden %s"
-
 #~ msgid "Stop"
 #~ msgstr "Stopp"
-
 #~ msgid "Disconnect"
 #~ msgstr "Koppla ifrån"
-
 #~ msgid "Connect"
 #~ msgstr "Anslut"
-
 #~ msgid "Bye bye"
 #~ msgstr "Hej då"
-
 #~ msgid "Successfully registered your new account settings."
 #~ msgstr "Registrering av dina nya kontoinställningar lyckades."
-
 #~ msgid "You should now be able to connect to your new account."
 #~ msgstr "Du ska nu kunna ansluta med ditt nya konto."
-
 #~ msgid "Failed to register your new account settings."
 #~ msgstr "Misslyckades med att registrera dina nya kontoinställningar."
-
 #~ msgid "Successfully changed your account password."
 #~ msgstr "Ditt kontolösenord ändrades."
-
 #~ msgid "You should now be able to connect with your new password."
 #~ msgstr "Du ska nu kunna ansluta med ditt nya lösenord."
-
 #~ msgid "Failed to change your account password."
 #~ msgstr "Misslyckades med att ändra ditt kontolösenord."
-
 #~ msgid ""
 #~ "Please enter a new password for this account:\n"
 #~ "%s"
 #~ msgstr ""
 #~ "Ange ett nytt lösenord för det här kontot:\n"
 #~ "%s"
-
 #~ msgid "No information is available for this contact."
 #~ msgstr "Ingen information finns tillgänglig för denna kontakt."
-
 #~ msgid "Information requested, please wait..."
 #~ msgstr "Information begärd, var vänlig vänta..."
-
 #~ msgid "To summarize:"
 #~ msgstr "Sammanfattning:"
-
 #~ msgid "%d subscription request"
 #~ msgid_plural "%d subscription requests"
 #~ msgstr[0] "%d prenumerationsförfrågan"
 #~ msgstr[1] "%d prenumerationsförfrågan"
-
 #~ msgid "%d file transfer request"
 #~ msgid_plural "%d file transfer requests"
 #~ msgstr[0] "%d filöverföringsförfrågan"
 #~ msgstr[1] "%d filöverföringsförfrågan"
-
 #~ msgid "%d server message"
 #~ msgid_plural "%d server messages"
 #~ msgstr[0] "%d servermeddelande"
 #~ msgstr[1] "%d servermeddelanden"
-
 #~ msgid "%d error"
 #~ msgid_plural "%d errors"
 #~ msgstr[0] "%d fel"
 #~ msgstr[1] "%d fel"
-
 #~ msgid "If you quit, you will lose all unread information."
 #~ msgstr "Om du avslutar kommer all oläst information förloras."
-
 #~ msgid "Gossip is still running, it is just hidden."
 #~ msgstr "Gossip kör fortfarande, den är bara dold."
-
 #~ msgid "Click on the notification area icon to show Gossip."
 #~ msgstr "Klicka på ikonen i notifieringsytan för att visa Gossip."
-
 #~ msgid "You were about to quit!"
 #~ msgstr "Du är på väg att avsluta!"
-
 #~ msgid ""
 #~ "Since no system or notification tray has been found, this action would "
 #~ "normally quit Gossip.\n"
@@ -2977,29 +3148,22 @@ msgstr ""
 #~ "\n"
 #~ "Detta är bara en påminnelse, från och med nu kommer Gossip att avslutas "
 #~ "när denna åtgärd genomförs såvida du inte avkryssar alternativet nedan."
-
 #~ msgid "Select who would you like to invite to room:"
 #~ msgstr "Välj vilka du vill bjuda in till rummet:"
-
 #~ msgid "Select which room you would like to invite:"
 #~ msgstr "Välj vilket rum du vill bjuda in till:"
-
 #~ msgid "Your invitation has been declined"
 #~ msgstr "Ditt inbjudan har nekats."
-
 #~ msgid "Accept"
 #~ msgstr "Acceptera"
-
 #~ msgid ""
 #~ "Please enter a new name for the group:\n"
 #~ "%s"
 #~ msgstr ""
 #~ "Ange ett nytt namn för gruppen:\n"
 #~ "%s"
-
 #~ msgid "Unsorted"
 #~ msgstr "Osorterade"
-
 #~ msgid ""
 #~ "Set the alias you want to use for:\n"
 #~ "<b>%s</b>\n"
@@ -3010,160 +3174,105 @@ msgstr ""
 #~ "<b>%s</b>\n"
 #~ "\n"
 #~ "Du kan hämta kontaktinformation från servern."
-
 #~ msgid "New file transfer request from %s"
 #~ msgstr "Ny filöverföringsförfrågan från %s"
-
-#~ msgid "File transfer is not supported by both parties."
-#~ msgstr "Filöverföring stöds inte av båda parter."
-
 #~ msgid "Your file transfer offer declined."
 #~ msgstr "Ditt erbjudande om filöverföring nekades."
-
 #~ msgid "The other user decided not to continue."
 #~ msgstr "Den andra användaren beslöts sig för att inte fortsätta."
-
 #~ msgid "Unknown error occurred during file transfer."
 #~ msgstr "Ett okänt fel inträffade under filöverföringen."
-
 #~ msgid "Someone would like to send you a file."
 #~ msgstr "Någon vill skicka en fil till dig."
-
 #~ msgid "Retry connection"
 #~ msgstr "Återanslut"
-
 #~ msgid "Invited %s to join this chat conference."
 #~ msgstr "Inbjöd %s till att gå med i chattkonferens."
-
 #~ msgid "%s has set the topic: %s"
 #~ msgstr "%s har satt ämnet: %s"
-
 #~ msgid "Conversation With"
 #~ msgstr "Samtal med"
-
 #~ msgid "Allow multiple instances of the application to run at the same time"
 #~ msgstr "Tillåt flera instanser av applikationen att köras samtidigt"
-
 # "Lista" som verb brukar vi inte använda; hellre "visa" eller möjligtvis
 # "visa i lista"
 #~ msgid "List the available accounts"
 #~ msgstr "Visa tillgängliga konton"
-
 #~ msgid "ACCOUNT-NAME"
 #~ msgstr "KONTONAMN"
-
 #~ msgid "You can not use --no-connect together with --account"
 #~ msgstr "Du kan inte använda --no-connect tillsammans med --account"
-
 #~ msgid "No accounts available."
 #~ msgstr "Inga konton tillgängliga."
-
 #~ msgid "Available accounts:"
 #~ msgstr "Tillgängliga konton:"
-
 #~ msgid "[default]"
 #~ msgstr "[standard]"
-
 #~ msgid "There is no account with the name '%s'."
 #~ msgstr "Det finns inget konto med namnet \"%s\"."
-
 #~ msgid "Found %d conference rooms"
 #~ msgstr "Hittade %d konferensrum"
-
 #~ msgid "Browsing for conference rooms, please wait..."
 #~ msgstr "Bläddrar efter konferensrum, vänta..."
-
 #~ msgid "Browsing cancelled!"
 #~ msgstr "Bläddring avbröts!"
-
 #~ msgid "Default"
 #~ msgstr "Standard"
-
 #~ msgid "Chat!"
 #~ msgstr "Chatta!"
-
 #~ msgid "%s wants to be added to your contact list."
 #~ msgstr "%s vill bli tillagd till din kontaktlista."
-
 #~ msgid "Someone wants to be added to your contact list."
 #~ msgstr "Någon vill bli tillagd till din kontaktlista."
-
 #~ msgid "Show"
 #~ msgstr "Visa"
-
 #~ msgid "Contact has been removed"
 #~ msgstr "Kontakten har tagits bort"
-
 #~ msgid "Subject: %s"
 #~ msgstr "Ämne: %s"
-
 #~ msgid "Do you want to add this person to your contact list?"
 #~ msgstr "Vill du lägga till denna person till din kontaktlista?"
-
 #~ msgid "Do you want to add %s to your contact list?"
 #~ msgstr "Vill du lägga till %s till din kontaktlista?"
-
 #~ msgid "Please enter your %s account password"
 #~ msgstr "Ange lösenordet för kontot %s"
-
 #~ msgid "Logging in to account '%s'"
 #~ msgstr "Loggar in mot kontot \"%s\""
-
 #~ msgid "Remember Password?"
 #~ msgstr "Kom ihåg lösenord?"
-
 #~ msgid "Do not show this again"
 #~ msgstr "Visa inte det här igen"
-
 #~ msgid "Could not display the help contents."
 #~ msgstr "Kunde inte visa hjälpinnehållet."
-
 #~ msgid "OK"
 #~ msgstr "OK"
-
 #~ msgid "The server does not seem to be responding."
 #~ msgstr "Servern verkar inte svara."
-
 #~ msgid "Try again later."
 #~ msgstr "Försök igen senare."
-
 #~ msgid "Change"
 #~ msgstr "Ändra"
-
 #~ msgid "File name:"
 #~ msgstr "Filnamn:"
-
 # "Web site" är "webbplats". "Web page" är "webbsida".
 #~ msgid "File size:"
 #~ msgstr "Filstorlek:"
-
 #~ msgid "Not supported yet"
 #~ msgstr "Stöds inte ännu"
-
 #~ msgid "This person wishes to send you this file:"
 #~ msgstr "Denna person vill skicka den här filen till dig:"
-
-#~ msgid "me"
-#~ msgstr "jag"
-
 #~ msgid "Choose the protocol"
 #~ msgstr "Välj protokollet"
-
 #~ msgid "Gossip"
 #~ msgstr "Gossip"
-
 #~ msgid "%s - New Message"
 #~ msgstr "%s - Nytt meddelande"
-
 #~ msgid "%s - Conversation"
 #~ msgstr "%s - Samtal"
-
 #~ msgid "_Forget"
 #~ msgstr "_Glöm"
-
 #~ msgid "Martyn Russell"
 #~ msgstr "Martyn Russell"
-
 #~ msgid ""
 #~ "Set the alias you want to use for:\n"
 #~ "<b>martyn@imendio.com</b>\n"
@@ -3174,92 +3283,64 @@ msgstr ""
 #~ "<b>martyn@imendio.com</b>\n"
 #~ "\n"
 #~ "Du kan hämta kontaktinformation från servern. "
-
 #~ msgid "    "
 #~ msgstr "    "
-
 #~ msgid "Group:"
 #~ msgstr "Grupp:"
-
 # "Web site" är "webbplats". "Web page" är "webbsida".
 #~ msgid "Web Site:"
 #~ msgstr "Webbplats:"
-
 #~ msgid "Favourite"
 #~ msgstr "Favorit"
-
 #~ msgid "Add to _favourites"
 #~ msgstr "_Lägg till i favoriter"
-
 #~ msgid ""
 #~ "Customize your own nickname, the server and chatroom which you wish to "
 #~ "join."
 #~ msgstr "Anpassa ditt smeknamn, servern och chattrummet du vill gå in i."
-
 #~ msgid "Edit your chat room details:"
 #~ msgstr "Redigera chattrumsdetaljer:"
-
 #~ msgid "Na_me:"
 #~ msgstr "Na_mn:"
-
 #~ msgid "New Chat Room"
 #~ msgstr "Nytt chattrum"
-
 #~ msgid ""
 #~ "Pick a saved chat room from the presets available below and click Join to "
 #~ "start chatting."
 #~ msgstr ""
 #~ "Välj ett sparat chattrum nedan och tryck Gå in för att börja chatta."
-
 #~ msgid "Save _this chat room"
 #~ msgstr "Spara detta chattrum"
-
 #~ msgid "Press Subscribe to request to receive their status"
 #~ msgstr "Tryck på Prenumerera för att ta emot kontaktens status"
-
 #~ msgid "_Group Chat"
 #~ msgstr "_Gruppchatt"
-
 #~ msgid "You have no Instant Messaging accounts configured!"
 #~ msgstr "Du har inte konfigurerar ett snabbmeddelandekonto!"
-
 #~ msgid ""
 #~ "Next you will be presented with the Account Information dialog to set "
 #~ "your details up."
 #~ msgstr ""
 #~ "Kontoinformationsdialogen kommer nu att visas så att du kan mata in din "
 #~ "information."
-
-#~ msgid "Registering account"
-#~ msgstr "Registrerar konto"
-
 #~ msgid "<span size=\"smaller\">Example:</span>"
 #~ msgstr "<span size=\"smaller\">Exempel:</span>"
-
 #~ msgid "Account Name"
 #~ msgstr "Kontonamn"
-
 #~ msgid "Connection Details"
 #~ msgstr "Anslutningsdetaljer"
-
 #~ msgid "Enter a name for this account"
 #~ msgstr "Ange ett namn för detta konto"
-
 #~ msgid "Enter the port used in the connection for this account"
 #~ msgstr "Ange porten att ansluta till för detta konto"
-
 #~ msgid "Enter the server used in the connection for this account"
 #~ msgstr "Ange den server som ska anslutas till för detta konto"
-
 #~ msgid "Enter your real name here"
 #~ msgstr "Ange ditt riktiga namn här"
-
 #~ msgid "Finished"
 #~ msgstr "Slutfört"
-
 #~ msgid "For increased security, enable this option"
 #~ msgstr "För ökad säkerhet, aktivera detta val"
-
 #~ msgid ""
 #~ "Gossip is a modern client for the Jabber Instant Messaging system.\n"
 #~ "\n"
@@ -3274,7 +3355,6 @@ msgstr ""
 #~ "till din Jabber-favoritserver.\n"
 #~ "\n"
 #~ "För att börja klickar du bara på \"Framåt\"."
-
 #~ msgid ""
 #~ "If you have another machine on your network which 'proxies' the "
 #~ "connection to the internet and you want to use it, enable this option"
@@ -3282,14 +3362,12 @@ msgstr ""
 #~ "Om du har en annan dator på ditt nätverk som fungerar som proxy för "
 #~ "anslutningar till internet och du vill använda den, aktivera detta "
 #~ "alternativ"
-
 #~ msgid ""
 #~ "If you need to set specific connection details, like a different server "
 #~ "or port, you can configure that here:"
 #~ msgstr ""
 #~ "Om du behöver ställa in specifika anslutningsdetaljer, som en annan "
 #~ "server eller port, kan du konfigurera det här:"
-
 #~ msgid ""
 #~ "Leave this blank if you don't want your password stored on a public "
 #~ "machine. If you decide to do this, you will be prompted each time you "
@@ -3298,16 +3376,12 @@ msgstr ""
 #~ "Lämna denna blank om du inte vill lagra ditt lösenord på en publik dator. "
 #~ "Om du väljer att göra det, kommer du att frågas efter ett lösenord varje "
 #~ "gång du ansluter"
-
 #~ msgid "Registering Account"
 #~ msgstr "Registrerar konto"
-
 #~ msgid "Welcome to Gossip"
 #~ msgstr "Välkommen till Gossip"
-
 #~ msgid "What is your name?"
 #~ msgstr "Vad heter du?"
-
 #~ msgid ""
 #~ "What name do you want to use to identify this account?\n"
 #~ "\n"
@@ -3318,63 +3392,42 @@ msgstr ""
 #~ "\n"
 #~ "Detta namn skulle kunna vara något som kan kopplas ihop med "
 #~ "tjänsteleverantören, till exempel <b>Google</b>."
-
 #~ msgid "What password do you want to use?"
 #~ msgstr "Vilket lösenord vill du använda?"
-
 #~ msgid "What username do you use?"
 #~ msgstr "Vad använder du för användarnamn?"
-
 #~ msgid "What username do you want to use?"
 #~ msgstr "Vilket användarnamn vill du använda?"
-
 #~ msgid ""
 #~ "You can change your account settings later by selecting the Edit-"
 #~ ">Accounts menu item."
 #~ msgstr ""
 #~ "Du kan ändra dina kontoinställningar senare genom att välja menyvalet "
 #~ "Redigera->Konton."
-
 #~ msgid ""
 #~ "You need to set a name for the connection, for example, <b>Home</b> or "
 #~ "<b>Laptop</b>."
 #~ msgstr ""
 #~ "Du behöver ställa in ett namn för anslutningen, till exempel <b>Hem</b> "
 #~ "eller <b>Bärbar dator</b>."
-
 #~ msgid "Your Account"
 #~ msgstr "Ditt konto"
-
 #~ msgid "Your Identity"
 #~ msgstr "Din identitet"
-
 #~ msgid "Your new account has now been set up."
 #~ msgstr "Ditt nya konto är nu inställt."
-
-#~ msgid "_No"
-#~ msgstr "_Nej"
-
-#~ msgid "_Yes"
-#~ msgstr "_Ja"
-
 #~ msgid "<b>Information requested, please wait...</b>"
 #~ msgstr "<b>Information begärd, var vänlig vänta...</b>"
-
 #~ msgid "%s will be added to your contact list."
 #~ msgstr "%s kommer att läggas till i din kontaktlista."
-
 #~ msgid "%s ID of new contact:"
 #~ msgstr "%s id för ny kontakt:"
-
 #~ msgid "Example: %s"
 #~ msgstr "Exempel: %s"
-
 #~ msgid "Add a contact"
 #~ msgstr "Lägg till en kontakt"
-
 #~ msgid "Enter the user's contact ID:"
 #~ msgstr "Ange användarens kontakt-ID:"
-
 #~ msgid ""
 #~ "In order to subscribe to presence notifications from the user, a request "
 #~ "will be sent. Until this request is approved, the user will always be "
@@ -3384,353 +3437,242 @@ msgstr ""
 #~ "en förfrågan att skickas. Användaren kommer alltid att visas som "
 #~ "\"Frånkopplad\" i din kontaktlista till dess att denna förfrågan är "
 #~ "godkänd."
-
 #~ msgid "In which group do you want to place this contact?"
 #~ msgstr "I vilken grupp vill du placera denna kontakt?"
-
 #~ msgid "Jabber ID:"
 #~ msgstr "Jabber-id:"
-
 #~ msgid "What instant messaging system does the contact use?"
 #~ msgstr "Vilket meddelandesystem använder kontakten?"
-
 #~ msgid "Which account do you want to add this contact to?"
 #~ msgstr "Till vilket konto vill du lägga till denna kontakt?"
-
 #~ msgid "_Search..."
 #~ msgstr "_Sök..."
-
 #~ msgid "_Compact contact list"
 #~ msgstr "_Kompakt kontaktlista"
-
 #~ msgid "Show accounts and pending connections"
 #~ msgstr "Visa konton och avvaktande anslutningar"
-
 #~ msgid "Edit"
 #~ msgstr "Redigera"
-
 #~ msgid "Perhaps you are trying to connect to the wrong port?"
 #~ msgstr "Försöker du kanske ansluta till fel port?"
-
 #~ msgid "Perhaps the service is not currently running?"
 #~ msgstr "Tjänsten kanske inte är igång just nu?"
-
 #~ msgid "Check your connection details."
 #~ msgstr "Kontrollera dina anslutningsdetaljer."
-
 #~ msgid "Perhaps the server is not running this service."
 #~ msgstr "Servern kanske inte kör denna tjänsten."
-
 #~ msgid "Check your username and password are correct."
 #~ msgstr "Kontrollera att användarnamn och lösenord är korrekta."
-
 #~ msgid "Re_name group"
 #~ msgstr "Byt _namn på grupp"
-
 #~ msgid "_Remove contact"
 #~ msgstr "_Ta bort kontakt"
-
 #~ msgid ""
 #~ "Please enter your invitation message to:\n"
 #~ "%s"
 #~ msgstr ""
 #~ "Ange ditt inbjudningsmeddelande till:\n"
 #~ "%s"
-
 # Vi brukar förvisso låta R:et vara åtkomsttangent i "Redigera"
 #~ msgid "_Edit Groups"
 #~ msgstr "R_edigera grupper"
-
 #~ msgid ""
 #~ "Please enter a new nickname for the contact\n"
 #~ "%s"
 #~ msgstr ""
 #~ "Ange ett nytt smeknamn för kontakten\n"
 #~ "%s"
-
 #~ msgid "Edit groups for %s"
 #~ msgstr "Redigera grupper för %s"
-
 # Vi översätter "hide" med "dölj" i GNOME. Gömmer gör man något för att det
 # inte ska hittas, döljer gör man för att det inte ska synas.
 #~ msgid "_Hide Contact List"
 #~ msgstr "_Dölj kontaktlista"
-
 #~ msgid "/Contact Infor_mation"
 #~ msgstr "/Kontaktinfor_mation"
-
 #~ msgid "/_View Previous Conversations"
 #~ msgstr "/Visa tidigare samtal"
-
 #~ msgid "Enable Spell Checker"
 #~ msgstr "Aktivera stavningskontroll"
-
 #~ msgid "Preset status messages"
 #~ msgstr "Förinställda statusmeddelanden"
-
 #~ msgid "Preset status messages."
 #~ msgstr "Förinställda statusmeddelanden."
-
 #~ msgid "Peekaboo"
 #~ msgstr "Peekaboo"
-
 # Vi översätter "hide" med "dölj" i GNOME. Gömmer gör man något för att det
 # inte ska hittas, döljer gör man för att det inte ska synas.
 #~ msgid "_Show/Hide Contact List"
 #~ msgstr "_Dölj/Visa kontaktlista"
-
 #~ msgid "An instant messaging applet."
 #~ msgstr "En snabbmeddelandeklient för GNOME"
-
 #~ msgid "Contact Information for %s"
 #~ msgstr "Kontaktinformation för %s"
-
 #~ msgid "Convert smiley text into images when chatting"
 #~ msgstr "Konvertera textsmilisar till bilder"
-
 #~ msgid "Be silent when away"
 #~ msgstr "Var tyst under frånvaro"
-
 #~ msgid "Be silent when busy"
 #~ msgstr "Var tyst under upptagetläge"
-
 #~ msgid "<b>Chat Window</b>"
 #~ msgstr "<b>Chattfönster</b>"
-
 #~ msgid "Join _Group Chat..."
 #~ msgstr "_Gå in i gruppchatt..."
-
 #~ msgid "Available..."
 #~ msgstr "Tillgänglig..."
-
 #~ msgid "Busy..."
 #~ msgstr "Upptagen..."
-
 #~ msgid "Away..."
 #~ msgstr "Frånvarande..."
-
 #~ msgid "Requesting contact information, please wait..."
 #~ msgstr "Begär kontaktinformation, var vänlig vänta..."
-
 #~ msgid "Height of main window"
 #~ msgstr "Höjden på huvudfönstret"
-
 #~ msgid "The X position of the main window."
 #~ msgstr "X-positionen av huvudfönstret."
-
 #~ msgid "The Y position of the main window."
 #~ msgstr "Y-positionen av huvudfönstret."
-
 #~ msgid "The width of the main window."
 #~ msgstr "Bredden på huvudfönstret."
-
 #~ msgid "Whether spell checking should be turned on."
 #~ msgstr "Huruvida stavningskontroll ska vara påslaget."
-
 #~ msgid "Width of the main window"
 #~ msgstr "Bredden på huvudfönstret"
-
 #~ msgid "X position of main window"
 #~ msgstr "X-positionen av huvudfönstret"
-
 #~ msgid "Y position of main window"
 #~ msgstr "Y-positionen av huvudfönstret"
-
 #~ msgid "<b>Appearance and Behavior</b>"
 #~ msgstr "<b>Utseende och beteende</b>"
-
 #~ msgid "Check spelling while I _type"
 #~ msgstr "Kontrollera stavning medan jag skriver"
-
 #~ msgid "Close this chat window"
 #~ msgstr "Stäng detta chattfönster"
-
 #~ msgid "Requested Information"
 #~ msgstr "Information efterfrågad"
-
 #~ msgid "Requested information."
 #~ msgstr "Information efterfrågad."
-
 #~ msgid "/_Contact Information"
 #~ msgstr "/_Kontaktinformation"
-
 #~ msgid "Contact _Information"
 #~ msgstr "Kontakti_nformation"
-
 #~ msgid "Gossip - Accounts"
 #~ msgstr "Gossip - konton"
-
 #~ msgid "Por_t:"
 #~ msgstr "_Port:"
-
 #~ msgid "/_Invite to Chat Conference"
 #~ msgstr "/_Bjud in till chattkonferens"
-
-#~ msgid "%s has gone offline"
-#~ msgstr "%s kopplade från"
-
 #~ msgid "/View Message _History"
 #~ msgstr "/Visa _meddelandehistorik"
-
 #~ msgid "View Message _History"
 #~ msgstr "Visa _meddelandehistorik"
-
 #~ msgid "View Message Hi_story"
 #~ msgstr "Visa _meddelandehistorik"
-
 #~ msgid "View Message History"
 #~ msgstr "Visa meddelandehistorik"
-
 #~ msgid "Gossip - Group Chat"
 #~ msgstr "Gossip - gruppchatt"
-
 #~ msgid "Gossip - New Chatroom"
 #~ msgstr "Gossip - nytt chattrum"
-
 #~ msgid "Gossip - Add contact"
 #~ msgstr "Gossip - lägg till kontakt"
-
 #~ msgid "Gossip - Contact Information"
 #~ msgstr "Gossip - kontaktinformation"
-
 #~ msgid "Gossip - Edit Groups"
 #~ msgstr "Gossip - redigera grupper"
-
 #~ msgid "Gossip - New Account"
 #~ msgstr "Gossip - nytt konto"
-
 #~ msgid "Gossip - Personal Details"
 #~ msgstr "Gossip - personlig information"
-
 #~ msgid "Gossip - Preferences"
 #~ msgstr "Gossip - inställningar"
-
 #~ msgid "Gossip - Spell Checker"
 #~ msgstr "Gossip - stavningskontroll"
-
 #~ msgid "Gossip - Status Message"
 #~ msgstr "Gossip - statusmeddelande"
-
 #~ msgid "Gossip - View Message History"
 #~ msgstr "Gossip - visa meddelandehistorik"
-
 #~ msgid "Written by:"
 #~ msgstr "Skrivet av:"
-
 #~ msgid "Artwork by:"
 #~ msgstr "Grafik av:"
-
 #~ msgid "Translated by:"
 #~ msgstr "Översatt av:"
-
 #~ msgid "/Show _Log"
 #~ msgstr "/_Visa logg"
-
 #~ msgid "View Lo_g"
 #~ msgstr "_Visa logg"
-
 #~ msgid ""
 #~ "You can identify this account with a name, for example, <b>Home</b> or "
 #~ "<b>Work</b>. Choose a name for this account:"
 #~ msgstr ""
 #~ "Du kan identifiera detta kontot med ett namn, till exempel <b>Hemma</b> "
 #~ "eller <b>Jobb</b>. Välj ett namn för kontot:"
-
 #~ msgid "Open"
 #~ msgstr "Öppet"
-
 #~ msgid "Account ID"
 #~ msgstr "Kontoid"
-
 #~ msgid "Could not find the server you wanted to use"
 #~ msgstr "Kunde inte hitta servern du ville använda"
-
 #~ msgid "Connection to the server failed."
 #~ msgstr "Anslutningen till servern misslyckades."
-
 #~ msgid "Connection could not be created"
 #~ msgstr "Anslutning kunde inte skapas"
-
 #~ msgid "Bad Request"
 #~ msgstr "Felaktig förfrågan"
-
 #~ msgid "Payment Required"
 #~ msgstr "Betalning krävd"
-
 #~ msgid "Not Found"
 #~ msgstr "Inte hittad"
-
 #~ msgid "Not Allowed"
 #~ msgstr "Inte tillåten"
-
 #~ msgid "Not Acceptable"
 #~ msgstr "Inte acceptabel"
-
 #~ msgid "Request Timeout"
 #~ msgstr "Förfrågan timade ut"
-
 #~ msgid "Conflict"
 #~ msgstr "Konflikt"
-
 #~ msgid "Remote Server Error"
 #~ msgstr "Fjärrserverfel"
-
 #~ msgid "Service Unavailable"
 #~ msgstr "Tjänst otillgänglig"
-
 #~ msgid "Custom"
 #~ msgstr "Anpassad"
-
 #~ msgid "Check the server host name is correct and is available."
 #~ msgstr ""
 #~ "Kontrollera att serverns namn är korrent och att den finns tillgänglig."
-
 # Dessa meddelanden slutar inte båda i punkt, borde kanske rapporteras
 #~ msgid "Gossip will now try to use your account:"
 #~ msgstr "Gossip kommer nu att försöka använda ditt konto:"
-
 #~ msgid "Gossip will now try to register the account:"
 #~ msgstr "Gossip kommer nu att försöka registrera kontot:"
-
 #~ msgid "Reason:"
 #~ msgstr "Orsak:"
-
 #~ msgid "R_esource:"
 #~ msgstr "R_esurs:"
-
 #~ msgid "<b>Personal Information</b>"
 #~ msgstr "<b>Personlig information</b>"
-
 #~ msgid "Choose a Server"
 #~ msgstr "Välj en server"
-
 #~ msgid "On what server do you have an account?"
 #~ msgstr "På vilken server har du ett konto?"
-
 #~ msgid "_Jabber ID of new contact:"
 #~ msgstr "_Jabber-id för ny kontakt:"
-
 #~ msgid "<b>Preferences</b>"
 #~ msgstr "<b>Inställningar</b>"
-
 #~ msgid "Connect _Server:"
 #~ msgstr "Anslut till _server:"
-
 #~ msgid "_Automatically Connect"
 #~ msgstr "_Anslut automatiskt"
-
 #~ msgid "_Resource:"
 #~ msgstr "_Resurs:"
-
 #~ msgid ""
 #~ "The default account is used for information like your name in chat "
 #~ "windows."
 #~ msgstr ""
 #~ "Standardkontot används för information som ditt namn i chattfönster."
-
 #~ msgid "_Connect..."
 #~ msgstr "_Anslut..."
-
 #, fuzzy
 #~ msgid ""
 #~ "<b>Configuring your new service...</b>\n"
@@ -3742,7 +3684,6 @@ msgstr ""
 #, fuzzy
 #~ msgid "<b>Preferred Service</b>"
 #~ msgstr "<b>Rekommenderade tjänster</b>"
-
 #~ msgid "<b>Recommended Services</b>"
 #~ msgstr "<b>Rekommenderade tjänster</b>"
 
@@ -3753,64 +3694,46 @@ msgstr ""
 #~ msgstr ""
 #~ "<b>Söker efter den bästa servern...</b>\n"
 #~ "Detta kommer att ta en stund, var god vänta."
-
-#~ msgid "Add Account"
-#~ msgstr "Lägg till konto"
-
 #~ msgid "Add Another Account"
 #~ msgstr "Lägg till ytterligare konto"
-
 #~ msgid "Configuring Service"
 #~ msgstr "Konfigurerar tjänst"
-
 #~ msgid "Nick name:"
 #~ msgstr "Smeknamn:"
-
 #~ msgid "Please complete the details below to set up your account:  "
 #~ msgstr "Fyll i detaljerna nedan för att ställa in ditt konto:  "
-
 #~ msgid "Remove Account"
 #~ msgstr "Ta bort konto"
-
 #~ msgid "Service Details"
 #~ msgstr "Tjänstedetaljer"
-
 #~ msgid "Service:"
 #~ msgstr "Tjänst:"
-
 #~ msgid ""
 #~ "This wizard will allow you to configure your account settings for another "
 #~ "protocol. "
 #~ msgstr ""
 #~ "Denna guide kommer att låta dig konfigurera dina kontoinställningar för "
 #~ "ytterligare ett protokoll. "
-
 #~ msgid "Which protocol would you like to set up? "
 #~ msgstr "Vilket protokoll vill du konfigurera? "
-
 #~ msgid "Edit List..."
 #~ msgstr "Redigera listan..."
-
 #~ msgid "Gossip - Status Presets"
 #~ msgstr "Gossip - förinställd status"
 
 #, fuzzy
 #~ msgid "Choose _from list:"
 #~ msgstr "Välj från lista:"
-
 #~ msgid "Jabber.com"
 #~ msgstr "Jabber.com"
-
 #~ msgid "Jabber.org"
 #~ msgstr "Jabber.org"
 
 #, fuzzy
 #~ msgid "Use a _different server"
 #~ msgstr "Använd en annan server"
-
 #~ msgid "_Account Information"
 #~ msgstr "_Kontoinformation"
-
 #~ msgid "Searching Local Services..."
 #~ msgstr "Söker lokala tjänster..."
 
@@ -3827,99 +3750,70 @@ msgstr ""
 #, fuzzy
 #~ msgid "Registration Successful!"
 #~ msgstr "Registrerar konto"
-
 #~ msgid "Service"
 #~ msgstr "Tjänst"
 
 #, fuzzy
 #~ msgid "Registering With Service"
 #~ msgstr "Konfigurerar tjänst"
-
 #~ msgid "From:"
 #~ msgstr "Från:"
-
 #~ msgid "In reply to:"
 #~ msgstr "Svar på:"
-
 #~ msgid "To:"
 #~ msgstr "Till:"
-
 #~ msgid "_Reply..."
 #~ msgstr "_Svara..."
-
 #~ msgid "C_onnect"
 #~ msgstr "A_nslut"
-
 #~ msgid "        "
 #~ msgstr "        "
-
 #~ msgid "<b>Available chat rooms</b>"
 #~ msgstr "<b>Tillgängliga chattrum</b>"
-
 #~ msgid "N_ickname:"
 #~ msgstr "Smek_namn:"
-
-#~ msgid "_Add"
-#~ msgstr "_Lägg till"
-
 #~ msgid "<b>Preset status messages</b>"
 #~ msgstr "<b>Förinställda statusmeddelanden</b>"
-
 #~ msgid "<i>Information not available</i>"
 #~ msgstr "<i>Informationen inte tillgänglig</i>"
-
 #~ msgid "Information about ..."
 #~ msgstr "Information om..."
-
 #~ msgid "Jabber Account"
 #~ msgstr "Jabberkonto"
-
 #~ msgid "Personal information"
 #~ msgstr "Personlig information"
-
 #~ msgid "Status Message"
 #~ msgstr "Statusmeddelande"
-
 #~ msgid "What request message do you want to send to %s?"
 #~ msgstr "Vilket förfrågansmeddelande vill du skicka till %s?"
-
 #~ msgid "%s wants to be notified of your status."
 #~ msgstr "%s vill bli meddelad om din status."
-
 #~ msgid "Add to your contact list"
 #~ msgstr "Lägg till i din kontaktlista"
-
 #~ msgid "What request message do you want to send to ...?"
 #~ msgstr "Vilket förfrågansmeddelande vill du skicka till ..."
-
 #~ msgid "Make sure that your account information is correct."
 #~ msgstr "Kontrollera att din kontoinformation är korrekt."
-
 #~ msgid "You were disconnected from the server. Do you want to reconnect?"
 #~ msgstr "Du frånkopplades från servern. Vill du återansluta?"
-
 #~ msgid ""
 #~ "Make sure that your account information is correct. The server may also "
 #~ "currently be unavailable."
 #~ msgstr ""
 #~ "Kontrollera att din kontoinformation är korrekt. Servern kan också vara "
 #~ "otillgänglig för tillfället."
-
 #~ msgid "An error occurred when chatting in the group chat %s."
 #~ msgstr "Ett fel inträffade under samtal i gruppchatten %s."
-
 #~ msgid "Details:"
 #~ msgstr "Detaljer:"
-
 #~ msgid "Unable to enter the group chat %s."
 #~ msgstr "Kunde inte gå in i gruppchatten %s."
-
 #~ msgid "An error occurred when chatting with %s."
 #~ msgstr "Ett fel inträffade under chatt med %s."
-
 #~ msgid ""
 #~ "Please enter your user name, password and all other required details "
 #~ "below to set up your account."
 #~ msgstr ""
 #~ "Ange ditt användarnamn, lösenord och alla andra nödvändiga detaljer nedan "
 #~ "för att konfigurera ditt konto."
+
diff --git a/po/ta.po b/po/ta.po
index d070d0bd6..29e48ec7b 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ta\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-19 05:47+0530\n"
-"PO-Revision-Date: 2009-06-20 14:19+0530\n"
+"POT-Creation-Date: 2009-07-21 20:24+0530\n"
+"PO-Revision-Date: 2009-07-21 20:26+0530\n"
 "Last-Translator: Dr.T.Vasudevan <agnihot3@gmail.com>\n"
 "Language-Team: Tamil <Ubuntu-l10n-tam@lists.ubuntu.com>\n"
 "MIME-Version: 1.0\n"
@@ -101,166 +101,183 @@ msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "துவங்கும் போது எம்பதி அரட்டை சாரளத்தில்  சின்னமாக தொடர்பின் அவதாரத்தை காட்ட  வேண்டும்."
 
 #: ../data/empathy.schemas.in.h:19
+msgid "Enable WebKit Developer Tools"
+msgstr "வெப்கிட் உருவாக்குவோர் கருவிகளை செயல்படுத்து"
+
+#: ../data/empathy.schemas.in.h:20
 msgid "Enable popup notifications for new messages"
 msgstr "புதிய செய்திகளுக்கு துள்ளு அறிவிப்புகளை செயல்படுத்து "
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:21
 msgid "Enable spell checker"
 msgstr "சொல் திருத்தியை செயல்படுத்து"
 
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:22
 msgid "Hide main window"
 msgstr "முதன்மை சாளரத்தை மறை "
 
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:23
 msgid "Hide the main window."
 msgstr "முதன்மை சாளரத்தை மறை "
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:24
 msgid "NetworkManager should be used"
 msgstr "வலைப்பின்னல் மேலாளரை பயன்படுத்த வேண்டும்"
 
-#: ../data/empathy.schemas.in.h:24
+#: ../data/empathy.schemas.in.h:25
 msgid "Nick completed character"
 msgstr "செல்லப்பெயரை பூர்த்தி செய்யும் எழுத்துரு"
 
-#: ../data/empathy.schemas.in.h:25
+#: ../data/empathy.schemas.in.h:26
 msgid "Open new chats in separate windows"
 msgstr "புதிய அரட்டைகளை தனி சாளரத்தில் திற"
 
-#: ../data/empathy.schemas.in.h:26
+#: ../data/empathy.schemas.in.h:27
 msgid "Path of the adium theme to use"
 msgstr "பயன்படுத்த வேண்டிய ஏடியம் கருத்துக்கு பாதை"
 
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:28
 msgid "Path of the adium theme to use if the theme used for chat is adium."
 msgstr "அரட்டை அறைகளில் எடியம் கருத்தை பயன்படுத்த வேண்டுமானால் அதன் பாதை"
 
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:29
 msgid "Play a sound for incoming messages"
 msgstr "உள்வரும் செய்திகளுக்கு ஒலி எழுப்பு"
 
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:30
 msgid "Play a sound for new conversations"
 msgstr "உள்வரும் உரையாடல்களுக்கு ஒலி எழுப்பு"
 
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:31
 msgid "Play a sound for outgoing messages"
 msgstr "வெளிச்செல்லும் செய்திகளுக்கு ஒலி எழுப்பு"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:32
 msgid "Play a sound when a contact logs in"
 msgstr "தொடர்பு உள் நுழைகையில் ஒலி எழுப்பு"
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:33
 msgid "Play a sound when a contact logs out"
 msgstr "தொடர்பு வெளி செல்கையில் ஒலி எழுப்பு"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:34
 msgid "Play a sound when we log in"
 msgstr "நாம் உள் நுழைகையில் ஒலி எழுப்பு"
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:35
 msgid "Play a sound when we log out"
 msgstr "நாம் வெளி செல்கையில் ஒலி எழுப்பு"
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:36
 msgid "Popup notifications if the chat isn't focused"
 msgstr "அரட்டை குவிப்பில் இல்லையானால் வெளித்துள்ளல் மூலம் அறிவி"
 
-#: ../data/empathy.schemas.in.h:36
+#: ../data/empathy.schemas.in.h:37
+msgid "Popup notifications when a contact sign in"
+msgstr "தொடர்பு உள் நுழைகையில் வெளித்துள்ளல் மூலம் அறிவி"
+
+#: ../data/empathy.schemas.in.h:38
+msgid "Popup notifications when a contact sign out"
+msgstr "தொடர்பு உள் நுழைகையில்  வெளித்துள்ளல் மூலம் அறிவி"
+
+#: ../data/empathy.schemas.in.h:39
 msgid "Salut account is created"
 msgstr "சாலுட் கணக்கு துவக்கப்பட்டது "
 
-#: ../data/empathy.schemas.in.h:37
+#: ../data/empathy.schemas.in.h:40
 msgid "Show avatars"
 msgstr "அவதாரங்களை காட்டு"
 
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:41
 msgid "Show contact list in rooms"
 msgstr "தொடர்பு பட்டியல் ஐ அறைகளில் காட்டு "
 
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:42
 msgid "Show hint about closing the main window"
 msgstr "முதன்மை சாளரத்தை மூடிவது குறித்து குறிப்பு காட்டு "
 
-#: ../data/empathy.schemas.in.h:40
+#: ../data/empathy.schemas.in.h:43
 msgid "Show offline contacts"
 msgstr " வலை தொடர்பில்லாத தொடர்புகளை காட்டு"
 
-#: ../data/empathy.schemas.in.h:41
+#: ../data/empathy.schemas.in.h:44
 msgid "Spell checking languages"
 msgstr "எழுத்துப்பிழை திருத்த மொழி"
 
-#: ../data/empathy.schemas.in.h:42
+#: ../data/empathy.schemas.in.h:45
 msgid "The default folder to save file transfers in."
 msgstr "இடமாற்றிய கோப்புகளை சேமிக்க முன்னிருப்பு அடைவு"
 
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:46
 msgid "The last directory that an avatar image was chosen from."
 msgstr "அவதாரம் படம் தேர்ந்தெடுத்த கடைசி அடைவு "
 
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:47
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "அரட்டை சாளரங்களில் உரையாடல்களை காட்ட பயன்படும் கருத்து"
 
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:48
 msgid "Use graphical smileys"
 msgstr "வரைகலை சிரிப்பான்களை பயன்படுத்துக"
 
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:49
 msgid "Use notification sounds"
 msgstr "அறிவிப்பு ஒலிகளை பயன்படுத்துக"
 
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:50
 msgid "Use theme for chat rooms"
 msgstr "அரட்டை அறைகளுக்கு கருத்துக்களை பயன்படுத்துக"
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:51
+msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "வெப் ஆய்வாளர் போன்ற வெப்கிட் உருவாக்குவோர் கருவிகளை செயல்படுத்த வேண்டுமா?"
+
+#: ../data/empathy.schemas.in.h:52
 msgid "Whether or not Empathy can publish the user's location to his contacts."
 msgstr "பயனரின் இடத்தை தொடர்புகளுக்கு எம்பதி காட்ட வேண்டுமா இல்லையா?"
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:53
 msgid "Whether or not Empathy can use the GPS to guess the location."
 msgstr "எம்பதி பயனரின் இடத்தை ஊகிக்க ஜிபிஎஸ் ஐ பயன்படுத்தலாமா இல்லையா."
 
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:54
 msgid "Whether or not Empathy can use the cellular network to guess the location."
 msgstr "எம்பதி பயனரின் இடத்தை ஊகிக்க அலைபேசி வலையை பயன்படுத்தலாமா இல்லையா."
 
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:55
 msgid "Whether or not Empathy can use the network to guess the location."
 msgstr "எம்பதி பயனரின் இடத்தை ஊகிக்க  வலையை பயன்படுத்தலாமா இல்லையா."
 
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:56
 msgid ""
 "Whether or not Empathy has asked about importing accounts from other "
 "programs."
 msgstr "எம்பதி மற்ற நிரல்களில் இருந்து கணக்குகளை இறக்குமதி செய்வது குறித்து வினவியதா இல்லையா."
 
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:57
 msgid ""
 "Whether or not Empathy should automatically log in to your accounts on "
 "startup."
 msgstr "எம்பதி துவங்கும்போது கணக்குகளில் தானியங்கியாக உள்நுழைய வேண்டுமா இல்லையா."
 
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:58
 msgid ""
 "Whether or not Empathy should reduce the location's accuracy for privacy "
 "reasons."
-msgstr "அந்தரங்கத்தை காப்பாற்ற துவங்கும் போது எம்பதி இடத்தின் குறிப்பை குறைக்க வேண்டுமா இல்லையா"
+msgstr ""
+"அந்தரங்கத்தை காப்பாற்ற துவங்கும் போது எம்பதி இடத்தின் குறிப்பை குறைக்க வேண்டுமா இல்லையா"
 
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:59
 msgid ""
 "Whether or not Empathy should use the avatar of the contact as the chat "
 "window icon."
 msgstr "எம்பதி தொடர்பின் அவதாரத்தை அரட்டை அறை சின்னமாக பயன்படுத்த வேண்டுமா இல்லையா."
 
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:60
 msgid "Whether or not the Salut account has been created on the first Empathy run."
 msgstr "முதல் ஓட்டத்தில் எம்பதி சலூட் கணக்கை உருவாக்கியதா இல்லையா."
 
-#: ../data/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:61
 msgid ""
 "Whether or not the network manager should be used to automatically "
 "disconnect/reconnect."
@@ -268,55 +285,63 @@ msgstr ""
 "வலைப்பின்னல் மேலாளர் ஐ தானியங்கியாக இணைக்கவும் இணைப்பு விலகவும் பயன்படுத்த வேண்டுமா "
 "இல்லையா"
 
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:62
 msgid ""
 "Whether or not to check words typed against the languages you want to check "
 "with."
 msgstr "நீங்கள் விரும்பிய மொழிகளில் உள்ளிட்ட சொற்களை சோதிக்க வேண்டுமா இல்லையா?"
 
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:63
 msgid "Whether or not to convert smileys into graphical images in conversations."
 msgstr "உரையாடல்களில் சிரிப்பான்களை வரைகலை படங்களாக மாற்ற வேண்டுமா இல்லையா?"
 
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:64
 msgid "Whether or not to play a sound to notify for contacts logging in the network."
 msgstr "வலைப்பின்னலில் தொடர்புகள் உள்நுழையும் போது ஒலியை எழுப்ப வேண்டுமா இல்லையா?"
 
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:65
 msgid ""
 "Whether or not to play a sound to notify for contacts logging off the "
 "network."
 msgstr "வலைப்பின்னலில் தொடர்புகள் வெளிச்செல்லும் போது ஒலியை எழுப்ப வேண்டுமா இல்லையா?"
 
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:66
 msgid "Whether or not to play a sound to notify for events."
 msgstr "நிகழ்வுகள் போது ஒலியை எழுப்ப வேண்டுமா இல்லையா?"
 
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:67
 msgid "Whether or not to play a sound to notify for incoming messages."
 msgstr "செய்திகள் உள்வரும் போது ஒலியை எழுப்ப வேண்டுமா இல்லையா?"
 
-#: ../data/empathy.schemas.in.h:64
+#: ../data/empathy.schemas.in.h:68
 msgid "Whether or not to play a sound to notify for new conversations."
 msgstr "புதிய உரையாடல்கள் போது ஒலியை எழுப்ப வேண்டுமா இல்லையா?"
 
-#: ../data/empathy.schemas.in.h:65
+#: ../data/empathy.schemas.in.h:69
 msgid "Whether or not to play a sound to notify for outgoing messages."
 msgstr "செய்திகள் வெளிச்செல்லும் போது ஒலியை எழுப்ப வேண்டுமா இல்லையா?"
 
-#: ../data/empathy.schemas.in.h:66
+#: ../data/empathy.schemas.in.h:70
 msgid "Whether or not to play a sound when logging in a network."
 msgstr "வலைப்பின்னலில் உள்நுழையும் போது ஒலி இயக்க வேண்டுமா இல்லையா?"
 
-#: ../data/empathy.schemas.in.h:67
+#: ../data/empathy.schemas.in.h:71
 msgid "Whether or not to play a sound when logging off a network."
 msgstr "வலைப்பின்னலில் வெளிச்செல்லும் போது ஒலி இயக்க வேண்டுமா இல்லையா?"
 
-#: ../data/empathy.schemas.in.h:68
+#: ../data/empathy.schemas.in.h:72
 msgid "Whether or not to play sound notifications when away or busy."
 msgstr "வெளியே அல்லது வேலையாக உள்ள போது ஒலி அறிக்கைகளை இயக்க வேண்டுமா இல்லையா?"
 
-#: ../data/empathy.schemas.in.h:69
+#: ../data/empathy.schemas.in.h:73
+msgid "Whether or not to show a popup notification when a contact goes offline."
+msgstr "தொடர்பு இணைப்பு விலகி செல்கையில்  துள்ளு அறிக்கைகளை காட்ட வேண்டுமா இல்லையா?"
+
+#: ../data/empathy.schemas.in.h:74
+msgid "Whether or not to show a popup notification when a contact goes online."
+msgstr "தொடர்பு இணைப்பில் வருகையில்  துள்ளு அறிக்கைகளை காட்ட வேண்டுமா இல்லையா?"
+
+#: ../data/empathy.schemas.in.h:75
 msgid ""
 "Whether or not to show a popup notification when receiving a new message "
 "even if the chat is already opened, but not focused."
@@ -324,29 +349,29 @@ msgstr ""
 "புதிய செய்தி ஒன்று வரும்போது அரட்டை திறந்து இருந்து குவிப்பில் இல்லாவிட்டாலும் துள்ளு "
 "அறிக்கையை காட்ட வேண்டுமா இல்லையா?"
 
-#: ../data/empathy.schemas.in.h:70
+#: ../data/empathy.schemas.in.h:76
 msgid "Whether or not to show a popup notification when receiving a new message."
 msgstr "புதிய செய்தி ஒன்று வரும்போது  துள்ளு அறிக்கையை காட்ட வேண்டுமா இல்லையா?"
 
-#: ../data/empathy.schemas.in.h:71
+#: ../data/empathy.schemas.in.h:77
 msgid ""
 "Whether or not to show avatars for contacts in the contact list and chat "
 "windows."
 msgstr "அரட்டை பட்டியலிலும் தொடர்பு பட்டியலிலும் அவதாரங்களை காட்ட வேண்டுமா இல்லையா?"
 
-#: ../data/empathy.schemas.in.h:72
+#: ../data/empathy.schemas.in.h:78
 msgid "Whether or not to show contacts that are offline in the contact list."
 msgstr "தொடர்பு பட்டியலிலும் இணைப்பில் இல்லாத தொடர்புகளை காட்ட வேண்டுமா இல்லையா?"
 
-#: ../data/empathy.schemas.in.h:73
+#: ../data/empathy.schemas.in.h:79
 msgid "Whether or not to show popup notifications when away or busy."
 msgstr "வெளியே அல்லது வேலையாக உள்ள போது துள்ளு அறிக்கைகளை காட்ட வேண்டுமா இல்லையா?"
 
-#: ../data/empathy.schemas.in.h:74
+#: ../data/empathy.schemas.in.h:80
 msgid "Whether or not to show the contact list in chat rooms."
 msgstr "அரட்டை அறையில் தொடர்பு பட்டியலை காட்ட வேண்டுமா இல்லையா?"
 
-#: ../data/empathy.schemas.in.h:75
+#: ../data/empathy.schemas.in.h:81
 msgid ""
 "Whether or not to show the message dialog about closing the main window with "
 "the 'x' button in the title bar."
@@ -354,15 +379,15 @@ msgstr ""
 "தலைப்பு பட்டியில் x பொத்தானால் முதன்மை சாளரத்தை மூடுவதை குறித்த உரையாடலை காட்ட "
 "வேண்டுமா இல்லையா?"
 
-#: ../data/empathy.schemas.in.h:76
+#: ../data/empathy.schemas.in.h:82
 msgid "Whether to show the contact list in compact mode or not."
 msgstr "அடக்கப்பாங்கில் தொடர்பு பட்டியலை காட்ட வேண்டுமா இல்லையா?"
 
-#: ../data/empathy.schemas.in.h:77
+#: ../data/empathy.schemas.in.h:83
 msgid "Whether to use the theme for chat rooms or not."
 msgstr "அரட்டை அறைகளில் கருத்துக்களை பயன்படுத்த வேண்டுமா இல்லையா?"
 
-#: ../data/empathy.schemas.in.h:78
+#: ../data/empathy.schemas.in.h:84
 msgid ""
 "Which criterium to use when sorting the contact list. Default is to use sort "
 "by the contact's name with the value \"name\". A value of \"state\" will "
@@ -388,7 +413,7 @@ msgstr "தேர்ந்தெடுத்த கோப்பு வழக்�
 msgid "The selected file is empty"
 msgstr "தேர்ந்தெடுத்த கோப்பு காலியாக உள்ளது"
 
-#: ../libempathy/empathy-tp-contact-list.c:757 ../src/empathy.c:287
+#: ../libempathy/empathy-tp-contact-list.c:843 ../src/empathy.c:289
 msgid "People nearby"
 msgstr "அருகில் உள்ள மக்கள்"
 
@@ -424,23 +449,23 @@ msgstr "மற்ற பங்குதாரர் கோப்பு பரி
 msgid "Unknown reason"
 msgstr "தெரியாத காரணம்"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:265
 msgid "Available"
 msgstr "இருப்பவை"
 
-#: ../libempathy/empathy-utils.c:276
+#: ../libempathy/empathy-utils.c:267
 msgid "Busy"
 msgstr "வேலையில்"
 
-#: ../libempathy/empathy-utils.c:279
+#: ../libempathy/empathy-utils.c:270
 msgid "Away"
 msgstr "வெளியில்"
 
-#: ../libempathy/empathy-utils.c:281
+#: ../libempathy/empathy-utils.c:272
 msgid "Hidden"
 msgstr "மறைந்துள்ள"
 
-#: ../libempathy/empathy-utils.c:283
+#: ../libempathy/empathy-utils.c:274
 msgid "Offline"
 msgstr "இணைப்பு விலகி"
 
@@ -490,7 +515,7 @@ msgstr[1] "%d மாதங்கள் முன்"
 msgid "in the future"
 msgstr "எதிர்காலத்தில்"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:419
+#: ../libempathy-gtk/empathy-account-chooser.c:426
 msgid "All"
 msgstr "அனைத்து"
 
@@ -560,7 +585,7 @@ msgstr "(_U) ஐசிக்யூ (ICQ) யுஐஎன்:"
 msgid "_Charset:"
 msgstr "(_C) எழுத்துருதொகுதி:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:241
+#: ../libempathy-gtk/empathy-account-widget-irc.c:240
 msgid "New Network"
 msgstr "புதிய வலையமைப்பு"
 
@@ -752,62 +777,101 @@ msgstr "தலைப்பு இதற்கு அமை: %s"
 msgid "No topic defined"
 msgstr "தலைப்பு ஏதும் வரையறுக்கப்படவில்லை"
 
-#: ../libempathy-gtk/empathy-chat.c:959
+#: ../libempathy-gtk/empathy-chat.c:960
 msgid "(No Suggestions)"
 msgstr "(பரிந்துரைகள் இல்லை )"
 
-#: ../libempathy-gtk/empathy-chat.c:1013
+#: ../libempathy-gtk/empathy-chat.c:1014
 msgid "Insert Smiley"
 msgstr "சிரிப்பானை சொருகு"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1031
-#: ../libempathy-gtk/empathy-ui-utils.c:1476
+#: ../libempathy-gtk/empathy-chat.c:1032
+#: ../libempathy-gtk/empathy-ui-utils.c:1480
 msgid "_Send"
 msgstr "அனுப்பு (_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1065
+#: ../libempathy-gtk/empathy-chat.c:1066
 msgid "_Spelling Suggestions"
 msgstr "_S எழுத்தாக்க பரிந்துரைகள் "
 
-#: ../libempathy-gtk/empathy-chat.c:1179
+#: ../libempathy-gtk/empathy-chat.c:1181
 #, c-format
-msgid "%s has joined the room"
-msgstr "%s அறையில் சேர்ந்தார்"
+msgid "%s has disconnected"
+msgstr "%s தொடர்பை துண்டித்தார்"
+
+#: ../libempathy-gtk/empathy-chat.c:1185
+#, c-format
+msgid "%s was kicked by %s"
+msgstr "%s  %s ஆல் உதைத்து வெளியேற்றப்பட்டார்"
 
-#: ../libempathy-gtk/empathy-chat.c:1182
+#: ../libempathy-gtk/empathy-chat.c:1188
+#, c-format
+msgid "%s was kicked"
+msgstr "%s உதைத்து வெளியேற்றப்பட்டார்"
+
+#: ../libempathy-gtk/empathy-chat.c:1193
+#, c-format
+msgid "%s was banned by %s"
+msgstr "%s %s ஆல் தடை செய்யப்பட்டார்"
+
+#: ../libempathy-gtk/empathy-chat.c:1196
+#, c-format
+msgid "%s was banned"
+msgstr "%s தடை செய்யப்பட்டார்"
+
+#: ../libempathy-gtk/empathy-chat.c:1200
 #, c-format
 msgid "%s has left the room"
 msgstr "%s அறையில் இருந்து வெளியேறினார்"
 
-#: ../libempathy-gtk/empathy-chat.c:1313 ../src/empathy-call-window.c:1199
+#. Note to translators: this string is appended to
+#. * notifications like "foo has left the room", with the message
+#. * given by the user living the room. If this poses a problem,
+#. * please let us know. :-)
+#.
+#: ../libempathy-gtk/empathy-chat.c:1209
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#: ../libempathy-gtk/empathy-chat.c:1232
+#, c-format
+msgid "%s has joined the room"
+msgstr "%s அறையில் சேர்ந்தார்"
+
+#: ../libempathy-gtk/empathy-chat.c:1365 ../src/empathy-call-window.c:1225
 msgid "Disconnected"
 msgstr "துண்டிக்கபட்டது"
 
-#: ../libempathy-gtk/empathy-chat.c:1742
+#: ../libempathy-gtk/empathy-chat.c:1800
 msgid "Connected"
 msgstr "இணைக்கப்பட்டது"
 
-#: ../libempathy-gtk/empathy-chat.c:1792
-#: ../libempathy-gtk/empathy-log-window.c:501
+#: ../libempathy-gtk/empathy-chat.c:1850
+#: ../libempathy-gtk/empathy-log-window.c:502
 msgid "Conversation"
 msgstr "உரையாடல்"
 
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:471
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472
 msgid "Topic:"
 msgstr "தலைப்பு:"
 
+#. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:316
+#: ../libempathy-gtk/empathy-theme-adium.c:264
 msgid "_Copy Link Address"
 msgstr "இணைப்பு முகவரியை நகலெடு (_C)"
 
+#. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:323
+#: ../libempathy-gtk/empathy-theme-adium.c:272
 msgid "_Open Link"
 msgstr "இணைப்பினை திற (_O)"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:421
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
@@ -820,7 +884,7 @@ msgstr "தொடர்பின்  தகவல் ஐ திருத்த�
 msgid "Personal Information"
 msgstr "தனிப்பட்ட தகவல்"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:392
+#: ../libempathy-gtk/empathy-contact-dialogs.c:393
 msgid "New Contact"
 msgstr "புதிய தொடர்பு"
 
@@ -832,66 +896,76 @@ msgstr "(_L) பிறகு முடிவு எடுக்கலாம்"
 msgid "Subscription Request"
 msgstr "சந்தா வேண்டுதல்"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1378
+#: ../libempathy-gtk/empathy-contact-list-view.c:1400
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "நீங்கள் நிச்சயம் குழு '%s' ஐ நீக்க விரும்புகிறீர்களா?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1380
+#: ../libempathy-gtk/empathy-contact-list-view.c:1402
 msgid "Removing group"
 msgstr "குழுவை நீக்குதல்"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1427
-#: ../libempathy-gtk/empathy-contact-list-view.c:1505
+#. Remove
+#: ../libempathy-gtk/empathy-contact-list-view.c:1449
+#: ../libempathy-gtk/empathy-contact-list-view.c:1526
 msgid "_Remove"
 msgstr "நீக்கவும் (_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1457
+#: ../libempathy-gtk/empathy-contact-list-view.c:1479
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "நீங்கள் நிச்சயம் தொடர்பு '%s' ஐ நீக்க விரும்புகிறீர்களா?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1459
+#: ../libempathy-gtk/empathy-contact-list-view.c:1481
 msgid "Removing contact"
 msgstr "தொடர்பு ஐ நீக்குதல்"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:135
-#: ../src/empathy-main-window.ui.h:8
+#: ../libempathy-gtk/empathy-contact-menu.c:195
+#: ../src/empathy-main-window.ui.h:11
+msgid "_Add Contact..."
+msgstr "(_A) தொடர்பை  சேர்..."
+
+#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../src/empathy-main-window.ui.h:12
 msgid "_Chat"
 msgstr "_C அரட்டை"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:166
+#: ../libempathy-gtk/empathy-contact-menu.c:253
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "(_A) ஒலி அழைப்பு"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:198
+#: ../libempathy-gtk/empathy-contact-menu.c:285
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "(_V) விடியோ அழைப்பு"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:237
+#: ../libempathy-gtk/empathy-contact-menu.c:324
 msgid "_View Previous Conversations"
 msgstr "(_V) முந்தைய உரையாடல்கள் ஐ காண்"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:259
+#: ../libempathy-gtk/empathy-contact-menu.c:346
 msgid "Send file"
 msgstr "கோப்பு ஐ அனுப்புக"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:287
+#: ../libempathy-gtk/empathy-contact-menu.c:369
+msgid "Share my desktop"
+msgstr "என் மேல்மேசையை பகிர்ந்து கொள்"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:397
 msgid "Infor_mation"
 msgstr "(_m) தகவல்"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:314
-#: ../src/empathy-main-window.ui.h:11
+#: ../libempathy-gtk/empathy-contact-menu.c:441
+#: ../src/empathy-main-window.ui.h:16
 msgid "_Edit"
 msgstr "திருத்து (_E)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:372
+#: ../libempathy-gtk/empathy-contact-menu.c:501
 msgid "Inviting to this room"
 msgstr "இந்த அறைக்கு அழைப்பு"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:403
+#: ../libempathy-gtk/empathy-contact-menu.c:532
 msgid "_Invite to chatroom"
 msgstr "(_I) அரட்டை அறைக்கு அழைப்பு"
 
@@ -899,128 +973,128 @@ msgstr "(_I) அரட்டை அறைக்கு அழைப்பு"
 msgid "Select a contact"
 msgstr "ஒரு தொடர்பு ஐ தேர்வு செய்க"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:440
+#: ../libempathy-gtk/empathy-contact-widget.c:447
 msgid "Save Avatar"
 msgstr "அவதாரத்தை சேமி"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:503
 msgid "Unable to save avatar"
 msgstr "அவதாரத்தை சேமிக்க முடியவில்லை"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:979
+#: ../libempathy-gtk/empathy-contact-widget.c:992
 msgid "Select"
 msgstr "தேர்வு"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:988
-#: ../src/empathy-main-window.c:905
+#: ../libempathy-gtk/empathy-contact-widget.c:1001
+#: ../src/empathy-main-window.c:1023
 msgid "Group"
 msgstr "குழு"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1239
+#: ../libempathy-gtk/empathy-contact-widget.c:1252
 msgid "Country ISO Code:"
 msgstr "நாட்டின் ஐஎஸ்ஓ குறி:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1241
+#: ../libempathy-gtk/empathy-contact-widget.c:1254
 msgid "Country:"
 msgstr "நாடு:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1243
+#: ../libempathy-gtk/empathy-contact-widget.c:1256
 msgid "State:"
 msgstr "மாநிலம்:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1245
+#: ../libempathy-gtk/empathy-contact-widget.c:1258
 msgid "City:"
 msgstr "மாநகரம்:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1247
+#: ../libempathy-gtk/empathy-contact-widget.c:1260
 msgid "Area:"
 msgstr "வட்டாரம்"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1249
+#: ../libempathy-gtk/empathy-contact-widget.c:1262
 msgid "Postal Code:"
 msgstr "அஞ்சல் குறி:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1251
+#: ../libempathy-gtk/empathy-contact-widget.c:1264
 msgid "Street:"
 msgstr "தெரு:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1253
+#: ../libempathy-gtk/empathy-contact-widget.c:1266
 msgid "Building:"
 msgstr "கட்டிடம்:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1255
+#: ../libempathy-gtk/empathy-contact-widget.c:1268
 msgid "Floor:"
 msgstr "தளம்:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1257
+#: ../libempathy-gtk/empathy-contact-widget.c:1270
 msgid "Room:"
 msgstr "அறை:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1259
+#: ../libempathy-gtk/empathy-contact-widget.c:1272
 msgid "Text:"
 msgstr "உரை:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1261
+#: ../libempathy-gtk/empathy-contact-widget.c:1274
 msgid "Description:"
 msgstr "விவரணம்:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1263
+#: ../libempathy-gtk/empathy-contact-widget.c:1276
 msgid "URI:"
 msgstr "யூஆர்ஐ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1265
+#: ../libempathy-gtk/empathy-contact-widget.c:1278
 msgid "Accuracy Level:"
 msgstr "பிழையின்மை மட்டம்:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1267
+#: ../libempathy-gtk/empathy-contact-widget.c:1280
 msgid "Error:"
 msgstr " பிழை:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1269
+#: ../libempathy-gtk/empathy-contact-widget.c:1282
 msgid "Vertical Error (meters):"
 msgstr "செங்குத்து பிழை (மீட்டர்கள்):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1271
+#: ../libempathy-gtk/empathy-contact-widget.c:1284
 msgid "Horizontal Error (meters):"
 msgstr "கிடைமட்ட பிழை (மீட்டர்கள்):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1273
+#: ../libempathy-gtk/empathy-contact-widget.c:1286
 msgid "Speed:"
 msgstr "வேகம்:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1275
+#: ../libempathy-gtk/empathy-contact-widget.c:1288
 msgid "Bearing:"
 msgstr "திசை கோணம்:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1277
+#: ../libempathy-gtk/empathy-contact-widget.c:1290
 msgid "Climb Speed:"
 msgstr "ஏறும் வேகம்:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1279
+#: ../libempathy-gtk/empathy-contact-widget.c:1292
 msgid "Last Updated on:"
 msgstr "கடைசியாக இற்றைப்படுத்தியது:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1281
+#: ../libempathy-gtk/empathy-contact-widget.c:1294
 msgid "Longitude:"
 msgstr "தீர்கரேகை:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1283
+#: ../libempathy-gtk/empathy-contact-widget.c:1296
 msgid "Latitude:"
 msgstr "அட்சரேகை:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1285
+#: ../libempathy-gtk/empathy-contact-widget.c:1298
 msgid "Altitude:"
 msgstr "குத்துயரம்:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1332
+#: ../libempathy-gtk/empathy-contact-widget.c:1345
 msgid "<b>Location</b>"
 msgstr "<b>இடம்</b>"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1345
+#: ../libempathy-gtk/empathy-contact-widget.c:1358
 msgid "<b>Location</b>, "
 msgstr "<b>இடம்</b>"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1395
+#: ../libempathy-gtk/empathy-contact-widget.c:1408
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y  %R யூடுசி (UTC) இல்"
 
@@ -1052,7 +1126,7 @@ msgid "Client:"
 msgstr "சார்ந்தோன்:"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:888
+#: ../src/empathy-main-window.c:1006
 msgid "Contact"
 msgstr "தொடர்பு"
 
@@ -1121,12 +1195,12 @@ msgstr "துறை"
 msgid "SSL"
 msgstr "எஸ்எஸ்எல்"
 
-#: ../libempathy-gtk/empathy-log-window.c:494
-#: ../src/empathy-import-dialog.c:281
+#: ../libempathy-gtk/empathy-log-window.c:495
+#: ../src/empathy-import-dialog.c:285
 msgid "Account"
 msgstr "கணக்கு"
 
-#: ../libempathy-gtk/empathy-log-window.c:511
+#: ../libempathy-gtk/empathy-log-window.c:512
 msgid "Date"
 msgstr "தேதி"
 
@@ -1197,6 +1271,46 @@ msgstr "உங்கள் நடப்பு நிலையையும் இ
 msgid "Custom messages..."
 msgstr "தனிப்பயன் செய்திகள்..."
 
+#: ../libempathy-gtk/empathy-sound.c:51
+msgid "Received an instant message"
+msgstr "ஒரு உடனடி செய்தி கிடைக்கப்பெற்றது"
+
+#: ../libempathy-gtk/empathy-sound.c:53
+msgid "Sent an instant message"
+msgstr "ஒரு உடனடி செய்தி அனுப்பு"
+
+#: ../libempathy-gtk/empathy-sound.c:55
+msgid "Incoming chat request"
+msgstr "உள்வரும் அரட்டை வேண்டுதல்"
+
+#: ../libempathy-gtk/empathy-sound.c:57
+msgid "Contact connected"
+msgstr "தொடர்பு இணைக்கப்பட்டது"
+
+#: ../libempathy-gtk/empathy-sound.c:59
+msgid "Contact disconnected"
+msgstr "தொடர்பு துண்டிக்கப்பட்டது"
+
+#: ../libempathy-gtk/empathy-sound.c:61
+msgid "Connected to server"
+msgstr "சேவையகத்துக்கு இணைக்கப்பட்டது"
+
+#: ../libempathy-gtk/empathy-sound.c:63
+msgid "Disconnected from server"
+msgstr "சேவையகத்துக்கு இணைப்பு துண்டிக்கபட்டது"
+
+#: ../libempathy-gtk/empathy-sound.c:65
+msgid "Incoming voice call"
+msgstr "உள்வரும் குரல் அழைப்பு"
+
+#: ../libempathy-gtk/empathy-sound.c:67
+msgid "Outgoing voice call"
+msgstr "வெளி செல்லும் குரல் அழைப்பு"
+
+#: ../libempathy-gtk/empathy-sound.c:69
+msgid "Voice call ended"
+msgstr "குரல் அழைப்பு முடிந்தது"
+
 #: ../libempathy-gtk/empathy-status-preset-dialog.c:362
 msgid "Enter Custom Message"
 msgstr "தனிப்பயன் செய்தியை உள்ளிடுக"
@@ -1221,78 +1335,34 @@ msgstr "ஜிடிகே-சேர்"
 msgid "gtk-remove"
 msgstr "ஜிடிகே-நீக்கு"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:66
+#: ../libempathy-gtk/empathy-theme-manager.c:67
 msgid "Classic"
 msgstr "தொன்மையான"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-manager.c:68
 msgid "Simple"
 msgstr "எளிய"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:69
 msgid "Clean"
 msgstr "சுத்தமான"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Blue"
 msgstr "நீலம்"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:71
-msgid "Adium"
-msgstr "ஏடியம்"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1378
+#: ../libempathy-gtk/empathy-ui-utils.c:1382
 msgid "Unable to open URI"
 msgstr "யூஆர்ஐ ஐ திறக்க முடியவில்லை"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1468
+#: ../libempathy-gtk/empathy-ui-utils.c:1472
 msgid "Select a file"
 msgstr "கோப்பை தேர்வு செய்"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1526
+#: ../libempathy-gtk/empathy-ui-utils.c:1530
 msgid "Select a destination"
 msgstr "ஒரு இலக்கிடம் தேர்வு செய்க"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1555
-msgid "Received an instant message"
-msgstr "ஒரு உடனடி செய்தி கிடைக்கப்பெற்றது"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1557
-msgid "Sent an instant message"
-msgstr "ஒரு உடனடி செய்தி அனுப்பு"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1559
-msgid "Incoming chat request"
-msgstr "உள்வரும் அரட்டை வேண்டுதல்"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1561
-msgid "Contact connected"
-msgstr "தொடர்பு இணைக்கப்பட்டது"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1563
-msgid "Contact disconnected"
-msgstr "தொடர்பு துண்டிக்கப்பட்டது"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1565
-msgid "Connected to server"
-msgstr "சேவையகத்துக்கு இணைக்கப்பட்டது"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1567
-msgid "Disconnected from server"
-msgstr "சேவையகத்துக்கு இணைப்பு துண்டிக்கபட்டது"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1569
-msgid "Incoming voice call"
-msgstr "உள்வரும் குரல் அழைப்பு"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1571
-msgid "Outgoing voice call"
-msgstr "வெளி செல்லும் குரல் அழைப்பு"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1573
-msgid "Voice call ended"
-msgstr "குரல் அழைப்பு முடிந்தது"
-
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
 msgstr "தற்போதைய மொழி உள்ளமைவு"
@@ -1476,7 +1546,7 @@ msgid "Megaphone"
 msgstr "ஒலி பெருக்கி"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:527
+#: ../megaphone/src/megaphone-applet.c:519
 msgid "Talk!"
 msgstr "பேசு!"
 
@@ -1490,7 +1560,7 @@ msgid "_Information"
 msgstr "(_I) தகவல்"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-main-window.ui.h:23
 msgid "_Preferences"
 msgstr "முன்னுரிமைகள் (_P)"
 
@@ -1511,19 +1581,19 @@ msgstr "இருப்பு"
 msgid "Set your own presence"
 msgstr "உங்கள் இருப்பை அமைக்கவும்"
 
-#: ../src/empathy.c:478
+#: ../src/empathy.c:506
 msgid "Don't connect on startup"
 msgstr "துவங்கும்போது இணைக்க வேண்டாம்"
 
-#: ../src/empathy.c:482
+#: ../src/empathy.c:510
 msgid "Don't show the contact list on startup"
 msgstr "துவங்கும்போது தொடர்பு பட்டியல் ஐ காட்ட வேண்டாம்"
 
-#: ../src/empathy.c:486
+#: ../src/empathy.c:514
 msgid "Show the accounts dialog"
 msgstr "கணக்குகள் உரையாடல் ஐ காட்டு "
 
-#: ../src/empathy.c:498
+#: ../src/empathy.c:526
 msgid "- Empathy Instant Messenger"
 msgstr "- எம்பதி உடனடி செய்தியாளர்"
 
@@ -1567,11 +1637,11 @@ msgstr "க்னோமுக்கு ஒரு உடனடி செய்த
 msgid "translator-credits"
 msgstr "மொழிபெயர்ப்பாளர்-நன்றி அறிதல் "
 
-#: ../src/empathy-accounts-dialog.c:393
+#: ../src/empathy-accounts-dialog.c:392
 msgid "Enabled"
 msgstr "செயலாக்கப்பட்டது"
 
-#: ../src/empathy-accounts-dialog.c:403 ../src/empathy-accounts-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1
 msgid "Accounts"
 msgstr "கணக்குகள்"
 
@@ -1651,53 +1721,53 @@ msgstr "(_C) ஒரு புதிய கணக்கை துவக்கு"
 msgid "_Reuse an existing account"
 msgstr "(_R) இருக்கும் ஒரு கணக்கை மறு உபயோகம் செய்க"
 
-#: ../src/empathy-call-window.c:63
-msgid "Connecting..."
-msgstr "இணைக்கிறது...."
-
-#: ../src/empathy-call-window.c:415
+#: ../src/empathy-call-window.c:420
 msgid "Contrast"
 msgstr "வேறுபாடு"
 
-#: ../src/empathy-call-window.c:418
+#: ../src/empathy-call-window.c:423
 msgid "Brightness"
 msgstr "வெளிச்சம்"
 
-#: ../src/empathy-call-window.c:421
+#: ../src/empathy-call-window.c:426
 msgid "Gamma"
 msgstr "காமா"
 
-#: ../src/empathy-call-window.c:526
+#: ../src/empathy-call-window.c:531
 msgid "Volume"
 msgstr "ஒலி அளவு"
 
-#: ../src/empathy-call-window.c:728
+#: ../src/empathy-call-window.c:662
+msgid "Connecting..."
+msgstr "இணைக்கிறது...."
+
+#: ../src/empathy-call-window.c:746
 msgid "_Sidebar"
 msgstr "பக்கப்பட்டை(_S)"
 
-#: ../src/empathy-call-window.c:747
+#: ../src/empathy-call-window.c:765
 msgid "Dialpad"
 msgstr "டயல் அட்டை"
 
-#: ../src/empathy-call-window.c:753
+#: ../src/empathy-call-window.c:771
 msgid "Audio input"
 msgstr "ஒலி உள்ளீடு"
 
-#: ../src/empathy-call-window.c:757
+#: ../src/empathy-call-window.c:775
 msgid "Video input"
 msgstr "வீடியோ உள்ளீடு"
 
-#: ../src/empathy-call-window.c:820
+#: ../src/empathy-call-window.c:835
 #, c-format
 msgid "Call with %s"
 msgstr "%s ஆல் அழை "
 
-#: ../src/empathy-call-window.c:889
+#: ../src/empathy-call-window.c:904
 msgid "Call"
 msgstr "அழை"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1308
+#: ../src/empathy-call-window.c:1335
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "இணைக்கப்பட்டது — %d:%02dm"
@@ -1726,16 +1796,16 @@ msgstr "ஒளித்தோற்ற முன்னோட்டம்"
 msgid "_Call"
 msgstr "(_C) அழை"
 
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
 msgid "_View"
 msgstr "பார்வை (_V)"
 
-#: ../src/empathy-chat-window.c:343
+#: ../src/empathy-chat-window.c:344
 #, c-format
 msgid "Conversations (%d)"
 msgstr "உரையாடல்கள் (%d)"
 
-#: ../src/empathy-chat-window.c:475
+#: ../src/empathy-chat-window.c:476
 msgid "Typing a message."
 msgstr "செய்திகள் தட்டச்சிடல்"
 
@@ -1755,75 +1825,75 @@ msgstr "தானியங்கி இணை"
 msgid "Manage Favorite Rooms"
 msgstr "பிடித்தமான அறைகளை மேலாள"
 
-#: ../src/empathy-event-manager.c:377
+#: ../src/empathy-event-manager.c:321
 msgid "Incoming call"
 msgstr "உள்வரும் அழைப்பு"
 
-#: ../src/empathy-event-manager.c:380
+#: ../src/empathy-event-manager.c:324
 #, c-format
 msgid "%s is calling you, do you want to answer?"
 msgstr "%s உங்களை அழைக்கிறார். நீங்கள் பதில் பேச வேண்டுமா?"
 
-#: ../src/empathy-event-manager.c:387
+#: ../src/empathy-event-manager.c:331
 msgid "_Reject"
 msgstr "(_R) ஏற்காதே"
 
-#: ../src/empathy-event-manager.c:393
+#: ../src/empathy-event-manager.c:337
 msgid "_Answer"
 msgstr "(_A) பதிலளி"
 
-#: ../src/empathy-event-manager.c:505
+#: ../src/empathy-event-manager.c:452
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s இடமிருந்து உள்வரும் அழைப்பு"
 
-#: ../src/empathy-event-manager.c:545
+#: ../src/empathy-event-manager.c:496
 #, c-format
 msgid "%s is offering you an invitation"
 msgstr "%s உங்களுக்கு ஒரு அழைப்பு வேண்டுதல் விடுக்கிறார்"
 
-#: ../src/empathy-event-manager.c:551
+#: ../src/empathy-event-manager.c:502
 msgid "An external application will be started to handle it."
 msgstr "இதை கையாள ஒரு வெளி பயன்பாடு துவக்கப்படும்."
 
-#: ../src/empathy-event-manager.c:556
+#: ../src/empathy-event-manager.c:507
 msgid "You don't have the needed external application to handle it."
 msgstr "இதை கையாள தேவையான ஒரு வெளி பயன்பாடு உங்கள் கணினியில் இல்லை."
 
-#: ../src/empathy-event-manager.c:683
+#: ../src/empathy-event-manager.c:634
 msgid "Room invitation"
 msgstr "அறை அழைப்பு"
 
-#: ../src/empathy-event-manager.c:686
+#: ../src/empathy-event-manager.c:637
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s உங்களை %s உடன் சேர அழைக்கிறார்."
 
-#: ../src/empathy-event-manager.c:694
+#: ../src/empathy-event-manager.c:645
 msgid "_Decline"
 msgstr "நிராகரி (_D)"
 
-#: ../src/empathy-event-manager.c:699
+#: ../src/empathy-event-manager.c:650
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "(_J) இணை"
 
-#: ../src/empathy-event-manager.c:738
+#: ../src/empathy-event-manager.c:689
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s  %s இல் சேர உங்களை அழைத்துள்ளார்"
 
-#: ../src/empathy-event-manager.c:764
+#: ../src/empathy-event-manager.c:715
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "%s இடமிருந்து உள்வரும் கோப்பு பரிமாற்றம்."
 
-#: ../src/empathy-event-manager.c:944
+#: ../src/empathy-event-manager.c:895
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "%s இன் சந்தா வேண்டுதல்"
 
-#: ../src/empathy-event-manager.c:948
+#: ../src/empathy-event-manager.c:899
 #, c-format
 msgid ""
 "\n"
@@ -1832,6 +1902,18 @@ msgstr ""
 "\n"
 "செய்தி: %s"
 
+#. someone is logging off
+#: ../src/empathy-event-manager.c:935
+#, c-format
+msgid "%s is now offline."
+msgstr "%s இப்போது இணைப்பு விலகி உள்ளார்"
+
+#. someone is logging in
+#: ../src/empathy-event-manager.c:951
+#, c-format
+msgid "%s is now online."
+msgstr "%s இப்போது இணைப்பில் உள்ளார்"
+
 #. Translators: time left, when it is more than one hour
 #: ../src/empathy-ft-manager.c:101
 #, c-format
@@ -1946,19 +2028,19 @@ msgstr ""
 "இருந்து  நீக்கு "
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-dialog.c:259
+#: ../src/empathy-import-dialog.c:263
 msgid "Import"
 msgstr "இறக்குமதி செய்"
 
-#: ../src/empathy-import-dialog.c:268
+#: ../src/empathy-import-dialog.c:272
 msgid "Protocol"
 msgstr "விதிமுறை"
 
-#: ../src/empathy-import-dialog.c:294
+#: ../src/empathy-import-dialog.c:298
 msgid "Source"
 msgstr "மூலம்"
 
-#: ../src/empathy-import-dialog.c:388
+#: ../src/empathy-import-dialog.c:392
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -1970,71 +2052,71 @@ msgstr ""
 msgid "Import Accounts"
 msgstr "இறக்குமதி செய் கணக்குகள்"
 
-#: ../src/empathy-main-window.c:395
+#: ../src/empathy-main-window.c:402
 msgid "_Edit account"
 msgstr "(_E) கணக்குகளை திருத்துக"
 
-#: ../src/empathy-main-window.c:498
+#: ../src/empathy-main-window.c:505
 msgid "No error specified"
 msgstr "பிழை ஏதும் குறிப்பிடவில்லை"
 
-#: ../src/empathy-main-window.c:501
+#: ../src/empathy-main-window.c:508
 msgid "Network error"
 msgstr "வலையமைப்பு பிழை"
 
-#: ../src/empathy-main-window.c:504
+#: ../src/empathy-main-window.c:511
 msgid "Authentication failed"
 msgstr "உறுதி செய்தல் தோல்வி"
 
-#: ../src/empathy-main-window.c:507
+#: ../src/empathy-main-window.c:514
 msgid "Encryption error"
 msgstr "மறையாக்க பிழை"
 
-#: ../src/empathy-main-window.c:510
+#: ../src/empathy-main-window.c:517
 msgid "Name in use"
 msgstr "பயனில் உள்ள பெயர் "
 
-#: ../src/empathy-main-window.c:513
+#: ../src/empathy-main-window.c:520
 msgid "Certificate not provided"
 msgstr "சான்றிதழ் தரப்படவில்லை"
 
-#: ../src/empathy-main-window.c:516
+#: ../src/empathy-main-window.c:523
 msgid "Certificate untrusted"
 msgstr "சான்றிதழில் நம்பக தன்மை இல்லை"
 
-#: ../src/empathy-main-window.c:519
+#: ../src/empathy-main-window.c:526
 msgid "Certificate expired"
 msgstr "சான்றிதழ் காலாவதியானது"
 
-#: ../src/empathy-main-window.c:522
+#: ../src/empathy-main-window.c:529
 msgid "Certificate not activated"
 msgstr "சான்றிதழ் செயல்படுத்தப்படவில்லை"
 
-#: ../src/empathy-main-window.c:525
+#: ../src/empathy-main-window.c:532
 msgid "Certificate hostname mismatch"
 msgstr "சான்றிதழ் புரவலன் பெயர் ஒத்திசையவில்லை"
 
-#: ../src/empathy-main-window.c:528
+#: ../src/empathy-main-window.c:535
 msgid "Certificate fingerprint mismatch"
 msgstr "சான்றிதழ் அடையாளம் ஒத்திசையவில்லை"
 
-#: ../src/empathy-main-window.c:531
+#: ../src/empathy-main-window.c:538
 msgid "Certificate self-signed"
 msgstr "சான்றிதழ் தானே கையெழுத்திட்டது"
 
-#: ../src/empathy-main-window.c:534
+#: ../src/empathy-main-window.c:541
 msgid "Certificate error"
 msgstr "சான்றிதழ் பிழை"
 
-#: ../src/empathy-main-window.c:537
+#: ../src/empathy-main-window.c:544
 msgid "Unknown error"
 msgstr "தெரியாத பிழை"
 
-#: ../src/empathy-main-window.c:1220
+#: ../src/empathy-main-window.c:1293
 msgid "Show and edit accounts"
 msgstr "கணக்குகளை காட்டவும் மற்றும் திருத்தவும் "
 
-#: ../src/empathy-main-window.ui.h:1 ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-main-window.ui.h:1
 msgid "Contact List"
 msgstr "தொடர்பு பட்டியல்"
 
@@ -2055,62 +2137,78 @@ msgid "Manage Favorites"
 msgstr "விருப்பங்களை மேலாளுக"
 
 #: ../src/empathy-main-window.ui.h:6
-msgid "_Accounts"
-msgstr "கணக்குகள் (_A)"
+msgid "N_ormal Size"
+msgstr " (_o) சாதாரண அளவு"
 
 #: ../src/empathy-main-window.ui.h:7
-msgid "_Add Contact..."
-msgstr "(_A) தொடர்பை  சேர்..."
+msgid "Normal Size With _Avatars"
+msgstr "( _A) சாதாரண அளவு அவதாரங்கள் உடன்"
+
+#: ../src/empathy-main-window.ui.h:8
+msgid "Sort by _Name"
+msgstr "(_N) பெயர் ஆல் வரிசைப்படுத்து"
 
 #: ../src/empathy-main-window.ui.h:9
+msgid "Sort by _Status"
+msgstr "(_S) நிலை வாரியாக வரிசைப்படுத்து"
+
+#: ../src/empathy-main-window.ui.h:10
+msgid "_Accounts"
+msgstr "கணக்குகள் (_A)"
+
+#: ../src/empathy-main-window.ui.h:13
+msgid "_Compact Size"
+msgstr "(_C) அடக்கமான அளவு"
+
+#: ../src/empathy-main-window.ui.h:14
 msgid "_Contents"
 msgstr "உள்ளடக்கங்கள் (_C)"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:15
 msgid "_Debug"
 msgstr "(_D) வழு நீக்கு"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:17
 msgid "_File Transfers"
 msgstr "(_F) கோப்பு பறிமாற்றங்கள் "
 
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:18
 msgid "_Help"
 msgstr "உதவி (_H)"
 
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window.ui.h:19
 msgid "_Join..."
 msgstr "(_J) சேர்..."
 
-#: ../src/empathy-main-window.ui.h:15 ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2
 msgid "_New Conversation..."
 msgstr "(_N) புதிய உரையாடல்..."
 
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window.ui.h:21
 msgid "_Offline Contacts"
 msgstr "(_O) இணைப்பு விலகி உள்ள தொடர்புகள்"
 
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window.ui.h:22
 msgid "_Personal Information"
 msgstr "(_P) தனிப்பட்ட தகவல்"
 
-#: ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-main-window.ui.h:24
 msgid "_Previous Conversations"
 msgstr "(_P) முந்தைய உரையாடல்கள்"
 
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window.ui.h:25
 msgid "_Room"
 msgstr "(_R) அறை"
 
-#: ../src/empathy-new-chatroom-dialog.c:332
+#: ../src/empathy-new-chatroom-dialog.c:331
 msgid "Chat Room"
 msgstr "அரட்டை அறை"
 
-#: ../src/empathy-new-chatroom-dialog.c:348
+#: ../src/empathy-new-chatroom-dialog.c:347
 msgid "Members"
 msgstr "உறுப்பினர்கள்"
 
-#: ../src/empathy-new-chatroom-dialog.c:492
+#: ../src/empathy-new-chatroom-dialog.c:496
 #, c-format
 msgctxt ""
 "Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
@@ -2126,21 +2224,21 @@ msgstr ""
 "கடவுச்சொல் தேவை: %s\n"
 "உறுப்பினர்கள்: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:494
-#: ../src/empathy-new-chatroom-dialog.c:495
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
 msgid "Yes"
 msgstr "ஆம்"
 
-#: ../src/empathy-new-chatroom-dialog.c:494
-#: ../src/empathy-new-chatroom-dialog.c:495
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
 msgid "No"
 msgstr "இல்லை"
 
-#: ../src/empathy-new-chatroom-dialog.c:522
+#: ../src/empathy-new-chatroom-dialog.c:526
 msgid "Could not start room listing"
 msgstr "அறை பட்டியலை எடுப்பதை துவக்க முடியவில்லை"
 
-#: ../src/empathy-new-chatroom-dialog.c:532
+#: ../src/empathy-new-chatroom-dialog.c:536
 msgid "Could not stop room listing"
 msgstr "அறை பட்டியலை எடுப்பதை நிறுத்த முடியவில்லை"
 
@@ -2174,191 +2272,172 @@ msgstr "அறை பட்டியல்"
 msgid "_Room:"
 msgstr "(_R) அறை:"
 
-#: ../src/empathy-preferences.c:159
+#: ../src/empathy-preferences.c:147
 msgid "Message received"
 msgstr "தகவல் பெறப்பட்டது"
 
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:148
 msgid "Message sent"
 msgstr "தகவல் அனுப்பப்பட்டது"
 
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:149
 msgid "New conversation"
 msgstr "புதிய உரையாடல்"
 
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:150
 msgid "Contact goes online"
 msgstr "தொடர்பு இணைபில் வருகிறார்"
 
-#: ../src/empathy-preferences.c:163
+#: ../src/empathy-preferences.c:151
 msgid "Contact goes offline"
 msgstr "தொடர்பு இணைப்பு விலகி செல்கிறார்"
 
-#: ../src/empathy-preferences.c:164
+#: ../src/empathy-preferences.c:152
 msgid "Account connected"
 msgstr "கணக்கு இணைக்கப்பட்டது"
 
-#: ../src/empathy-preferences.c:165
+#: ../src/empathy-preferences.c:153
 msgid "Account disconnected"
 msgstr "கணக்கு இணைப்பு நீக்கப்பட்டது"
 
-#: ../src/empathy-preferences.c:432
+#: ../src/empathy-preferences.c:393
 msgid "Language"
 msgstr "மொழி"
 
 #: ../src/empathy-preferences.ui.h:1
-msgid "Adium theme to use:"
-msgstr "பயன்படுத்த வேண்டிய ஏடியம்  கருத்து:"
-
-#: ../src/empathy-preferences.ui.h:2
 msgid "Allow _GPS usage"
 msgstr "(_G) ஜிபிஎஸ் பயனை அனுமதி"
 
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:2
 msgid "Allow _cellphone usage"
 msgstr "(_c)  அலைபேசி பயனை அனுமதி"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:3
 msgid "Allow _network usage"
 msgstr "(_n)  வலைப்பின்னல் பயனை அனுமதி"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:4
 msgid "Appearance"
 msgstr "தோற்றம்"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:5
 msgid "Automatically _connect on startup "
 msgstr "(_c) துவங்கும்போது தானியங்கியாக இணை"
 
-#: ../src/empathy-preferences.ui.h:7
-msgid "Avatars are user chosen images shown in the contact list"
-msgstr "அவதாரங்கள் என்பது தொடர்பு பட்டியலில் காணப்படும் பயனர் தேர்ந்தெடுத்த பிம்பங்கள்"
-
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:6
 msgid "Behavior"
 msgstr "நடத்தை"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:7
 msgid "Chat Th_eme:"
 msgstr "(_e) அரட்டை கருத்து:"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:8
 msgid "Disable notifications when _away or busy"
 msgstr "(_a) வெளியே  அல்லது வேலையில் உள்ளபோது அறிவிப்புகளை செயல் நீக்கு"
 
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:9
 msgid "Disable sounds when _away or busy"
 msgstr "(_a) வெளியே  அல்லது வேலையில் உள்ளபோது ஒலிகளை செயல் நீக்கு"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:10
+msgid "Enable notifications when a contact comes online"
+msgstr "தொடர்பு உள் நுழைகையில் அறிவிப்புகளை செயல்படுத்து"
+
+#: ../src/empathy-preferences.ui.h:11
+msgid "Enable notifications when a contact goes offline"
+msgstr "தொடர்பு இணைப்பு விலகி செல்கையில் அறிவிப்புகளை செயல்படுத்து"
+
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "(_c) அரட்டை குவிப்பில் இல்லாத போது அறிவிப்புகளை செயல்படுத்து"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "மொழிகளுக்கு எழுத்து பிழை திருத்தத்தை செயல்படுத்து:"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "பொது"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:15
 msgid "Geoclue Settings"
 msgstr "ஜியோ க்ளூ அமைப்புகள்"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:16
 msgid "Location"
 msgstr "இடம்"
 
-#: ../src/empathy-preferences.ui.h:18
-msgid "Not a valid adium theme"
-msgstr "செல்லுபடியாகும் ஏடியம் கருத்து அல்ல"
-
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:17
 msgid "Notifications"
 msgstr "அறிவிப்புகள்"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:18
 msgid "Play sound for events"
 msgstr "நிகழ்வுகளுக்கு ஒலியை இயக்கு"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:19
 msgid "Preferences"
 msgstr "விருப்பங்கள்"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:20
 msgid "Privacy"
 msgstr "அந்தரங்கம்"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:21
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will have a random "
 "value added (&#xB1;0.25&#xB0;)."
 msgstr ""
-"குறைத்த இட குறிப்பு எனில் உங்கள் மாநகரம், மாநிலம், நாடு தவிர ஒன்றும் "
-"வெளியிடப்படாது. ஜிபிஎஸ் ஆயத்தொலைவுகளுக்கு தற்போக்கு மதிப்பு சேர்க்கப்படும் "
-"(&#xB1;0.25&#xB0;)."
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Show _avatars"
-msgstr "(_a) அவதாரங்களை காட்டு"
+"குறைத்த இட குறிப்பு எனில் உங்கள் மாநகரம், மாநிலம், நாடு தவிர ஒன்றும் வெளியிடப்படாது. "
+"ஜிபிஎஸ் ஆயத்தொலைவுகளுக்கு தற்போக்கு மதிப்பு சேர்க்கப்படும் (&#xB1;0.25&#xB0;)."
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:22
 msgid "Show _smileys as images"
 msgstr "(_s) சிரிப்பான்களை பிம்பங்களாக காட்டு"
 
-#: ../src/empathy-preferences.ui.h:26
-msgid "Show co_mpact contact list"
-msgstr "(_m) அடக்கமான தொடர்பு பட்டியல் ஐ காட்டு "
-
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:23
 msgid "Show contact _list in rooms"
 msgstr "(_l) அறைகளில் தொடர்பு பட்டியல் ஐ காட்டு "
 
-#: ../src/empathy-preferences.ui.h:28
-msgid "Sort by _name"
-msgstr "(_n) பெயர் ஆல் வரிசைப்படுத்து"
-
-#: ../src/empathy-preferences.ui.h:29
-msgid "Sort by s_tate"
-msgstr "(_t) நிலை வாரியாக வரிசைப்படுத்து"
-
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "ஒலிகள்"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:25
 msgid "Spell Checking"
 msgstr "எழுத்து பிழை திருத்தம்"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:26
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
-msgstr "இந்த பட்டியல் நீங்கள் எந்த மொழிகளுக்கு அகராதி நிறுவி இருக்கிறீர்களோ அவற்றை மட்டுமே காட்டுகிறது"
+msgstr ""
+"இந்த பட்டியல் நீங்கள் எந்த மொழிகளுக்கு அகராதி நிறுவி இருக்கிறீர்களோ அவற்றை மட்டுமே "
+"காட்டுகிறது"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:27
 msgid "Themes"
 msgstr "கருத்துகள்"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:28
 msgid "_Enable bubble notifications"
 msgstr "(_E) பலூனில் அறிவிப்புகளை செயல்படுத்து"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:29
 msgid "_Enable sound notifications"
 msgstr "(_E) ஒலி அறிவிப்புகளை செயல்படுத்து"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:30
 msgid "_Open new chats in separate windows"
 msgstr "(_O) புதிய அரட்டைகளை தனி சாளரங்களில் திற"
 
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Publish location to my contacts"
 msgstr "(_P) என் தொடர்புகளுக்கு இடத்தை வெளியிடு"
 
-#: ../src/empathy-preferences.ui.h:38
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Reduce location accuracy"
 msgstr "(_R) இடத்தின் குறிப்பை குறை"
 
@@ -2385,8 +2464,8 @@ msgid ""
 "An invitation was offered for service %s, but you don't have the needed "
 "application to handle it"
 msgstr ""
-" %s சேவைக்கு அழைப்பு கொடுக்கப்பட்டது. ஆனால் அதை கையாள உங்கள் கணினியில் தேவையான பயன்பாடு "
-"இல்லை"
+" %s சேவைக்கு அழைப்பு கொடுக்கப்பட்டது. ஆனால் அதை கையாள உங்கள் கணினியில் தேவையான "
+"பயன்பாடு இல்லை"
 
 #: ../src/empathy-call-window-fullscreen.ui.h:1
 msgid "gtk-leave-fullscreen"
@@ -2396,67 +2475,83 @@ msgstr "ஜிடிகே முழுத்திரையை  விட்ட
 msgid "Contact Map View"
 msgstr "தொடர்புகள் படக்காட்சி"
 
-#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1075
+#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
 msgid "Error"
 msgstr " பிழை"
 
-#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1069
+#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
 msgid "Critical"
 msgstr "ஆபத்தானன்"
 
-#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1063
+#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
 msgid "Warning"
 msgstr "எச்சரிக்கை"
 
-#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1057
-#: ../src/empathy-debug-dialog.c:1105
+#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065
+#: ../src/empathy-debug-dialog.c:1113
 msgid "Message"
 msgstr "செய்தி"
 
-#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1051
+#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059
 msgid "Info"
 msgstr "தகவல்"
 
-#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1045
+#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053
 msgid "Debug"
 msgstr "வழுநீக்கு"
 
-#: ../src/empathy-debug-dialog.c:837
+#: ../src/empathy-debug-dialog.c:845
 msgid "Save"
 msgstr "சேமி"
 
-#: ../src/empathy-debug-dialog.c:940
+#: ../src/empathy-debug-dialog.c:948
 msgid "Debug Window"
 msgstr "வழு நீக்கு சாளரம்"
 
-#: ../src/empathy-debug-dialog.c:1013
+#: ../src/empathy-debug-dialog.c:1021
 msgid "Pause"
 msgstr "தாமதி"
 
-#: ../src/empathy-debug-dialog.c:1025
+#: ../src/empathy-debug-dialog.c:1033
 msgid "Level "
 msgstr "மட்டம்"
 
-#: ../src/empathy-debug-dialog.c:1094
+#: ../src/empathy-debug-dialog.c:1102
 msgid "Time"
 msgstr "நேரம்"
 
-#: ../src/empathy-debug-dialog.c:1096
+#: ../src/empathy-debug-dialog.c:1104
 msgid "Domain"
 msgstr "களம்"
 
-#: ../src/empathy-debug-dialog.c:1098
+#: ../src/empathy-debug-dialog.c:1106
 msgid "Category"
 msgstr "வகை"
 
-#: ../src/empathy-debug-dialog.c:1100
+#: ../src/empathy-debug-dialog.c:1108
 msgid "Level"
 msgstr "மட்டம்"
 
-#: ../src/empathy-debug-dialog.c:1132
+#: ../src/empathy-debug-dialog.c:1140
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr "தேர்ந்தெடுத்த இணைப்பு மேலாளர் தொலை வழு நீக்கத்தை ஆதரிக்கவில்லை"
 
+#~ msgid "Avatars are user chosen images shown in the contact list"
+#~ msgstr "அவதாரங்கள் என்பது தொடர்பு பட்டியலில் காணப்படும் பயனர் தேர்ந்தெடுத்த பிம்பங்கள்"
+
+#~ msgid "Show _avatars"
+#~ msgstr "(_a) அவதாரங்களை காட்டு"
+
+#~ msgid "Show co_mpact contact list"
+#~ msgstr "(_m) அடக்கமான தொடர்பு பட்டியல் ஐ காட்டு "
+
+#~ msgid "Adium"
+#~ msgstr "ஏடியம்"
+
+#~ msgid "Adium theme to use:"
+#~ msgstr "பயன்படுத்த வேண்டிய ஏடியம்  கருத்து:"
 
+#~ msgid "Not a valid adium theme"
+#~ msgstr "செல்லுபடியாகும் ஏடியம் கருத்து அல்ல"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index fce50d7a5..2cedfd1c8 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,23 +1,28 @@
 # Simplified Chinese translation of Empathy.
 # Convert to Simp. Chinese translation of Empathy.
 # Copyright (C) 2003-2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the Empathy package.
+#
 # Abel Cheung <maddog@linux.org.hk>, 2003.
 # Mai Haohui <maihaohui@hotmail.com>, 2003.
 # Rongjun Mu <elanmu@sina.com>, 2003.
 # YangZhang <zyangmath@gmail.com>, 2008.
 # Funda Wang <fundawang@gmail.com>, 2009.
+# Aron Xu <aronxu@gnome.org>, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gossip\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=empathy&component=general\n"
-"POT-Creation-Date: 2009-04-03 14:58+0000\n"
-"PO-Revision-Date: 2009-01-08 08:49+0800\n"
-"Last-Translator: Mai Haohui <maihaohui@hotmail.com>\n"
-"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"POT-Creation-Date: 2009-07-25 07:51+0000\n"
+"PO-Revision-Date: 2009-07-25 21:28+0000\n"
+"Last-Translator: Aron Xu <aronxu@gnome.org>\n"
+"Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Empathy Instant Messenger"
@@ -25,7 +30,7 @@ msgstr "Empathy 即时通讯程序"
 
 #: ../data/empathy.desktop.in.in.h:2
 msgid "Send and receive instant messages"
-msgstr "发送和接收即时消息"
+msgstr "发送接收即时消息"
 
 #: ../data/empathy.schemas.in.h:1
 msgid "Always open a separate chat window for new chats."
@@ -67,258 +72,329 @@ msgid "Disable sounds when away"
 msgstr "离开时禁用声音"
 
 #: ../data/empathy.schemas.in.h:10
+msgid "Empathy can publish the user's location"
+msgstr "Empathy 能够发布用户的位置"
+
+#: ../data/empathy.schemas.in.h:11
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy 能够通过 GPS 来估算位置"
+
+#: ../data/empathy.schemas.in.h:12
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy 能够通过手机来估算位置"
+
+#: ../data/empathy.schemas.in.h:13
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy 能够通过网络来估算位置"
+
+#: ../data/empathy.schemas.in.h:14
 msgid "Empathy default download folder"
 msgstr "Empathy 默认下载文件夹"
 
-#: ../data/empathy.schemas.in.h:11
+#: ../data/empathy.schemas.in.h:15
 msgid "Empathy has asked about importing accounts"
 msgstr "Empathy 已经询问导入账户"
 
-#: ../data/empathy.schemas.in.h:12
+#: ../data/empathy.schemas.in.h:16
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy 启动时是否自动连接"
 
-#: ../data/empathy.schemas.in.h:13
+#: ../data/empathy.schemas.in.h:17
+msgid "Empathy should reduce the location's accuracy"
+msgstr "降低 Emapthy 位置信息的准确度"
+
+#: ../data/empathy.schemas.in.h:18
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy 是否使用联系人头像作为聊天窗口图标"
 
-#: ../data/empathy.schemas.in.h:14
+#: ../data/empathy.schemas.in.h:19
+msgid "Enable WebKit Developer Tools"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:20
 msgid "Enable popup notifications for new messages"
 msgstr "启用弹出提示"
 
-#: ../data/empathy.schemas.in.h:15
+#: ../data/empathy.schemas.in.h:21
 msgid "Enable spell checker"
 msgstr "启用拼写检查器"
 
-#: ../data/empathy.schemas.in.h:16
+#: ../data/empathy.schemas.in.h:22
 msgid "Hide main window"
 msgstr "隐藏主窗口"
 
-#: ../data/empathy.schemas.in.h:17
+#: ../data/empathy.schemas.in.h:23
 msgid "Hide the main window."
 msgstr "隐藏主窗口。"
 
-#: ../data/empathy.schemas.in.h:18
+#: ../data/empathy.schemas.in.h:24
 msgid "NetworkManager should be used"
 msgstr "是否使用 NetworkManager"
 
-#: ../data/empathy.schemas.in.h:19
+#: ../data/empathy.schemas.in.h:25
 msgid "Nick completed character"
 msgstr "昵称补全字符"
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:26
 msgid "Open new chats in separate windows"
 msgstr "在单独窗口中打开新聊天"
 
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:27
+msgid "Path of the adium theme to use"
+msgstr "Adium 主题的路径"
+
+#: ../data/empathy.schemas.in.h:28
+msgid "Path of the adium theme to use if the theme used for chat is adium."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:29
 msgid "Play a sound for incoming messages"
 msgstr "收到消息时播放声音"
 
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:30
 msgid "Play a sound for new conversations"
 msgstr "新对话时播放声音"
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:31
 msgid "Play a sound for outgoing messages"
 msgstr "发出消息时播放声音"
 
-#: ../data/empathy.schemas.in.h:24
+#: ../data/empathy.schemas.in.h:32
 msgid "Play a sound when a contact logs in"
 msgstr "联系人登录时播放声音"
 
-#: ../data/empathy.schemas.in.h:25
+#: ../data/empathy.schemas.in.h:33
 msgid "Play a sound when a contact logs out"
 msgstr "联系人注销时播放声音"
 
-#: ../data/empathy.schemas.in.h:26
+#: ../data/empathy.schemas.in.h:34
 msgid "Play a sound when we log in"
 msgstr "登录时播放声音"
 
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:35
 msgid "Play a sound when we log out"
 msgstr "注销时播放声音"
 
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:36
 msgid "Popup notifications if the chat isn't focused"
-msgstr ""
+msgstr "如果聊天窗口不是焦点则弹出消息通知"
 
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:37
+msgid "Popup notifications when a contact sign in"
+msgstr "当联系人登录时弹出通知"
+
+#: ../data/empathy.schemas.in.h:38
+msgid "Popup notifications when a contact sign out"
+msgstr "当联系人注销时弹出通知"
+
+#: ../data/empathy.schemas.in.h:39
 msgid "Salut account is created"
-msgstr "创建 Salut 账户"
+msgstr "已创建 Salut 账户"
 
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:40
 msgid "Show avatars"
 msgstr "显示头像"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:41
+msgid "Show contact list in rooms"
+msgstr "在聊天室显示联系人列表"
+
+#: ../data/empathy.schemas.in.h:42
 msgid "Show hint about closing the main window"
 msgstr "关闭主窗口时显示提示"
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:43
 msgid "Show offline contacts"
 msgstr "显示离线联系人"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:44
 msgid "Spell checking languages"
 msgstr "拼写检查器语言"
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:45
 msgid "The default folder to save file transfers in."
 msgstr "保存传送文件的默认文件夹。"
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:46
 msgid "The last directory that an avatar image was chosen from."
 msgstr "上次选取头像图片的目录。"
 
-#: ../data/empathy.schemas.in.h:36
+#: ../data/empathy.schemas.in.h:47
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "用于在聊天窗口中显示会话的主题。"
 
-#: ../data/empathy.schemas.in.h:37
+#: ../data/empathy.schemas.in.h:48
 msgid "Use graphical smileys"
 msgstr "使用表情图标"
 
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:49
 msgid "Use notification sounds"
 msgstr "使用通知声音"
 
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:50
 msgid "Use theme for chat rooms"
 msgstr "为聊天室使用主题"
 
-#: ../data/empathy.schemas.in.h:40
+#: ../data/empathy.schemas.in.h:51
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:52
+msgid "Whether or not Empathy can publish the user's location to his contacts."
+msgstr "是否允许 Empathy 将用户的位置共享给联系人"
+
+#: ../data/empathy.schemas.in.h:53
+msgid "Whether or not Empathy can use the GPS to guess the location."
+msgstr "是否允许 Empathy 通过 GPS 估算位置"
+
+#: ../data/empathy.schemas.in.h:54
+msgid ""
+"Whether or not Empathy can use the cellular network to guess the location."
+msgstr "是否允许 Empathy 通过手机估算位置"
+
+#: ../data/empathy.schemas.in.h:55
+msgid "Whether or not Empathy can use the network to guess the location."
+msgstr "是否允许 Empathy 通过网络估算位置"
+
+#: ../data/empathy.schemas.in.h:56
 msgid ""
 "Whether or not Empathy has asked about importing accounts from other "
 "programs."
 msgstr "Empathy 是否应该已经询问过要从其它程序中导入账户。"
 
-#: ../data/empathy.schemas.in.h:41
+#: ../data/empathy.schemas.in.h:57
 msgid ""
 "Whether or not Empathy should automatically log in to your accounts on "
 "startup."
 msgstr "Empathy 是否在启动时自动登入您的账户。"
 
-#: ../data/empathy.schemas.in.h:42
+#: ../data/empathy.schemas.in.h:58
+msgid ""
+"Whether or not Empathy should reduce the location's accuracy for privacy "
+"reasons."
+msgstr "是否出于隐私原因降低 Empathy 位置信息的准确度。"
+
+#: ../data/empathy.schemas.in.h:59
 msgid ""
 "Whether or not Empathy should use the avatar of the contact as the chat "
 "window icon."
 msgstr "是否使用联系人的头像作为聊天窗口的图标。"
 
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:60
 msgid ""
 "Whether or not the Salut account has been created on the first Empathy run."
 msgstr "是否在 Empathy 第一次运行时创建 Salut 账户。"
 
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:61
 msgid ""
 "Whether or not the network manager should be used to automatically "
 "disconnect/reconnect."
 msgstr "是否使用 NetworkManager(网络管理器) 自动断开连接/重新连接。"
 
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:62
 msgid ""
 "Whether or not to check words typed against the languages you want to check "
 "with."
 msgstr "是否对您想要作拼写检查的单词作拼写检查。"
 
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:63
 msgid ""
 "Whether or not to convert smileys into graphical images in conversations."
 msgstr "对话时是否将表情符号转换为真正的图标。"
 
-#: ../data/empathy.schemas.in.h:47
-#, fuzzy
+#: ../data/empathy.schemas.in.h:64
 msgid ""
 "Whether or not to play a sound to notify for contacts logging in the network."
-msgstr "是否在联系人列表和聊天窗口中显示头像。"
+msgstr "是否需要联系人上线提示音。"
 
-#: ../data/empathy.schemas.in.h:48
-#, fuzzy
+#: ../data/empathy.schemas.in.h:65
 msgid ""
 "Whether or not to play a sound to notify for contacts logging off the "
 "network."
-msgstr "是否在联系人列表和聊天窗口中显示头像。"
+msgstr "是否需要联系人下线提示音。"
 
-#: ../data/empathy.schemas.in.h:49
-#, fuzzy
+#: ../data/empathy.schemas.in.h:66
 msgid "Whether or not to play a sound to notify for events."
-msgstr "忙碌时是否播放声音。"
+msgstr "是否需要事件提示音。"
 
-#: ../data/empathy.schemas.in.h:50
-#, fuzzy
+#: ../data/empathy.schemas.in.h:67
 msgid "Whether or not to play a sound to notify for incoming messages."
-msgstr "收到消息时是否播放声音。"
+msgstr "是否需要消息到达提示音。"
 
-#: ../data/empathy.schemas.in.h:51
-#, fuzzy
+#: ../data/empathy.schemas.in.h:68
 msgid "Whether or not to play a sound to notify for new conversations."
-msgstr "收到消息时是否播放声音。"
+msgstr "是否需要新会话提示音。"
 
-#: ../data/empathy.schemas.in.h:52
-#, fuzzy
+#: ../data/empathy.schemas.in.h:69
 msgid "Whether or not to play a sound to notify for outgoing messages."
-msgstr "收到消息时是否播放声音。"
+msgstr "是否为外出消息使用语音提示。"
 
-#: ../data/empathy.schemas.in.h:53
-#, fuzzy
+#: ../data/empathy.schemas.in.h:70
 msgid "Whether or not to play a sound when logging in a network."
-msgstr "离开时是否播放声音。"
+msgstr "当联网登录时是否播放提示音。"
 
-#: ../data/empathy.schemas.in.h:54
-#, fuzzy
+#: ../data/empathy.schemas.in.h:71
 msgid "Whether or not to play a sound when logging off a network."
-msgstr "离开时是否播放声音。"
+msgstr "当网络断开时是否播放提示音。"
 
-#: ../data/empathy.schemas.in.h:55
-#, fuzzy
-#| msgid "Whether or not to play a sound notifications when away or busy."
+#: ../data/empathy.schemas.in.h:72
 msgid "Whether or not to play sound notifications when away or busy."
-msgstr "离开或忙碌时是否播放声音通知。"
+msgstr "当离开或忙碌时是否使用语音通知。"
 
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:73
+msgid ""
+"Whether or not to show a popup notification when a contact goes offline."
+msgstr "当联系人离线时是否显示弹出通知。"
+
+#: ../data/empathy.schemas.in.h:74
+msgid "Whether or not to show a popup notification when a contact goes online."
+msgstr "当联系人上线时是否显示弹出通知"
+
+#: ../data/empathy.schemas.in.h:75
 msgid ""
 "Whether or not to show a popup notification when receiving a new message "
 "even if the chat is already opened, but not focused."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:57
-#, fuzzy
-#| msgid "Whether or not to play a sound notifications when away or busy."
+#: ../data/empathy.schemas.in.h:76
 msgid ""
 "Whether or not to show a popup notification when receiving a new message."
-msgstr "离开或忙碌时是否播放声音通知。"
+msgstr "当收到新消息时是否弹出显示提示框。"
 
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:77
 msgid ""
 "Whether or not to show avatars for contacts in the contact list and chat "
 "windows."
 msgstr "是否在联系人列表和聊天窗口中显示头像。"
 
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:78
 msgid "Whether or not to show contacts that are offline in the contact list."
 msgstr "是否显示联系人清单中离线的联系人。"
 
-#: ../data/empathy.schemas.in.h:60
-#, fuzzy
-#| msgid "Whether or not to play a sound notifications when away or busy."
+#: ../data/empathy.schemas.in.h:79
 msgid "Whether or not to show popup notifications when away or busy."
-msgstr "离开或忙碌时是否播放声音通知。"
+msgstr "当离开活忙碌时是否弹出显示提示框。"
 
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:80
+msgid "Whether or not to show the contact list in chat rooms."
+msgstr "是否在聊天室显示联系人列表。"
+
+#: ../data/empathy.schemas.in.h:81
 msgid ""
 "Whether or not to show the message dialog about closing the main window with "
 "the 'x' button in the title bar."
 msgstr "是否对使用标题栏中的“X”按钮关闭主窗口显示消息对话框。"
 
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:82
 msgid "Whether to show the contact list in compact mode or not."
 msgstr "是否以紧凑格式显示联系人列表。"
 
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:83
 msgid "Whether to use the theme for chat rooms or not."
 msgstr "是否对聊天室使用主题。"
 
-#: ../data/empathy.schemas.in.h:64
+#: ../data/empathy.schemas.in.h:84
 msgid ""
 "Which criterium to use when sorting the contact list. Default is to use sort "
 "by the contact's name with the value \"name\". A value of \"state\" will "
@@ -327,732 +403,964 @@ msgstr ""
 "使用何种准则来排序联系人列表。默认情况下使用值“name”以按联系人姓名\n"
 "排序。取值为“state”时将按状态排序联系人列表。"
 
-#: ../libempathy/empathy-tp-contact-list.c:731 ../src/empathy.c:271
+#: ../libempathy/empathy-ft-handler.c:838
+msgid "The hash of the received file and the sent one do not match"
+msgstr "接收到的文件和发送的那个文件哈希值不匹配"
+
+#: ../libempathy/empathy-ft-handler.c:1098
+msgid "File transfer not supported by remote contact"
+msgstr "文件传输不支持远程连接"
+
+#: ../libempathy/empathy-ft-handler.c:1156
+msgid "The selected file is not a regular file"
+msgstr "所选文件是非正常的文件"
+
+#: ../libempathy/empathy-ft-handler.c:1165
+msgid "The selected file is empty"
+msgstr "所选文件是空的"
+
+#: ../libempathy/empathy-tp-contact-list.c:843 ../src/empathy.c:289
 msgid "People nearby"
 msgstr "附近的人"
 
-#: ../libempathy/empathy-utils.c:252
+#: ../libempathy/empathy-tp-file.c:279
+msgid "Socket type not supported"
+msgstr "不支持Socket类型"
+
+#: ../libempathy/empathy-tp-file.c:398
+msgid "No reason was specified"
+msgstr "未指定原因"
+
+#: ../libempathy/empathy-tp-file.c:401
+msgid "The change in state was requested"
+msgstr "需要状态改变信息"
+
+#: ../libempathy/empathy-tp-file.c:404
+msgid "You canceled the file transfer"
+msgstr "您取消了文件传输"
+
+#: ../libempathy/empathy-tp-file.c:407
+msgid "The other participant canceled the file transfer"
+msgstr "另外的参与者取消了文件的传输"
+
+#: ../libempathy/empathy-tp-file.c:410
+msgid "Error while trying to transfer the file"
+msgstr "当传输这个文件的时候发生错误"
+
+#: ../libempathy/empathy-tp-file.c:413
+msgid "The other participant is unable to transfer the file"
+msgstr "另外的参与者无法传输这个文件"
+
+#: ../libempathy/empathy-tp-file.c:416
+msgid "Unknown reason"
+msgstr "未知原因"
+
+#: ../libempathy/empathy-utils.c:265
 msgid "Available"
 msgstr "在线"
 
-#: ../libempathy/empathy-utils.c:254
+#: ../libempathy/empathy-utils.c:267
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../libempathy/empathy-utils.c:257
+#: ../libempathy/empathy-utils.c:270
 msgid "Away"
 msgstr "离开"
 
-#: ../libempathy/empathy-utils.c:259
+#: ../libempathy/empathy-utils.c:272
 msgid "Hidden"
 msgstr "隐身"
 
-#: ../libempathy/empathy-utils.c:262
+#: ../libempathy/empathy-utils.c:274
 msgid "Offline"
 msgstr "离线"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:326
+#: ../libempathy/empathy-time.c:137
+#, c-format
+msgid "%d second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "%d 秒钟前"
+
+#: ../libempathy/empathy-time.c:142
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "%d 分钟前"
+
+#: ../libempathy/empathy-time.c:147
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "%d 小时前"
+
+#: ../libempathy/empathy-time.c:152
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d 天前"
+
+#: ../libempathy/empathy-time.c:157
+#, c-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "%d 星期前"
+
+#: ../libempathy/empathy-time.c:162
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "%d 月前"
+
+#: ../libempathy/empathy-time.c:167
+msgid "in the future"
+msgstr "将来"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:426
 msgid "All"
 msgstr "全部"
 
 #: ../libempathy-gtk/empathy-account-widget.c:302
-#: ../libempathy-gtk/empathy-account-widget.c:347
+#: ../libempathy-gtk/empathy-account-widget.c:354
 #, c-format
 msgid "%s:"
 msgstr "%s："
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-generic.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:1
-msgid "<b>Advanced</b>"
-msgstr "<b>高级</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:2
-msgid "Forget password and clear the entry."
-msgstr "忘记密码并清空输入框。"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Advanced"
+msgstr "高级"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
 msgid "Pass_word:"
 msgstr "密码(_W)："
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
 msgid "Screen _Name:"
 msgstr "用户名(_N)："
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:11
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "_Port:"
 msgstr "端口(_P)："
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:12
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:10
-#: ../src/empathy-new-chatroom-dialog.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
 msgstr "服务器(_S)："
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "登录 I_D："
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
 msgid "ICQ _UIN:"
 msgstr "ICQ _UIN："
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "_Charset:"
 msgstr "字符集(_C)："
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:245
+#: ../libempathy-gtk/empathy-account-widget-irc.c:240
 msgid "New Network"
 msgstr "新建网络"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:1
-msgid "<b>Network</b>"
-msgstr "<b>网络</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:2
-msgid "<b>Servers</b>"
-msgstr "<b>服务器</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 msgid "Charset:"
 msgstr "字符集："
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:4
-msgid "Create a new IRC network"
-msgstr "创建新的 IRC 网络"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:5
-msgid "Edit the selected IRC network"
-msgstr "编辑选中的 IRC 网络"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Network"
 msgstr "网络"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Network:"
 msgstr "网络："
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Nickname:"
 msgstr "昵称："
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Password:"
 msgstr "密码："
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Quit message:"
 msgstr "退出消息："
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:11
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Real name:"
 msgstr "全名："
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:12
-msgid "Remove the selected IRC network"
-msgstr "删除选中的 IRC 网络"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+msgid "Servers"
+msgstr "服务器"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:2
-msgid "<b>Override server settings</b>"
-msgstr "<b>覆盖服务器设置</b>"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+msgid "Override server settings"
+msgstr "覆盖服务器设置"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
 msgid "Pri_ority:"
 msgstr "优先级(_O)："
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "Reso_urce:"
 msgstr "资源(_U)："
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 msgid "Use old SS_L"
 msgstr "使用旧的 SS_L"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "_Encryption required (TLS/SSL)"
 msgstr "需要加密(TLS/SSL)(_E)"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
 msgid "_Ignore SSL certificate errors"
 msgstr "忽略 SSL 证书错误(_I)"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:2
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:2
 msgid "_Email:"
 msgstr "电子邮件(_E)："
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:3
-#, fuzzy
-#| msgid "_First Name: "
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3
 msgid "_First Name:"
-msgstr "名(_F)："
+msgstr "名(_F)"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:4
 msgid "_Jabber ID:"
 msgstr "_Jabber ID："
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:5
 msgid "_Last Name:"
 msgstr "姓(_L)："
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:6
-#: ../src/empathy-chatrooms-window.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:6
 msgid "_Nickname:"
 msgstr "昵称(_N)："
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:7
 msgid "_Published Name:"
 msgstr "公开的名字(_P)："
 
 #. look up the DNS SRV record at the service's domain for the host name of a STUN server.
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "Discover STUN"
 msgstr "搜索 STUN"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 msgid "STUN Server:"
 msgstr "STUN 服务器："
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
 msgid "STUN port:"
 msgstr "STUN 端口："
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "_Username:"
 msgstr "用户名(_U)："
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
 msgid "Use _Yahoo Japan"
 msgstr "使用 _Yahoo 日本"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
 msgid "Yahoo I_D:"
 msgstr "Yahoo I_D："
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 msgid "_Ignore conference and chatroom invitations"
 msgstr "忽略会议和聊天室邀请(_I)"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
 msgid "_Room List locale:"
-msgstr "房间列表 locale(_R)："
+msgstr "聊天室列表 locale(_R)："
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:462
-#: ../libempathy-gtk/empathy-avatar-chooser.c:537
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:525
 msgid "Couldn't convert image"
 msgstr "无法转换图像"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:463
+#: ../libempathy-gtk/empathy-avatar-chooser.c:450
 msgid "None of the accepted image formats is supported on your system"
-msgstr ""
+msgstr "没有一个公认的图片格式能被您的系统支持"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:956
+#: ../libempathy-gtk/empathy-avatar-chooser.c:933
 msgid "Select Your Avatar Image"
 msgstr "选择您的头像图片"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:959
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
 msgid "No Image"
 msgstr "无图像"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
+#: ../libempathy-gtk/empathy-avatar-chooser.c:998
 msgid "Images"
 msgstr "图像"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1025
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
 msgid "All Files"
 msgstr "所有文件"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:294
+#: ../libempathy-gtk/empathy-avatar-image.c:324
 msgid "Click to enlarge"
 msgstr "单击以放大"
 
-#. This is an unknown command, display a message to the user
-#: ../libempathy-gtk/empathy-chat.c:378
+#: ../libempathy-gtk/empathy-chat.c:186
+msgid "Failed to reconnect this chat"
+msgstr "重新连接到对话失败"
+
+#: ../libempathy-gtk/empathy-chat.c:404
 msgid "Unsupported command"
-msgstr ""
+msgstr "不支持的命令"
 
-#: ../libempathy-gtk/empathy-chat.c:506
+#: ../libempathy-gtk/empathy-chat.c:539
 msgid "offline"
 msgstr "离线"
 
-#: ../libempathy-gtk/empathy-chat.c:509
+#: ../libempathy-gtk/empathy-chat.c:542
 msgid "invalid contact"
 msgstr "无效联系人"
 
-#: ../libempathy-gtk/empathy-chat.c:512
+#: ../libempathy-gtk/empathy-chat.c:545
 msgid "permission denied"
-msgstr "权限不够"
+msgstr "权限不足"
 
-#: ../libempathy-gtk/empathy-chat.c:515
+#: ../libempathy-gtk/empathy-chat.c:548
 msgid "too long message"
 msgstr "消息太长"
 
-#: ../libempathy-gtk/empathy-chat.c:518
+#: ../libempathy-gtk/empathy-chat.c:551
 msgid "not implemented"
 msgstr "尚未实现"
 
-#: ../libempathy-gtk/empathy-chat.c:521
+#: ../libempathy-gtk/empathy-chat.c:554
 msgid "unknown"
 msgstr "未知"
 
-#: ../libempathy-gtk/empathy-chat.c:525
+#: ../libempathy-gtk/empathy-chat.c:558
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "发送消息“%s”出错：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:555
+#: ../libempathy-gtk/empathy-chat.c:588
 #, c-format
 msgid "Topic set to: %s"
 msgstr "话题被设置为：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:557
+#: ../libempathy-gtk/empathy-chat.c:590
 msgid "No topic defined"
 msgstr "未设置话题"
 
-#: ../libempathy-gtk/empathy-chat.c:972
+#: ../libempathy-gtk/empathy-chat.c:960
+msgid "(No Suggestions)"
+msgstr "(没有建议)"
+
+#: ../libempathy-gtk/empathy-chat.c:1014
 msgid "Insert Smiley"
 msgstr "插入表情"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:990
-#: ../libempathy-gtk/empathy-ui-utils.c:1559
+#: ../libempathy-gtk/empathy-chat.c:1032
+#: ../libempathy-gtk/empathy-ui-utils.c:1480
 msgid "_Send"
 msgstr "发送(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1024
-msgid "_Check Word Spelling..."
-msgstr "拼写检查(_C)..."
+#: ../libempathy-gtk/empathy-chat.c:1066
+msgid "_Spelling Suggestions"
+msgstr "拼写建议(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1142
+#: ../libempathy-gtk/empathy-chat.c:1181
 #, c-format
-msgid "%s has joined the room"
-msgstr "%s 加入了房间"
+msgid "%s has disconnected"
+msgstr "%s 已断开连接"
+
+#: ../libempathy-gtk/empathy-chat.c:1185
+#, c-format
+msgid "%s was kicked by %s"
+msgstr "%s 被 %s 踢出"
+
+#: ../libempathy-gtk/empathy-chat.c:1188
+#, c-format
+msgid "%s was kicked"
+msgstr "%s 被踢出"
+
+#: ../libempathy-gtk/empathy-chat.c:1193
+#, c-format
+msgid "%s was banned by %s"
+msgstr "%s 被 %s 禁止"
 
-#: ../libempathy-gtk/empathy-chat.c:1145
+#: ../libempathy-gtk/empathy-chat.c:1196
+#, c-format
+msgid "%s was banned"
+msgstr "%s 被禁止"
+
+#: ../libempathy-gtk/empathy-chat.c:1200
 #, c-format
 msgid "%s has left the room"
-msgstr "%s 离开了房间"
+msgstr "%s 离开了聊天室"
+
+#. Note to translators: this string is appended to
+#. * notifications like "foo has left the room", with the message
+#. * given by the user living the room. If this poses a problem,
+#. * please let us know. :-)
+#.
+#: ../libempathy-gtk/empathy-chat.c:1209
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:1260 ../src/empathy-call-window.c:764
+#: ../libempathy-gtk/empathy-chat.c:1232
+#, c-format
+msgid "%s has joined the room"
+msgstr "%s 加入了聊天室"
+
+#: ../libempathy-gtk/empathy-chat.c:1365 ../src/empathy-call-window.c:1225
 msgid "Disconnected"
 msgstr "已断开连接"
 
-#: ../libempathy-gtk/empathy-chat.c:1657
+#: ../libempathy-gtk/empathy-chat.c:1800
 msgid "Connected"
 msgstr "已连接"
 
-#: ../libempathy-gtk/empathy-chat.c:1707
-#: ../libempathy-gtk/empathy-log-window.c:505
+#: ../libempathy-gtk/empathy-chat.c:1850
+#: ../libempathy-gtk/empathy-log-window.c:502
 msgid "Conversation"
 msgstr "对话"
 
-#: ../libempathy-gtk/empathy-chat.glade.h:1
-msgid "<b>Topic:</b>"
-msgstr "<b>话题：</b>"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:2
-msgid "Group Chat"
-msgstr "群聊"
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472
+msgid "Topic:"
+msgstr "话题："
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:331
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:316
+#: ../libempathy-gtk/empathy-theme-adium.c:264
 msgid "_Copy Link Address"
 msgstr "复制链接地址(_C)"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:339
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:323
+#: ../libempathy-gtk/empathy-theme-adium.c:272
 msgid "_Open Link"
 msgstr "打开链接(_O)"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:432
-#, fuzzy
-#| msgid "%A %d %B %Y"
+#: ../libempathy-gtk/empathy-chat-text-view.c:421
 msgid "%A %B %d %Y"
-msgstr "%Y年%-m月%-d日%A"
+msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:180
-msgid "Personal Information"
-msgstr "个人信息"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:183
+#: ../libempathy-gtk/empathy-contact-dialogs.c:179
+#: ../libempathy-gtk/empathy-contact-dialogs.c:238
 msgid "Edit Contact Information"
 msgstr "编辑联系人信息"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:186
-msgid "Contact Information"
-msgstr "联系人信息"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:267
-msgid "I would like to add you to my contact list."
-msgstr "我希望可以将您加入我的联系人列表中。"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:289
+msgid "Personal Information"
+msgstr "个人信息"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:291
+#: ../libempathy-gtk/empathy-contact-dialogs.c:393
 msgid "New Contact"
 msgstr "新建联系人"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:1
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
 msgid "Decide _Later"
 msgstr "以后再决定(_L)"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:2
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "订阅请求"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1255
+#: ../libempathy-gtk/empathy-contact-list-view.c:1400
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "您真的要删除群组“%s”吗？"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1257
+#: ../libempathy-gtk/empathy-contact-list-view.c:1402
 msgid "Removing group"
 msgstr "删除群组"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1304
-#: ../libempathy-gtk/empathy-contact-list-view.c:1383
+#. Remove
+#: ../libempathy-gtk/empathy-contact-list-view.c:1449
+#: ../libempathy-gtk/empathy-contact-list-view.c:1526
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1334
+#: ../libempathy-gtk/empathy-contact-list-view.c:1479
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "您真的想要删除联系人“%s”吗？"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1336
+#: ../libempathy-gtk/empathy-contact-list-view.c:1481
 msgid "Removing contact"
 msgstr "删除联系人"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1341
-msgid "Sorry, I don't want you in my contact list anymore."
-msgstr "对不起，我不想让你以后出现在我的联系人列表中了。"
+#: ../libempathy-gtk/empathy-contact-menu.c:195
+#: ../src/empathy-main-window.ui.h:11
+msgid "_Add Contact..."
+msgstr "添加联系人(_A)..."
 
-#: ../libempathy-gtk/empathy-contact-menu.c:130
-#: ../src/empathy-main-window.glade.h:9
+#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../src/empathy-main-window.ui.h:12
 msgid "_Chat"
 msgstr "聊天(_C)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:161
-#: ../src/empathy-call-window.glade.h:5
-msgid "_Call"
-msgstr "通话(_C)"
+#: ../libempathy-gtk/empathy-contact-menu.c:253
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "音频呼叫(_A)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:200
-#: ../src/empathy-main-window.glade.h:17
+#: ../libempathy-gtk/empathy-contact-menu.c:285
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "视频呼叫(_V)"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:324
 msgid "_View Previous Conversations"
 msgstr "查看以前对话(_V)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../libempathy-gtk/empathy-contact-menu.c:346
 msgid "Send file"
 msgstr "发送文件"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:250
+#: ../libempathy-gtk/empathy-contact-menu.c:369
+msgid "Share my desktop"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-menu.c:397
 msgid "Infor_mation"
 msgstr "信息(_M)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:277
-#: ../src/empathy-chat-window.glade.h:14 ../src/empathy-main-window.glade.h:11
+#: ../libempathy-gtk/empathy-contact-menu.c:441
+#: ../src/empathy-main-window.ui.h:16
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:336
+#: ../libempathy-gtk/empathy-contact-menu.c:501
 msgid "Inviting to this room"
-msgstr "邀请到此房间"
+msgstr "邀请到此聊天室"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:369
+#: ../libempathy-gtk/empathy-contact-menu.c:532
 msgid "_Invite to chatroom"
 msgstr "邀请到聊天室(_I)"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:111
-#, fuzzy
-#| msgid "Select contact..."
+#: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
-msgstr "选择联系人..."
+msgstr "选择一个联系"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:361
+#: ../libempathy-gtk/empathy-contact-widget.c:447
 msgid "Save Avatar"
 msgstr "保存头像"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:417
+#: ../libempathy-gtk/empathy-contact-widget.c:503
 msgid "Unable to save avatar"
 msgstr "无法保存头像"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:912
+#: ../libempathy-gtk/empathy-contact-widget.c:992
 msgid "Select"
 msgstr "选择"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../src/empathy-main-window.c:991
+#: ../libempathy-gtk/empathy-contact-widget.c:1001
+#: ../src/empathy-main-window.c:1023
 msgid "Group"
 msgstr "群组"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:1
-msgid "<b>Client Information</b>"
-msgstr "<b>客户端信息</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1252
+msgid "Country ISO Code:"
+msgstr "包括 ISO 编码"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1254
+msgid "Country:"
+msgstr "国家"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1256
+msgid "State:"
+msgstr "省"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1258
+msgid "City:"
+msgstr "市"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1260
+msgid "Area:"
+msgstr "地区"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1262
+msgid "Postal Code:"
+msgstr "邮政编码"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1264
+msgid "Street:"
+msgstr "街"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1266
+msgid "Building:"
+msgstr "建筑物"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1268
+msgid "Floor:"
+msgstr "楼层："
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:2
-msgid "<b>Contact Details</b>"
-msgstr "<b>联系人详情</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1270
+msgid "Room:"
+msgstr "房间："
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:3
-msgid "<b>Contact</b>"
-msgstr "<b>联系人</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1272
+msgid "Text:"
+msgstr "文本："
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:4
-msgid "<b>Groups</b>"
-msgstr "<b>群组</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1274
+msgid "Description:"
+msgstr "描述："
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:5
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:1
-#: ../src/empathy-chatrooms-window.glade.h:1
-#: ../src/empathy-new-chatroom-dialog.glade.h:1
+#: ../libempathy-gtk/empathy-contact-widget.c:1276
+msgid "URI:"
+msgstr "URI："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1278
+msgid "Accuracy Level:"
+msgstr "准确程度："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1280
+msgid "Error:"
+msgstr "错误："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1282
+msgid "Vertical Error (meters):"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1284
+msgid "Horizontal Error (meters):"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1286
+msgid "Speed:"
+msgstr "速度："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1288
+msgid "Bearing:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1290
+msgid "Climb Speed:"
+msgstr "爬升速度："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1292
+msgid "Last Updated on:"
+msgstr "最近更新于:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1294
+msgid "Longitude:"
+msgstr "经度："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1296
+msgid "Latitude:"
+msgstr "纬度："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1298
+msgid "Altitude:"
+msgstr "海拔："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1345
+msgid "<b>Location</b>"
+msgstr "<b>位置</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1358
+msgid "<b>Location</b>, "
+msgstr "<b>位置</b>，"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1408
+msgid "%B %e, %Y at %R UTC"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+msgid "<b>Location</b> at (date)\t"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid "Account:"
 msgstr "账户："
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:6
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
 msgid "Alias:"
 msgstr "别名："
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:7
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
 msgid "Birthday:"
 msgstr "生日："
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:8
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "Client Information"
+msgstr "客户端信息"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
 msgid "Client:"
 msgstr "客户端："
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:9
-msgid "Contact information"
-msgstr "联系人信息"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../src/empathy-main-window.c:1006
+msgid "Contact"
+msgstr "联系人"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Contact Details"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "Email:"
 msgstr "电子邮件："
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Fullname:"
 msgstr "全称："
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Groups"
+msgstr ""
+
 #. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
 msgid "Identifier:"
 msgstr "用户 ID："
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:14
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
 msgid "Information requested..."
 msgstr "已请求信息..."
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
 msgid "OS:"
 msgstr "操作系统："
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:16
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 msgstr "选择您想将该联系人加入的群组。注意您可以选择多个群组，也可以不选择。"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:17
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
 msgid "Version:"
 msgstr "版本："
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:18
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
 msgid "Web site:"
 msgstr "网站："
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:19
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
 msgid "_Add Group"
 msgstr "添加群组(_A)"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:284
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:283
 msgid "new server"
 msgstr "新建服务器"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:513
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:510
 msgid "Server"
 msgstr "服务器"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:528
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:525
 msgid "Port"
 msgstr "端口"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:541
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:498
-#: ../src/empathy-import-dialog.c:282
+#: ../libempathy-gtk/empathy-log-window.c:495
+#: ../src/empathy-import-dialog.c:285
 msgid "Account"
 msgstr "账户"
 
-#: ../libempathy-gtk/empathy-log-window.c:515
+#: ../libempathy-gtk/empathy-log-window.c:512
 msgid "Date"
 msgstr "日期"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.glade.h:2
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
 msgid "Conversations"
 msgstr "对话"
 
-#: ../libempathy-gtk/empathy-log-window.glade.h:3
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
 msgid "Previous Conversations"
 msgstr "以前的对话"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.glade.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Search"
 msgstr "搜索"
 
-#. Searching *for* something
-#: ../libempathy-gtk/empathy-log-window.glade.h:7
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "_For:"
 msgstr "包含(_F)："
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:2
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
 msgid "C_all"
 msgstr "通话(_A)"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:3
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
 msgid "C_hat"
 msgstr "聊天(_H)"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:4
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
 msgid "Contact ID:"
 msgstr "联系人 ID："
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:5
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
 msgid "New Conversation"
 msgstr "新建对话"
 
-#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:685
-msgid "Custom messages..."
+#. COL_STATE_ICON_NAME
+#. COL_STATE
+#. COL_STATUS_TEXT
+#. COL_DISPLAY_MARKUP
+#. COL_STATUS_CUSTOMISABLE
+#. COL_TYPE
+#: ../libempathy-gtk/empathy-presence-chooser.c:172
+msgid "Custom Message..."
 msgstr "自定义消息..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:1
-msgid "Custom message"
-msgstr "自定义消息"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:2
-msgid "Message:"
-msgstr "消息："
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:3
-msgid "Save message"
-msgstr "保存消息"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:4
-msgid "Status:"
-msgstr "状态："
-
-#: ../libempathy-gtk/empathy-spell-dialog.c:88
-msgid "Word"
-msgstr "单词"
+#: ../libempathy-gtk/empathy-presence-chooser.c:227
+msgid "Edit Custom Messages..."
+msgstr "编辑自定义消息..."
 
-#: ../libempathy-gtk/empathy-spell-dialog.c:265
-msgid "Suggestions for the word"
-msgstr "单词的拼写建议"
-
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:1
-msgid "Spell Checker"
-msgstr "拼写检查器"
-
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:2
-msgid "Suggestions for the word:"
-msgstr "单词的拼写建议："
-
-#: ../libempathy-gtk/empathy-theme-manager.c:60
-msgid "Classic"
-msgstr "经典"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:61
-msgid "Simple"
-msgstr "简洁"
+#: ../libempathy-gtk/empathy-presence-chooser.c:326
+msgid "Click to remove this status as a favorite"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-theme-manager.c:62
-msgid "Clean"
-msgstr "清爽"
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
+msgid "Click to make this status a favorite"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-theme-manager.c:63
-msgid "Blue"
-msgstr "蓝色"
+#: ../libempathy-gtk/empathy-presence-chooser.c:369
+msgid "Set status"
+msgstr "设置状态"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1406
-msgid "Unable to open URI"
-msgstr "无法打开 URI"
+#: ../libempathy-gtk/empathy-presence-chooser.c:782
+msgid "Set your presence and current status"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1551
-msgid "Select a file"
-msgstr "选择文件"
+#. Custom messages
+#: ../libempathy-gtk/empathy-presence-chooser.c:1017
+msgid "Custom messages..."
+msgstr "自定义消息..."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1587
+#: ../libempathy-gtk/empathy-sound.c:51
 msgid "Received an instant message"
 msgstr "收到了即时消息"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1589
+#: ../libempathy-gtk/empathy-sound.c:53
 msgid "Sent an instant message"
 msgstr "发送即时消息"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1591
+#: ../libempathy-gtk/empathy-sound.c:55
 msgid "Incoming chat request"
 msgstr "收到的聊天请求"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1593
+#: ../libempathy-gtk/empathy-sound.c:57
 msgid "Contact connected"
 msgstr "联系人已连接"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1595
+#: ../libempathy-gtk/empathy-sound.c:59
 msgid "Contact disconnected"
 msgstr "联系人已断开"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1597
+#: ../libempathy-gtk/empathy-sound.c:61
 msgid "Connected to server"
 msgstr "已连接到服务器"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1599
+#: ../libempathy-gtk/empathy-sound.c:63
 msgid "Disconnected from server"
 msgstr "已从服务器断开连接"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1601
+#: ../libempathy-gtk/empathy-sound.c:65
 msgid "Incoming voice call"
 msgstr "呼入的语音通话"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1603
+#: ../libempathy-gtk/empathy-sound.c:67
 msgid "Outgoing voice call"
 msgstr "呼出的语音通话"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1605
+#: ../libempathy-gtk/empathy-sound.c:69
 msgid "Voice call ended"
 msgstr "语音通话结束"
 
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
+msgid "Enter Custom Message"
+msgstr "输入自定义消息"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
+msgid "Edit Custom Messages"
+msgstr "编辑自定义消息"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+msgid "Add _New Preset"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
+msgid "Saved Presets"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:3
+msgid "gtk-add"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:4
+msgid "gtk-remove"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-theme-manager.c:67
+msgid "Classic"
+msgstr "经典"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:68
+msgid "Simple"
+msgstr "简洁"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:69
+msgid "Clean"
+msgstr "清爽"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:70
+msgid "Blue"
+msgstr "蓝色"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1382
+msgid "Unable to open URI"
+msgstr "无法打开 URI"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1472
+msgid "Select a file"
+msgstr "选择文件"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1530
+msgid "Select a destination"
+msgstr "选择目的地"
+
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
 msgstr "当前 Locale"
@@ -1237,7 +1545,7 @@ msgid "Megaphone"
 msgstr "话筒"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:417
+#: ../megaphone/src/megaphone-applet.c:519
 msgid "Talk!"
 msgstr "说吧！"
 
@@ -1251,15 +1559,15 @@ msgid "_Information"
 msgstr "信息(_I)"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.glade.h:15
+#: ../src/empathy-main-window.ui.h:23
 msgid "_Preferences"
 msgstr "首选项(_P)"
 
-#: ../megaphone/src/megaphone-applet.c:255
+#: ../megaphone/src/megaphone-applet.c:168
 msgid "Please configure a contact."
 msgstr "请配置一个联系人。"
 
-#: ../megaphone/src/megaphone-applet.c:348
+#: ../megaphone/src/megaphone-applet.c:258
 msgid "Select contact..."
 msgstr "选择联系人..."
 
@@ -1272,23 +1580,23 @@ msgstr "状态"
 msgid "Set your own presence"
 msgstr "设置您的状态"
 
-#: ../src/empathy.c:430
+#: ../src/empathy.c:567
 msgid "Don't connect on startup"
 msgstr "启动时不自动登录"
 
-#: ../src/empathy.c:434
+#: ../src/empathy.c:571
 msgid "Don't show the contact list on startup"
 msgstr "启动时不显示联系人列表"
 
-#: ../src/empathy.c:438
+#: ../src/empathy.c:575
 msgid "Show the accounts dialog"
 msgstr "显示账户对话框"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:587
 msgid "- Empathy Instant Messenger"
 msgstr "- Empathy 即时通讯程序"
 
-#: ../src/empathy-about-dialog.c:84
+#: ../src/empathy-about-dialog.c:83
 msgid ""
 "Empathy is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU General Public License as published by the Free Software "
@@ -1298,7 +1606,7 @@ msgstr ""
 "Empathy 是自由软件；您可以在自由软件基金会发布的 GNU 通用公共许可证下重新发布"
 "或修改它；许可证可使用第二版或您想选择的更新的版本。"
 
-#: ../src/empathy-about-dialog.c:88
+#: ../src/empathy-about-dialog.c:87
 msgid ""
 "Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1308,7 +1616,7 @@ msgstr ""
 "Empathy 发布的目的是希望它对您有用，但是没有任何担保；即使是对商业应用以及其"
 "它特定目的。查阅 GNU 通用公共许可证以获取更多细节。"
 
-#: ../src/empathy-about-dialog.c:92
+#: ../src/empathy-about-dialog.c:91
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
@@ -1318,33 +1626,41 @@ msgstr ""
 "给自由软件基金会写信。地址是：51 Franklin Street, Fifth Floor, Boston, MA "
 "02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:120
+#: ../src/empathy-about-dialog.c:119
 msgid "An Instant Messaging client for GNOME"
 msgstr "一个 GNOME 即时消息客户端"
 
-#: ../src/empathy-about-dialog.c:126
+#: ../src/empathy-about-dialog.c:125
 msgid "translator-credits"
 msgstr ""
-"开源软件国际化简体中文组，2003\n"
-"(http://i18n.linux.net.cn)\n"
-"YangZhang, <zyangmath@gmail.com>, 2008"
 
-#: ../src/empathy-accounts-dialog.c:391
+"YangZhang, <zyangmath@gmail.com>\n"
+"Aron Xu <aronxu@gnome.org>\n"
+""
+"Launchpad Contributions:\n"
+"  =KK= https://launchpad.net/~sevkme\n"
+"  AnThOnYhO https://launchpad.net/~anthonyho\n"
+"  HeaJO_o https://launchpad.net/~zhejo\n"
+"  Mai Haohui https://launchpad.net/~maihaohui\n"
+"  Sean.Z https://launchpad.net/~onepill-gmail\n"
+"  fujianwzh https://launchpad.net/~fujianwzh\n"
+"  yuane https://launchpad.net/~yuane"
+
+#: ../src/empathy-accounts-dialog.c:392
 msgid "Enabled"
 msgstr "启用"
 
-#: ../src/empathy-accounts-dialog.c:401
-#: ../src/empathy-accounts-dialog.glade.h:4
+#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1
 msgid "Accounts"
 msgstr "账户"
 
 #. To translator: %s is the protocol name
-#: ../src/empathy-accounts-dialog.c:833
+#: ../src/empathy-accounts-dialog.c:837
 #, c-format
 msgid "New %s account"
 msgstr "新建 %s 账户"
 
-#: ../src/empathy-accounts-dialog.c:943
+#: ../src/empathy-accounts-dialog.c:950
 #, c-format
 msgid ""
 "You are about to remove your %s account!\n"
@@ -1353,7 +1669,7 @@ msgstr ""
 "您将要删除您的 %s 账户！\n"
 "您确定要继续吗？"
 
-#: ../src/empathy-accounts-dialog.c:949
+#: ../src/empathy-accounts-dialog.c:956
 msgid ""
 "Any associated conversations and chat rooms will NOT be removed if you "
 "decide to proceed.\n"
@@ -1365,331 +1681,225 @@ msgstr ""
 "\n"
 "如果将来您重新添加此账户，它们将仍然存在。"
 
-#: ../src/empathy-accounts-dialog.glade.h:1
-msgid "<b>New Account</b>"
-msgstr "<b>新建账户</b>"
+#: ../src/empathy-accounts-dialog.ui.h:2
+msgid "Add Account"
+msgstr "添加帐户"
 
-#: ../src/empathy-accounts-dialog.glade.h:2
-msgid "<b>No protocol installed</b>"
-msgstr "<b>未安装协议</b>"
-
-#: ../src/empathy-accounts-dialog.glade.h:3
-msgid "<b>Settings</b>"
-msgstr "<b>设置</b>"
-
-#: ../src/empathy-accounts-dialog.glade.h:5
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "Cr_eate"
 msgstr "创建(_E)"
 
-#: ../src/empathy-accounts-dialog.glade.h:6
-msgid "I already have an account I want to use"
-msgstr "我已经拥有账户，我想使用它"
+#: ../src/empathy-accounts-dialog.ui.h:4
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/empathy-accounts-dialog.glade.h:7
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid "Import Accounts..."
 msgstr "导入账户..."
 
-#: ../src/empathy-accounts-dialog.glade.h:8
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol installed"
+msgstr "尚未安装协议"
+
+#: ../src/empathy-accounts-dialog.ui.h:7
+msgid "Settings"
+msgstr "设置"
+
+#: ../src/empathy-accounts-dialog.ui.h:8
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 msgstr "要添加一个新账户，您首先需要为您想要使用的每个协议安装后端。"
 
-#: ../src/empathy-accounts-dialog.glade.h:9
+#: ../src/empathy-accounts-dialog.ui.h:9
 msgid "Type:"
 msgstr "类型："
 
-#: ../src/empathy-call-window.c:346
-#, fuzzy
-#| msgid "Contact"
+#: ../src/empathy-accounts-dialog.ui.h:10
+msgid "_Add..."
+msgstr "添加(_A)..."
+
+#: ../src/empathy-accounts-dialog.ui.h:11
+msgid "_Create a new account"
+msgstr "创建新的帐户(_C)"
+
+#: ../src/empathy-accounts-dialog.ui.h:12
+msgid "_Reuse an existing account"
+msgstr "启用现有帐户(_R)"
+
+#: ../src/empathy-call-window.c:420
 msgid "Contrast"
-msgstr "联系人"
+msgstr "对比度"
 
-#: ../src/empathy-call-window.c:349
+#: ../src/empathy-call-window.c:423
 msgid "Brightness"
-msgstr ""
+msgstr "亮度"
 
-#: ../src/empathy-call-window.c:352
+#: ../src/empathy-call-window.c:426
 msgid "Gamma"
-msgstr ""
+msgstr "伽马"
 
-#: ../src/empathy-call-window.c:456
-#, fuzzy
-#| msgid "<b>Volume</b>"
+#: ../src/empathy-call-window.c:531
 msgid "Volume"
-msgstr "<b>音量</b>"
+msgstr "音量"
+
+#: ../src/empathy-call-window.c:662
+msgid "Connecting..."
+msgstr "正在连接..."
 
-#: ../src/empathy-call-window.c:547
+#: ../src/empathy-call-window.c:746
 msgid "_Sidebar"
-msgstr ""
+msgstr "侧边栏(_S)"
 
-#: ../src/empathy-call-window.c:565
+#: ../src/empathy-call-window.c:765
 msgid "Dialpad"
 msgstr ""
 
-#: ../src/empathy-call-window.c:571
+#: ../src/empathy-call-window.c:771
 msgid "Audio input"
-msgstr ""
+msgstr "音频输入"
 
-#: ../src/empathy-call-window.c:575
+#: ../src/empathy-call-window.c:775
 msgid "Video input"
-msgstr ""
+msgstr "视频输入"
 
-#: ../src/empathy-call-window.c:588
-#, fuzzy
-#| msgid "Connecting"
-msgid "Connecting..."
-msgstr "正在连接"
+#: ../src/empathy-call-window.c:835
+#, c-format
+msgid "Call with %s"
+msgstr "与 %s 通话"
+
+#: ../src/empathy-call-window.c:904
+msgid "Call"
+msgstr "通话"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:844
+#: ../src/empathy-call-window.c:1335
 #, c-format
 msgid "Connected — %d:%02dm"
-msgstr ""
+msgstr "已连接 — %d:%02dm"
 
-#: ../src/empathy-call-window.glade.h:1
-#, fuzzy
-#| msgid "Hang Up"
+#: ../src/empathy-call-window.ui.h:1
 msgid "Hang up"
-msgstr "挂断"
+msgstr "挂起"
 
-#: ../src/empathy-call-window.glade.h:2
-#, fuzzy
-#| msgid "Send Video"
+#: ../src/empathy-call-window.ui.h:2
+msgid "Redial"
+msgstr "重播"
+
+#: ../src/empathy-call-window.ui.h:3
 msgid "Send Audio"
-msgstr "发送视频"
+msgstr "发送音频"
 
-#: ../src/empathy-call-window.glade.h:3
-#, fuzzy
-#| msgid "Send Video"
+#: ../src/empathy-call-window.ui.h:4
 msgid "Send video"
 msgstr "发送视频"
 
-#: ../src/empathy-call-window.glade.h:4
+#: ../src/empathy-call-window.ui.h:5
 msgid "Video preview"
-msgstr ""
+msgstr "视频预览"
 
-#: ../src/empathy-call-window.glade.h:6
+#: ../src/empathy-call-window.ui.h:6
+msgid "_Call"
+msgstr "通话(_C)"
+
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
 msgid "_View"
-msgstr ""
+msgstr "查看(_V)"
 
-#: ../src/empathy-chat-window.c:313
+#: ../src/empathy-chat-window.c:344
 #, c-format
 msgid "Conversations (%d)"
 msgstr "对话 (%d)"
 
-#: ../src/empathy-chat-window.c:418
-msgid "Topic:"
-msgstr "话题："
-
-#: ../src/empathy-chat-window.c:423
+#: ../src/empathy-chat-window.c:476
 msgid "Typing a message."
 msgstr "输入消息。"
 
-#: ../src/empathy-chat-window.c:892 ../src/empathy-event-manager.c:429
-#, fuzzy, c-format
-#| msgid ""
-#| "New message from %s:\n"
-#| "%s"
-msgid "New message from %s"
-msgstr ""
-"来自 %s 的新消息：\n"
-"%s"
-
-#: ../src/empathy-chat-window.glade.h:1
-msgid "C_lear"
-msgstr "清除(_L)"
-
-#: ../src/empathy-chat-window.glade.h:2
-msgid "Chat"
-msgstr "聊天"
-
-#: ../src/empathy-chat-window.glade.h:3
-msgid "Insert _Smiley"
-msgstr "插入表情(_M)"
-
-#: ../src/empathy-chat-window.glade.h:4
-msgid "Invitation _message:"
-msgstr "邀请消息(_M)："
-
-#: ../src/empathy-chat-window.glade.h:5
-msgid "Invite"
-msgstr "邀请"
-
-#: ../src/empathy-chat-window.glade.h:6
-msgid "Move Tab _Left"
-msgstr "左移标签(_L)"
-
-#: ../src/empathy-chat-window.glade.h:7
-msgid "Move Tab _Right"
-msgstr "右移标签(_R)"
-
-#: ../src/empathy-chat-window.glade.h:8
-msgid "Select who would you like to invite:"
-msgstr "选择您要邀请的人："
-
-#: ../src/empathy-chat-window.glade.h:9
-msgid "You have been invited to join a chat conference."
-msgstr "您被邀请加入一个聊天会议。"
-
-#: ../src/empathy-chat-window.glade.h:10
-msgid "_Contact"
-msgstr "联系人(_C)"
-
-#: ../src/empathy-chat-window.glade.h:11 ../src/empathy-main-window.glade.h:10
-msgid "_Contents"
-msgstr "内容(_C)"
-
-#: ../src/empathy-chat-window.glade.h:12
-msgid "_Conversation"
-msgstr "对话(_C)"
-
-#: ../src/empathy-chat-window.glade.h:13
-msgid "_Detach Tab"
-msgstr "漂移标签(_D)"
-
-#: ../src/empathy-chat-window.glade.h:15
-msgid "_Favorite Chatroom"
-msgstr "收藏聊天室(_F)"
-
-#: ../src/empathy-chat-window.glade.h:16 ../src/empathy-main-window.glade.h:12
-msgid "_Help"
-msgstr "帮助(_H)"
-
-#: ../src/empathy-chat-window.glade.h:17
-msgid "_Next Tab"
-msgstr "下一标签(_N)"
-
-#: ../src/empathy-chat-window.glade.h:18
-msgid "_Previous Tab"
-msgstr "上一标签(_P)"
-
-#: ../src/empathy-chat-window.glade.h:19
-msgid "_Tabs"
-msgstr "标签(_T)"
-
-#: ../src/empathy-chatrooms-window.c:262
+#: ../src/empathy-chatrooms-window.c:258
 msgid "Name"
 msgstr "名称"
 
-#: ../src/empathy-chatrooms-window.c:280
+#: ../src/empathy-chatrooms-window.c:276
 msgid "Room"
-msgstr "房间"
+msgstr "聊天室"
 
-#: ../src/empathy-chatrooms-window.c:289
+#: ../src/empathy-chatrooms-window.c:285
 msgid "Auto-Connect"
 msgstr "自动连接"
 
-#: ../src/empathy-chatrooms-window.glade.h:2
-msgid "Edit Favorite Room"
-msgstr "编辑房间收藏"
-
-#: ../src/empathy-chatrooms-window.glade.h:3
-msgid "Join room on start_up"
-msgstr "启动时加入房间(_U)"
-
-#: ../src/empathy-chatrooms-window.glade.h:4
-msgid "Join this chat room when Empathy starts and you are connected"
-msgstr "在 Empathy 启动并且您已经连接上时加入此聊天室"
-
-#: ../src/empathy-chatrooms-window.glade.h:5
+#: ../src/empathy-chatrooms-window.ui.h:2
 msgid "Manage Favorite Rooms"
 msgstr "管理聊天室收藏"
 
-#: ../src/empathy-chatrooms-window.glade.h:6
-msgid "N_ame:"
-msgstr "名称(_A)："
-
-#: ../src/empathy-chatrooms-window.glade.h:7
-msgid "S_erver:"
-msgstr "服务器(_E)："
-
-#: ../src/empathy-chatrooms-window.glade.h:9
-#: ../src/empathy-new-chatroom-dialog.glade.h:9
-msgid "_Room:"
-msgstr "房间(_R)："
-
-#: ../src/empathy-event-manager.c:377
+#: ../src/empathy-event-manager.c:321
 msgid "Incoming call"
 msgstr "来电"
 
-#: ../src/empathy-event-manager.c:380
+#: ../src/empathy-event-manager.c:324
 #, c-format
 msgid "%s is calling you, do you want to answer?"
 msgstr "%s 来电，您想要接听吗？"
 
-#: ../src/empathy-event-manager.c:387
+#: ../src/empathy-event-manager.c:331
 msgid "_Reject"
 msgstr "拒绝(_R)"
 
-#: ../src/empathy-event-manager.c:393
+#: ../src/empathy-event-manager.c:337
 msgid "_Answer"
 msgstr "接听(_A)"
 
-#: ../src/empathy-event-manager.c:516
+#: ../src/empathy-event-manager.c:452
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s 的来电"
 
-#: ../src/empathy-event-manager.c:564
+#: ../src/empathy-event-manager.c:496
 #, c-format
 msgid "%s is offering you an invitation"
-msgstr ""
+msgstr "%s 正发送邀请给您"
 
-#: ../src/empathy-event-manager.c:570
-#, fuzzy
-#| msgid ""
-#| "%s is offering you an invitation. An external application will be started "
-#| "to handle it."
+#: ../src/empathy-event-manager.c:502
 msgid "An external application will be started to handle it."
-msgstr "%s 给您发送了一份邀请。将启动一个外部程序来处理它。"
+msgstr "将启动一个外部应用程序来处理它."
 
-#: ../src/empathy-event-manager.c:575
-#, fuzzy
-#| msgid ""
-#| "%s is offering you an invitation, but you don't have the needed external "
-#| "application to handle it."
+#: ../src/empathy-event-manager.c:507
 msgid "You don't have the needed external application to handle it."
-msgstr "%s 给您发送了一份邀请，但是您没有处理它所需的外部程序。"
+msgstr "您没有必需的外部应用程序来处理它."
 
-#: ../src/empathy-event-manager.c:698
-#, fuzzy
-#| msgid "Romanian"
+#: ../src/empathy-event-manager.c:634
 msgid "Room invitation"
-msgstr "罗马尼亚语"
+msgstr "聊天室邀请"
 
-#: ../src/empathy-event-manager.c:701
+#: ../src/empathy-event-manager.c:637
 #, c-format
 msgid "%s is inviting you to join %s"
-msgstr ""
+msgstr "%s 正邀请您加入 %s"
 
-#. Decline button
-#: ../src/empathy-event-manager.c:709 ../src/empathy-ft-manager.c:1032
+#: ../src/empathy-event-manager.c:645
 msgid "_Decline"
 msgstr "拒绝(_D)"
 
-#: ../src/empathy-event-manager.c:714
-#, fuzzy
-#| msgid "Join"
+#: ../src/empathy-event-manager.c:650
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
-msgstr "加入"
+msgstr "加入(_J)"
 
-#: ../src/empathy-event-manager.c:744
+#: ../src/empathy-event-manager.c:689
 #, c-format
 msgid "%s invited you to join %s"
-msgstr ""
+msgstr "%s 已邀请您加入 %s"
 
-#: ../src/empathy-event-manager.c:867
-#, fuzzy, c-format
+#: ../src/empathy-event-manager.c:715
+#, c-format
 msgid "Incoming file transfer from %s"
-msgstr "%s 的来电"
+msgstr "接收 %s 文件传输"
 
-#: ../src/empathy-event-manager.c:961
+#: ../src/empathy-event-manager.c:895
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "%s 的订阅请求"
 
-#: ../src/empathy-event-manager.c:965
+#: ../src/empathy-event-manager.c:899
 #, c-format
 msgid ""
 "\n"
@@ -1698,504 +1908,876 @@ msgstr ""
 "\n"
 "消息：%s"
 
+#. someone is logging off
+#: ../src/empathy-event-manager.c:935
+#, c-format
+msgid "%s is now offline."
+msgstr "%s 当前离线。"
+
+#. someone is logging in
+#: ../src/empathy-event-manager.c:951
+#, c-format
+msgid "%s is now online."
+msgstr "%s 当前在线。"
+
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:114
+#: ../src/empathy-ft-manager.c:101
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:117
+#: ../src/empathy-ft-manager.c:104
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:166
-msgid "No reason was specified"
-msgstr "未指定原因"
-
-#: ../src/empathy-ft-manager.c:168
-msgid "The change in state was requested"
-msgstr ""
-
-#: ../src/empathy-ft-manager.c:170
-msgid "You canceled the file transfer"
-msgstr ""
-
-#: ../src/empathy-ft-manager.c:172
-msgid "The other participant canceled the file transfer"
-msgstr ""
-
-#: ../src/empathy-ft-manager.c:174
-msgid "Error while trying to transfer the file"
-msgstr ""
+#: ../src/empathy-ft-manager.c:180
+msgctxt "file transfer percent"
+msgid "Unknown"
+msgstr "未知"
 
-#: ../src/empathy-ft-manager.c:176
-msgid "The other participant is unable to transfer the file"
-msgstr ""
+#: ../src/empathy-ft-manager.c:275
+#, c-format
+msgid "%s of %s at %s/s"
+msgstr "%2$s 中的 %1$s，速度 %3$s/s"
 
-#: ../src/empathy-ft-manager.c:178
-msgid "Unknown reason"
-msgstr "未知原因"
+#: ../src/empathy-ft-manager.c:276
+#, c-format
+msgid "%s of %s"
+msgstr "%2$s 中的 %1$s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:226
-#, fuzzy, c-format
+#: ../src/empathy-ft-manager.c:307
+#, c-format
 msgid "Receiving \"%s\" from %s"
-msgstr "%s 的来电"
+msgstr "正在从 %2$s 接收 \"%1$s\""
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:229
+#: ../src/empathy-ft-manager.c:310
 #, c-format
 msgid "Sending \"%s\" to %s"
-msgstr ""
+msgstr "正在向 %2$s 发送 \"%1$s\""
 
-#: ../src/empathy-ft-manager.c:239
-msgctxt "file size"
-msgid "Unknown"
-msgstr "未知"
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:340
+#, c-format
+msgid "Error receiving \"%s\" from %s"
+msgstr "从 %2$s 接收 \"%1$s\" 出错"
 
-#. translators: first %s is the transferred size, second %s is
-#. * the total file size
-#: ../src/empathy-ft-manager.c:247
+#: ../src/empathy-ft-manager.c:343
+msgid "Error receiving a file"
+msgstr "接收文件出错"
+
+#: ../src/empathy-ft-manager.c:348
 #, c-format
-msgid "%s of %s"
-msgstr ""
+msgid "Error sending \"%s\" to %s"
+msgstr "向 %2$s 发送 \"%1$s\" 出错"
 
-#: ../src/empathy-ft-manager.c:254
-msgid "Waiting the other participant's response"
-msgstr "正在等待其他参与者的响应"
+#: ../src/empathy-ft-manager.c:351
+msgid "Error sending a file"
+msgstr "发送文件出错"
 
-#: ../src/empathy-ft-manager.c:264
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:490
 #, c-format
 msgid "\"%s\" received from %s"
-msgstr ""
+msgstr "已经从 %2$s 完成接收 \"%1$s\""
 
-#: ../src/empathy-ft-manager.c:270
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:495
 #, c-format
 msgid "\"%s\" sent to %s"
-msgstr ""
+msgstr "已经向 %2$s 完成发送 \"%1$s\""
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:498
 msgid "File transfer completed"
 msgstr "文件传送完成"
 
-#: ../src/empathy-ft-manager.c:282
-#, c-format
-msgid "\"%s\" receiving from %s"
-msgstr ""
+#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784
+msgid "Waiting for the other participant's response"
+msgstr "正在等待其他参与者的回应"
 
-#: ../src/empathy-ft-manager.c:288
+#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
 #, c-format
-msgid "\"%s\" sending to %s"
+msgid "Checking integrity of \"%s\""
 msgstr ""
 
-#: ../src/empathy-ft-manager.c:291
+#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684
 #, c-format
-msgid "File transfer canceled: %s"
-msgstr "文件传送已传送：%s"
-
-#: ../src/empathy-ft-manager.c:306
-msgctxt "remaining time"
-msgid "Unknown"
-msgstr "未知"
-
-#: ../src/empathy-ft-manager.c:366
-msgctxt "file transfer percent"
-msgid "Unknown"
-msgstr "未知"
+msgid "Hashing \"%s\""
+msgstr ""
 
-#: ../src/empathy-ft-manager.c:663
+#: ../src/empathy-ft-manager.c:1024
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:675
+#: ../src/empathy-ft-manager.c:1036
 msgid "File"
 msgstr "文件"
 
-#: ../src/empathy-ft-manager.c:697
+#: ../src/empathy-ft-manager.c:1058
 msgid "Remaining"
 msgstr "剩余"
 
-#: ../src/empathy-ft-manager.c:895
-msgid "Cannot save file to this location"
-msgstr "无法将文件保存到此位置"
-
-#: ../src/empathy-ft-manager.c:941
-msgid "Save file as..."
-msgstr "文件另存为..."
-
-#: ../src/empathy-ft-manager.c:1011
-msgid "unknown size"
-msgstr "未知大小"
-
-#: ../src/empathy-ft-manager.c:1017
-#, c-format
-msgid "%s would like to send you a file"
-msgstr "%s 想要给您发送一个文件"
-
-#. Translators: the first %s is the file name, the second %s is the file size
-#: ../src/empathy-ft-manager.c:1023
-#, c-format
-msgid "Do you want to accept the file \"%s\" (%s)?"
-msgstr "你想要接收文件“%s”(%s)吗？"
+#: ../src/empathy-ft-manager.ui.h:1
+msgid "File Transfers"
+msgstr "文件传输"
 
-#. Accept button
-#: ../src/empathy-ft-manager.c:1041
-msgid "_Accept"
-msgstr "接受(_A)"
-
-#: ../src/empathy-ft-manager.glade.h:1
-msgid "File transfers"
-msgstr "文件传送"
-
-#: ../src/empathy-ft-manager.glade.h:2
+#: ../src/empathy-ft-manager.ui.h:2
 msgid "Remove completed, canceled and failed file transfers from the list"
-msgstr ""
+msgstr "从列表移除已完成、已取消及已失败的文件传输"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-dialog.c:260
+#: ../src/empathy-import-dialog.c:263
 msgid "Import"
 msgstr "导入"
 
-#: ../src/empathy-import-dialog.c:269
+#: ../src/empathy-import-dialog.c:272
 msgid "Protocol"
 msgstr "协议"
 
-#: ../src/empathy-import-dialog.c:295
+#: ../src/empathy-import-dialog.c:298
 msgid "Source"
 msgstr "源"
 
-#: ../src/empathy-import-dialog.c:389
+#: ../src/empathy-import-dialog.c:392
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr "未找到可导入的账户。Empathy 目前只能支持从 Pidgin 导入账户。"
 
-#: ../src/empathy-import-dialog.glade.h:1
+#: ../src/empathy-import-dialog.ui.h:1
 msgid "Import Accounts"
 msgstr "导入账户"
 
-#: ../src/empathy-main-window.c:391
+#: ../src/empathy-main-window.c:402
+msgid "_Edit account"
+msgstr "编辑账户(_E)"
+
+#: ../src/empathy-main-window.c:505
 msgid "No error specified"
 msgstr "没有说明错误"
 
-#: ../src/empathy-main-window.c:394
+#: ../src/empathy-main-window.c:508
 msgid "Network error"
 msgstr "网络错误"
 
-#: ../src/empathy-main-window.c:397
+#: ../src/empathy-main-window.c:511
 msgid "Authentication failed"
 msgstr "验证失败"
 
-#: ../src/empathy-main-window.c:400
+#: ../src/empathy-main-window.c:514
 msgid "Encryption error"
 msgstr "加密错误"
 
-#: ../src/empathy-main-window.c:403
+#: ../src/empathy-main-window.c:517
 msgid "Name in use"
 msgstr "用户名已经被占用"
 
-#: ../src/empathy-main-window.c:406
+#: ../src/empathy-main-window.c:520
 msgid "Certificate not provided"
 msgstr "未提供证书"
 
-#: ../src/empathy-main-window.c:409
+#: ../src/empathy-main-window.c:523
 msgid "Certificate untrusted"
 msgstr "证书不被信任"
 
-#: ../src/empathy-main-window.c:412
+#: ../src/empathy-main-window.c:526
 msgid "Certificate expired"
 msgstr "证书已过期"
 
-#: ../src/empathy-main-window.c:415
+#: ../src/empathy-main-window.c:529
 msgid "Certificate not activated"
 msgstr "证书尚未激活"
 
-#: ../src/empathy-main-window.c:418
+#: ../src/empathy-main-window.c:532
 msgid "Certificate hostname mismatch"
 msgstr "证书主机名不匹配"
 
-#: ../src/empathy-main-window.c:421
+#: ../src/empathy-main-window.c:535
 msgid "Certificate fingerprint mismatch"
 msgstr "证书指纹不匹配"
 
-#: ../src/empathy-main-window.c:424
+#: ../src/empathy-main-window.c:538
 msgid "Certificate self-signed"
 msgstr "证书是自签属的"
 
-#: ../src/empathy-main-window.c:427
+#: ../src/empathy-main-window.c:541
 msgid "Certificate error"
 msgstr "证书错误"
 
-#: ../src/empathy-main-window.c:430
+#: ../src/empathy-main-window.c:544
 msgid "Unknown error"
 msgstr "未知的错误"
 
-#: ../src/empathy-main-window.c:594
+#: ../src/empathy-main-window.c:1293
 msgid "Show and edit accounts"
 msgstr "显示和编辑账户"
 
-#: ../src/empathy-main-window.c:974
-msgid "Contact"
-msgstr "联系人"
-
-#: ../src/empathy-main-window.c:1176
-msgid "_Edit account"
-msgstr "编辑账户(_E)"
-
-#: ../src/empathy-main-window.glade.h:1
+#: ../src/empathy-main-window.ui.h:1
 msgid "Contact List"
 msgstr "联系人列表"
 
-#: ../src/empathy-main-window.glade.h:2
+#: ../src/empathy-main-window.ui.h:2
+msgid "Contacts on a _Map"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:3
 msgid "Context"
 msgstr "上下文"
 
-#: ../src/empathy-main-window.glade.h:3
+#: ../src/empathy-main-window.ui.h:4
 msgid "Join _Favorites"
-msgstr "加入已收藏的房间(_F)"
+msgstr "加入已收藏的聊天室(_F)"
 
-#: ../src/empathy-main-window.glade.h:4
-msgid "Join _New..."
-msgstr "加入新房间(_N)..."
-
-#: ../src/empathy-main-window.glade.h:5
+#: ../src/empathy-main-window.ui.h:5
 msgid "Manage Favorites"
 msgstr "管理收藏夹"
 
-#: ../src/empathy-main-window.glade.h:6
-msgid "Show _Offline Contacts"
-msgstr "显示离线联系人(_O)"
+#: ../src/empathy-main-window.ui.h:6
+msgid "N_ormal Size"
+msgstr "正常尺寸(_O)"
+
+#: ../src/empathy-main-window.ui.h:7
+msgid "Normal Size With _Avatars"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:8
+msgid "Sort by _Name"
+msgstr "按姓姓名序(_N)"
 
-#: ../src/empathy-main-window.glade.h:7
+#: ../src/empathy-main-window.ui.h:9
+msgid "Sort by _Status"
+msgstr "按状态排序(_S)"
+
+#: ../src/empathy-main-window.ui.h:10
 msgid "_Accounts"
 msgstr "账户(_A)"
 
-#: ../src/empathy-main-window.glade.h:8
-msgid "_Add Contact..."
-msgstr "添加联系人(_A)..."
+#: ../src/empathy-main-window.ui.h:13
+msgid "_Compact Size"
+msgstr "紧凑模式(_C)"
+
+#: ../src/empathy-main-window.ui.h:14
+msgid "_Contents"
+msgstr "内容(_C)"
+
+#: ../src/empathy-main-window.ui.h:15
+msgid "_Debug"
+msgstr "调试(_D)"
+
+#: ../src/empathy-main-window.ui.h:17
+msgid "_File Transfers"
+msgstr "文件传输(_F)"
 
-#: ../src/empathy-main-window.glade.h:13 ../src/empathy-status-icon.glade.h:2
+#: ../src/empathy-main-window.ui.h:18
+msgid "_Help"
+msgstr "帮助(_H)"
+
+#: ../src/empathy-main-window.ui.h:19
+msgid "_Join..."
+msgstr "加入(_J)..."
+
+#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2
 msgid "_New Conversation..."
 msgstr "新建对话(_N)..."
 
-#: ../src/empathy-main-window.glade.h:14
+#: ../src/empathy-main-window.ui.h:21
+msgid "_Offline Contacts"
+msgstr "离线联系人(_O)"
+
+#: ../src/empathy-main-window.ui.h:22
 msgid "_Personal Information"
 msgstr "个人信息(_P)"
 
-#: ../src/empathy-main-window.glade.h:16
+#: ../src/empathy-main-window.ui.h:24
+msgid "_Previous Conversations"
+msgstr "最近会话(_P)"
+
+#: ../src/empathy-main-window.ui.h:25
 msgid "_Room"
-msgstr "房间(_R)"
+msgstr "聊天室(_R)"
 
-#: ../src/empathy-new-chatroom-dialog.c:291
-msgid "Chat Rooms"
+#: ../src/empathy-new-chatroom-dialog.c:331
+msgid "Chat Room"
 msgstr "聊天室"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:2
-msgid "Browse:"
-msgstr "浏览："
+#: ../src/empathy-new-chatroom-dialog.c:347
+msgid "Members"
+msgstr "成员"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:3
+#: ../src/empathy-new-chatroom-dialog.c:496
+#, c-format
+msgctxt ""
+"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
+"and a number."
+msgid ""
+"<b>%s</b>\n"
+"Invite required: %s\n"
+"Password required: %s\n"
+"Members: %s"
+msgstr ""
+"<b>%s</b>\n"
+"需要邀请：%s\n"
+"需要邀请：%s\n"
+"成员：%s"
+
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
+msgid "Yes"
+msgstr "是"
+
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
+msgid "No"
+msgstr "否"
+
+#: ../src/empathy-new-chatroom-dialog.c:526
+msgid "Could not start room listing"
+msgstr "无法开始聊天室列表"
+
+#: ../src/empathy-new-chatroom-dialog.c:536
+msgid "Could not stop room listing"
+msgstr "无法停止聊天室列表"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
+msgid "Couldn't load room list"
+msgstr "无法载入聊天室列表"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
 "Enter the room name to join here or click on one or more rooms in the list."
-msgstr "输入房间名以加入或在列表中点击一个或多个房间。"
+msgstr "输入聊天室名以加入或在列表中点击一个或多个聊天室。"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:4
+#: ../src/empathy-new-chatroom-dialog.ui.h:4
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
-msgstr "输入房间所在的服务器，或为空表示房间在当前账户的服务器上。"
+msgstr "输入聊天室所在的服务器，或为空表示聊天室在当前账户的服务器上。"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:5
-msgid "Join"
-msgstr "加入"
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
+msgid "Join Room"
+msgstr "加入聊天室"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:6
-msgid "Join New"
-msgstr "加入新房间"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "Room List"
+msgstr "聊天室列表"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:7
-msgid "Re_fresh"
-msgstr "刷新(_F)"
-
-#: ../src/empathy-new-chatroom-dialog.glade.h:8
-msgid ""
-"This list represents all chat rooms hosted on the server you have entered."
-msgstr "此列表显示您所进入的服务器上的所有聊天室。"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "_Room:"
+msgstr "聊天室(_R)："
 
-#: ../src/empathy-preferences.c:157
+#: ../src/empathy-preferences.c:147
 msgid "Message received"
 msgstr "收到了消息"
 
-#: ../src/empathy-preferences.c:158
+#: ../src/empathy-preferences.c:148
 msgid "Message sent"
 msgstr "发出了消息"
 
-#: ../src/empathy-preferences.c:159
+#: ../src/empathy-preferences.c:149
 msgid "New conversation"
 msgstr "新对话"
 
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:150
 msgid "Contact goes online"
 msgstr "离线人上线"
 
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:151
 msgid "Contact goes offline"
 msgstr "联系人离线"
 
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:152
 msgid "Account connected"
 msgstr "账户已连接"
 
-#: ../src/empathy-preferences.c:163
+#: ../src/empathy-preferences.c:153
 msgid "Account disconnected"
 msgstr "账户已断开连接"
 
-#: ../src/empathy-preferences.c:397
+#: ../src/empathy-preferences.c:393
 msgid "Language"
 msgstr "语言"
 
-#: ../src/empathy-preferences.glade.h:1
-msgid "<b>Appearance</b>"
-msgstr "<b>外观</b>"
-
-#: ../src/empathy-preferences.glade.h:2
-#, fuzzy
-#| msgid "<b>Behaviour</b>"
-msgid "<b>Behavior</b>"
-msgstr "<b>行为</b>"
+#: ../src/empathy-preferences.ui.h:1
+msgid "Allow _GPS usage"
+msgstr "允许使用 _GPS 信息"
 
-#: ../src/empathy-preferences.glade.h:3
-msgid "<b>Contact List</b>"
-msgstr "<b>联系人列表</b>"
+#: ../src/empathy-preferences.ui.h:2
+msgid "Allow _cellphone usage"
+msgstr "允许使用网络信息(_C)"
 
-#: ../src/empathy-preferences.glade.h:4
-msgid "<b>Enable spell checking for languages:</b>"
-msgstr "<b>启用拼写检查的语言：</b>"
+#: ../src/empathy-preferences.ui.h:3
+msgid "Allow _network usage"
+msgstr "允许使用网络信息(_N)"
 
-#: ../src/empathy-preferences.glade.h:5
-msgid "<b>Play sound for events</b>"
-msgstr "<b>播放声音的事件</b>"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Appearance"
+msgstr "外观"
 
-#: ../src/empathy-preferences.glade.h:6
-msgid ""
-"<small>The list of languages reflects only the languages for which you have "
-"a dictionary installed.</small>"
-msgstr "<small>语言列表仅包含您已安装词典的语言。</small>"
-
-#: ../src/empathy-preferences.glade.h:7
+#: ../src/empathy-preferences.ui.h:5
 msgid "Automatically _connect on startup "
-msgstr "启动时自动登录(_C)"
+msgstr "启动时自动登录(_C) "
 
-#: ../src/empathy-preferences.glade.h:8
-msgid "Avatars are user chosen images shown in the contact list"
-msgstr "头像是用户选择的显示在联系人列表中的图片"
+#: ../src/empathy-preferences.ui.h:6
+msgid "Behavior"
+msgstr "行为"
 
-#: ../src/empathy-preferences.glade.h:9
+#: ../src/empathy-preferences.ui.h:7
 msgid "Chat Th_eme:"
 msgstr "聊天主题(_E)："
 
-#: ../src/empathy-preferences.glade.h:10
-#, fuzzy
-#| msgid "Disable sounds when _away or busy"
+#: ../src/empathy-preferences.ui.h:8
 msgid "Disable notifications when _away or busy"
-msgstr "离开或忙时禁用声音(_A)"
+msgstr "离开或忙碌时禁用提示(_A)"
 
-#: ../src/empathy-preferences.glade.h:11
+#: ../src/empathy-preferences.ui.h:9
 msgid "Disable sounds when _away or busy"
-msgstr "离开或忙时禁用声音(_A)"
+msgstr "离开或忙碌时禁用声音(_A)"
+
+#: ../src/empathy-preferences.ui.h:10
+msgid "Enable notifications when a contact comes online"
+msgstr "当联系人上线时允许提示"
 
-#: ../src/empathy-preferences.glade.h:12
+#: ../src/empathy-preferences.ui.h:11
+msgid "Enable notifications when a contact goes offline"
+msgstr "当联系人离线时允许提示"
+
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr ""
 
-#: ../src/empathy-preferences.glade.h:13
+#: ../src/empathy-preferences.ui.h:13
+msgid "Enable spell checking for languages:"
+msgstr "允许拼写检查的语言："
+
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "常规"
 
-#: ../src/empathy-preferences.glade.h:14
-#, fuzzy
-#| msgid "Use notification sounds"
+#: ../src/empathy-preferences.ui.h:15
+msgid "Geoclue Settings"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Location"
+msgstr "位置"
+
+#: ../src/empathy-preferences.ui.h:17
 msgid "Notifications"
-msgstr "使用通知声音"
+msgstr "提示"
+
+#: ../src/empathy-preferences.ui.h:18
+msgid "Play sound for events"
+msgstr "播放事件声音"
 
-#: ../src/empathy-preferences.glade.h:15
+#: ../src/empathy-preferences.ui.h:19
 msgid "Preferences"
 msgstr "首选项"
 
-#: ../src/empathy-preferences.glade.h:16
-msgid "Show _avatars"
-msgstr "显示头像(_A)"
+#: ../src/empathy-preferences.ui.h:20
+msgid "Privacy"
+msgstr "隐私"
+
+#: ../src/empathy-preferences.ui.h:21
+msgid ""
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will have a random "
+"value added (&#xB1;0.25&#xB0;)."
+msgstr ""
 
-#: ../src/empathy-preferences.glade.h:17
+#: ../src/empathy-preferences.ui.h:22
 msgid "Show _smileys as images"
 msgstr "显示表情符号为图形(_S)"
 
-#: ../src/empathy-preferences.glade.h:18
-msgid "Show co_mpact contact list"
-msgstr "紧凑显示联系人列表(_M)"
+#: ../src/empathy-preferences.ui.h:23
+msgid "Show contact _list in rooms"
+msgstr "在聊天室显示联系人列表(_L)"
 
-#: ../src/empathy-preferences.glade.h:19
-msgid "Sort by _name"
-msgstr "按名称排序(_N)"
-
-#: ../src/empathy-preferences.glade.h:20
-msgid "Sort by s_tate"
-msgstr "按状态排序(_T)"
-
-#: ../src/empathy-preferences.glade.h:21
+#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "声音"
 
-#: ../src/empathy-preferences.glade.h:22
+#: ../src/empathy-preferences.ui.h:25
 msgid "Spell Checking"
 msgstr "拼写检查"
 
-#: ../src/empathy-preferences.glade.h:23
+#: ../src/empathy-preferences.ui.h:26
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:27
 msgid "Themes"
 msgstr "主题"
 
-#: ../src/empathy-preferences.glade.h:24
-#, fuzzy
-#| msgid "_Enable sound notifications"
+#: ../src/empathy-preferences.ui.h:28
 msgid "_Enable bubble notifications"
-msgstr "启用声音通知(_E)"
+msgstr "允许气泡通知(_E)"
 
-#: ../src/empathy-preferences.glade.h:25
+#: ../src/empathy-preferences.ui.h:29
 msgid "_Enable sound notifications"
 msgstr "启用声音通知(_E)"
 
-#: ../src/empathy-preferences.glade.h:26
+#: ../src/empathy-preferences.ui.h:30
 msgid "_Open new chats in separate windows"
 msgstr "在单独窗口中打开新聊天(_O)"
 
-#: ../src/empathy-status-icon.glade.h:1
+#: ../src/empathy-preferences.ui.h:31
+msgid "_Publish location to my contacts"
+msgstr "向我的联系人公布位置信息(_P)"
+
+#: ../src/empathy-preferences.ui.h:32
+msgid "_Reduce location accuracy"
+msgstr "降低位置信息精度(_R)"
+
+#: ../src/empathy-status-icon.ui.h:1
 msgid "Status"
 msgstr "状态"
 
-#: ../src/empathy-status-icon.glade.h:3
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_Quit"
 msgstr "退出(_Q)"
 
-#: ../src/empathy-status-icon.glade.h:4
+#: ../src/empathy-status-icon.ui.h:4
 msgid "_Show Contact List"
 msgstr "显示联系人列表(_S)"
 
-#: ../src/empathy-tube-dispatch.c:364
+#: ../src/empathy-tube-dispatch.c:375
 #, c-format
 msgid "Unable to start application for service %s: %s"
 msgstr ""
 
-#: ../src/empathy-tube-dispatch.c:435
-#, fuzzy, c-format
-#| msgid ""
-#| "%s is offering you an invitation, but you don't have the needed external "
-#| "application to handle it."
+#: ../src/empathy-tube-dispatch.c:446
+#, c-format
 msgid ""
 "An invitation was offered for service %s, but you don't have the needed "
 "application to handle it"
-msgstr "%s 给您发送了一份邀请，但是您没有处理它所需的外部程序。"
+msgstr ""
+
+#: ../src/empathy-call-window-fullscreen.ui.h:1
+msgid "gtk-leave-fullscreen"
+msgstr ""
+
+#: ../src/empathy-map-view.ui.h:1
+msgid "Contact Map View"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
+msgid "Error"
+msgstr "错误"
+
+#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
+msgid "Critical"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
+msgid "Warning"
+msgstr "警告"
+
+#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065
+#: ../src/empathy-debug-dialog.c:1113
+msgid "Message"
+msgstr "消息"
+
+#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059
+msgid "Info"
+msgstr "信息"
+
+#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053
+msgid "Debug"
+msgstr "调试"
+
+#: ../src/empathy-debug-dialog.c:845
+msgid "Save"
+msgstr "保存"
+
+#: ../src/empathy-debug-dialog.c:948
+msgid "Debug Window"
+msgstr "调试窗口"
+
+#: ../src/empathy-debug-dialog.c:1021
+msgid "Pause"
+msgstr "暂停"
+
+#: ../src/empathy-debug-dialog.c:1033
+msgid "Level "
+msgstr "级别 "
+
+#: ../src/empathy-debug-dialog.c:1102
+msgid "Time"
+msgstr "时间"
+
+#: ../src/empathy-debug-dialog.c:1104
+msgid "Domain"
+msgstr "域"
+
+#: ../src/empathy-debug-dialog.c:1106
+msgid "Category"
+msgstr "类别"
+
+#: ../src/empathy-debug-dialog.c:1108
+msgid "Level"
+msgstr "级别"
+
+#: ../src/empathy-debug-dialog.c:1140
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr ""
+
+#~ msgid "<b>Advanced</b>"
+#~ msgstr "<b>高级</b>"
+
+#~ msgid "Forget password and clear the entry."
+#~ msgstr "忘记密码并清空输入框。"
+
+#~ msgid "<b>Network</b>"
+#~ msgstr "<b>网络</b>"
+
+#~ msgid "<b>Servers</b>"
+#~ msgstr "<b>服务器</b>"
+
+#~ msgid "Create a new IRC network"
+#~ msgstr "创建新的 IRC 网络"
+
+#~ msgid "Edit the selected IRC network"
+#~ msgstr "编辑选中的 IRC 网络"
+
+#~ msgid "Remove the selected IRC network"
+#~ msgstr "删除选中的 IRC 网络"
+
+#~ msgid "<b>Override server settings</b>"
+#~ msgstr "<b>覆盖服务器设置</b>"
+
+#~ msgid "_Check Word Spelling..."
+#~ msgstr "拼写检查(_C)..."
+
+#~ msgid "<b>Topic:</b>"
+#~ msgstr "<b>话题：</b>"
+
+#~ msgid "Group Chat"
+#~ msgstr "群聊"
+
+#~ msgid "Contact Information"
+#~ msgstr "联系人信息"
+
+#~ msgid "I would like to add you to my contact list."
+#~ msgstr "我希望可以将您加入我的联系人列表中。"
+
+#~ msgid "Sorry, I don't want you in my contact list anymore."
+#~ msgstr "对不起，我不想让您以后出现在我的联系人列表中了。"
+
+#~ msgid "<b>Client Information</b>"
+#~ msgstr "<b>客户端信息</b>"
+
+#~ msgid "<b>Contact Details</b>"
+#~ msgstr "<b>联系人详情</b>"
+
+#~ msgid "<b>Contact</b>"
+#~ msgstr "<b>联系人</b>"
+
+#~ msgid "<b>Groups</b>"
+#~ msgstr "<b>群组</b>"
+
+#~ msgid "Contact information"
+#~ msgstr "联系人信息"
+
+#~ msgid "Custom message"
+#~ msgstr "自定义消息"
+
+#~ msgid "Message:"
+#~ msgstr "消息："
+
+#~ msgid "Save message"
+#~ msgstr "保存消息"
+
+#~ msgid "Status:"
+#~ msgstr "状态："
+
+#~ msgid "Word"
+#~ msgstr "单词"
+
+#~ msgid "Suggestions for the word"
+#~ msgstr "单词的拼写建议"
+
+#~ msgid "Spell Checker"
+#~ msgstr "拼写检查器"
+
+#~ msgid "Suggestions for the word:"
+#~ msgstr "单词的拼写建议："
+
+#~ msgid "<b>New Account</b>"
+#~ msgstr "<b>新建账户</b>"
+
+#~ msgid "<b>No protocol installed</b>"
+#~ msgstr "<b>未安装协议</b>"
+
+#~ msgid "<b>Settings</b>"
+#~ msgstr "<b>设置</b>"
+
+#~ msgid "I already have an account I want to use"
+#~ msgstr "我已经拥有账户，我想使用它"
+
+#~ msgid "C_lear"
+#~ msgstr "清除(_L)"
+
+#~ msgid "Chat"
+#~ msgstr "聊天"
+
+#~ msgid "Insert _Smiley"
+#~ msgstr "插入表情(_M)"
+
+#~ msgid "Invitation _message:"
+#~ msgstr "邀请消息(_M)："
+
+#~ msgid "Invite"
+#~ msgstr "邀请"
+
+#~ msgid "Move Tab _Left"
+#~ msgstr "左移标签(_L)"
+
+#~ msgid "Move Tab _Right"
+#~ msgstr "右移标签(_R)"
+
+#~ msgid "Select who would you like to invite:"
+#~ msgstr "选择您要邀请的人："
+
+#~ msgid "You have been invited to join a chat conference."
+#~ msgstr "您被邀请加入一个聊天会议。"
+
+#~ msgid "_Contact"
+#~ msgstr "联系人(_C)"
+
+#~ msgid "_Conversation"
+#~ msgstr "对话(_C)"
+
+#~ msgid "_Detach Tab"
+#~ msgstr "漂移标签(_D)"
+
+#~ msgid "_Favorite Chatroom"
+#~ msgstr "收藏聊天室(_F)"
+
+#~ msgid "_Next Tab"
+#~ msgstr "下一标签(_N)"
+
+#~ msgid "_Previous Tab"
+#~ msgstr "上一标签(_P)"
+
+#~ msgid "_Tabs"
+#~ msgstr "标签(_T)"
+
+#~ msgid "Edit Favorite Room"
+#~ msgstr "编辑聊天室收藏"
+
+#~ msgid "Join room on start_up"
+#~ msgstr "启动时加入聊天室(_U)"
+
+#~ msgid "Join this chat room when Empathy starts and you are connected"
+#~ msgstr "在 Empathy 启动并且您已经连接上时加入此聊天室"
+
+#~ msgid "N_ame:"
+#~ msgstr "名称(_A)："
+
+#~ msgid "S_erver:"
+#~ msgstr "服务器(_E)："
+
+#~ msgctxt "file size"
+#~ msgid "Unknown"
+#~ msgstr "未知"
+
+#~ msgid "Waiting the other participant's response"
+#~ msgstr "正在等待其他参与者的响应"
+
+#~ msgid "File transfer canceled: %s"
+#~ msgstr "文件传送已传送：%s"
+
+#~ msgctxt "remaining time"
+#~ msgid "Unknown"
+#~ msgstr "未知"
+
+#~ msgid "Cannot save file to this location"
+#~ msgstr "无法将文件保存到此位置"
+
+#~ msgid "Save file as..."
+#~ msgstr "文件另存为..."
+
+#~ msgid "unknown size"
+#~ msgstr "未知大小"
+
+#~ msgid "%s would like to send you a file"
+#~ msgstr "%s 想要给您发送一个文件"
+
+#~ msgid "Do you want to accept the file \"%s\" (%s)?"
+#~ msgstr "您想要接收文件“%s”(%s)吗？"
+
+#~ msgid "_Accept"
+#~ msgstr "接受(_A)"
+
+#~ msgid "File transfers"
+#~ msgstr "文件传送"
+
+#~ msgid "Join _New..."
+#~ msgstr "加入新聊天室(_N)..."
+
+#~ msgid "Show _Offline Contacts"
+#~ msgstr "显示离线联系人(_O)"
+
+#~ msgid "Chat Rooms"
+#~ msgstr "聊天室"
+
+#~ msgid "Browse:"
+#~ msgstr "浏览："
+
+#~ msgid "Join"
+#~ msgstr "加入"
+
+#~ msgid "Join New"
+#~ msgstr "加入新聊天室"
+
+#~ msgid "Re_fresh"
+#~ msgstr "刷新(_F)"
+
+#~ msgid ""
+#~ "This list represents all chat rooms hosted on the server you have entered."
+#~ msgstr "此列表显示您所进入的服务器上的所有聊天室。"
+
+#~ msgid "<b>Appearance</b>"
+#~ msgstr "<b>外观</b>"
+
+#~ msgid "<b>Contact List</b>"
+#~ msgstr "<b>联系人列表</b>"
+
+#~ msgid "<b>Enable spell checking for languages:</b>"
+#~ msgstr "<b>启用拼写检查的语言：</b>"
+
+#~ msgid "<b>Play sound for events</b>"
+#~ msgstr "<b>播放声音的事件</b>"
+
+#~ msgid ""
+#~ "<small>The list of languages reflects only the languages for which you "
+#~ "have a dictionary installed.</small>"
+#~ msgstr "<small>语言列表仅包含您已安装词典的语言。</small>"
+
+#~ msgid "Avatars are user chosen images shown in the contact list"
+#~ msgstr "头像是用户选择的显示在联系人列表中的图片"
+
+#~ msgid "Show _avatars"
+#~ msgstr "显示头像(_A)"
+
+#~ msgid "Show co_mpact contact list"
+#~ msgstr "紧凑显示联系人列表(_M)"
+
+#~ msgid "Sort by _name"
+#~ msgstr "按名称排序(_N)"
+
+#~ msgid "Sort by s_tate"
+#~ msgstr "按状态排序(_T)"
 
 #~ msgid "Enable popup when contact is available"
 #~ msgstr "启用联系人上线时弹出通知"
author	Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>	2009-08-01 16:32:39 +0800
committer	Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>	2009-08-01 16:32:39 +0800
commit	3e8f25168aadd741ecc0fe8da4d1847eece5ff83 (patch)
tree	69b2fc8984c98b9cad38d2ca5e8563da2b9aad8a /po
parent	41e5b31c1918f40c3ba47bff2dc9ab682fe0391f (diff)
parent	87070d25c5f2d9a0ecba73e8ce913eca7f183c79 (diff)
download	gsoc2013-empathy-3e8f25168aadd741ecc0fe8da4d1847eece5ff83.tar gsoc2013-empathy-3e8f25168aadd741ecc0fe8da4d1847eece5ff83.tar.gz gsoc2013-empathy-3e8f25168aadd741ecc0fe8da4d1847eece5ff83.tar.bz2 gsoc2013-empathy-3e8f25168aadd741ecc0fe8da4d1847eece5ff83.tar.lz gsoc2013-empathy-3e8f25168aadd741ecc0fe8da4d1847eece5ff83.tar.xz gsoc2013-empathy-3e8f25168aadd741ecc0fe8da4d1847eece5ff83.tar.zst gsoc2013-empathy-3e8f25168aadd741ecc0fe8da4d1847eece5ff83.zip