Merge branch 'master' into call1

21 files changed, 5311 insertions, 5144 deletions

diff --git a/NEWS b/NEWS
index 8a3611521..df6866024 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,43 @@
+NEW in 3.3.4 (16/01/2012)
+============
+
+The empathy-accounts dialog has been partially re-designed, please report any
+regression you may experience.
+
+Dependencies:
+ • champlain ≥ 0.12.1 (optional)
+
+Bugs fixed:
+ - Fixed #631236, Adding # on mistyping of channel names (Jovanka Gulicoska)
+ - Fixed #652670, Combine account parameter editing and personal information editing (Danielle Madeley, Guillaume Desmottes)
+ - Fixed #661500, Display map in tooltip (Guillaume Desmottes)
+ - Fixed #666864, Can't link contacts
+ - Fixed #667676, segfault in empathy-chat (Guillaume Desmottes)
+ - Fixed #667743, Topup menu item not displayed when re-connecting account (Guillaume Desmottes)
+ - Fixed #667791, Should set Account.Service on IRC accounts (Guillaume Desmottes)
+ - Fixed #666531, Invite IRC contacts to join room broken (Guillaume Desmottes)
+
+Translations:
+ - Updated be Translation (Kasia Bondarava)
+ - Updated es Translation (Daniel Mustieles)
+ - Updated et Translation (Mattias Põldaru)
+ - Updated gl Translation (Fran Diéguez)
+ - Updated he Translation (Yaron Shahrabani)
+ - Updated hu Translation (Gabor Kelemen)
+ - Updated mk Translation (Jovan Naumovski)
+ - Updated nl Translation (Hannie Dumoleyn)
+ - Updated ru Translation (Yuri Myasoedov)
+ - Updated tr Translation (Muhammet Kara)
+ - Updated xh Translation (Andiswa Mvanyashe)
+ - Updated zh_HK Translation (Cheng-Chia Tseng)
+ - Updated zh_TW Translation (Cheng-Chia Tseng)
+
+Documentation translations:
+ - Updated es Documentation translation (Daniel Mustieles)
+ - Updated fr Documentation translation (Bruno Brouard)
+ - Updated pl Documentation translation (Piotr Drąg)
+ - Updated sl Documentation translation (Andrej Žnidaršič)
+
 NEW in 3.3.3 (19/12/2011)
 ============
 
diff --git a/configure.ac b/configure.ac
index efc7583b6..939237800 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ m4_define(empathy_released, 0)
 
 m4_define([empathy_major_version], [3])
 m4_define([empathy_minor_version], [3])
-m4_define([empathy_micro_version], [3])
+m4_define([empathy_micro_version], [4])
 m4_define([empathy_nano_version], [0])
 
 dnl Display the nano_version only if it's not '0'
diff --git a/help/gl/gl.po b/help/gl/gl.po
index c2f0f98cc..9d3405ae6 100644
--- a/help/gl/gl.po
+++ b/help/gl/gl.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the tomboy package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # Fran Diéguez <frandieguez@gnome.org>, 2011.
-# Fran Dieguez <frandieguez@gnome.org>, 2011.
+# Fran Dieguez <frandieguez@gnome.org>, 2011, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: tomboy gnome-2-28\n"
-"POT-Creation-Date: 2011-09-08 06:13+0000\n"
-"PO-Revision-Date: 2011-09-09 14:54+0200\n"
+"POT-Creation-Date: 2011-12-19 21:11+0000\n"
+"PO-Revision-Date: 2012-01-16 23:06+0100\n"
 "Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
 "Language-Team: Galician <gnome-l10n-gl@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,11 +19,8 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/video-call.page:38(None) C/audio-video.page:70(None)
+#: C/video-call.page:39(None) C/audio-video.page:70(None)
 #: C/audio-call.page:36(None)
-#| msgid ""
-#| "@@image: 'figures/add-to-notebook.png'; "
-#| "md5=03469ddb5137f525ac4f8318caed5532"
 msgid "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
 msgstr ""
 "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
@@ -32,12 +29,12 @@ msgstr ""
 msgid "Start a video conversation with one of your contacts."
 msgstr "Comezar unha conversa de vídeo con un dos seus contactos."
 
-#: C/video-call.page:21(name) C/status-icons.page:16(name)
+#: C/video-call.page:22(name) C/status-icons.page:16(name)
 #: C/share-desktop.page:14(name) C/set-custom-status.page:19(name)
 #: C/send-file.page:21(name) C/salut-protocol.page:18(name)
-#: C/remove-account.page:18(name) C/prob-conn-neterror.page:18(name)
-#: C/prob-conn-name.page:17(name) C/prob-conn-auth.page:21(name)
-#: C/prob-conn-acctdisabled.page:18(name) C/prev-conv.page:16(name)
+#: C/remove-account.page:19(name) C/prob-conn-neterror.page:19(name)
+#: C/prob-conn-name.page:18(name) C/prob-conn-auth.page:21(name)
+#: C/prob-conn-acctdisabled.page:19(name) C/prev-conv.page:17(name)
 #: C/link-contacts.page:15(name) C/irc-start-conversation.page:15(name)
 #: C/irc-send-file.page:16(name) C/irc-nick-password.page:18(name)
 #: C/irc-manage.page:20(name) C/irc-join-room.page:16(name)
@@ -48,18 +45,18 @@ msgstr "Comezar unha conversa de vídeo con un dos seus contactos."
 #: C/geolocation-turn.page:18(name) C/geolocation-supported.page:16(name)
 #: C/geolocation-privacy.page:17(name) C/geolocation-not-showing.page:17(name)
 #: C/geolocation.page:17(name) C/favorite-rooms.page:14(name)
-#: C/disable-account.page:20(name) C/create-account.page:19(name)
+#: C/disable-account.page:21(name) C/create-account.page:19(name)
 #: C/audio-video.page:17(name) C/audio-call.page:19(name)
-#: C/add-account.page:20(name)
+#: C/add-account.page:21(name)
 msgid "Milo Casagrande"
 msgstr "Milo Casagrande"
 
-#: C/video-call.page:22(email) C/status-icons.page:17(email)
+#: C/video-call.page:23(email) C/status-icons.page:17(email)
 #: C/share-desktop.page:15(email) C/set-custom-status.page:20(email)
 #: C/send-file.page:22(email) C/salut-protocol.page:19(email)
-#: C/remove-account.page:19(email) C/prob-conn-neterror.page:19(email)
-#: C/prob-conn-name.page:18(email) C/prob-conn-auth.page:22(email)
-#: C/prob-conn-acctdisabled.page:19(email) C/prev-conv.page:17(email)
+#: C/remove-account.page:20(email) C/prob-conn-neterror.page:20(email)
+#: C/prob-conn-name.page:19(email) C/prob-conn-auth.page:22(email)
+#: C/prob-conn-acctdisabled.page:20(email) C/prev-conv.page:18(email)
 #: C/link-contacts.page:16(email) C/irc-start-conversation.page:16(email)
 #: C/irc-send-file.page:17(email) C/irc-nick-password.page:19(email)
 #: C/irc-manage.page:21(email) C/irc-join-room.page:17(email)
@@ -70,19 +67,19 @@ msgstr "Milo Casagrande"
 #: C/geolocation-turn.page:19(email) C/geolocation-supported.page:17(email)
 #: C/geolocation-privacy.page:18(email)
 #: C/geolocation-not-showing.page:18(email) C/geolocation.page:18(email)
-#: C/favorite-rooms.page:15(email) C/disable-account.page:21(email)
+#: C/favorite-rooms.page:15(email) C/disable-account.page:22(email)
 #: C/create-account.page:20(email) C/audio-video.page:18(email)
-#: C/audio-call.page:20(email) C/add-account.page:21(email)
+#: C/audio-call.page:20(email) C/add-account.page:22(email)
 msgid "milo@ubuntu.com"
 msgstr "milo@ubuntu.com"
 
-#: C/video-call.page:25(p) C/status-icons.page:24(p)
+#: C/video-call.page:26(p) C/status-icons.page:24(p)
 #: C/share-desktop.page:22(p) C/set-custom-status.page:23(p)
 #: C/send-message.page:21(p) C/send-file.page:25(p)
-#: C/salut-protocol.page:22(p) C/remove-account.page:22(p)
-#: C/prob-conn.page:18(p) C/prob-conn-neterror.page:22(p)
-#: C/prob-conn-name.page:21(p) C/prob-conn-auth.page:25(p)
-#: C/prob-conn-acctdisabled.page:22(p) C/prev-conv.page:24(p)
+#: C/salut-protocol.page:22(p) C/remove-account.page:23(p)
+#: C/prob-conn.page:18(p) C/prob-conn-neterror.page:23(p)
+#: C/prob-conn-name.page:22(p) C/prob-conn-auth.page:25(p)
+#: C/prob-conn-acctdisabled.page:23(p) C/prev-conv.page:25(p)
 #: C/link-contacts.page:19(p) C/irc-start-conversation.page:19(p)
 #: C/irc-send-file.page:20(p) C/irc-nick-password.page:22(p)
 #: C/irc-manage.page:24(p) C/irc-join-room.page:20(p)
@@ -92,31 +89,36 @@ msgstr "milo@ubuntu.com"
 #: C/geolocation-what-is.page:22(p) C/geolocation-turn.page:22(p)
 #: C/geolocation-supported.page:20(p) C/geolocation-privacy.page:21(p)
 #: C/geolocation-not-showing.page:21(p) C/geolocation.page:21(p)
-#: C/favorite-rooms.page:18(p) C/disable-account.page:28(p)
-#: C/create-account.page:23(p) C/change-status.page:23(p)
+#: C/favorite-rooms.page:18(p) C/disable-account.page:29(p)
+#: C/create-account.page:23(p) C/change-status.page:28(p)
 #: C/audio-video.page:21(p) C/audio-call.page:23(p) C/add-contact.page:22(p)
-#: C/add-account.page:28(p) C/accounts-window.page:22(p)
+#: C/add-account.page:29(p) C/accounts-window.page:22(p)
 #: C/account-jabber.page:18(p) C/account-irc.page:20(p)
 msgid "Creative Commons Share Alike 3.0"
 msgstr "Creative Commons Compartir Igual 3.0"
 
-#: C/video-call.page:28(title)
+#: C/video-call.page:29(title)
 msgid "Start a video conversation"
 msgstr "Comezar unha conversa de vídeo"
 
-#: C/video-call.page:30(p)
+#: C/video-call.page:31(p)
+#| msgid ""
+#| "If you have a webcam, you can call your contacts and have a video "
+#| "conversation with them. This features only works with certain types of "
+#| "accounts, and it requires the other person to have an application that "
+#| "supports video calls."
 msgid ""
 "If you have a webcam, you can call your contacts and have a video "
-"conversation with them. This features only works with certain types of "
+"conversation with them. This feature only works with certain types of "
 "accounts, and it requires the other person to have an application that "
 "supports video calls."
 msgstr ""
-"Se ten unha cámara web poderá facer chamadas aos seus contactos e ter unha "
-"conversa con vídeo con eles. Estas funcionalidades só funcionarán con certos "
-"tipos de contas, e require que outra persoa teña un aplicativo que admita as "
+"Se ten unha cámara web poderá facer chamadas aos seus contactos e ter unha "
+"conversa con vídeo con eles. Estas funcionalidades só funcionan en certos "
+"tipos de contas, e require que outra persoa teña un aplicativo que admita as "
 "videochamadas."
 
-#: C/video-call.page:37(p)
+#: C/video-call.page:38(p)
 msgid ""
 "From the <gui>Contact List</gui> window, click the <media type=\"image\" "
 "mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon "
@@ -128,7 +130,7 @@ msgstr ""
 "media> ao lado do nome do contacto ao que quere chamar e seleccione <gui "
 "style=\"menuitem\">Videochamada</gui>."
 
-#: C/video-call.page:43(p) C/audio-call.page:42(p)
+#: C/video-call.page:44(p) C/audio-call.page:42(p)
 msgid ""
 "A new window will open. When the connection is established, you will see "
 "<gui>Connected</gui> at the bottom of the window, along with the total "
@@ -138,11 +140,11 @@ msgstr ""
 "<placeholder-2/> na parte inferior da xanela, ao carón do tempo de conversa "
 "total."
 
-#: C/video-call.page:48(p) C/audio-call.page:48(p)
+#: C/video-call.page:49(p) C/audio-call.page:48(p)
 msgid "To end the conversation, click on <gui style=\"button\">Hang up</gui>."
 msgstr "Para rematar a conversa, prema sobre <placeholder-1/>"
 
-#: C/video-call.page:54(p)
+#: C/video-call.page:55(p)
 msgid ""
 "To turn a video conversation into an audio conversation, choose <guiseq><gui "
 "style=\"menu\">Video</gui><gui style=\"menuitem\">Video Off</gui></guiseq>."
@@ -151,18 +153,18 @@ msgstr ""
 "<guiseq><gui style=\"menu\">Vídeo</gui><gui style=\"menuitem\">Desactivar "
 "vídeo</gui></guiseq>."
 
-#: C/video-call.page:60(title)
+#: C/video-call.page:61(title)
 msgid "Start a video conversation with a meta-contact"
 msgstr "Comezar unha conversa de vídeo con un metacontacto."
 
-#: C/video-call.page:63(p) C/send-message.page:53(p) C/audio-call.page:66(p)
+#: C/video-call.page:64(p) C/send-message.page:53(p) C/audio-call.page:66(p)
 msgid ""
 "From the <gui>Contact List</gui> window, right-click on the meta-contact."
 msgstr ""
 "Desde a xanela <gui>Lista de contactos</gui>, prema co botón dereito sobre "
 "un metacontacto."
 
-#: C/video-call.page:68(p)
+#: C/video-call.page:69(p)
 msgid ""
 "Select the contact you want to have the conversation, and from the menu "
 "select <gui style=\"menuitem\">Video Call</gui>."
@@ -170,7 +172,7 @@ msgstr ""
 "Seleccione o contacto co que desexe ter unha conversa e desde o menú "
 "seleccione <gui style=\"menuitem\">Vídeochamada</gui>."
 
-#: C/video-call.page:75(p) C/send-message.page:65(p) C/audio-call.page:78(p)
+#: C/video-call.page:76(p) C/send-message.page:65(p) C/audio-call.page:78(p)
 msgid ""
 "To recognize if a contact is a <em>meta-contact</em>, move your mouse on a "
 "contact in the <gui>Contact List</gui> window, and stop over it for a "
@@ -185,16 +187,12 @@ msgstr ""
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/status-icons.page:39(None)
-#| msgid ""
-#| "@@image: 'figures/note-template.png'; md5=49ee364d7e060de4e7a583e49a2f7db7"
 msgid "@@image: 'figures/available.png'; md5=2196b2f0ad4ce26fdb7b9d48e75d1947"
 msgstr "@@image: 'figures/available.png'; md5=2196b2f0ad4ce26fdb7b9d48e75d1947"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/status-icons.page:45(None)
-#| msgid ""
-#| "@@image: 'figures/tomboy-panel.png'; md5=37fb8231c5dece7539e3471b76ec0d00"
 msgid "@@image: 'figures/busy.png'; md5=15eb2adff5faedf97b0cb9105d09410a"
 msgstr "@@image: 'figures/busy.png'; md5=15eb2adff5faedf97b0cb9105d09410a"
 
@@ -207,8 +205,6 @@ msgstr "@@image: 'figures/away.png'; md5=9c504d6ffa0cf1a9cc8933d16e1bea33"
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/status-icons.page:62(None) C/status-icons.page:69(None)
-#| msgid ""
-#| "@@image: 'figures/tomboy-panel.png'; md5=37fb8231c5dece7539e3471b76ec0d00"
 msgid "@@image: 'figures/offline.png'; md5=c5b0c21181cbd6e13f8909243c0fa964"
 msgstr "@@image: 'figures/offline.png'; md5=c5b0c21181cbd6e13f8909243c0fa964"
 
@@ -217,17 +213,17 @@ msgid "Understanding the various statuses and status icons."
 msgstr "Entendendo os diferentes estados e iconas de estado."
 
 #: C/status-icons.page:20(name) C/salut-protocol.page:36(cite)
-#: C/prev-conv.page:20(name) C/prev-conv.page:38(cite)
-#: C/import-account.page:27(name) C/disable-account.page:24(name)
-#: C/audio-video.page:109(cite) C/audio-video.page:117(cite)
-#: C/add-account.page:24(name) C/accounts-window.page:18(name)
-#: C/account-jabber.page:14(name) C/account-irc.page:16(name)
+#: C/prev-conv.page:21(name) C/import-account.page:27(name)
+#: C/disable-account.page:25(name) C/audio-video.page:109(cite)
+#: C/audio-video.page:117(cite) C/add-account.page:25(name)
+#: C/accounts-window.page:18(name) C/account-jabber.page:14(name)
+#: C/account-irc.page:16(name)
 msgid "Shaun McCance"
 msgstr "Shaun McCance"
 
-#: C/status-icons.page:21(email) C/prev-conv.page:21(email)
-#: C/import-account.page:28(email) C/disable-account.page:25(email)
-#: C/add-account.page:25(email) C/accounts-window.page:19(email)
+#: C/status-icons.page:21(email) C/prev-conv.page:22(email)
+#: C/import-account.page:28(email) C/disable-account.page:26(email)
+#: C/add-account.page:26(email) C/accounts-window.page:19(email)
 #: C/account-jabber.page:15(email) C/account-irc.page:17(email)
 msgid "shaunm@gnome.org"
 msgstr "shaunm@gnome.org"
@@ -333,12 +329,10 @@ msgid "Ekaterina Gerasimova"
 msgstr "Ekaterina Gerasimova"
 
 #: C/share-desktop.page:19(email)
-#| msgid "btimothy@gmail.com"
 msgid "kittykat3756@gmail.com"
 msgstr "kittykat3756@gmail.com"
 
 #: C/share-desktop.page:33(title)
-#| msgid "Synchronize your notes"
 msgid "Share your desktop"
 msgstr "Compartir o seu escritorio"
 
@@ -586,17 +580,16 @@ msgid "Send a message to one of your contacts."
 msgstr "Enviar unha mensaxe a un dos seus contactos."
 
 #: C/send-message.page:17(name) C/send-file.page:17(name)
-#: C/prob-conn.page:14(name) C/prob-conn-neterror.page:14(name)
-#: C/prob-conn-auth.page:17(name) C/prob-conn-acctdisabled.page:14(name)
-#: C/change-status.page:19(name) C/add-contact.page:18(name)
+#: C/prob-conn.page:14(name) C/prob-conn-neterror.page:15(name)
+#: C/prob-conn-auth.page:17(name) C/prob-conn-acctdisabled.page:15(name)
+#: C/change-status.page:24(name) C/add-contact.page:18(name)
 msgid "Phil Bull"
 msgstr "Phil Bull"
 
 #: C/send-message.page:18(email) C/send-file.page:18(email)
-#: C/prob-conn.page:15(email) C/prob-conn-neterror.page:15(email)
-#: C/prob-conn-auth.page:18(email) C/prob-conn-acctdisabled.page:15(email)
-#: C/change-status.page:20(email) C/add-contact.page:19(email)
-#| msgid "btimothy@gmail.com"
+#: C/prob-conn.page:15(email) C/prob-conn-neterror.page:16(email)
+#: C/prob-conn-auth.page:18(email) C/prob-conn-acctdisabled.page:16(email)
+#: C/change-status.page:25(email) C/add-contact.page:19(email)
 msgid "philbull@gmail.com"
 msgstr "philbull@gmail.com"
 
@@ -764,11 +757,11 @@ msgstr ""
 msgid "Completely remove an account from <app>Empathy</app>."
 msgstr "Quitar completamente unha conta en <app>Empathy</app>."
 
-#: C/remove-account.page:33(title)
+#: C/remove-account.page:34(title)
 msgid "Remove an account"
 msgstr "Eliminar unha conta"
 
-#: C/remove-account.page:35(p)
+#: C/remove-account.page:36(p)
 msgid ""
 "You can completely remove an account from <app>Empathy</app> if you no "
 "longer wish to use the account. If you wish to use the account in "
@@ -779,8 +772,8 @@ msgstr ""
 "seguir usándoa. Se quere usar de novo a conta en <app>Empathy</app> no "
 "futuro, deberá engadir os detalles da conta de novo."
 
-#: C/remove-account.page:42(p) C/irc-nick-password.page:50(p)
-#: C/disable-account.page:48(p) C/add-account.page:48(p)
+#: C/remove-account.page:43(p) C/irc-nick-password.page:50(p)
+#: C/disable-account.page:49(p) C/add-account.page:49(p)
 msgid ""
 "From the <gui>Contact List</gui> window, choose <guiseq><gui>Edit</"
 "gui><gui>Accounts</gui></guiseq>, or press <key>F4</key>."
@@ -788,7 +781,7 @@ msgstr ""
 "Desde a xanela <gui>Lista de contactos</gui> seleccione <guiseq><gui>Editar</"
 "gui><gui>Contas</gui></guiseq> ou prema <key>F4</key>."
 
-#: C/remove-account.page:46(p)
+#: C/remove-account.page:47(p)
 msgid ""
 "Select the account you wish to remove from the accounts list on the left "
 "side of the window."
@@ -796,11 +789,12 @@ msgstr ""
 "Seleccione a conta que desexa eliminar desde a lista de contas na parte "
 "esquerda da xanela."
 
-#: C/remove-account.page:50(p)
-msgid "Click on <gui style=\"button\">Remove</gui>."
-msgstr "Prema <gui style=\"button\">Quitar</gui>."
+#: C/remove-account.page:51(p)
+#| msgid "Click <gui style=\"button\">Add</gui>."
+msgid "Click <gui style=\"button\">-</gui>."
+msgstr "Prema <gui style=\"button\">-</gui>."
 
-#: C/remove-account.page:53(p)
+#: C/remove-account.page:54(p)
 msgid ""
 "A dialog will be shown asking for confirmation. Click the <gui>Remove</gui> "
 "button to permanently remove the account."
@@ -808,7 +802,7 @@ msgstr ""
 "Mostrarase un diálogo preguntando por unha confirmación. Prema no botón "
 "<gui>Eliminar</gui> para quitar a conta permanentemente."
 
-#: C/remove-account.page:59(p)
+#: C/remove-account.page:60(p)
 msgid ""
 "Even after removing an account, <app>Empathy</app> does not delete your "
 "conversation history for that account."
@@ -828,10 +822,8 @@ msgstr "Problemas ao conectarse a un servizo de mensaxaría instantánea"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/prob-conn-neterror.page:58(None) C/prob-conn-name.page:43(None)
+#: C/prob-conn-neterror.page:59(None) C/prob-conn-name.page:44(None)
 #: C/prob-conn-auth.page:58(None) C/account-irc.page:109(None)
-#| msgid ""
-#| "@@image: 'figures/note-template.png'; md5=49ee364d7e060de4e7a583e49a2f7db7"
 msgid "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b"
 msgstr "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b"
 
@@ -842,15 +834,15 @@ msgid ""
 msgstr ""
 "Aparecerá a mensaxe de erro «<gui>Erro de rede</gui>» na xanela principal."
 
-#: C/prob-conn-neterror.page:33(title)
+#: C/prob-conn-neterror.page:34(title)
 msgid "I get a message that says “Network error”"
 msgstr "Obteño unha mensaxe que mostra «Erro de rede»"
 
-#: C/prob-conn-neterror.page:36(cite)
+#: C/prob-conn-neterror.page:37(cite)
 msgid "shaunm"
 msgstr "shaunm"
 
-#: C/prob-conn-neterror.page:37(p)
+#: C/prob-conn-neterror.page:38(p)
 msgid ""
 "Empathy no longer allows you to create an IRC account without a valid nick. "
 "I've removed the guide link. Remove the text."
@@ -858,7 +850,7 @@ msgstr ""
 "Empathy xa non lle permite crear unha conta de IRC sen un alcume válido. "
 "Quitouse a ligazón da guía. Quitar o texto."
 
-#: C/prob-conn-neterror.page:41(p)
+#: C/prob-conn-neterror.page:42(p)
 msgid ""
 "This kind of error happens when <app>Empathy</app> cannot communicate with "
 "the instant messaging service for some reason."
@@ -866,7 +858,7 @@ msgstr ""
 "Este tipo de mensaxe sucede cando <app>Empathy</app> non se pode comunicar "
 "co servizo de mensaxaría instantánea por algunha razón."
 
-#: C/prob-conn-neterror.page:45(p)
+#: C/prob-conn-neterror.page:46(p)
 msgid ""
 "Also, this kind of error happens when you try to use an IRC account without "
 "setting a nickname."
@@ -874,14 +866,14 @@ msgstr ""
 "Este tipo de erro tamén sucede cando intenta usar unha conta de IRC sen ter "
 "configurado o alcume"
 
-#: C/prob-conn-neterror.page:52(p) C/prob-conn-auth.page:45(p)
-#: C/prob-conn-acctdisabled.page:43(p)
+#: C/prob-conn-neterror.page:53(p) C/prob-conn-auth.page:45(p)
+#: C/prob-conn-acctdisabled.page:44(p)
 msgid ""
 "Make sure that you are connected to the Internet, or to a local area network."
 msgstr ""
 "Asegúrese de que está conectado a Internet ou a unha rede de área local."
 
-#: C/prob-conn-neterror.page:57(p) C/prob-conn-name.page:42(p)
+#: C/prob-conn-neterror.page:58(p) C/prob-conn-name.page:43(p)
 #: C/prob-conn-auth.page:57(p)
 msgid ""
 "Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png"
@@ -891,7 +883,7 @@ msgstr ""
 "\">Logotipo da mensaxaría instantánea Empathy</media>Mensaxaría instantánea "
 "Empathy"
 
-#: C/prob-conn-neterror.page:65(p) C/prob-conn-acctdisabled.page:59(p)
+#: C/prob-conn-neterror.page:64(p) C/prob-conn-acctdisabled.page:60(p)
 msgid ""
 "Check in the <gui>Advanced</gui> section that all the details are correct. "
 "You should be able to find these details from the website of the messaging "
@@ -901,19 +893,22 @@ msgstr ""
 "Vostede poderá encontrar estes detalles no sitio web do seu servizo de "
 "mensaxería."
 
-#: C/prob-conn-neterror.page:82(p) C/prob-conn-auth.page:68(p)
+#: C/prob-conn-neterror.page:79(p) C/prob-conn-name.page:65(p)
+#| msgid ""
+#| "Deselect the <gui>Enabled</gui>, and then select it again to try to "
+#| "reconnect to the service."
 msgid ""
-"Deselect the <gui>Enabled</gui>, and then select it again to try to "
-"reconnect to the service."
+"Switch the account off, and then switch it on to try to reconnect to the "
+"service."
 msgstr ""
-"Deseleccione <placeholder-1/>, e seleccióneo de novo para tentar "
-"reconectarse ao servizo."
+"Deseleccione a conta, e selecciónea de novo para tentar reconectarse ao "
+"servizo."
 
-#: C/prob-conn-neterror.page:90(title)
+#: C/prob-conn-neterror.page:87(title)
 msgid "Proxy support"
 msgstr "Compatibilidade de proxy"
 
-#: C/prob-conn-neterror.page:91(p)
+#: C/prob-conn-neterror.page:88(p)
 msgid ""
 "At the moment <app>Empathy</app> can not be configured to work with a proxy."
 msgstr ""
@@ -932,11 +927,11 @@ msgstr ""
 "Aparecen na xanela principal unha mensaxe de erro que dice «<gui>Nome en "
 "uso</gui>»"
 
-#: C/prob-conn-name.page:32(title)
+#: C/prob-conn-name.page:33(title)
 msgid "I get a message that says “Name in use”"
 msgstr "Obteño unha mensaxe de erro que mostra «Nome en uso»"
 
-#: C/prob-conn-name.page:34(p)
+#: C/prob-conn-name.page:35(p)
 msgid ""
 "This kind of error happens when you try to connect to your IRC account and "
 "you are using a nickname that is already being used by someone else on that "
@@ -945,11 +940,11 @@ msgstr ""
 "Este tipo de erro sucede cando tenta conectarse á súa conta de IRC e está "
 "usando un alcume que xa está usando outra persoa nesa rede en particular."
 
-#: C/prob-conn-name.page:50(p)
+#: C/prob-conn-name.page:51(p)
 msgid "In the <gui>Nickname</gui> text box, type a new nickname."
 msgstr "Na caixa de texto <gui>Alcume</gui> escriba un alcume novo."
 
-#: C/prob-conn-name.page:55(p)
+#: C/prob-conn-name.page:56(p)
 msgid ""
 "If you have registered that nickname within the network you are using, set "
 "the password for that nickname. For more information, see <link xref=\"irc-"
@@ -959,14 +954,6 @@ msgstr ""
 "para ese alcume. Para obter máis información consulte a <link xref=\"irc-"
 "nick-password\"/>."
 
-#: C/prob-conn-name.page:64(p)
-msgid ""
-"Deselect the <gui>Enabled</gui> check-box next to the name of your account, "
-"and then select it again to try to reconnect to the service."
-msgstr ""
-"Deseleccione <placeholder-1/>, e seleccióneo de novo para tentar "
-"reconectarse ao servizo."
-
 #: C/prob-conn-auth.page:8(desc)
 msgid ""
 "An error message which says “<gui>Authentication failed</gui>” appears in "
@@ -999,13 +986,21 @@ msgstr ""
 "conectarse. Se non ten unha conta a maioría dos servizos non lle permitirán "
 "que se conecte."
 
-#: C/prob-conn-auth.page:63(p) C/prob-conn-acctdisabled.page:54(p)
+#: C/prob-conn-auth.page:63(p) C/prob-conn-acctdisabled.page:55(p)
 msgid ""
 "Type your username and password again to make sure that they are correct."
 msgstr ""
 "Escriba o seu nome de usuario e contrasinal de novo e asegúrese de que son "
 "correctos."
 
+#: C/prob-conn-auth.page:68(p)
+msgid ""
+"Deselect the <gui>Enabled</gui>, and then select it again to try to "
+"reconnect to the service."
+msgstr ""
+"Deseleccione <placeholder-1/>, e seleccióneo de novo para tentar "
+"reconectarse ao servizo."
+
 #: C/prob-conn-acctdisabled.page:7(desc)
 msgid ""
 "The instant messaging account that you want to use is not enabled in the "
@@ -1014,11 +1009,11 @@ msgstr ""
 "A conta de mensaxaría instantánea que quere usar non está activada na lista "
 "de contas."
 
-#: C/prob-conn-acctdisabled.page:33(title)
+#: C/prob-conn-acctdisabled.page:34(title)
 msgid "My account is not enabled"
 msgstr "A miña conta non está activada"
 
-#: C/prob-conn-acctdisabled.page:35(p)
+#: C/prob-conn-acctdisabled.page:36(p)
 msgid ""
 "If the instant messaging account that you want to use is not enabled in the "
 "drop-down account list when you try to start a new conversation or join a "
@@ -1028,7 +1023,7 @@ msgstr ""
 "lista despregábel de contas, cando tenta iniciar unha conversa nova ou "
 "unirse a unha charla, pode que os detalles da súa conta non sexa correctos."
 
-#: C/prob-conn-acctdisabled.page:48(p)
+#: C/prob-conn-acctdisabled.page:49(p)
 msgid ""
 "Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq> and select the "
 "account that is not working."
@@ -1036,37 +1031,19 @@ msgstr ""
 "Elixa <guiseq><gui>Editar</gui><gui>Contas</gui></guiseq> e seleccione a "
 "conta que non está funcionando."
 
-#: C/prob-conn-acctdisabled.page:65(p)
-msgid ""
-"Check that the <gui style=\"checkbox\">Enabled</gui> check-box is selected. "
-"If it is not, select the check-box to enable the account."
-msgstr ""
-"Comprobe que a casilla de verificación <gui style=\"checkbox\">Activada</"
-"gui> está seleccionada. Se non o está marque a casilla de verificación para "
-"activar a conta."
+#: C/prob-conn-acctdisabled.page:66(p)
+msgid "Check that the account is switched on."
+msgstr "Comprobe que a conta está activada."
 
 #: C/prev-conv.page:8(desc)
 msgid "Browse or search your previous conversations."
 msgstr "Explorar ou buscar nas súas mensaxes anteriores."
 
-#: C/prev-conv.page:35(title)
+#: C/prev-conv.page:36(title)
 msgid "View previous conversations"
 msgstr "Ver as conversas anteriores"
 
-#: C/prev-conv.page:39(p)
-msgid ""
-"Highlighting text is quirky: <link href=\"http://bugzilla.gnome.org/show_bug."
-"cgi?id=593733\">#593733</link>. If there's an actual highlighting going on, "
-"independent of the selection (like in yellow or something), we can use the "
-"term \"highlight\". Otherwise we need to use the term \"select\". Watch that "
-"bug."
-msgstr ""
-"Resaltar texto é estraño <link href=\"http://bugzilla.gnome.org/show_bug.cgi?"
-"id=593733\">#59733</link>. Se existe un resaltado actualmente, independente "
-"da selección (en amarelo, por exemplo), pódese usar o termo «resaltar». De "
-"outra forma débese usar o termo «seleccionado». Siga o proceso do erro."
-
-#: C/prev-conv.page:46(p)
+#: C/prev-conv.page:38(p)
 msgid ""
 "<app>Empathy</app> automatically saves all your text conversations you have "
 "with your contacts. You can <link xref=\"#search\">search through all of "
@@ -1078,7 +1055,7 @@ msgstr ""
 "súas conversas anteriores</link> ou <link xref=\"#browse\">buscar conversas "
 "anteriores</link> por contacto e data."
 
-#: C/prev-conv.page:54(p)
+#: C/prev-conv.page:46(p)
 msgid ""
 "You do not need to be connected to the Internet to view and search your "
 "previous conversations."
@@ -1086,11 +1063,11 @@ msgstr ""
 "Non necesita estar conectado a Internet para ver e buscar nas súas conversas "
 "anteriores."
 
-#: C/prev-conv.page:61(title)
+#: C/prev-conv.page:53(title)
 msgid "Search previous conversations"
 msgstr "Buscar conversas anteriores"
 
-#: C/prev-conv.page:63(p)
+#: C/prev-conv.page:55(p)
 msgid ""
 "You can perform a full-text search through all of your previous "
 "conversations."
@@ -1098,7 +1075,7 @@ msgstr ""
 "Pode realizar unha busca de texto completo sobre todas as súas conversas "
 "anteriores."
 
-#: C/prev-conv.page:67(p) C/prev-conv.page:96(p)
+#: C/prev-conv.page:59(p) C/prev-conv.page:87(p)
 msgid ""
 "From the <gui>Contact List</gui> window, choose <guiseq><gui>View</"
 "gui><gui>Previous Conversations</gui></guiseq>. Alternatively, press "
@@ -1108,40 +1085,39 @@ msgstr ""
 "gui><gui>Conversas previas</gui></guiseq>. De forma alternativa prema "
 "<key>F3</key>."
 
-#: C/prev-conv.page:71(p)
-msgid "Select the <gui>Search</gui> tab."
-msgstr "Seleccione o separador <gui>Buscar</gui>."
-
-#: C/prev-conv.page:74(p)
+#: C/prev-conv.page:63(p)
+#| msgid ""
+#| "Select an account from the drop-down list in the top left. A list of "
+#| "contacts and chat room for that account will be shown below."
 msgid ""
-"In the <gui>For</gui> field, type the text you want to search for. Click "
-"<gui>Find</gui> or press <key>Enter</key>."
+"Select an account from the drop-down list in the top. A list of contacts and "
+"chat room for that account will be shown below."
 msgstr ""
-"No campo <gui>Para</gui> escriba o texto que quere buscar. Prema "
-"<gui>Buscar</gui> ou prema <key>Intro</key>."
+"Seleccione unha conta desde a lista despregábel na parte superior. "
+"Mostrarase unha lista de contactos e salas de conversa para dita conta."
 
-#: C/prev-conv.page:78(p)
+#: C/prev-conv.page:67(p)
 msgid ""
-"Any conversations that matched your search terms will be shown in the list "
-"below the search field. By default, conversations are ordered by date."
-msgstr ""
-"Mostrarase na lista baixo o campo de busca calquera conversa que coincida "
-"cos seus termos de busca. As conversas ordénanse por data de forma "
-"predefinida."
+"Type the text you want to search for in the <gui>Search</gui> text field."
+msgstr "Escriba o texto que quere buscar no campo de texto <gui>Buscar</gui>."
 
-#: C/prev-conv.page:82(p)
+#: C/prev-conv.page:71(p)
+#| msgid ""
+#| "Any conversations that matched your search terms will be shown in the "
+#| "list below the search field. By default, conversations are ordered by "
+#| "date."
 msgid ""
-"Click on a conversation to view it. <app>Empathy</app> will select the text "
-"in the conversation that matched your search terms."
+"Any conversations that matched your search terms will be shown. By default, "
+"conversations are ordered by date."
 msgstr ""
-"Prema sobre unha conversa para vela. <app>Empathy</app> seleccionará o texto "
-"na conversa que coincida cos seus termos de busca."
+"Mostrarase calquera conversa que coincida cos seus termos de busca. Por "
+"omisión, as conversas ordénanse por data."
 
-#: C/prev-conv.page:89(title)
+#: C/prev-conv.page:80(title)
 msgid "Browse previous conversations"
 msgstr "Explorar as conversas anteriores"
 
-#: C/prev-conv.page:91(p)
+#: C/prev-conv.page:82(p)
 msgid ""
 "You can browse your previous conversations with your contacts or in chat "
 "rooms by date."
@@ -1149,11 +1125,7 @@ msgstr ""
 "Pode examinar por data as conversas previas cos seus contactos ou en salas "
 "de conversa."
 
-#: C/prev-conv.page:100(p)
-msgid "Select the <gui>Conversations</gui> tab."
-msgstr "Seleccione o separador <gui>Conversas</gui>."
-
-#: C/prev-conv.page:103(p)
+#: C/prev-conv.page:91(p)
 msgid ""
 "Select an account from the drop-down list in the top left. A list of "
 "contacts and chat room for that account will be shown below."
@@ -1161,7 +1133,7 @@ msgstr ""
 "Seleccione unha conta desde a lista despregábel na parte superior esquerda. "
 "Mostrarase unha lista de contactos e salas de conversa para dita conta."
 
-#: C/prev-conv.page:107(p)
+#: C/prev-conv.page:95(p)
 msgid ""
 "Select a contact or chat room to view your previous conversations from. By "
 "default the most recent conversation will be shown."
@@ -1169,7 +1141,7 @@ msgstr ""
 "Seleccione un contacto ou sala de conversa desde a que ver as anteriores "
 "conversas. Por omisión mostrarase a conversa máis recente."
 
-#: C/prev-conv.page:111(p)
+#: C/prev-conv.page:99(p)
 msgid ""
 "You can browse your conversations by date. Days on which you had a "
 "conversation with the selected contact will be shown in bold text. Click a "
@@ -1181,25 +1153,33 @@ msgstr ""
 "para seleccionala e prema nas frechas ao lado do mes e ano para explorar as "
 "datas máis cercanas."
 
-#: C/prev-conv.page:117(p)
+#: C/prev-conv.page:105(p)
+#| msgid ""
+#| "You can search for text in the displayed conversation by typing into the "
+#| "search field at the top. The matching text will be highlighted."
 msgid ""
-"You can search for text in the displayed conversation by typing into the "
-"search field at the top. The matching text will be highlighted."
+"You can search for text in the conversations by typing into the search field "
+"at the top. The matching conversations will be showed."
 msgstr ""
-"Pode buscar dentro do texto das conversas mostradas escribindo na caixa de "
+"Pode buscar dentro do texto das conversas escribindo no campo de texto de "
 "busca na parte superior. O texto coincidente resaltarase."
 
-#: C/prev-conv.page:121(p)
+#: C/prev-conv.page:111(p)
+#| msgid ""
+#| "You can quickly view the previous conversations with one of your contacts "
+#| "from the <gui>Contact List</gui> window. Simply right click the contact "
+#| "and choose <gui>View Previous Conversations</gui>. The <gui>Previous "
+#| "Conversations</gui> window will open with that contact already selected."
 msgid ""
 "You can quickly view the previous conversations with one of your contacts "
 "from the <gui>Contact List</gui> window. Simply right click the contact and "
-"choose <gui>View Previous Conversations</gui>. The <gui>Previous "
-"Conversations</gui> window will open with that contact already selected."
+"choose <gui>Previous Conversations</gui>. The <gui>Previous Conversations</"
+"gui> window will open with that contact already selected."
 msgstr ""
 "Pode ver rapidamente as conversas anteriores con un dos seus contactos desde "
-"a xanela <gui>Lista de contactos</gui>. Simplemente prema co botón dereito "
+"a xanela <gui>Lista de contactos</gui>. Simplemente prema co botón dereito "
 "do rato sobre o contacto e seleccione <gui>Conversas anteriores</gui>. "
-"Abrirase a xanela <gui>Ver conversas previas</gui> co contacto seleccionado."
+"Abrirase a xanela <gui>Conversas anteriores</gui> co contacto seleccionado."
 
 #: C/link-contacts.page:11(desc)
 msgid "Merge and separate different contacts into a single one."
@@ -1286,7 +1266,6 @@ msgstr ""
 "presencia en liña máis alta."
 
 #: C/link-contacts.page:91(title)
-#| msgid "Creating Notes"
 msgid "Separating contacts"
 msgstr "Separar contactos"
 
@@ -1344,7 +1323,6 @@ msgid "Under the following conditions:"
 msgstr "Baixo as seguintes condicións:"
 
 #: C/license.page:38(em)
-#| msgid "Introduction"
 msgid "Attribution"
 msgstr "Atribución"
 
@@ -1491,6 +1469,7 @@ msgstr ""
 "usar para rexistrar o seu alcume."
 
 #: C/irc-nick-password.page:63(p) C/import-account.page:61(p)
+#: C/add-account.page:74(p)
 msgid "Click <gui style=\"button\">Apply</gui>."
 msgstr "Prema <gui style=\"button\">Aplicar</gui>."
 
@@ -1645,9 +1624,6 @@ msgstr ""
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/introduction.page:41(None)
-#| msgid ""
-#| "@@image: 'figures/tomboy-main-menu.png'; "
-#| "md5=420af676a38a074abd5431e7a07d1fec"
 msgid ""
 "@@image: 'figures/empathy-main-window.png'; "
 "md5=54908dcb2588beddb15ef0968d2c2582"
@@ -1711,9 +1687,6 @@ msgstr "Xanela principal de <app>Empathy</app>."
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/index.page:28(None)
-#| msgid ""
-#| "@@image: 'figures/delete-notebook.png'; "
-#| "md5=f1b41a9034715d6314ee36b66389c897"
 msgid ""
 "@@image: 'figures/empathy-logo.png'; md5=1afc419a644e90b16393807e35cb5cb2"
 msgstr ""
@@ -1959,7 +1932,6 @@ msgstr ""
 "existentes."
 
 #: C/group-conversations.page:133(p)
-#| msgid "Double-click on a note."
 msgid "Double-click on the name of a room to join it."
 msgstr "Prema dúas veces sobre o nome dunha sala á que queira unirse."
 
@@ -2163,7 +2135,6 @@ msgid "Only your contacts can see your geographical position."
 msgstr "Só os seus contactos poden ver a súa posición xeográfica."
 
 #: C/geolocation-privacy.page:63(title)
-#| msgid "What links here?"
 msgid "What is the privacy mode"
 msgstr "Que é o modo de privacidade"
 
@@ -2313,7 +2284,6 @@ msgid "Join favorite rooms"
 msgstr "Unirse ás salas favoritas"
 
 #: C/favorite-rooms.page:71(p)
-#| msgid "Press the <keycap>Tab</keycap> key."
 msgid "Press <key>F5</key>."
 msgstr "Prema <key>F5</key>."
 
@@ -2384,11 +2354,11 @@ msgstr "Cando remate prema <placeholder-1/>."
 msgid "Prevent <app>Empathy</app> from automatically logging in to an account."
 msgstr "Evitar que <app>Empathy</app> inicie sesión automaticamente na conta."
 
-#: C/disable-account.page:39(title)
+#: C/disable-account.page:40(title)
 msgid "Disable an account"
 msgstr "Desactivar unha conta"
 
-#: C/disable-account.page:41(p)
+#: C/disable-account.page:42(p)
 msgid ""
 "You can disable an account to prevent <app>Empathy</app> from logging in to "
 "it without removing the account entirely. You may wish to disable and re-"
@@ -2400,7 +2370,7 @@ msgstr ""
 "conta e reactivala se só quere iniciar sesión na conta de vez en cando, pero "
 "segue querendo usar <app>Empathy</app> para outras contas."
 
-#: C/disable-account.page:52(p)
+#: C/disable-account.page:53(p)
 msgid ""
 "Select the account you wish to disable from the accounts list on the left "
 "side of the window."
@@ -2408,19 +2378,16 @@ msgstr ""
 "Seleccione a conta que quere desactivar desde a lista de contas na parte "
 "esquerda da xanela."
 
-#: C/disable-account.page:56(p)
-msgid ""
-"Deselect <gui style=\"checkbox\">Enabled</gui> on the right side of the "
-"window."
-msgstr ""
-"Deseleccione <gui style=\"checkbox\">Activada</gui> na parte dereita da "
-"xanela."
+#: C/disable-account.page:57(p)
+msgid "On the right side of the window, switch it off."
+msgstr "Na parte dereita da xanela, desactíveo."
 
 #: C/disable-account.page:62(p)
-msgid ""
-"To re-enable the account, simply select <gui style=\"checkbox\">Enabled</"
-"gui>."
-msgstr "Para reactivar a conta simplemente seleccione <placeholder-1/>."
+#| msgid ""
+#| "To re-enable the account, simply select <gui style=\"checkbox\">Enabled</"
+#| "gui>."
+msgid "To re-enable the account, switch it on."
+msgstr "Para reactivar a conta simplemente actíveo."
 
 #: C/create-account.page:9(desc)
 msgid "Register for an account with one of the supported messaging services."
@@ -2642,11 +2609,11 @@ msgid "Change your status to advertise your availability to your contacts."
 msgstr ""
 "Cambie o seu estado para avisar da súa dispoñibilidade aos seus contactos."
 
-#: C/change-status.page:34(title)
+#: C/change-status.page:39(title)
 msgid "Change your status"
 msgstr "Cambiar o seu estado"
 
-#: C/change-status.page:36(p)
+#: C/change-status.page:41(p)
 msgid ""
 "You can set your status to indicate your availability to your contacts. "
 "<app>Empathy</app> allows you to select from a list of defined statuses."
@@ -2655,30 +2622,35 @@ msgstr ""
 "contactos <app>Empathy</app> permítelle seleccionar unha lista de estados "
 "predefinidos."
 
-#: C/change-status.page:41(p)
+#: C/change-status.page:46(p)
 msgid ""
 "Click on the drop-down list at the top of the <gui>Contact List</gui> window."
 msgstr ""
 "Prema na lista despregábel na parte superior da xanela da <gui>Lista de "
 "contactos</gui>."
 
-#: C/change-status.page:46(p)
+#: C/change-status.page:51(p)
 msgid "Select a status from the list."
 msgstr "Seleccione o estado desde a lista."
 
-#: C/change-status.page:52(p)
+#: C/change-status.page:57(p)
+#| msgid ""
+#| "See <link xref=\"status-icons\"/> for a list of the built-in statuses and "
+#| "what they mean. You can also <link xref=\"set-custom-message\">add custom "
+#| "status messages</link> to provide more information about your "
+#| "availability to your contacts."
 msgid ""
 "See <link xref=\"status-icons\"/> for a list of the built-in statuses and "
-"what they mean. You can also <link xref=\"set-custom-message\">add custom "
+"what they mean. You can also <link xref=\"set-custom-status\">add custom "
 "status messages</link> to provide more information about your availability "
 "to your contacts."
 msgstr ""
 "Consulte a <link xref=\"status-icons\"/> para obter unha lista de estados "
-"predefinidos e o que significan. Tamén pode <link xref=\"set-custom-message"
-"\"> engadir mensaxes de estado personalizados</link> para fornecerlle aos "
-"seus contactos máis información sobre a súa dispoñibilidade."
+"predefinidos e o que significan. Tamén pode <link xref=\"set-custom-message"
+"\">engadir mensaxes de estado personalizados</link> para fornecerlle aos "
+"seus contactos maís información sobre a sú dispoñibilidade."
 
-#: C/change-status.page:58(p)
+#: C/change-status.page:63(p)
 msgid ""
 "If you do not use your computer for a while, or if the screensaver is on, "
 "the status will be automatically set to Away."
@@ -2808,7 +2780,6 @@ msgstr ""
 "que vai dar tempo incluirase."
 
 #: C/audio-video.page:128(p)
-#| msgid "Search"
 msgid "Service"
 msgstr "Servizo"
 
@@ -2987,11 +2958,11 @@ msgstr ""
 msgid "Add a new account to <app>Empathy</app>."
 msgstr "Engadir unha nova conta en <app>Empathy</app>."
 
-#: C/add-account.page:39(title)
+#: C/add-account.page:40(title)
 msgid "Add a new account"
 msgstr "Engadir unha nova conta"
 
-#: C/add-account.page:41(p)
+#: C/add-account.page:42(p)
 msgid ""
 "You can add instant messaging accounts from any supported service to "
 "communicate with all of your contacts in <app>Empathy</app>. For some "
@@ -3004,11 +2975,12 @@ msgstr ""
 "conta. Para obter máis información consulte a <link xref=\"create-account\"/"
 ">."
 
-#: C/add-account.page:52(p)
-msgid "Click <gui style=\"button\">Add</gui>."
-msgstr "Prema <gui style=\"button\">Engadir</gui>."
+#: C/add-account.page:53(p)
+#| msgid "Click <gui style=\"button\">Add</gui>."
+msgid "Click <gui style=\"button\">+</gui>."
+msgstr "Prema <gui style=\"button\">+</gui>."
 
-#: C/add-account.page:57(p)
+#: C/add-account.page:58(p)
 msgid ""
 "From the <gui>Protocol</gui> drop-down list, select the type of account you "
 "wish to add."
@@ -3016,7 +2988,7 @@ msgstr ""
 "Desde a lista despregábel <gui>Protocolo</gui>seleccione o tipo de conta que "
 "quere engadir."
 
-#: C/add-account.page:61(p)
+#: C/add-account.page:62(p)
 msgid ""
 "If you do not already have a registered account, select <gui>Create a new "
 "account on the server</gui>. This feature is not available for all account "
@@ -3028,22 +3000,23 @@ msgstr ""
 "tipos de contas e pode non funcionar con algúns fornecedores de contas. Para "
 "obter máis información consulte a <link xref=\"create-account\"/>."
 
-#: C/add-account.page:66(p)
+#: C/add-account.page:69(p)
+#| msgid ""
+#| "Enter the required information. For most accounts, you will only need a "
+#| "login ID and a password. Some accounts may require additional "
+#| "information. See <link xref=\"accounts-window#details\"/> for more "
+#| "information."
 msgid ""
 "Enter the required information. For most accounts, you will only need a "
 "login ID and a password. Some accounts may require additional information. "
-"See <link xref=\"accounts-window#details\"/> for more information."
+"See <link xref=\"accounts-window#details\"/>for more information."
 msgstr ""
-"Introduza a información requirida. Para a maioría das contas só necesitará "
-"un ID de inicio de sesión e un contrasinal. Algunhas contas poden requirir "
-"información adicional. Para obter máis información consulte a <link xref="
+"Escriba a información requirida. Para a maioría das contas só precisa un ID "
+"de inicio de sesión e un contrasinal. Algunhas contas poden requirir "
+"información adicional. Para obter maís información consulte a <link xref="
 "\"accounts-window#details\"/>."
 
-#: C/add-account.page:71(p)
-msgid "Click <gui style=\"button\">Log in</gui>."
-msgstr "Prema <gui style=\"button\">Iniciar sesión</gui>."
-
-#: C/add-account.page:78(p)
+#: C/add-account.page:81(p)
 msgid ""
 "To change the name that identifies the account in the <gui>Accounts</gui> "
 "window, select the account from the list on the left and either click on the "
@@ -3154,7 +3127,6 @@ msgid "Resource"
 msgstr "Recurso"
 
 #: C/account-jabber.page:60(gui)
-#| msgid "Print"
 msgid "Priority"
 msgstr "Prioridad"
 
@@ -3199,17 +3171,12 @@ msgstr ""
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/account-irc.page:106(None)
-#| msgid ""
-#| "@@image: 'figures/add-to-notebook.png'; "
-#| "md5=03469ddb5137f525ac4f8318caed5532"
 msgid "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d"
 msgstr "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/account-irc.page:112(None)
-#| msgid ""
-#| "@@image: 'figures/new-notebook.png'; md5=b5645185d7fed6183b550c0dab7b72cb"
 msgid "@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6"
 msgstr ""
 "@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6"
@@ -3458,6 +3425,67 @@ msgstr ""
 msgid "translator-credits"
 msgstr "Fran Dieguez <frandieguez@gnome.org>, 2011."
 
+#~ msgid "Click on <gui style=\"button\">Remove</gui>."
+#~ msgstr "Prema <gui style=\"button\">Quitar</gui>."
+
+#~ msgid ""
+#~ "Deselect the <gui>Enabled</gui> check-box next to the name of your "
+#~ "account, and then select it again to try to reconnect to the service."
+#~ msgstr ""
+#~ "Deseleccione <placeholder-1/>, e seleccióneo de novo para tentar "
+#~ "reconectarse ao servizo."
+
+#~ msgid ""
+#~ "Check that the <gui style=\"checkbox\">Enabled</gui> check-box is "
+#~ "selected. If it is not, select the check-box to enable the account."
+#~ msgstr ""
+#~ "Comprobe que a casilla de verificación <gui style=\"checkbox\">Activada</"
+#~ "gui> está seleccionada. Se non o está marque a casilla de verificación "
+#~ "para activar a conta."
+
+#~ msgid ""
+#~ "Highlighting text is quirky: <link href=\"http://bugzilla.gnome.org/"
+#~ "show_bug.cgi?id=593733\">#593733</link>. If there's an actual "
+#~ "highlighting going on, independent of the selection (like in yellow or "
+#~ "something), we can use the term \"highlight\". Otherwise we need to use "
+#~ "the term \"select\". Watch that bug."
+#~ msgstr ""
+#~ "Resaltar texto é estraño <link href=\"http://bugzilla.gnome.org/show_bug."
+#~ "cgi?id=593733\">#59733</link>. Se existe un resaltado actualmente, "
+#~ "independente da selección (en amarelo, por exemplo), pódese usar o termo "
+#~ "«resaltar». De outra forma débese usar o termo «seleccionado». Siga o "
+#~ "proceso do erro."
+
+#~ msgid "Select the <gui>Search</gui> tab."
+#~ msgstr "Seleccione o separador <gui>Buscar</gui>."
+
+#~ msgid ""
+#~ "In the <gui>For</gui> field, type the text you want to search for. Click "
+#~ "<gui>Find</gui> or press <key>Enter</key>."
+#~ msgstr ""
+#~ "No campo <gui>Para</gui> escriba o texto que quere buscar. Prema "
+#~ "<gui>Buscar</gui> ou prema <key>Intro</key>."
+
+#~ msgid ""
+#~ "Click on a conversation to view it. <app>Empathy</app> will select the "
+#~ "text in the conversation that matched your search terms."
+#~ msgstr ""
+#~ "Prema sobre unha conversa para vela. <app>Empathy</app> seleccionará o "
+#~ "texto na conversa que coincida cos seus termos de busca."
+
+#~ msgid "Select the <gui>Conversations</gui> tab."
+#~ msgstr "Seleccione o separador <gui>Conversas</gui>."
+
+#~ msgid ""
+#~ "Deselect <gui style=\"checkbox\">Enabled</gui> on the right side of the "
+#~ "window."
+#~ msgstr ""
+#~ "Deseleccione <gui style=\"checkbox\">Activada</gui> na parte dereita da "
+#~ "xanela."
+
+#~ msgid "Click <gui style=\"button\">Log in</gui>."
+#~ msgstr "Prema <gui style=\"button\">Iniciar sesión</gui>."
+
 #~ msgid ""
 #~ "@@image: 'figures/tomboy-new-note.png'; "
 #~ "md5=ba337ad3ae256f3fdf79afeef82d7883"
diff --git a/help/sl/sl.po b/help/sl/sl.po
index f6b69a530..61dea1f53 100644
--- a/help/sl/sl.po
+++ b/help/sl/sl.po
@@ -4,9 +4,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Empathy manual\n"
-"POT-Creation-Date: 2011-07-19 20:27+0000\n"
+"POT-Creation-Date: 2012-01-10 13:23+0000\n"
 "PO-Revision-Date: \n"
-"Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
+"Last-Translator: Andrej Žnidaršič <andrej.znidarsic@gmail.com>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/video-call.page:38(None)
+#: C/video-call.page:39(None)
 #: C/audio-video.page:70(None)
 #: C/audio-call.page:36(None)
 msgid "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
@@ -29,23 +29,23 @@ msgstr "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
 msgid "Start a video conversation with one of your contacts."
 msgstr "Začnite video pogovor z enim od vaših stikov"
 
-#: C/video-call.page:21(name)
+#: C/video-call.page:22(name)
 #: C/status-icons.page:16(name)
-#: C/share-desktop.page:13(name)
+#: C/share-desktop.page:14(name)
 #: C/set-custom-status.page:19(name)
 #: C/send-file.page:21(name)
 #: C/salut-protocol.page:18(name)
-#: C/remove-account.page:18(name)
-#: C/prob-conn-neterror.page:18(name)
-#: C/prob-conn-name.page:17(name)
+#: C/remove-account.page:19(name)
+#: C/prob-conn-neterror.page:19(name)
+#: C/prob-conn-name.page:18(name)
 #: C/prob-conn-auth.page:21(name)
-#: C/prob-conn-acctdisabled.page:18(name)
-#: C/prev-conv.page:16(name)
+#: C/prob-conn-acctdisabled.page:19(name)
+#: C/prev-conv.page:17(name)
 #: C/link-contacts.page:15(name)
 #: C/irc-start-conversation.page:15(name)
 #: C/irc-send-file.page:16(name)
 #: C/irc-nick-password.page:18(name)
-#: C/irc-manage.page:19(name)
+#: C/irc-manage.page:20(name)
 #: C/irc-join-room.page:16(name)
 #: C/irc-join-pwd.page:17(name)
 #: C/irc-commands.page:10(name)
@@ -61,31 +61,31 @@ msgstr "Začnite video pogovor z enim od vaših stikov"
 #: C/geolocation-not-showing.page:17(name)
 #: C/geolocation.page:17(name)
 #: C/favorite-rooms.page:14(name)
-#: C/disable-account.page:20(name)
+#: C/disable-account.page:21(name)
 #: C/create-account.page:19(name)
 #: C/audio-video.page:17(name)
 #: C/audio-call.page:19(name)
-#: C/add-account.page:20(name)
+#: C/add-account.page:21(name)
 msgid "Milo Casagrande"
 msgstr "Milo Casagrande"
 
-#: C/video-call.page:22(email)
+#: C/video-call.page:23(email)
 #: C/status-icons.page:17(email)
-#: C/share-desktop.page:14(email)
+#: C/share-desktop.page:15(email)
 #: C/set-custom-status.page:20(email)
 #: C/send-file.page:22(email)
 #: C/salut-protocol.page:19(email)
-#: C/remove-account.page:19(email)
-#: C/prob-conn-neterror.page:19(email)
-#: C/prob-conn-name.page:18(email)
+#: C/remove-account.page:20(email)
+#: C/prob-conn-neterror.page:20(email)
+#: C/prob-conn-name.page:19(email)
 #: C/prob-conn-auth.page:22(email)
-#: C/prob-conn-acctdisabled.page:19(email)
-#: C/prev-conv.page:17(email)
+#: C/prob-conn-acctdisabled.page:20(email)
+#: C/prev-conv.page:18(email)
 #: C/link-contacts.page:16(email)
 #: C/irc-start-conversation.page:16(email)
 #: C/irc-send-file.page:17(email)
 #: C/irc-nick-password.page:19(email)
-#: C/irc-manage.page:20(email)
+#: C/irc-manage.page:21(email)
 #: C/irc-join-room.page:17(email)
 #: C/irc-join-pwd.page:18(email)
 #: C/irc-commands.page:11(email)
@@ -101,33 +101,33 @@ msgstr "Milo Casagrande"
 #: C/geolocation-not-showing.page:18(email)
 #: C/geolocation.page:18(email)
 #: C/favorite-rooms.page:15(email)
-#: C/disable-account.page:21(email)
+#: C/disable-account.page:22(email)
 #: C/create-account.page:20(email)
 #: C/audio-video.page:18(email)
 #: C/audio-call.page:20(email)
-#: C/add-account.page:21(email)
+#: C/add-account.page:22(email)
 msgid "milo@ubuntu.com"
 msgstr "milo@ubuntu.com"
 
-#: C/video-call.page:25(p)
+#: C/video-call.page:26(p)
 #: C/status-icons.page:24(p)
-#: C/share-desktop.page:17(p)
+#: C/share-desktop.page:22(p)
 #: C/set-custom-status.page:23(p)
 #: C/send-message.page:21(p)
 #: C/send-file.page:25(p)
 #: C/salut-protocol.page:22(p)
-#: C/remove-account.page:22(p)
+#: C/remove-account.page:23(p)
 #: C/prob-conn.page:18(p)
-#: C/prob-conn-neterror.page:22(p)
-#: C/prob-conn-name.page:21(p)
+#: C/prob-conn-neterror.page:23(p)
+#: C/prob-conn-name.page:22(p)
 #: C/prob-conn-auth.page:25(p)
-#: C/prob-conn-acctdisabled.page:22(p)
-#: C/prev-conv.page:24(p)
+#: C/prob-conn-acctdisabled.page:23(p)
+#: C/prev-conv.page:25(p)
 #: C/link-contacts.page:19(p)
 #: C/irc-start-conversation.page:19(p)
 #: C/irc-send-file.page:20(p)
 #: C/irc-nick-password.page:22(p)
-#: C/irc-manage.page:23(p)
+#: C/irc-manage.page:24(p)
 #: C/irc-join-room.page:20(p)
 #: C/irc-join-pwd.page:21(p)
 #: C/irc-commands.page:14(p)
@@ -143,60 +143,60 @@ msgstr "milo@ubuntu.com"
 #: C/geolocation-not-showing.page:21(p)
 #: C/geolocation.page:21(p)
 #: C/favorite-rooms.page:18(p)
-#: C/disable-account.page:28(p)
+#: C/disable-account.page:29(p)
 #: C/create-account.page:23(p)
-#: C/change-status.page:23(p)
+#: C/change-status.page:28(p)
 #: C/audio-video.page:21(p)
 #: C/audio-call.page:23(p)
 #: C/add-contact.page:22(p)
-#: C/add-account.page:28(p)
+#: C/add-account.page:29(p)
 #: C/accounts-window.page:22(p)
 #: C/account-jabber.page:18(p)
 #: C/account-irc.page:20(p)
 msgid "Creative Commons Share Alike 3.0"
 msgstr "Dovoljenje Creative Commons - deljenje pod istimi pogoji 3.0"
 
-#: C/video-call.page:28(title)
+#: C/video-call.page:29(title)
 msgid "Start a video conversation"
 msgstr "Začenjanje video konference"
 
-#: C/video-call.page:30(p)
-msgid "If you have a webcam, you can call your contacts and have a video conversation with them. This features only works with certain types of accounts, and it requires the other person to have an application that supports video calls."
+#: C/video-call.page:31(p)
+msgid "If you have a webcam, you can call your contacts and have a video conversation with them. This feature only works with certain types of accounts, and it requires the other person to have an application that supports video calls."
 msgstr "V primeru da imate spletno kamero, lahko svoje stike pokličite in imate z njimi video pogovor. Ta zmožnost deluje le z določenimi vrstami računov in zahteva, da ima druga oseba program, ki podpira video klice."
 
-#: C/video-call.page:37(p)
+#: C/video-call.page:38(p)
 msgid "From the <gui>Contact List</gui> window, click the <media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon next to the name of the contact you wish to call and choose <gui style=\"menuitem\">Video Call</gui>."
 msgstr "V oknu <gui>Seznam stikov</gui> kliknite ikono <media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">video klic</media> poleg imena stika, ki ga želite poklicati, in izberite <gui style=\"menuitem\">Video klic</gui>. Namesto tega lahko desno kliknete na stik in izberete <gui style=\"menuitem\">Video klic</gui>. "
 
-#: C/video-call.page:43(p)
+#: C/video-call.page:44(p)
 #: C/audio-call.page:42(p)
 msgid "A new window will open. When the connection is established, you will see <gui>Connected</gui> at the bottom of the window, along with the total conversation time."
 msgstr "Odprlo se bo novo okno. Ko je povezava vzpostavljena boste na dnu okna videli <gui>Povezano</gui> skupaj s celotnim časom pogovora."
 
-#: C/video-call.page:48(p)
+#: C/video-call.page:49(p)
 #: C/audio-call.page:48(p)
 msgid "To end the conversation, click on <gui style=\"button\">Hang up</gui>."
 msgstr "Za končanje pogovora izberite <guiseq><gui style=\"menu\">Klic</gui><gui style=\"menuitem\">Odloži</gui></guiseq>."
 
-#: C/video-call.page:54(p)
+#: C/video-call.page:55(p)
 msgid "To turn a video conversation into an audio conversation, choose <guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Video Off</gui></guiseq>."
 msgstr "Za pretvorbo video pogovora v zvočni pogovor izberite <guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Izklopi</gui></guiseq>."
 
-#: C/video-call.page:60(title)
+#: C/video-call.page:61(title)
 msgid "Start a video conversation with a meta-contact"
 msgstr "Začnite video pogovor z enim od svojih meta-stikov"
 
-#: C/video-call.page:63(p)
+#: C/video-call.page:64(p)
 #: C/send-message.page:53(p)
 #: C/audio-call.page:66(p)
 msgid "From the <gui>Contact List</gui> window, right-click on the meta-contact."
 msgstr "V oknu <gui>Seznam stikov</gui> desno kliknite na meta-stik."
 
-#: C/video-call.page:68(p)
+#: C/video-call.page:69(p)
 msgid "Select the contact you want to have the conversation, and from the menu select <gui style=\"menuitem\">Video Call</gui>."
 msgstr "Desno kliknite na ime stika s katerim želite imeti pogovor in izberite <gui style=\"menuitem\">Klepet</gui>."
 
-#: C/video-call.page:75(p)
+#: C/video-call.page:76(p)
 #: C/send-message.page:65(p)
 #: C/audio-call.page:78(p)
 msgid "To recognize if a contact is a <em>meta-contact</em>, move your mouse on a contact in the <gui>Contact List</gui> window, and stop over it for a second: a small pop-up message will appear showing the number of the contacts that form the meta-contact."
@@ -233,13 +233,12 @@ msgstr "Razumevanje različnih stanj in ikon stanja."
 
 #: C/status-icons.page:20(name)
 #: C/salut-protocol.page:36(cite)
-#: C/prev-conv.page:20(name)
-#: C/prev-conv.page:38(cite)
+#: C/prev-conv.page:21(name)
 #: C/import-account.page:27(name)
-#: C/disable-account.page:24(name)
+#: C/disable-account.page:25(name)
 #: C/audio-video.page:109(cite)
 #: C/audio-video.page:117(cite)
-#: C/add-account.page:24(name)
+#: C/add-account.page:25(name)
 #: C/accounts-window.page:18(name)
 #: C/account-jabber.page:14(name)
 #: C/account-irc.page:16(name)
@@ -247,10 +246,10 @@ msgid "Shaun McCance"
 msgstr "Shaun McCance"
 
 #: C/status-icons.page:21(email)
-#: C/prev-conv.page:21(email)
+#: C/prev-conv.page:22(email)
 #: C/import-account.page:28(email)
-#: C/disable-account.page:25(email)
-#: C/add-account.page:25(email)
+#: C/disable-account.page:26(email)
+#: C/add-account.page:26(email)
 #: C/accounts-window.page:19(email)
 #: C/account-jabber.page:15(email)
 #: C/account-irc.page:17(email)
@@ -319,49 +318,59 @@ msgid "Setting your status to <em>Offline</em> disconnects you from all of your
 msgstr "Nastavitev vašega stanja na <em>Nepovezano</em> prekine povezavo z vsemi vašimi računi."
 
 #: C/share-desktop.page:7(desc)
-msgid "Share the desktop with your contacts."
-msgstr "Dajanje namizja v souporabo s stiki."
+msgid "Show your desktop to your contacts."
+msgstr "Dajte namizje v souporabo s svojimi stiki."
 
-#: C/share-desktop.page:28(title)
+#: C/share-desktop.page:18(name)
+msgid "Ekaterina Gerasimova"
+msgstr "Ekaterina Gerasimova"
+
+#: C/share-desktop.page:19(email)
+msgid "kittykat3756@gmail.com"
+msgstr "kittykat3756@gmail.com"
+
+#: C/share-desktop.page:33(title)
 msgid "Share your desktop"
 msgstr "Dajte vaše namizje v souporabo"
 
-#: C/share-desktop.page:30(p)
-msgid "It is possible, with some of your contacts, to share your desktop with them, or to start using your contacts desktop. You can use this functionality to show your desktop to your contacts, to ask for help or to help your contacts resolve a problem."
-msgstr "Z nekaterimi stiki je mogoče dati svoje namizje v souporabo ali začeti uporabljati njihovo namizje. To zmožnost lahko uporabljate za prikaz svojega namizja vašim stikom, za iskanje pomoči ali za pomoč svojim stikom pri reševanju težav."
+#: C/share-desktop.page:35(p)
+msgid "It is possible to share your desktop with some of your contacts. You can use this functionality to show your desktop to your contacts to, for example, ask for help or help your contacts resolve a problem."
+msgstr "Z nekaterimi stiki je mogoče dati svoje namizje v souporabo ali začeti uporabljati njihovo namizje. To zmožnost lahko uporabljate za prikaz svojega namizja vašim stikom, za iskanje pomoči ali za pomoč svojim stikom pri odpravljanju težav."
 
-#: C/share-desktop.page:38(p)
-msgid "In order to be able to share your desktop or to remotely use your contacts desktop, it is necessary to have a remote desktop viewer application installed in your system."
-msgstr "Za souporabo svojega namizja ali za oddaljeno uporabo namizja svojega stika morate imeti na svojemu sistemu nameščen program oddaljenega pregledovalnika namizja."
+#: C/share-desktop.page:42(p)
+msgid "To be able to share your desktop, you need to have a VNC server, which has support for the feature, installed on your system. <app>Vino</app>, the GNOME VNC server, has the required support."
+msgstr "Za zmožnost souporabe namizja boste morali imeti nameščen strežnik VNC z ustrezno podporo. <app>Vino</app>, GNOME strežnik VNC ima zahtevano podporo."
 
-#: C/share-desktop.page:46(p)
-#: C/send-file.page:40(p)
-#: C/favorite-rooms.page:66(p)
-msgid "From the <gui>Contact List</gui> window, perform one of the following:"
+#: C/share-desktop.page:51(p)
+msgid "From the <gui>Contact List</gui> window, do one of the following:"
 msgstr "V oknu <gui>Seznam stikov</gui> izvedite eno od naslednjega:"
 
-#: C/share-desktop.page:51(p)
-msgid "Select the contact you want to share your desktop with, and choose <guiseq><gui>Edit</gui><gui>Contact</gui><gui>Share my desktop</gui></guiseq>."
+#: C/share-desktop.page:56(p)
+msgid "Select the contact you want to share your desktop with and choose <guiseq><gui>Edit</gui><gui>Contact</gui><gui>Share My Desktop</gui></guiseq>."
 msgstr "Izberite stik kateremu želite dati svoje namizje v souporabo in izberite  <guiseq><gui>Uredi</gui><gui>Stik</gui><gui>Daj moje namizje v souporabo</gui></guiseq>."
 
-#: C/share-desktop.page:57(p)
-msgid "Right-click on the name of the contact you want to share your desktop with, and select <gui>Share my desktop</gui>."
+#: C/share-desktop.page:63(p)
+msgid "Right-click on the name of the contact you want to share your desktop with and select <gui>Share My Desktop</gui>."
 msgstr "Desno kliknite na ime stika kateremu želite dati namizje v souporabo in izberite <gui>Daj moje namizje v souporabo</gui>."
 
-#: C/share-desktop.page:65(p)
-msgid "A request will be sent to the contact you want to share your desktop with. If they accept, the default remote desktop viewer application will be launched in order to permit you to disconnect the user that is controlling your desktop."
-msgstr "Vašemu stiku bo poslana zahteva za souporabo namizja. V primeru da zahtevo sprejme, se bo zagnal privzeti oddaljeni pregledovalnik namizja, ki vam bo omogočal prekinitev povezave z uporabnikom, ki nadzira vaše namizje."
+#: C/share-desktop.page:71(p)
+msgid "An invitation to view your desktop will be sent to the contact you have selected. To view your desktop, they will need to accept it."
+msgstr "Povabilo za ogled vašega namizja bo bilo poslano izbranemu stiku. Za ogled vašega namizja ga bo moral sprejeti."
 
-#: C/share-desktop.page:70(p)
-msgid "For more information about how to use the remote desktop viewer application, refer to its help."
+#: C/share-desktop.page:77(p)
+msgid "You can disconnect the contact from your computer using your desktop sharing application."
+msgstr "Povezavo stika s svojim oddaljenim namizjem lahko prekinete s programom souporabe namizja."
+
+#: C/share-desktop.page:82(p)
+msgid "For more information about how to use the remote desktop sharing application, refer to its help."
 msgstr "Za več podrobnosti kako uporabiti program oddaljenega pregledovalnika namizja se sklicujte na pomoč."
 
-#: C/share-desktop.page:77(p)
+#: C/share-desktop.page:90(p)
 msgid "When you share your desktop with someone else, it is possible to experience system performance slowdown and low Internet speed."
 msgstr "Ko svoje namizje date v souporabo z nekom drugim, boste morda opazili upočasnjeno delovanje sistema in nizko hitrost medmrežja."
 
-#: C/share-desktop.page:83(p)
-msgid "Not all your contacts might be able to support this functionality. It is necessary for them to have at least the 2.28 version of <app>Empathy</app> and a remote desktop viewer application installed in their system."
+#: C/share-desktop.page:96(p)
+msgid "Some of your contacts may not be able to use this feature. It is necessary for them to have version 2.28, or newer, of <app>Empathy</app> and a compatible remote desktop viewer application installed in their system."
 msgstr "Vsi stiki morda ne podpirajo te zmožnosti. Stiki morajo imeti vsaj <app>Empathy</app> različico 2.28 in na svojemu sistemu nameščen program pregledovalnika oddaljenega namizja."
 
 #: C/set-custom-status.page:9(desc)
@@ -472,10 +481,10 @@ msgstr "Pošljite sporočilo enemu od vaših stikov."
 #: C/send-message.page:17(name)
 #: C/send-file.page:17(name)
 #: C/prob-conn.page:14(name)
-#: C/prob-conn-neterror.page:14(name)
+#: C/prob-conn-neterror.page:15(name)
 #: C/prob-conn-auth.page:17(name)
-#: C/prob-conn-acctdisabled.page:14(name)
-#: C/change-status.page:19(name)
+#: C/prob-conn-acctdisabled.page:15(name)
+#: C/change-status.page:24(name)
 #: C/add-contact.page:18(name)
 msgid "Phil Bull"
 msgstr "Phil Bull"
@@ -483,10 +492,10 @@ msgstr "Phil Bull"
 #: C/send-message.page:18(email)
 #: C/send-file.page:18(email)
 #: C/prob-conn.page:15(email)
-#: C/prob-conn-neterror.page:15(email)
+#: C/prob-conn-neterror.page:16(email)
 #: C/prob-conn-auth.page:18(email)
-#: C/prob-conn-acctdisabled.page:15(email)
-#: C/change-status.page:20(email)
+#: C/prob-conn-acctdisabled.page:16(email)
+#: C/change-status.page:25(email)
 #: C/add-contact.page:19(email)
 msgid "philbull@gmail.com"
 msgstr "philbull@gmail.com"
@@ -519,6 +528,11 @@ msgstr "Pošljite datoteko s svojega računalnika enemu od svojih stikov."
 msgid "Send files"
 msgstr "Pošiljanje datotek"
 
+#: C/send-file.page:40(p)
+#: C/favorite-rooms.page:66(p)
+msgid "From the <gui>Contact List</gui> window, perform one of the following:"
+msgstr "V oknu <gui>Seznam stikov</gui> izvedite eno od naslednjega:"
+
 #: C/send-file.page:45(p)
 msgid "Right click on the contact you want to send a file to, and choose <gui>Send file</gui>."
 msgstr "Desno kliknite na stik, kateremu želite poslati datoteko in izberite <gui>Pošlji datoteko</gui>."
@@ -564,8 +578,9 @@ msgid "What is People Nearby?"
 msgstr "Kaj je \"Ljudje v bližini\"?"
 
 #: C/salut-protocol.page:37(p)
+#, fuzzy
 msgid "I'd like to see this played up a bit more."
-msgstr ""
+msgstr "?"
 
 #: C/salut-protocol.page:40(p)
 msgid "The People Nearby service is a serverless communication service: you do not need to connect and authenticate to a central server in order to use it."
@@ -587,34 +602,34 @@ msgstr "Vsa novejša krajevna omrežja bi morala podpirati to vrsto storitve."
 msgid "Completely remove an account from <app>Empathy</app>."
 msgstr "Popolnoma odstrani račun iz <app>Empathy</app>."
 
-#: C/remove-account.page:33(title)
+#: C/remove-account.page:34(title)
 msgid "Remove an account"
 msgstr "Odstranitev računa"
 
-#: C/remove-account.page:35(p)
+#: C/remove-account.page:36(p)
 msgid "You can completely remove an account from <app>Empathy</app> if you no longer wish to use the account. If you wish to use the account in <app>Empathy</app> again in the future, you will have to add your account details again."
 msgstr "V primeru da računa ne želite več uporabljati, lahko račun popolnoma odstranite iz <app>Empathy</app>. V primeru da želite v prihodnosti račun v <app>Empathy</app> ponovno uporabljati boste morali ponovno dodati podrobnosti svojega računa."
 
-#: C/remove-account.page:42(p)
+#: C/remove-account.page:43(p)
 #: C/irc-nick-password.page:50(p)
-#: C/disable-account.page:48(p)
-#: C/add-account.page:48(p)
+#: C/disable-account.page:49(p)
+#: C/add-account.page:49(p)
 msgid "From the <gui>Contact List</gui> window, choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq>, or press <key>F4</key>."
 msgstr "V oknu <gui>Seznam stikov</gui> izberite <guiseq><gui>Uredi</gui><gui>Računi</gui></guiseq> ali pritisnite <key>F4</key>."
 
-#: C/remove-account.page:46(p)
+#: C/remove-account.page:47(p)
 msgid "Select the account you wish to remove from the accounts list on the left side of the window."
 msgstr "Na seznamu računov na levi strani okna izberite račun, ki ga želite odstraniti."
 
-#: C/remove-account.page:50(p)
-msgid "Click on <gui style=\"button\">Remove</gui>."
-msgstr "Kliknite <gui style=\"button\">Odstrani</gui>."
+#: C/remove-account.page:51(p)
+msgid "Click <gui style=\"button\">-</gui>."
+msgstr "Kliknite <gui style=\"button\">-</gui>."
 
-#: C/remove-account.page:53(p)
+#: C/remove-account.page:54(p)
 msgid "A dialog will be shown asking for confirmation. Click the <gui>Remove</gui> button to permanently remove the account."
 msgstr "Pojavilo se pogovorno okno, ki vas bo spraševalo za potrditev. Kliknite gumb <gui>Odstrani</gui> za odstranitev računa."
 
-#: C/remove-account.page:59(p)
+#: C/remove-account.page:60(p)
 msgid "Even after removing an account, <app>Empathy</app> does not delete your conversation history for that account."
 msgstr "Tudi po odstraniti računa <app>Empathy</app> ne izbriše zgodovine vaših pogovorov za ta račun."
 
@@ -628,8 +643,8 @@ msgstr "Težave s povezovanjem s storitvijo hipnega sporočanja"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/prob-conn-neterror.page:58(None)
-#: C/prob-conn-name.page:43(None)
+#: C/prob-conn-neterror.page:59(None)
+#: C/prob-conn-name.page:44(None)
 #: C/prob-conn-auth.page:58(None)
 #: C/account-irc.page:109(None)
 msgid "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b"
@@ -639,53 +654,53 @@ msgstr "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b"
 msgid "An error message which says “<gui>Network error</gui>” appears in the main window."
 msgstr "V glavnemu oknu se pojavi sporočilo napake, ki pravi  “<gui>Network error</gui>”."
 
-#: C/prob-conn-neterror.page:33(title)
+#: C/prob-conn-neterror.page:34(title)
 msgid "I get a message that says “Network error”"
 msgstr "Dobim sporočilo, ki pravi “Napaka omrežja”"
 
-#: C/prob-conn-neterror.page:36(cite)
+#: C/prob-conn-neterror.page:37(cite)
 msgid "shaunm"
 msgstr "shaunm"
 
-#: C/prob-conn-neterror.page:37(p)
+#: C/prob-conn-neterror.page:38(p)
 msgid "Empathy no longer allows you to create an IRC account without a valid nick. I've removed the guide link. Remove the text."
 msgstr "Empathy vam ne dovoli ustvarjanje računa IRC brez veljavnega vzdevka. Povezava vodiča je bila odstranjena. Odstrani besedilo."
 
-#: C/prob-conn-neterror.page:41(p)
+#: C/prob-conn-neterror.page:42(p)
 msgid "This kind of error happens when <app>Empathy</app> cannot communicate with the instant messaging service for some reason."
 msgstr "Ta vrsta napake se zgodi, ko <app>Empathy</app> zaradi nekega vzroka ne more komunicirati s storitvijo hipnega sporočanja. "
 
-#: C/prob-conn-neterror.page:45(p)
+#: C/prob-conn-neterror.page:46(p)
 msgid "Also, this kind of error happens when you try to use an IRC account without setting a nickname."
 msgstr "Ta vrsta napake se zgodi, ko poskušate uporabiti račun IRC brez nastavitve vzdevka."
 
-#: C/prob-conn-neterror.page:52(p)
+#: C/prob-conn-neterror.page:53(p)
 #: C/prob-conn-auth.page:45(p)
-#: C/prob-conn-acctdisabled.page:43(p)
+#: C/prob-conn-acctdisabled.page:44(p)
 msgid "Make sure that you are connected to the Internet, or to a local area network."
 msgstr "Prepričajte se, da ste povezani na medmrežje ali na krajevno omrežje."
 
-#: C/prob-conn-neterror.page:57(p)
-#: C/prob-conn-name.page:42(p)
+#: C/prob-conn-neterror.page:58(p)
+#: C/prob-conn-name.page:43(p)
 #: C/prob-conn-auth.page:57(p)
 msgid "Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\">edit</media> icon in the error message."
 msgstr "V sporočilu napake kliknite na ikono <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\">uredi</media>."
 
-#: C/prob-conn-neterror.page:65(p)
-#: C/prob-conn-acctdisabled.page:59(p)
+#: C/prob-conn-neterror.page:64(p)
+#: C/prob-conn-acctdisabled.page:60(p)
 msgid "Check in the <gui>Advanced</gui> section that all the details are correct. You should be able to find these details from the website of the messaging service."
 msgstr "V odseku <gui>Napredno</gui> preverite, da so vse podrobnosti pravilne. Te podrobnosti bi morali najti na spletišču storitve sporočanja."
 
-#: C/prob-conn-neterror.page:82(p)
-#: C/prob-conn-auth.page:68(p)
-msgid "Deselect the <gui>Enabled</gui>, and then select it again to try to reconnect to the service."
-msgstr "Odstranite izbiro <gui>Omogočeno</gui> in jo nato ponovno izberite za poskus ponovne povezave s storitvijo."
+#: C/prob-conn-neterror.page:79(p)
+#: C/prob-conn-name.page:65(p)
+msgid "Switch the account off, and then switch it on to try to reconnect to the service."
+msgstr "Izklopite račun in ga ponovno vklopite za poskus ponovne povezave s storitvijo."
 
-#: C/prob-conn-neterror.page:90(title)
+#: C/prob-conn-neterror.page:87(title)
 msgid "Proxy support"
 msgstr "Podpora posredniških strežnikov"
 
-#: C/prob-conn-neterror.page:91(p)
+#: C/prob-conn-neterror.page:88(p)
 msgid "At the moment <app>Empathy</app> can not be configured to work with a proxy."
 msgstr "Trenutno <app>Empathy</app> ni mogoče nastaviti za delo s posredovalnim strežnikom."
 
@@ -697,26 +712,22 @@ msgstr "“Ime v uporabi”"
 msgid "An error message which says “<gui>Name in use</gui>” appears in the main window."
 msgstr "V glavnemu oknu se pojavi sporočilo napake, ki pravi  “<gui>Ime v uporabi</gui>”."
 
-#: C/prob-conn-name.page:32(title)
+#: C/prob-conn-name.page:33(title)
 msgid "I get a message that says “Name in use”"
 msgstr "Dobim sporočilo, ki pravi “Ime v uporabi” "
 
-#: C/prob-conn-name.page:34(p)
+#: C/prob-conn-name.page:35(p)
 msgid "This kind of error happens when you try to connect to your IRC account and you are using a nickname that is already being used by someone else on that particular network."
 msgstr "Ta vrsta napak se zgodi, ko se poskusite povezati s svojim računom IRC in uporabljate vzdevek, ki ga na istemu omrežju že uporablja nekdo drug. "
 
-#: C/prob-conn-name.page:50(p)
+#: C/prob-conn-name.page:51(p)
 msgid "In the <gui>Nickname</gui> text box, type a new nickname."
 msgstr "V besedilno polje <gui>Vzdevek</gui> vpišite nov vzdevek."
 
-#: C/prob-conn-name.page:55(p)
+#: C/prob-conn-name.page:56(p)
 msgid "If you have registered that nickname within the network you are using, set the password for that nickname. For more information, see <link xref=\"irc-nick-password\"/>."
 msgstr "V primeru da ste ta vzdevek ustvarili v omrežju, ki ga uporabljate, nastavite geslo za ta vzdevek. Za več podrobnosti si oglejte  <link xref=\"irc-nick-password\"/>."
 
-#: C/prob-conn-name.page:64(p)
-msgid "Deselect the <gui>Enabled</gui> check-box next to the name of your account, and then select it again to try to reconnect to the service."
-msgstr "Odstranite izbiro izbirnega polja <gui>Omogočeno</gui> poleg imena svojega računa, in jo nato ponovno izberite za poskus ponovne povezave s storitvijo."
-
 #: C/prob-conn-auth.page:8(desc)
 msgid "An error message which says “<gui>Authentication failed</gui>” appears in the main window."
 msgstr "V glavnemu oknu se pojavi sporočilo napake, ki pravi “<gui>Overitev je spodletela</gui>”."
@@ -734,110 +745,102 @@ msgid "Make sure that you have registered an account with the service you are tr
 msgstr "Prepričajte se, da ste ustvarili račun za storitev s katero se želite povezati. V primeru da nimate računa, vam večina storitev ne bo dovolila povezave."
 
 #: C/prob-conn-auth.page:63(p)
-#: C/prob-conn-acctdisabled.page:54(p)
+#: C/prob-conn-acctdisabled.page:55(p)
 msgid "Type your username and password again to make sure that they are correct."
 msgstr "Ponovno vpišite svoje uporabniško ime in geslo ter se prepričajte da sta pravilna."
 
+#: C/prob-conn-auth.page:68(p)
+msgid "Deselect the <gui>Enabled</gui>, and then select it again to try to reconnect to the service."
+msgstr "Odstranite izbiro <gui>Omogočeno</gui> in jo nato ponovno izberite za poskus ponovne povezave s storitvijo."
+
 #: C/prob-conn-acctdisabled.page:7(desc)
 msgid "The instant messaging account that you want to use is not enabled in the list of accounts."
 msgstr "Račun hipnega sporočanja, ki ga želite uporabiti ni omogočen na seznamu računov."
 
-#: C/prob-conn-acctdisabled.page:33(title)
+#: C/prob-conn-acctdisabled.page:34(title)
 msgid "My account is not enabled"
 msgstr "Moj račun ni omogočen"
 
-#: C/prob-conn-acctdisabled.page:35(p)
+#: C/prob-conn-acctdisabled.page:36(p)
 msgid "If the instant messaging account that you want to use is not enabled in the drop-down account list when you try to start a new conversation or join a room, your account details may not be correct."
 msgstr "V primeru da račun hipnega sporočanja, ki ga želite uporabiti, v spustnemu seznamu računov ob poskusu začetka novega pogovora ali pridružitve sobe ni omogočen, so morda podrobnosti vašega računa nepravilne. "
 
-#: C/prob-conn-acctdisabled.page:48(p)
+#: C/prob-conn-acctdisabled.page:49(p)
 msgid "Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq> and select the account that is not working."
 msgstr "Izberite <guiseq><gui>Uredi</gui><gui>Računi</gui></guiseq> in izberite račun, ki ne deluje."
 
-#: C/prob-conn-acctdisabled.page:65(p)
-msgid "Check that the <gui style=\"checkbox\">Enabled</gui> check-box is selected. If it is not, select the check-box to enable the account."
-msgstr "Preverite, če je izbrano izbirno polje <gui style=\"checkbox\">Omogočeno</gui>. Če ni, ga izberite in s tem omogočite račun."
+#: C/prob-conn-acctdisabled.page:66(p)
+msgid "Check that the account is switched on."
+msgstr "Preverite, da je račun vklopljen."
 
 #: C/prev-conv.page:8(desc)
 msgid "Browse or search your previous conversations."
 msgstr "Brskanje ali iskanje po preteklih pogovorih."
 
-#: C/prev-conv.page:35(title)
+#: C/prev-conv.page:36(title)
 msgid "View previous conversations"
 msgstr "Ogled preteklih pogovorov"
 
-#: C/prev-conv.page:39(p)
-msgid "Highlighting text is quirky: <link href=\"http://bugzilla.gnome.org/show_bug.cgi?id=593733\">#593733</link>. If there's an actual highlighting going on, independent of the selection (like in yellow or something), we can use the term \"highlight\". Otherwise we need to use the term \"select\". Watch that bug."
-msgstr "Poudarjanje besedila je čudno: <link href=\"http://bugzilla.gnome.org/show_bug.cgi?id=593733\">#593733</link>. V primeru da pride do dejanskega poudarjanja neodvisno od izbire (na primer v rumeni barvi), lahko uporabimo izraz \"poudarjanje\". V nasprotnemu primeru moramo uporabiti \"izbira\". Opazujte ta hrošč."
-
-#: C/prev-conv.page:46(p)
+#: C/prev-conv.page:38(p)
 msgid "<app>Empathy</app> automatically saves all your text conversations you have with your contacts. You can <link xref=\"#search\">search through all of your previous conversations</link> or <link xref=\"#browse\">browse previous conversations</link> by contact and date."
 msgstr "<app>Empathy</app> samodejno shrani vse vaše besedilne pogovore z vašimi stiki. Lahko <link xref=\"#search\">iščete po vseh vaših predhodnih pogovorih</link> ali <link xref=\"#browse\">brskate predhodne pogovore</link> po stiku in datumu."
 
-#: C/prev-conv.page:54(p)
+#: C/prev-conv.page:46(p)
 msgid "You do not need to be connected to the Internet to view and search your previous conversations."
 msgstr "Za ogled in iskanje vaših predhodnih pogovorov vam ni treba biti povezan na medmrežje."
 
-#: C/prev-conv.page:61(title)
+#: C/prev-conv.page:53(title)
 msgid "Search previous conversations"
 msgstr "Iskanje predhodnih pogovorov"
 
-#: C/prev-conv.page:63(p)
+#: C/prev-conv.page:55(p)
 msgid "You can perform a full-text search through all of your previous conversations."
 msgstr "Izvedete lahko iskanje celega besedila skozi vse vaše predhodne pogovore."
 
-#: C/prev-conv.page:67(p)
-#: C/prev-conv.page:96(p)
+#: C/prev-conv.page:59(p)
+#: C/prev-conv.page:87(p)
 msgid "From the <gui>Contact List</gui> window, choose <guiseq><gui>View</gui><gui>Previous Conversations</gui></guiseq>. Alternatively, press <key>F3</key>."
 msgstr "V oknu <gui>Seznam stikov</gui> izberite <guiseq><gui>Pogled</gui><gui>Pretekli pogovori</gui></guiseq>. Namesto tega lahko pritisnete <key>F3</key>."
 
-#: C/prev-conv.page:71(p)
-msgid "Select the <gui>Search</gui> tab."
-msgstr "Izberite zavihek <gui>Iskanje</gui>."
+#: C/prev-conv.page:63(p)
+msgid "Select an account from the drop-down list in the top. A list of contacts and chat room for that account will be shown below."
+msgstr "Izberite račun s spustnega seznama na vrhu. Seznam vseh stikov in klepetalnic za ta račun bo prikazan spodaj."
 
-#: C/prev-conv.page:74(p)
-msgid "In the <gui>For</gui> field, type the text you want to search for. Click <gui>Find</gui> or press <key>Enter</key>."
-msgstr "V polje <gui>Za</gui>, vtipkajte besedilo, ki ga želite iskati. Kliknite <gui>išči</gui> ali pritisnite <key>Enter</key>."
+#: C/prev-conv.page:67(p)
+msgid "Type the text you want to search for in the <gui>Search</gui> text field."
+msgstr "Vnesite besedilo, ki ga želite najti, v besedilno polje <gui>Iskanje</gui>."
 
-#: C/prev-conv.page:78(p)
-msgid "Any conversations that matched your search terms will be shown in the list below the search field. By default, conversations are ordered by date."
+#: C/prev-conv.page:71(p)
+msgid "Any conversations that matched your search terms will be shown. By default, conversations are ordered by date."
 msgstr "Katerikoli pogovori, ki se skladajo z vašimi iskalnimi pogoji bodo prikazani v seznamu pod iskalnim poljem. Privzeto so pogovori razvrščeni po datumu."
 
-#: C/prev-conv.page:82(p)
-msgid "Click on a conversation to view it. <app>Empathy</app> will select the text in the conversation that matched your search terms."
-msgstr "Za ogled pogovora kliknite nanj. <app>Empathy</app> bo izbral besedilo v pogovoru, ki se sklada z vašimi pogoji iskanja."
-
-#: C/prev-conv.page:89(title)
+#: C/prev-conv.page:80(title)
 msgid "Browse previous conversations"
 msgstr "Brskaj predhodne pogovore"
 
-#: C/prev-conv.page:91(p)
+#: C/prev-conv.page:82(p)
 msgid "You can browse your previous conversations with your contacts or in chat rooms by date."
 msgstr "Svoje predhodne pogovore s svojimi stiki ali klepetalnicami lahko brskate po datumu."
 
-#: C/prev-conv.page:100(p)
-msgid "Select the <gui>Conversations</gui> tab."
-msgstr "Izberite zavihek <gui>Pogovori</gui>."
-
-#: C/prev-conv.page:103(p)
+#: C/prev-conv.page:91(p)
 msgid "Select an account from the drop-down list in the top left. A list of contacts and chat room for that account will be shown below."
 msgstr "Izberite račun s spustnega seznama zgoraj levo. Seznam vseh stikov in klepetalnic za ta račun bo prikazan spodaj."
 
-#: C/prev-conv.page:107(p)
+#: C/prev-conv.page:95(p)
 msgid "Select a contact or chat room to view your previous conversations from. By default the most recent conversation will be shown."
 msgstr "Izberite stik ali klepetalnico za ogled svojih predhodnih pogovorov. Privzeto bodo prikazani najbolj nedavni stiki."
 
-#: C/prev-conv.page:111(p)
+#: C/prev-conv.page:99(p)
 msgid "You can browse your conversations by date. Days on which you had a conversation with the selected contact will be shown in bold text. Click a date to select it. Click the arrows next to the month and year to browse earlier dates."
 msgstr "Svoje pogovore lahko brskate po datumu. Dnevi ob katerih ste imeli pogovor z izbranim stikom bodo prikazni krepko. Kliknite na datum za izbiro. Kliknite puščice poleg meseca in leta za brskanje zgodnejših datumov."
 
-#: C/prev-conv.page:117(p)
-msgid "You can search for text in the displayed conversation by typing into the search field at the top. The matching text will be highlighted."
+#: C/prev-conv.page:105(p)
+msgid "You can search for text in the conversations by typing into the search field at the top. The matching conversations will be showed."
 msgstr "Besedilo v prikazanemu pogovoru lahko iščete s pisanjem v iskalno polje na vrhu. Skladajoče besedilo bo poudarjeno."
 
-#: C/prev-conv.page:121(p)
-msgid "You can quickly view the previous conversations with one of your contacts from the <gui>Contact List</gui> window. Simply right click the contact and choose <gui>View Previous Conversations</gui>. The <gui>Previous Conversations</gui> window will open with that contact already selected."
-msgstr "Predhodne pogovore z enim od vašim stikov si lahko hitro ogledate v oknu <gui>Seznam stikov</gui>. Enostavno desno kliknite na stik in izberite <gui>Ogled predhodnih pogovorov</gui>. Okno <gui>Predhodni pogovori</gui> bo bilo odprto s predhodno izbranim stikom."
+#: C/prev-conv.page:111(p)
+msgid "You can quickly view the previous conversations with one of your contacts from the <gui>Contact List</gui> window. Simply right click the contact and choose <gui>Previous Conversations</gui>. The <gui>Previous Conversations</gui> window will open with that contact already selected."
+msgstr "Predhodne pogovore z enim od svojih stikov si lahko hitro ogledate v oknu <gui>Seznam stikov</gui>. Desno kliknite na stik in izberite <gui>Ogled predhodnih pogovorov</gui>. Odprlo se bo okno <gui>Predhodni pogovori</gui> s predhodno izbranim stikom."
 
 #: C/link-contacts.page:11(desc)
 msgid "Merge and separate different contacts into a single one."
@@ -1029,6 +1032,7 @@ msgstr "V polje <gui>Geslo</gui> vtipkajte geslo, ki ste ga uporabili za ustvarj
 
 #: C/irc-nick-password.page:63(p)
 #: C/import-account.page:61(p)
+#: C/add-account.page:74(p)
 msgid "Click <gui style=\"button\">Apply</gui>."
 msgstr "Kliknite <gui style=\"button\">Uveljavi</gui>."
 
@@ -1036,32 +1040,36 @@ msgstr "Kliknite <gui style=\"button\">Uveljavi</gui>."
 msgid "These instructions only allow you to use a password-protected nickname on certain IRC networks. It is not currently possible to register an IRC nickname or change your nickname password using <app>Empathy</app>."
 msgstr "Ta navodila vam dovolijo uporabo z geslom zaščitenega vzdevka na določenih omrežjih IRC. Trenutno z <app>Empathy</app> ni mogoče ustvariti vzdevka IRC ali spremeniti svojega vzdevka ali gesla. "
 
-#: C/irc-manage.page:9(desc)
+#: C/irc-manage.page:10(desc)
 msgid "How to use IRC with <app>Empathy</app>."
 msgstr "Kako uporabiti IRC z <app>Empathy</app>."
 
-#: C/irc-manage.page:34(title)
+#: C/irc-manage.page:35(title)
 msgid "Internet Relay Chat (IRC)"
 msgstr "Klepet IRC"
 
-#: C/irc-manage.page:37(p)
+#: C/irc-manage.page:38(p)
 #: C/account-irc.page:39(p)
 msgid "You must have the <sys>telepathy-idle</sys> package installed to use IRC in <app>Empathy</app>."
 msgstr "Za uporabo IRC-a v <app>Empathy</app> morate imeti nameščen paket <sys>telepathy-idle</sys>."
 
-#: C/irc-manage.page:43(title)
+#: C/irc-manage.page:42(link)
+msgid "Install telepathy-idle"
+msgstr "Namesite telepathy-idle"
+
+#: C/irc-manage.page:49(title)
 msgid "IRC Chat Rooms and Conversations"
 msgstr "Pogovori in klepetalnice IRC"
 
-#: C/irc-manage.page:45(title)
+#: C/irc-manage.page:51(title)
 msgid "Chat Rooms and Conversations"
 msgstr "Klepetalnice in pogovori"
 
-#: C/irc-manage.page:50(title)
+#: C/irc-manage.page:56(title)
 msgid "Common IRC Problems"
 msgstr "Pogoste težave IRC"
 
-#: C/irc-manage.page:52(title)
+#: C/irc-manage.page:58(title)
 #: C/index.page:55(title)
 msgid "Common Problems"
 msgstr "Pogoste težave"
@@ -1625,25 +1633,25 @@ msgstr "Ko ste končali, kliknite <gui>Zapri</gui>."
 msgid "Prevent <app>Empathy</app> from automatically logging in to an account."
 msgstr "Preprečitev samodejnega prijavljanja <app>Empathy</app> v račun."
 
-#: C/disable-account.page:39(title)
+#: C/disable-account.page:40(title)
 msgid "Disable an account"
 msgstr "Onemogočitev računa"
 
-#: C/disable-account.page:41(p)
+#: C/disable-account.page:42(p)
 msgid "You can disable an account to prevent <app>Empathy</app> from logging in to it without removing the account entirely. You may wish to disable and re-enable an account if you only want to be logged in to the account at certain times, but you still want to use <app>Empathy</app> for other accounts."
 msgstr "Za preprečitev prijave v <app>Empaty</app> brez odstranitve računa lahko račun onemogočite. Morda želite račun onemogočiti in ponovno omogočiti v primeru da želite biti v račun prijavljeni le ob določenih časih, toda želite <app>Empathy</app> še vedno uporabiti za druge račune. "
 
-#: C/disable-account.page:52(p)
+#: C/disable-account.page:53(p)
 msgid "Select the account you wish to disable from the accounts list on the left side of the window."
 msgstr "Izberite račun, ki ga želite onemogočiti, s seznama računov na levi strani okna."
 
-#: C/disable-account.page:56(p)
-msgid "Deselect <gui style=\"checkbox\">Enabled</gui> on the right side of the window."
-msgstr "Odstranite izbiro <gui style=\"checkbox\">Omogočeno</gui> na desni strani okna."
+#: C/disable-account.page:57(p)
+msgid "On the right side of the window, switch it off."
+msgstr "Na desni strani okna ga izklopite."
 
 #: C/disable-account.page:62(p)
-msgid "To re-enable the account, simply select <gui style=\"checkbox\">Enabled</gui>."
-msgstr "Za ponovno omogočitev računa enostavno izberite <gui style=\"checkbox\">Omogočeno</gui>."
+msgid "To re-enable the account, switch it on."
+msgstr "Za ponovno omogočitev računa ga vklopite."
 
 #: C/create-account.page:9(desc)
 msgid "Register for an account with one of the supported messaging services."
@@ -1769,27 +1777,27 @@ msgstr "Yahoo!"
 msgid "Change your status to advertise your availability to your contacts."
 msgstr "Spremenite svoje stanje za oglaševanje vaše razpoložljivosti vašim stikom."
 
-#: C/change-status.page:34(title)
+#: C/change-status.page:39(title)
 msgid "Change your status"
 msgstr "Sprememba stanja"
 
-#: C/change-status.page:36(p)
+#: C/change-status.page:41(p)
 msgid "You can set your status to indicate your availability to your contacts. <app>Empathy</app> allows you to select from a list of defined statuses."
 msgstr "Nastavite lahko svoje stanje za nakaz vaše razpoložljivosti vašim stikov. <app>Empathy</app> vam omogoča izbiro s seznama določenih stanj."
 
-#: C/change-status.page:41(p)
+#: C/change-status.page:46(p)
 msgid "Click on the drop-down list at the top of the <gui>Contact List</gui> window."
 msgstr "Kliknite na spustni seznam na vrhu okna <gui>Seznam stikov</gui>."
 
-#: C/change-status.page:46(p)
+#: C/change-status.page:51(p)
 msgid "Select a status from the list."
 msgstr "Izberite stanje s seznama"
 
-#: C/change-status.page:52(p)
-msgid "See <link xref=\"status-icons\"/> for a list of the built-in statuses and what they mean. You can also <link xref=\"set-custom-message\">add custom status messages</link> to provide more information about your availability to your contacts."
-msgstr "Oglejte si <link xref=\"status-icons\"/> za seznam vgrajenih stanj in kaj pomenijo.  Lahko tudi <link xref=\"set-custom-message\">dodate sporočila stanja po meri</link> za več podrobnosti o vaših razpoložljivosti vašim stikom."
+#: C/change-status.page:57(p)
+msgid "See <link xref=\"status-icons\"/> for a list of the built-in statuses and what they mean. You can also <link xref=\"set-custom-status\">add custom status messages</link> to provide more information about your availability to your contacts."
+msgstr "Oglejte si <link xref=\"status-icons\"/> za seznam vgrajenih stanj in kaj pomenijo.  Lahko tudi <link xref=\"set-custom-message\">dodate sporočila stanja po meri</link> za več podrobnosti o vaši razpoložljivosti svojim stikom."
 
-#: C/change-status.page:58(p)
+#: C/change-status.page:63(p)
 msgid "If you do not use your computer for a while, or if the screensaver is on, the status will be automatically set to Away."
 msgstr "V primeru da svojega računalnika nekaj časa ne uporabljate, ali če je ohranjevalnik zaslona vklopljen bo stanje samodejno nastavljeno na Odsoten."
 
@@ -2015,35 +2023,31 @@ msgstr "Za dodajanje nove osebe na vaš seznam stikov morate biti povezani na me
 msgid "Add a new account to <app>Empathy</app>."
 msgstr "Dodajanje novega računa v <app>Empathy</app>."
 
-#: C/add-account.page:39(title)
+#: C/add-account.page:40(title)
 msgid "Add a new account"
 msgstr "Dodajanje novega računa"
 
-#: C/add-account.page:41(p)
+#: C/add-account.page:42(p)
 msgid "You can add instant messaging accounts from any supported service to communicate with all of your contacts in <app>Empathy</app>. For some account providers, these steps will also allow you to register for a new account. For more details, see <link xref=\"create-account\"/>."
 msgstr "Račune hipnega sporočanja za sporazumevanje z vsemi svojimi stiki v <app>Empathy</app> lahko dodate s katerekoli podprte naprave. Za nekatere ponudnike računov vam bodo ti koraki omogočili tudi ustvarjanje novega računa. Za več podrobnosti si oglejte <link xref=\"create-account\"/>."
 
-#: C/add-account.page:52(p)
-msgid "Click <gui style=\"button\">Add</gui>."
-msgstr "Kliknite <gui style=\"button\">Dodaj</gui>."
+#: C/add-account.page:53(p)
+msgid "Click <gui style=\"button\">+</gui>."
+msgstr "Kliknite <gui style=\"button\">+</gui>."
 
-#: C/add-account.page:57(p)
+#: C/add-account.page:58(p)
 msgid "From the <gui>Protocol</gui> drop-down list, select the type of account you wish to add."
 msgstr "Na spustnemu seznamu <gui>Protokol</gui> izberite vrsto računa, ki jo želite dodati."
 
-#: C/add-account.page:61(p)
+#: C/add-account.page:62(p)
 msgid "If you do not already have a registered account, select <gui>Create a new account on the server</gui>. This feature is not available for all account types, and may not work with some account providers. See <link xref=\"create-account\"/> for more information."
 msgstr "V primeru da še niste ustvarili novega račun, izberite <gui>Ustvari nov račun na strežniku</gui>. Ta zmožnost ni na voljo za vse vrste računov in morda ne bo delovala z nekaterimi ponudniki računov. Za več podrobnosti si oglejte <link xref=\"create-account\"/>. "
 
-#: C/add-account.page:66(p)
-msgid "Enter the required information. For most accounts, you will only need a login ID and a password. Some accounts may require additional information. See <link xref=\"accounts-window#details\"/> for more information."
+#: C/add-account.page:69(p)
+msgid "Enter the required information. For most accounts, you will only need a login ID and a password. Some accounts may require additional information. See <link xref=\"accounts-window#details\"/>for more information."
 msgstr "Vnesite zahtevane podatke. Za večino računov boste potrebovali le ID prijave in geslo. Nekateri računi morda zahtevajo dodatne podrobnosti. Za več podrobnosti si oglejte <link xref=\"accounts-window#details\"/>."
 
-#: C/add-account.page:71(p)
-msgid "Click <gui style=\"button\">Log in</gui>."
-msgstr "Kliknite <gui style=\"button\">Prijava</gui>."
-
-#: C/add-account.page:78(p)
+#: C/add-account.page:81(p)
 msgid "To change the name that identifies the account in the <gui>Accounts</gui> window, select the account from the list on the left and either click on the name or press the space bar. Edit the account name and press <key>Enter</key> when you’re finished."
 msgstr "Za spremembo imena, ki identificira račun v oknu <gui>Računi</gui>, izberite račun s seznama na levi ali kliknite na ime ali pritisnite preslednico. Uredite ime računa in pritisnite <key>Enter</key>, ko ste končali."
 
@@ -2264,6 +2268,87 @@ msgid "translator-credits"
 msgstr "Andrej Žnidaršič <andrej.znidarsic@gmail.com>, 2010"
 
 #~ msgid ""
+#~ "In order to be able to share your desktop or to remotely use your "
+#~ "contacts desktop, it is necessary to have a remote desktop viewer "
+#~ "application installed in your system."
+#~ msgstr ""
+#~ "Za souporabo svojega namizja ali za oddaljeno uporabo namizja svojega "
+#~ "stika morate imeti na svojemu sistemu nameščen program oddaljenega "
+#~ "pregledovalnika namizja."
+
+#~ msgid ""
+#~ "A request will be sent to the contact you want to share your desktop "
+#~ "with. If they accept, the default remote desktop viewer application will "
+#~ "be launched in order to permit you to disconnect the user that is "
+#~ "controlling your desktop."
+#~ msgstr ""
+#~ "Vašemu stiku bo poslana zahteva za souporabo namizja. V primeru da "
+#~ "zahtevo sprejme, se bo zagnal privzeti oddaljeni pregledovalnik namizja, "
+#~ "ki vam bo omogočal prekinitev povezave z uporabnikom, ki nadzira vaše "
+#~ "namizje."
+
+#~ msgid "Click on <gui style=\"button\">Remove</gui>."
+#~ msgstr "Kliknite <gui style=\"button\">Odstrani</gui>."
+
+#~ msgid ""
+#~ "Deselect the <gui>Enabled</gui> check-box next to the name of your "
+#~ "account, and then select it again to try to reconnect to the service."
+#~ msgstr ""
+#~ "Odstranite izbiro izbirnega polja <gui>Omogočeno</gui> poleg imena "
+#~ "svojega računa, in jo nato ponovno izberite za poskus ponovne povezave s "
+#~ "storitvijo."
+
+#~ msgid ""
+#~ "Check that the <gui style=\"checkbox\">Enabled</gui> check-box is "
+#~ "selected. If it is not, select the check-box to enable the account."
+#~ msgstr ""
+#~ "Preverite, če je izbrano izbirno polje <gui style=\"checkbox\">Omogočeno</"
+#~ "gui>. Če ni, ga izberite in s tem omogočite račun."
+
+#~ msgid ""
+#~ "Highlighting text is quirky: <link href=\"http://bugzilla.gnome.org/"
+#~ "show_bug.cgi?id=593733\">#593733</link>. If there's an actual "
+#~ "highlighting going on, independent of the selection (like in yellow or "
+#~ "something), we can use the term \"highlight\". Otherwise we need to use "
+#~ "the term \"select\". Watch that bug."
+#~ msgstr ""
+#~ "Poudarjanje besedila je čudno: <link href=\"http://bugzilla.gnome.org/"
+#~ "show_bug.cgi?id=593733\">#593733</link>. V primeru da pride do dejanskega "
+#~ "poudarjanja neodvisno od izbire (na primer v rumeni barvi), lahko "
+#~ "uporabimo izraz \"poudarjanje\". V nasprotnemu primeru moramo uporabiti "
+#~ "\"izbira\". Opazujte ta hrošč."
+
+#~ msgid "Select the <gui>Search</gui> tab."
+#~ msgstr "Izberite zavihek <gui>Iskanje</gui>."
+
+#~ msgid ""
+#~ "In the <gui>For</gui> field, type the text you want to search for. Click "
+#~ "<gui>Find</gui> or press <key>Enter</key>."
+#~ msgstr ""
+#~ "V polje <gui>Za</gui>, vtipkajte besedilo, ki ga želite iskati. Kliknite "
+#~ "<gui>išči</gui> ali pritisnite <key>Enter</key>."
+
+#~ msgid ""
+#~ "Click on a conversation to view it. <app>Empathy</app> will select the "
+#~ "text in the conversation that matched your search terms."
+#~ msgstr ""
+#~ "Za ogled pogovora kliknite nanj. <app>Empathy</app> bo izbral besedilo v "
+#~ "pogovoru, ki se sklada z vašimi pogoji iskanja."
+
+#~ msgid "Select the <gui>Conversations</gui> tab."
+#~ msgstr "Izberite zavihek <gui>Pogovori</gui>."
+
+#~ msgid ""
+#~ "Deselect <gui style=\"checkbox\">Enabled</gui> on the right side of the "
+#~ "window."
+#~ msgstr ""
+#~ "Odstranite izbiro <gui style=\"checkbox\">Omogočeno</gui> na desni strani "
+#~ "okna."
+
+#~ msgid "Click <gui style=\"button\">Log in</gui>."
+#~ msgstr "Kliknite <gui style=\"button\">Prijava</gui>."
+
+#~ msgid ""
 #~ "To turn a video conversation into an audio conversation, choose "
 #~ "<guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Video Off</"
 #~ "gui></guiseq>, or click the <media type=\"image\" mime=\"image/png\" src="
diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c
index c21a22ebc..ae3f1dd15 100644
--- a/libempathy-gtk/empathy-account-chooser.c
+++ b/libempathy-gtk/empathy-account-chooser.c
@@ -90,6 +90,10 @@ filter_result_callback_data_new (EmpathyAccountChooser *self,
 {
   FilterResultCallbackData *data;
 
+  g_return_val_if_fail (self != NULL, NULL);
+  g_return_val_if_fail (account != NULL, NULL);
+  g_return_val_if_fail (iter != NULL, NULL);
+
   data = g_slice_new0 (FilterResultCallbackData);
   data->self = g_object_ref (self);
   data->account = g_object_ref (account);
diff --git a/libempathy-gtk/empathy-account-widget-irc.ui b/libempathy-gtk/empathy-account-widget-irc.ui
index aa6e643ec..999fd320a 100644
--- a/libempathy-gtk/empathy-account-widget-irc.ui
+++ b/libempathy-gtk/empathy-account-widget-irc.ui
@@ -81,6 +81,7 @@
                       </object>
                       <packing>
                         <property name="top_attach">1</property>
+                        <property name="left_attach">0</property>
                       </packing>
                     </child>
                     <child>
diff --git a/libempathy-gtk/empathy-groups-widget.c b/libempathy-gtk/empathy-groups-widget.c
index efb58fa99..5d87ef4f4 100644
--- a/libempathy-gtk/empathy-groups-widget.c
+++ b/libempathy-gtk/empathy-groups-widget.c
@@ -182,8 +182,6 @@ populate_data (EmpathyGroupsWidget *self)
           COL_EDITABLE, TRUE,
           COL_ENABLED, enabled,
           -1);
-
-      g_free (l->data);
     }
 
   g_list_free (all_groups);
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index 1a837cf83..dad975b3c 100644
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -219,8 +219,10 @@ individual_view_query_tooltip_cb (EmpathyIndividualView *view,
           EMPATHY_INDIVIDUAL_WIDGET_SHOW_CLIENT_TYPES);
       gtk_container_set_border_width (GTK_CONTAINER (priv->tooltip_widget), 8);
       g_object_ref (priv->tooltip_widget);
-      g_signal_connect (priv->tooltip_widget, "destroy",
-          G_CALLBACK (individual_view_tooltip_destroy_cb), view);
+
+      tp_g_signal_connect_object (priv->tooltip_widget, "destroy",
+          G_CALLBACK (individual_view_tooltip_destroy_cb), view, 0);
+
       gtk_widget_show (priv->tooltip_widget);
     }
   else
@@ -1635,54 +1637,6 @@ individual_view_row_has_child_toggled_cb (GtkTreeModel *model,
   g_free (name);
 }
 
-/* FIXME: This is a workaround for bgo#621076 */
-static void
-individual_view_verify_group_visibility (EmpathyIndividualView *view,
-    GtkTreePath *path)
-{
-  EmpathyIndividualViewPriv *priv = GET_PRIV (view);
-  GtkTreeModel *model;
-  GtkTreePath *parent_path;
-  GtkTreeIter parent_iter;
-
-  if (gtk_tree_path_get_depth (path) < 2)
-    return;
-
-  /* A group row is visible if and only if at least one if its child is visible.
-   * So when a row is inserted/deleted/changed in the base model, that could
-   * modify the visibility of its parent in the filter model.
-  */
-
-  model = GTK_TREE_MODEL (priv->store);
-  parent_path = gtk_tree_path_copy (path);
-  gtk_tree_path_up (parent_path);
-  if (gtk_tree_model_get_iter (model, &parent_iter, parent_path))
-    {
-      /* This tells the filter to verify the visibility of that row, and
-       * show/hide it if necessary */
-      gtk_tree_model_row_changed (GTK_TREE_MODEL (priv->store),
-              parent_path, &parent_iter);
-    }
-  gtk_tree_path_free (parent_path);
-}
-
-static void
-individual_view_store_row_changed_cb (GtkTreeModel *model,
-  GtkTreePath *path,
-  GtkTreeIter *iter,
-  EmpathyIndividualView *view)
-{
-  individual_view_verify_group_visibility (view, path);
-}
-
-static void
-individual_view_store_row_deleted_cb (GtkTreeModel *model,
-  GtkTreePath *path,
-  EmpathyIndividualView *view)
-{
-  individual_view_verify_group_visibility (view, path);
-}
-
 static gboolean
 individual_view_is_visible_individual (EmpathyIndividualView *self,
     FolksIndividual *individual,
@@ -1813,14 +1767,6 @@ individual_view_filter_visible_func (GtkTreeModel *model,
       g_object_unref (individual);
       g_free (group);
 
-      /* FIXME: Work around bgo#626552/bgo#621076 */
-      if (visible)
-        {
-          GtkTreePath *path = gtk_tree_model_get_path (model, iter);
-          individual_view_verify_group_visibility (self, path);
-          gtk_tree_path_free (path);
-        }
-
       return visible;
     }
 
@@ -2818,11 +2764,6 @@ empathy_individual_view_set_store (EmpathyIndividualView *self,
   /* Destroy the old filter and remove the old store */
   if (priv->store != NULL)
     {
-      g_signal_handlers_disconnect_by_func (priv->store,
-          individual_view_store_row_changed_cb, self);
-      g_signal_handlers_disconnect_by_func (priv->store,
-          individual_view_store_row_deleted_cb, self);
-
       g_signal_handlers_disconnect_by_func (priv->filter,
           individual_view_row_has_child_toggled_cb, self);
 
@@ -2849,13 +2790,6 @@ empathy_individual_view_set_store (EmpathyIndividualView *self,
           G_CALLBACK (individual_view_row_has_child_toggled_cb), self);
       gtk_tree_view_set_model (GTK_TREE_VIEW (self),
           GTK_TREE_MODEL (priv->filter));
-
-      tp_g_signal_connect_object (priv->store, "row-changed",
-          G_CALLBACK (individual_view_store_row_changed_cb), self, 0);
-      tp_g_signal_connect_object (priv->store, "row-inserted",
-          G_CALLBACK (individual_view_store_row_changed_cb), self, 0);
-      tp_g_signal_connect_object (priv->store, "row-deleted",
-          G_CALLBACK (individual_view_store_row_deleted_cb), self, 0);
     }
 }
 
diff --git a/libempathy-gtk/empathy-irc-network-chooser-dialog.c b/libempathy-gtk/empathy-irc-network-chooser-dialog.c
index 9d29aff4a..755eb584e 100644
--- a/libempathy-gtk/empathy-irc-network-chooser-dialog.c
+++ b/libempathy-gtk/empathy-irc-network-chooser-dialog.c
@@ -132,6 +132,9 @@ dup_selected_network (EmpathyIrcNetworkChooserDialog *self,
   GtkTreeModel *model;
 
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview));
+  if (selection == NULL)
+    return NULL;
+
   if (!gtk_tree_selection_get_selected (selection, &model, &iter))
     return NULL;
 
@@ -157,7 +160,7 @@ treeview_changed_cb (GtkTreeView *treeview,
   network = dup_selected_network (self, NULL);
   if (network == priv->network)
     {
-      g_object_unref (network);
+      g_clear_object (&network);
       return;
     }
 
diff --git a/libempathy-gtk/empathy-irc-network-chooser.c b/libempathy-gtk/empathy-irc-network-chooser.c
index 7a6bd7898..74c9685e8 100644
--- a/libempathy-gtk/empathy-irc-network-chooser.c
+++ b/libempathy-gtk/empathy-irc-network-chooser.c
@@ -118,6 +118,40 @@ unset_server_params (EmpathyIrcNetworkChooser *self)
   empathy_account_settings_unset (priv->settings, "use-ssl");
 }
 
+static gchar *
+dup_network_service (EmpathyIrcNetwork *network)
+{
+  /* Account.Service has to be a lower case alphanumeric string which may
+   * also contain '-' but not start with it. */
+#define VALID G_CSET_a_2_z G_CSET_DIGITS "-"
+  gchar *service, *tmp;
+
+  service = g_strdup (empathy_irc_network_get_name (network));
+  service = g_strstrip (service);
+
+  if (tp_str_empty (service))
+    {
+      g_free (service);
+      return NULL;
+    }
+
+  tmp = service;
+  service = g_ascii_strdown (service, -1);
+  g_free (tmp);
+
+  service = g_strcanon (service, VALID, '-');
+
+  if (service[0] == '-')
+    {
+      tmp = service;
+      service = g_strdup (service + 1);
+
+      g_free (tmp);
+    }
+
+  return service;
+}
+
 static void
 update_server_params (EmpathyIrcNetworkChooser *self)
 {
@@ -139,6 +173,7 @@ update_server_params (EmpathyIrcNetworkChooser *self)
       gchar *address;
       guint port;
       gboolean ssl;
+      gchar *service;
 
       g_object_get (server,
           "address", &address,
@@ -153,7 +188,13 @@ update_server_params (EmpathyIrcNetworkChooser *self)
       DEBUG ("Setting use-ssl to %s", ssl ? "TRUE": "FALSE" );
       empathy_account_settings_set_boolean (priv->settings, "use-ssl", ssl);
 
+      /* Set Account.Service */
+      service = dup_network_service (priv->network);
+      DEBUG ("Setting Service to %s", service);
+      empathy_account_settings_set_service (priv->settings, service);
+
       g_free (address);
+      g_free (service);
     }
   else
     {
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index 4d6168745..f3761e5cd 100644
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -718,26 +718,25 @@ empathy_pixbuf_avatar_from_individual_scaled_async (
 
 	avatar_icon =
 		folks_avatar_details_get_avatar (FOLKS_AVATAR_DETAILS (individual));
-	if (avatar_icon == NULL)
-		goto out;
+	if (avatar_icon == NULL) {
+		g_simple_async_result_set_error (result, TP_ERRORS,
+			TP_ERROR_INVALID_ARGUMENT, "no avatar found");
+
+		g_simple_async_result_complete (result);
+		g_object_unref (result);
+		return;
+	}
 
 	closure = pixbuf_avatar_from_individual_closure_new (individual, result,
 							     width, height,
 							     cancellable);
-	if (closure == NULL)
-		goto out;
+
+	g_return_if_fail (closure != NULL);
 
 	g_loadable_icon_load_async (avatar_icon, width, cancellable,
 			avatar_icon_load_cb, closure);
 
 	g_object_unref (result);
-
-	return;
-
-out:
-	g_simple_async_result_set_op_res_gpointer (result, NULL, NULL);
-	g_simple_async_result_complete (result);
-	g_object_unref (result);
 }
 
 /* Return a ref on the GdkPixbuf */
diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c
index 78d609685..cf269bdc8 100644
--- a/libempathy/empathy-account-settings.c
+++ b/libempathy/empathy-account-settings.c
@@ -103,6 +103,8 @@ struct _EmpathyAccountSettingsPriv
   /* If TRUE, the account should have 'tel' in its
    * Account.Interface.Addressing.URISchemes property. */
   gboolean uri_scheme_tel;
+  /* If TRUE, Service property needs to be updated when applying changes */
+  gboolean update_service;
 
   GSimpleAsyncResult *apply_result;
 };
@@ -743,6 +745,21 @@ empathy_account_settings_get_service (EmpathyAccountSettings *settings)
   return priv->service;
 }
 
+void
+empathy_account_settings_set_service (EmpathyAccountSettings *settings,
+    const gchar *service)
+{
+  EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
+
+  if (!tp_strdiff (priv->service, service))
+    return;
+
+  g_free (priv->service);
+  priv->service = g_strdup (service);
+  g_object_notify (G_OBJECT (settings), "service");
+  priv->update_service = TRUE;
+}
+
 gchar *
 empathy_account_settings_get_icon_name (EmpathyAccountSettings *settings)
 {
@@ -1446,6 +1463,32 @@ update_account_uri_schemes (EmpathyAccountSettings *self)
 }
 
 static void
+set_service_cb (GObject *source,
+    GAsyncResult *result,
+    gpointer user_data)
+{
+  GError *error = NULL;
+
+  if (!tp_account_set_service_finish (TP_ACCOUNT (source), result, &error))
+    {
+      DEBUG ("Failed to set Account.Service: %s", error->message);
+      g_error_free (error);
+    }
+}
+
+static void
+update_account_service (EmpathyAccountSettings *self)
+{
+  EmpathyAccountSettingsPriv *priv = GET_PRIV (self);
+
+  if (!priv->update_service)
+    return;
+
+  tp_account_set_service_async (priv->account,
+      priv->service != NULL ? priv->service : "", set_service_cb, self);
+}
+
+static void
 empathy_account_settings_account_updated (GObject *source,
     GAsyncResult *result,
     gpointer user_data)
@@ -1486,6 +1529,7 @@ empathy_account_settings_account_updated (GObject *source,
     }
 
   update_account_uri_schemes (settings);
+  update_account_service (settings);
 
   g_simple_async_result_set_op_res_gboolean (priv->apply_result,
       g_strv_length (reconnect_required) > 0);
diff --git a/libempathy/empathy-account-settings.h b/libempathy/empathy-account-settings.h
index ea0c5b048..10ed3684f 100644
--- a/libempathy/empathy-account-settings.h
+++ b/libempathy/empathy-account-settings.h
@@ -78,6 +78,9 @@ const gchar *empathy_account_settings_get_protocol (
 const gchar *empathy_account_settings_get_service (
     EmpathyAccountSettings *settings);
 
+void empathy_account_settings_set_service (EmpathyAccountSettings *settings,
+    const gchar *service);
+
 TpAccount *empathy_account_settings_get_account (
     EmpathyAccountSettings *settings);
 
diff --git a/libempathy/empathy-client-factory.c b/libempathy/empathy-client-factory.c
index 65c0d267a..2a8559441 100644
--- a/libempathy/empathy-client-factory.c
+++ b/libempathy/empathy-client-factory.c
@@ -134,15 +134,21 @@ empathy_client_factory_dup_contact_features (TpSimpleClientFactory *factory,
         TpConnection *connection)
 {
   GArray *features;
-  TpContactFeature feature;
+  TpContactFeature extra_features[] = {
+      TP_CONTACT_FEATURE_ALIAS,
+      TP_CONTACT_FEATURE_PRESENCE,
+      TP_CONTACT_FEATURE_AVATAR_TOKEN,
+      TP_CONTACT_FEATURE_AVATAR_DATA,
+      TP_CONTACT_FEATURE_CAPABILITIES,
+      /* Needed by empathy_individual_add_menu_item_new to check if a contact
+       * is already in the contact list. This feature is pretty cheap to
+       * prepare as it doesn't prepare the full roster. */
+      TP_CONTACT_FEATURE_SUBSCRIPTION_STATES,
+  };
 
   features = chainup->dup_contact_features (factory, connection);
 
-  /* Needed by empathy_individual_add_menu_item_new to check if a contact is
-   * already in the contact list. This feature is pretty cheap to prepare as
-   * it doesn't prepare the full roster. */
-  feature = TP_CONTACT_FEATURE_SUBSCRIPTION_STATES;
-  g_array_append_val (features, feature);
+  g_array_append_vals (features, extra_features, G_N_ELEMENTS (extra_features));
 
   return features;
 }
diff --git a/libempathy/empathy-connection-aggregator.c b/libempathy/empathy-connection-aggregator.c
index 22d5ab8b2..fde365c27 100644
--- a/libempathy/empathy-connection-aggregator.c
+++ b/libempathy/empathy-connection-aggregator.c
@@ -231,6 +231,7 @@ empathy_connection_aggregator_dup_singleton (void)
   return aggregator;
 }
 
+/* (transfer container) */
 GList *
 empathy_connection_aggregator_get_all_groups (EmpathyConnectionAggregator *self)
 {
diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index 55e23380c..4b5738b7a 100644
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -393,7 +393,7 @@ empathy_account_get_error_message (TpAccount *account,
 {
   const gchar *dbus_error;
   const gchar *message;
-        const GHashTable *details = NULL;
+  const GHashTable *details = NULL;
   TpConnectionStatusReason reason;
 
   dbus_error = tp_account_get_detailed_error (account, &details);
@@ -410,11 +410,11 @@ empathy_account_get_error_message (TpAccount *account,
   if (message != NULL)
     return message;
 
+  tp_account_get_connection_status (account, &reason);
+
   DEBUG ("Don't understand error '%s'; fallback to the status reason (%u)",
     dbus_error, reason);
 
-  tp_account_get_connection_status (account, &reason);
-
   return empathy_status_reason_get_default_message (reason);
 }
 
diff --git a/po/gl.po b/po/gl.po
index b0653dda3..9d4404c37 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,14 +7,14 @@
 # Antón Méixome <meixome@certima.net>, 2010.
 # Francisco Diéguez <frandieguez@ubuntu.com>, 2010.
 # Fran Diéguez <frandieguez@gnome.org>,2009, 2010, 2011.
-# Fran Dieguez <frandieguez@gnome.org>, 2009, 2010, 2011.
+# Fran Dieguez <frandieguez@gnome.org>, 2009, 2010, 2011, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy-master-po-gl-57278_.merged\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 13:01+0100\n"
-"PO-Revision-Date: 2011-11-04 13:02+0100\n"
+"POT-Creation-Date: 2012-01-15 15:44+0100\n"
+"PO-Revision-Date: 2012-01-15 15:45+0100\n"
 "Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
 "Language-Team: Galician <gnome-l10n-gl@gnome.org>\n"
 "Language: gl\n"
@@ -25,242 +25,271 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr ""
-"Converse en Google Talk, Facebook, MSN e moitos máis servizos de conversa"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "Cliente de MI"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Mensaxaría na Internet Empathy"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "Cliente de MI"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr ""
+"Converse en Google Talk, Facebook, MSN e moitos máis servizos de conversa"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Abrir sempre unha xanela de conversa á parte para as conversas novas."
+msgid "Connection managers should be used"
+msgstr "Se se deberían usar xestores de conexión"
 
+# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "Volume da chamada"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+"Indica se deberían usarse xestores de conectividade para conectarse ou "
+"desconectarse automaticamente ou non."
 
+# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "Volume da chamada, como porcentaxe."
+msgid "Empathy should auto-connect on startup"
+msgstr "O Empathy debería conectarse automaticamente ao inicio"
 
+# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Camera device"
-msgstr "Dispositivo da cámara"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr ""
+"Indica se o Empathy debería iniciar a sesión nas súas contas automaticamente "
+"ao inicio ou non."
 
+# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Camera position"
-msgstr "Posición da cámara"
+msgid "Empathy should auto-away when idle"
+msgstr "O Empathy debería pórse automaticamente en ausente ao estar inactivo"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
-"O carácter para engadir despois do alcume cando se use o completado de "
-"alcume (tabulador) nunha conversa de grupo."
+"Indica se o Empathy debería pórse no estado de ausente se o usuario está "
+"inactivo."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Chat window theme"
-msgstr "Tema da xanela de conversa"
+msgid "Empathy default download folder"
+msgstr "Cartafol de descargas predeterminado do Empathy"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Chat window theme variant"
-msgstr "Variante do tema da xanela de charla"
+msgid "The default folder to save file transfers in."
+msgstr ""
+"O cartafol predeterminado en que gardar as transferencias de ficheiros."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-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 a usar (p."
-"ex., «gl, pt, en»)."
+msgid "Show offline contacts"
+msgstr "Mostrar os contactos desconectados"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Compact contact list"
-msgstr "Lista de contactos compacta"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr ""
+"Indica se mostrar ou non os contactos que están desconectados na lista de "
+"contactos."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Connection managers should be used"
-msgstr "Se se deberían usar xestores de conexión"
+msgid "Show avatars"
+msgstr "Mostrar os avatares"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Contact list sort criterion"
-msgstr "Criterio de ordenación da lista de contactos"
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr ""
+"Indica se mostrar ou non os avatares dos contactos da lista de contactos e "
+"das xanelas de conversa."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "D-Bus object path of the last account selected to join a room."
-msgstr ""
-"Ruta do obxecto D-Bus da última conta seleccionada para unirse a unha sala."
+msgid "Show protocols"
+msgstr "Mostrar os protocolos"
 
+# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgid "Whether to show protocols for contacts in the contact list."
 msgstr ""
-"Dispositivo de cámara predeterminado para usar nas chamadas de vídeo, p.ex. /"
-"dev/video0."
+"Indica se mostrar ou non os protocolos para os contacto na lista de "
+"contactos."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Default directory to select an avatar image from"
-msgstr "O cartafol predeterminado desde o que seleccionar unha imaxe de avatar"
+msgid "Show Balance in contact list"
+msgstr "Mostrar o balance na lista de contactos"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Disable popup notifications when away"
-msgstr "Desactivar as notificacións emerxentes cando se está ausente"
+msgid "Whether to show account balances in the contact list."
+msgstr "Indica se mostrar ou non os balances na lista de contactos."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Disable sounds when away"
-msgstr "Desactivar os sons cando se está ausente"
+msgid "Compact contact list"
+msgstr "Lista de contactos compacta"
 
+# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Display incoming events in the status area"
-msgstr "Mostrar os eventos de entrada na área de estado"
+msgid "Whether to show the contact list in compact mode."
+msgstr "Indica se mostrar ou non a lista de contactos no modo compacto."
 
+# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"Mostrar os eventos entrantes na área de estado. Se é falso mostrarllos "
-"directamente ao usuario."
+msgid "Hide main window"
+msgstr "Agochar a xanela principal"
 
+# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Echo cancellation support"
-msgstr "Compatibilidade de cancelación de eco"
+msgid "Hide the main window."
+msgstr "Agochar a xanela principal."
 
+# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can publish the user's location"
-msgstr "Empathy pode publicar a localización dos usuarios"
+msgid "Default directory to select an avatar image from"
+msgstr "O cartafol predeterminado desde o que seleccionar unha imaxe de avatar"
 
+# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy pode usar o GPS para seguir a localización"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "O último cartafol desde onde foi escollida unha imaxe de avatar."
 
+# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-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"
+msgid "Open new chats in separate windows"
+msgstr "Abrir as novas conversas en xanelas separadas"
 
+# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy pode usar a rede para adiviñar a localización"
+msgid "Always open a separate chat window for new chats."
+msgstr "Abrir sempre unha xanela de conversa á parte para as conversas novas."
 
-# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy default download folder"
-msgstr "Cartafol de descargas predeterminado do Empathy"
+msgid "Display incoming events in the status area"
+msgstr "Mostrar os eventos de entrada na área de estado"
 
-# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should auto-away when idle"
-msgstr "O Empathy debería pórse automaticamente en ausente ao estar inactivo"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Mostrar os eventos entrantes na área de estado. Se é falso mostrarllos "
+"directamente ao usuario."
 
-# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should auto-connect on startup"
-msgstr "O Empathy debería conectarse automaticamente ao inicio"
+msgid "The position for the chat window side pane"
+msgstr "A posición do panel lateral da xanela de conversa"
 
-# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Empathy should reduce the location's accuracy"
-msgstr "O Empathy debería reducir a precisión da localización"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr ""
+"A posición almacenada (en píxeles) do panel lateral da xanela de conversa."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-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"
+msgid "Contact list sort criterion"
+msgstr "Criterio de ordenación da lista de contactos"
 
+# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable WebKit Developer Tools"
-msgstr "Activar as ferramentas de desenvolvedor WebKit"
+msgid ""
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's name with the value \"name\". A value of \"state\" will sort "
+"the contact list by state."
+msgstr ""
+"Que criterio usará ao ordenar a lista de contactos. O predeterminado é usar "
+"a ordenación polo nome do contacto co valor \"name\". Un valor de \"estado\" "
+"ordenará a lista de contactos por estado."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Enable popup notifications for new messages"
-msgstr "Activar as notificacións emerxentes para as mensaxes novas"
+msgid "Use notification sounds"
+msgstr "Usar sons de notificación"
 
-# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Enable spell checker"
-msgstr "Activar a verificación ortográfica"
+msgid "Whether to play a sound to notify of events."
+msgstr "Indica se reproducir ou non un son para notificar os eventos."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Hide main window"
-msgstr "Agochar a xanela principal"
+msgid "Disable sounds when away"
+msgstr "Desactivar os sons cando se está ausente"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Hide the main window."
-msgstr "Agochar a xanela principal."
+msgid "Whether to play sound notifications when away or busy."
+msgstr ""
+"Indica se reproducir ou non un son para notificar cando se está ocupado ou "
+"ausente."
 
+# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Last account selected in Join Room dialog"
-msgstr "Última conta seleccionada no diálogo Unirse á sala"
+msgid "Play a sound for incoming messages"
+msgstr "Reproducir un son para as mensaxes entrantes"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Nick completed character"
-msgstr "Carácter de completado de alcume"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr ""
+"Indica se reproducir ou non un son para notificar as mensaxes entrantes."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Open new chats in separate windows"
-msgstr "Abrir as novas conversas en xanelas separadas"
+msgid "Play a sound for outgoing messages"
+msgstr "Reproducir un son para as mensaxes saíntes"
 
+# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Path of the Adium theme to use"
-msgstr "Ruta do tema de Adium para usar"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Indica se reproducir ou non un son para notificar as mensaxes saíntes."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr ""
-"Ruta do tema de Adium para usar se o tema usado para o chat é de Adium."
+msgid "Play a sound for new conversations"
+msgstr "Reproducir un son para as conversas novas"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for incoming messages"
-msgstr "Reproducir un son para as mensaxes entrantes"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Indica se reproducir ou non un son para notificar as conversas novas."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Play a sound for new conversations"
-msgstr "Reproducir un son para as conversas novas"
+msgid "Play a sound when a contact logs in"
+msgstr "Reproducir un son cando un contacto inicia unha sesión"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound for outgoing messages"
-msgstr "Reproducir un son para as mensaxes saíntes"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr ""
+"Indica se reproducir ou non un son para notificar que os contactos inician "
+"unha sesión na rede."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when a contact logs in"
-msgstr "Reproducir un son cando un contacto inicia unha sesión"
+msgid "Play a sound when a contact logs out"
+msgstr "Reproducir un son cando un contacto saia da sesión"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when a contact logs out"
-msgstr "Reproducir un son cando un contacto saia da sesión"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr ""
+"Indica se reproducir ou non un son para notificar que os contactos terminan "
+"unha sesión na rede."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
@@ -269,377 +298,374 @@ msgstr "Reproducir un son cando iniciamos a sesión"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Play a sound when we log out"
-msgstr "Reproducir un son cando saímos da sesión"
+msgid "Whether to play a sound when logging into a network."
+msgstr ""
+"Indica se reproducir ou non un son cando se inicia unha sesión na rede."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "Facer emerxer unha notificación cando a conversa non está enfocada"
+msgid "Play a sound when we log out"
+msgstr "Reproducir un son cando saímos da sesión"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Pop up notifications when a contact logs in"
-msgstr "Facer emerxer unha notificación cando un contacto entra"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Indica se reproducir ou non un son cando se sae da sesión na rede."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Pop up notifications when a contact logs out"
-msgstr "Facer emerxer unha notificación cando un contacto sae"
+msgid "Enable popup notifications for new messages"
+msgstr "Activar as notificacións emerxentes para as mensaxes novas"
 
+# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Position the camera preview should be during a call."
+msgid "Whether to show a popup notification when receiving a new message."
 msgstr ""
-"Posición onde debe estar a vista previa da cámara durante unha chamada."
+"Indica se mostrar ou non unha notificación emerxente cando se reciba unha "
+"mensaxe nova."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show Balance in contact list"
-msgstr "Mostrar o balance na lista de contactos"
+msgid "Disable popup notifications when away"
+msgstr "Desactivar as notificacións emerxentes cando se está ausente"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show avatars"
-msgstr "Mostrar os avatares"
+msgid "Whether to show popup notifications when away or busy."
+msgstr ""
+"Indica se mostrar ou non as notificacións emerxentes cando se está ausente "
+"ou ocupado."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show contact list in rooms"
-msgstr "Mostrar a lista de contactos nas salas"
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Facer emerxer unha notificación cando a conversa non está enfocada"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show hint about closing the main window"
-msgstr "Mostrar unha indicación sobre pechar a xanela principal"
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Indica se mostrar ou non unha notificación emerxente cando se reciba unha "
+"mensaxe nova, aínda cando a conversa xa estea aberta mais non estea enfocada."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Show offline contacts"
-msgstr "Mostrar os contactos desconectados"
+msgid "Pop up notifications when a contact logs in"
+msgstr "Facer emerxer unha notificación cando un contacto entra"
 
+# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Show protocols"
-msgstr "Mostrar os protocolos"
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr ""
+"Indica se mostrar ou non unha notificación emerxente cando un contacto está "
+"conectado."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "Spell checking languages"
-msgstr "Idiomas para a corrección ortográfica"
+msgid "Pop up notifications when a contact logs out"
+msgstr "Facer emerxer unha notificación cando un contacto sae"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The default folder to save file transfers in."
+msgid "Whether to show a popup notification when a contact goes offline."
 msgstr ""
-"O cartafol predeterminado en que gardar as transferencias de ficheiros."
+"Indica se mostrar ou non unha notificación emerxente cando un contacto está "
+"desconectado."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The last directory that an avatar image was chosen from."
-msgstr "O último cartafol desde onde foi escollida unha imaxe de avatar."
+msgid "Use graphical smileys"
+msgstr "Usar emoticonas gráficas"
 
+# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The position for the chat window side pane"
-msgstr "A posición do panel lateral da xanela de conversa"
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr ""
+"Indica se converter ou non as emoticonas en imaxes gráficas nas conversas."
 
+# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr ""
-"A posición almacenada (en píxeles) do panel lateral da xanela de conversa."
+msgid "Show contact list in rooms"
+msgstr "Mostrar a lista de contactos nas salas"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-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."
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Indica se mostrar ou non a lista de contactos nas salas de conversa."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr ""
-"A variante do tema que se usará para mostrar a conversa nas xanelas de chat."
+msgid "Chat window theme"
+msgstr "Tema da xanela de conversa"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use graphical smileys"
-msgstr "Usar emoticonas gráficas"
+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/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Use notification sounds"
-msgstr "Usar sons de notificación"
+msgid "Chat window theme variant"
+msgstr "Variante do tema da xanela de charla"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Use theme for chat rooms"
-msgstr "Usar un tema para as salas de conversa"
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr ""
+"A variante do tema que se usará para mostrar a conversa nas xanelas de chat."
 
-# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr ""
-"Indica se o Empathy pode ou non publicar a localización do usuario aos seus "
-"contactos."
+msgid "Path of the Adium theme to use"
+msgstr "Ruta do tema de Adium para usar"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the GPS to guess the location."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr ""
-"Indica se o Empathy pode usar ou non o GPS para adiviñar a localización."
+"Ruta do tema de Adium para usar se o tema usado para o chat é de Adium."
 
-# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr ""
-"Indica se o Empathy pode ou non usar a rede de telefonía móbil para adiviñar "
-"a localización."
+msgid "Enable WebKit Developer Tools"
+msgstr "Activar as ferramentas de desenvolvedor WebKit"
 
-# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy can use the network to guess the location."
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
-"Indica se o Empathy pode ou non usar a rede para adiviñar a localización."
+"Indica se as ferramentas de desenvolvedor WebKit, tales como Web Inspector, "
+"deberían ser activadas."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr ""
-"Indica se o Empathy debería iniciar a sesión nas súas contas automaticamente "
-"ao inicio ou non."
+msgid "Use theme for chat rooms"
+msgstr "Usar un tema para as salas de conversa"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr ""
-"Indica se o Empathy debería pórse no estado de ausente se o usuario está "
-"inactivo."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Indica se usar ou non o tema para as salas de conversa."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"Indica se o Empathy debería ou non reducir a precisión de localización por "
-"motivos de privacidade."
+msgid "Spell checking languages"
+msgstr "Idiomas para a corrección ortográfica"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
-"Indica se o Empathy debería usar o avatar dos contactos como a icona da "
-"xanela da conversa ou non."
+"Unha lista separada por vírgulas dos verificadores ortográficos a usar (p."
+"ex., «gl, pt, en»)."
 
+# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr ""
-"Indica se as ferramentas de desenvolvedor WebKit, tales como Web Inspector, "
-"deberían ser activadas."
+msgid "Enable spell checker"
+msgstr "Activar a verificación ortográfica"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr ""
-"Indica se deberían usarse xestores de conectividade para conectarse ou "
-"desconectarse automaticamente ou non."
-
-# rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr ""
 "Indica se se deberían verificar ou non as palabras escritas no idioma co que "
 "as quere verificar."
 
 # rever
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+msgid "Nick completed character"
+msgstr "Carácter de completado de alcume"
+
+# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to convert smileys into graphical images in conversations."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
 msgstr ""
-"Indica se converter ou non as emoticonas en imaxes gráficas nas conversas."
+"O carácter para engadir despois do alcume cando se use o completado de "
+"alcume (tabulador) nunha conversa de grupo."
 
+# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "Indica se activar o filtro de cancelación de eco de Pulseaudio."
+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"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of contacts logging into the network."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
-"Indica se reproducir ou non un son para notificar que os contactos inician "
-"unha sesión na rede."
+"Indica se o Empathy debería usar o avatar dos contactos como a icona da "
+"xanela da conversa ou non."
 
-# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr ""
-"Indica se reproducir ou non un son para notificar que os contactos terminan "
-"unha sesión na rede."
+msgid "Last account selected in Join Room dialog"
+msgstr "Última conta seleccionada no diálogo Unirse á sala"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of events."
-msgstr "Indica se reproducir ou non un son para notificar os eventos."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr ""
+"Ruta do obxecto D-Bus da última conta seleccionada para unirse a unha sala."
 
-# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr ""
-"Indica se reproducir ou non un son para notificar as mensaxes entrantes."
+msgid "Camera device"
+msgstr "Dispositivo da cámara"
 
-# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Indica se reproducir ou non un son para notificar as conversas novas."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr ""
+"Dispositivo de cámara predeterminado para usar nas chamadas de vídeo, p.ex. /"
+"dev/video0."
 
-# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Indica se reproducir ou non un son para notificar as mensaxes saíntes."
+msgid "Camera position"
+msgstr "Posición da cámara"
 
-# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play a sound when logging into a network."
+msgid "Position the camera preview should be during a call."
 msgstr ""
-"Indica se reproducir ou non un son cando se inicia unha sesión na rede."
+"Posición onde debe estar a vista previa da cámara durante unha chamada."
 
-# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Indica se reproducir ou non un son cando se sae da sesión na rede."
+msgid "Echo cancellation support"
+msgstr "Compatibilidade de cancelación de eco"
 
-# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to play sound notifications when away or busy."
-msgstr ""
-"Indica se reproducir ou non un son para notificar cando se está ocupado ou "
-"ausente."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Indica se activar o filtro de cancelación de eco de Pulseaudio."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr ""
-"Indica se mostrar ou non unha notificación emerxente cando un contacto está "
-"desconectado."
+msgid "Show hint about closing the main window"
+msgstr "Mostrar unha indicación sobre pechar a xanela principal"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when a contact goes online."
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
 msgstr ""
-"Indica se mostrar ou non unha notificación emerxente cando un contacto está "
-"conectado."
+"Indica se mostrar ou non o diálogo de mensaxe sobre pechar a xanela "
+"principal co botón 'x' da barra de título."
 
-# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"Indica se mostrar ou non unha notificación emerxente cando se reciba unha "
-"mensaxe nova, aínda cando a conversa xa estea aberta mais non estea enfocada."
+msgid "Empathy can publish the user's location"
+msgstr "Empathy pode publicar a localización dos usuarios"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show a popup notification when receiving a new message."
+msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr ""
-"Indica se mostrar ou non unha notificación emerxente cando se reciba unha "
-"mensaxe nova."
+"Indica se o Empathy pode ou non publicar a localización do usuario aos seus "
+"contactos."
 
-# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show account balances in the contact list."
-msgstr "Indica se mostrar ou non os balances na lista de contactos."
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy pode usar a rede para adiviñar a localización"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
+msgid "Whether Empathy can use the network to guess the location."
 msgstr ""
-"Indica se mostrar ou non os avatares dos contactos da lista de contactos e "
-"das xanelas de conversa."
+"Indica se o Empathy pode ou non usar a rede para adiviñar a localización."
 
-# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr ""
-"Indica se mostrar ou non os contactos que están desconectados na lista de "
-"contactos."
+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"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show popup notifications when away or busy."
+msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr ""
-"Indica se mostrar ou non as notificacións emerxentes cando se está ausente "
-"ou ocupado."
+"Indica se o Empathy pode ou non usar a rede de telefonía móbil para adiviñar "
+"a localización."
 
-# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr ""
-"Indica se mostrar ou non os protocolos para os contacto na lista de "
-"contactos."
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy pode usar o GPS para seguir a localización"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Indica se mostrar ou non a lista de contactos nas salas de conversa."
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr ""
+"Indica se o Empathy pode usar ou non o GPS para adiviñar a localización."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to show the contact list in compact mode."
-msgstr "Indica se mostrar ou non a lista de contactos no modo compacto."
+msgid "Empathy should reduce the location's accuracy"
+msgstr "O Empathy debería reducir a precisión da localización"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
-"Indica se mostrar ou non o diálogo de mensaxe sobre pechar a xanela "
-"principal co botón 'x' da barra de título."
+"Indica se o Empathy debería ou non reducir a precisión de localización por "
+"motivos de privacidade."
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2406
+msgid "Messaging and VoIP Accounts"
+msgstr "Contas de mensaxaría e VoIP"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Xestionar as contas de mensaxaría e VoIP"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
-msgid "Whether to use the theme for chat rooms."
-msgstr "Indica se usar ou non o tema para as salas de conversa."
+#: ../libempathy/empathy-ft-handler.c:736
+msgid "No reason was specified"
+msgstr "Non se especificou un motivo"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
-msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
-msgstr ""
-"Que criterio usará ao ordenar a lista de contactos. O predeterminado é usar "
-"a ordenación polo nome do contacto co valor \"name\". Un valor de \"estado\" "
-"ordenará a lista de contactos por estado."
+#: ../libempathy/empathy-ft-handler.c:739
+msgid "The change in state was requested"
+msgstr "Foi solicitado o cambio de estado"
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Xestionar as contas de mensaxaría e VoIP"
+# rever
+#: ../libempathy/empathy-ft-handler.c:742
+msgid "You canceled the file transfer"
+msgstr "Vostede cancelou a transferencia de ficheiros"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2307
-msgid "Messaging and VoIP Accounts"
-msgstr "Contas de mensaxaría e VoIP"
+# rever
+#: ../libempathy/empathy-ft-handler.c:745
+msgid "The other participant canceled the file transfer"
+msgstr "O outro participante cancelou a transferencia de ficheiros"
+
+# rever
+#: ../libempathy/empathy-ft-handler.c:748
+msgid "Error while trying to transfer the file"
+msgstr "Produciuse un erro ao tentar transferir o ficheiro"
 
-#: ../libempathy/empathy-ft-handler.c:838
+# rever
+#: ../libempathy/empathy-ft-handler.c:751
+msgid "The other participant is unable to transfer the file"
+msgstr "O outro participante non pode transferir o ficheiro"
+
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:311
+msgid "Unknown reason"
+msgstr "Motivo descoñecido"
+
+#: ../libempathy/empathy-ft-handler.c:917
 msgid "File transfer completed, but the file was corrupted"
 msgstr ""
 "Completouse a transferencia de ficheiro pero o ficheiro está corrompido"
 
-#: ../libempathy/empathy-ft-handler.c:1124
+#: ../libempathy/empathy-ft-handler.c:1203
 msgid "File transfer not supported by remote contact"
 msgstr "A transferencia de ficheiro non é permitida polo contacto remoto"
 
-#: ../libempathy/empathy-ft-handler.c:1180
+#: ../libempathy/empathy-ft-handler.c:1259
 msgid "The selected file is not a regular file"
 msgstr "O ficheiro seleccionado non é un ficheiro regular"
 
-#: ../libempathy/empathy-ft-handler.c:1189
+#: ../libempathy/empathy-ft-handler.c:1268
 msgid "The selected file is empty"
 msgstr "O ficheiro seleccionado está baleiro"
 
@@ -659,194 +685,156 @@ msgstr "Chamou %s"
 msgid "Call from %s"
 msgstr "Chamada de %s"
 
-#: ../libempathy/empathy-tp-file.c:258
-msgid "Socket type not supported"
-msgstr "O tipo de socket non é compatíbel"
-
-# rever
-#: ../libempathy/empathy-tp-file.c:377
-msgid "No reason was specified"
-msgstr "Non se especificou un motivo"
-
-# rever
-#: ../libempathy/empathy-tp-file.c:380
-msgid "The change in state was requested"
-msgstr "Foi solicitado o cambio de estado"
-
-# rever
-#: ../libempathy/empathy-tp-file.c:383
-msgid "You canceled the file transfer"
-msgstr "Vostede cancelou a transferencia de ficheiros"
-
-# rever
-#: ../libempathy/empathy-tp-file.c:386
-msgid "The other participant canceled the file transfer"
-msgstr "O outro participante cancelou a transferencia de ficheiros"
-
-# rever
-#: ../libempathy/empathy-tp-file.c:389
-msgid "Error while trying to transfer the file"
-msgstr "Produciuse un erro ao tentar transferir o ficheiro"
-
-# rever
-#: ../libempathy/empathy-tp-file.c:392
-msgid "The other participant is unable to transfer the file"
-msgstr "O outro participante non pode transferir o ficheiro"
-
-#: ../libempathy/empathy-tp-file.c:395 ../libempathy/empathy-utils.c:312
-msgid "Unknown reason"
-msgstr "Motivo descoñecido"
-
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:231
 msgid "Available"
 msgstr "Dispoñíbel"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:233
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:236
 msgid "Away"
 msgstr "Ausente"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:238
 msgid "Invisible"
 msgstr "Invisíbel"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:240
 msgid "Offline"
 msgstr "Desconectado"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:243
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Descoñecido"
 
 # rever
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:283
 msgid "No reason specified"
 msgstr "Non se especificou un motivo"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:341
 msgid "Status is set to offline"
 msgstr "O estado está definido a desconectado"
 
 # rever
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:321
 #: ../libempathy-gtk/empathy-call-utils.c:49
-#: ../libempathy-gtk/empathy-new-message-dialog.c:82
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Erro de rede"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
 msgid "Authentication failed"
 msgstr "Fallou a autenticación"
 
 # rever
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Encryption error"
 msgstr "Erro de cifrado"
 
 # rever
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:293
 msgid "Name in use"
 msgstr "Nome en uso"
 
 # rever
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:295 ../libempathy/empathy-utils.c:327
 msgid "Certificate not provided"
 msgstr "Non se proporcionou o certificado"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate untrusted"
 msgstr "Certificado non fiábel"
 
 # rever
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate expired"
 msgstr "O certificado caducou"
 
 # rever
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate not activated"
 msgstr "O certificado non está activado"
 
 # rever
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate hostname mismatch"
 msgstr "O nome do host do certificado non coincide"
 
 # rever
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate fingerprint mismatch"
 msgstr "A impresión dixital do certificado non coincide"
 
 # rever
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate self-signed"
 msgstr "Certificado autoasinado"
 
 # rever
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:309
 msgid "Certificate error"
 msgstr "Erro de certificado"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:343
 msgid "Encryption is not available"
 msgstr "O cifrado non está dispoñíbel"
 
 # rever
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:345
 msgid "Certificate is invalid"
 msgstr "O certificado non é válido"
 
 # rever
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:347
 msgid "Connection has been refused"
 msgstr "Rexeitouse a conexión"
 
 # rever
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection can't be established"
 msgstr "Non é posíbel estabelecer a conexión"
 
 # rever
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection has been lost"
 msgstr "Perdeuse a conexión"
 
-#: ../libempathy/empathy-utils.c:354
+#: ../libempathy/empathy-utils.c:353
 msgid "This resource is already connected to the server"
 msgstr "Este recurso xa está conectado ao servidor"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:355
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "A conexión foi substituída por unha nova conexión empregando o mesmo recurso"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:358
 msgid "The account already exists on the server"
 msgstr "Esta conta xa existe no servidor"
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:360
 msgid "Server is currently too busy to handle the connection"
 msgstr "Nestes intres o servidor está moi ocupado para xesionar a conexión"
 
 # rever
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:362
 msgid "Certificate has been revoked"
 msgstr "O certificado foi revocado"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:364
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "O certificado usa un algoritmo de cifrado inseguro ou cripotograficamente "
 "débil"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:367
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -855,25 +843,25 @@ msgstr ""
 "certificado do servidor excede os límites impostos pola biblioteca de "
 "criptografía."
 
-#: ../libempathy/empathy-utils.c:372
+#: ../libempathy/empathy-utils.c:371
 msgid "Your software is too old"
 msgstr "O seu software é demasiado antigo"
 
 # rever
-#: ../libempathy/empathy-utils.c:531
+#: ../libempathy/empathy-utils.c:530
 msgid "People Nearby"
 msgstr "Persoas próximas"
 
 # rever
-#: ../libempathy/empathy-utils.c:536
+#: ../libempathy/empathy-utils.c:535
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:564
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:566
+#: ../libempathy/empathy-utils.c:565
 msgid "Facebook Chat"
 msgstr "Chat de Facebook"
 
@@ -927,223 +915,193 @@ msgstr "no futuro"
 msgid "All accounts"
 msgstr "Tódalas contas"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:335
 msgid "Account"
 msgstr "Conta"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "Contrasinal"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Servidor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Porto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:776
-#: ../libempathy-gtk/empathy-account-widget.c:828
+#: ../libempathy-gtk/empathy-account-widget.c:763
+#: ../libempathy-gtk/empathy-account-widget.c:815
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-# rever
-#: ../libempathy-gtk/empathy-account-widget.c:1182
-msgid "My Web Accounts"
-msgstr "As miñas contas web"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1199
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "A conta %s edítase mediante %s."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1205
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "Non é posíbel editar a conta %s en Empathy."
-
-# rever
-#: ../libempathy-gtk/empathy-account-widget.c:1224
-msgid "Launch My Web Accounts"
-msgstr "Iniciar My Web Accounts"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1232
-#, c-format
-msgid "Edit %s"
-msgstr "Editar %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1582
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1396
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Nome de _usuario:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1900
+#: ../libempathy-gtk/empathy-account-widget.c:1708
 msgid "A_pply"
 msgstr "A_plicar"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1930
+#: ../libempathy-gtk/empathy-account-widget.c:1737
 msgid "L_og in"
 msgstr "Iniciar sesi_ón"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2004
+#: ../libempathy-gtk/empathy-account-widget.c:1810
 msgid "This account already exists on the server"
 msgstr "Esta conta xa existe no servidor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2007
+#: ../libempathy-gtk/empathy-account-widget.c:1814
 msgid "Create a new account on the server"
 msgstr "Crear unha nova conta no servidor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2199
-msgid "Ca_ncel"
-msgstr "Ca_ncelar"
-
 # rever
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2477
+#: ../libempathy-gtk/empathy-account-widget.c:2239
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s sobre %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2503
+#: ../libempathy-gtk/empathy-account-widget.c:2265
 #, c-format
 msgid "%s Account"
 msgstr "Conta %s"
 
 # rever
-#: ../libempathy-gtk/empathy-account-widget.c:2507
+#: ../libempathy-gtk/empathy-account-widget.c:2269
 msgid "New account"
 msgstr "Conta nova"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Exemplo:</b> MeuNomeEnPantalla"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "Con_trasinal:"
 
+# rever
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "Avanzado"
+msgid "Screen _Name:"
+msgstr "_Nome en pantalla:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Exemplo:</b> MeuNomeEnPantalla"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "Con_trasinal:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Lembrar o contrasinal"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Lembrar o contrasinal"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Porto:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "Lembrar o contrasinal"
-
-# rever
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "_Nome en pantalla:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Servidor:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "Cal e o seu contrasinal para AIM?"
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Avanzado"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "Cal é o seu nome en patalla para AIM?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Porto:"
+msgid "What is your AIM password?"
+msgstr "Cal e o seu contrasinal para AIM?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Servidor:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Exemplo:</b> nomeusuario"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Lembrar o contrasinal"
 
 # rever
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "I_D de sesión:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Exemplo:</b> nomeusuario"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "Cal é o seu ID de usuario en GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "Cal é o seu contrasinal en GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+# rever
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "_UIN ICQ:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Exemplo:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "Codificación de c_aracteres:"
 
-# rever
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "_UIN ICQ:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "Cal é o seu UIN para ICQ?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "Cal é o seu contrasinal pra ICQ?"
 
@@ -1180,11 +1138,23 @@ msgstr "Opcións"
 msgid "None"
 msgstr "Ningún"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Rede"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "Rede:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Character set:"
 msgstr "Codificación de caracteres:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "Servidores"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -1192,14 +1162,6 @@ msgstr ""
 "A maioría dos servidores IRC non precisan contrasinal, polo que se non está "
 "seguro non escriba un contrasinal."
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "Rede"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "Rede:"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Alcume:"
@@ -1217,51 +1179,20 @@ msgstr "Mensaxe de saída:"
 msgid "Real name:"
 msgstr "Nome real:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Servidores"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "Cal é o seu alcume de IRC?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Que rede IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Examplo:</b> usuario@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Exemplo:</b> user@jabber.org"
-
-# rever
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "Requírese o c_ifrado (TLS/SSL)"
-
-# rever
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "I_gnorar os erros do certificado SSL"
-
-# rever
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Ignorar as configuracións do servidor"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "Pri_oridade:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "Cal é o seu alcume de IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "Rec_urso:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "Cal é o seu nome de usuario para Facebook?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1273,186 +1204,213 @@ msgstr ""
 "Use <a href=\"http://www.facebook.com/username/\">esta páxina</a> para "
 "seleccioar o nome de usuario de Facebook se non ten ningún."
 
-# rever
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "Usar o SS_L antigo"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "Cal é o seu contrasinal para Facebook?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "Cal é o seu nome de usuario para Facebook?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "Cal é o seu ID de Google?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Examplo:</b> usuario@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "Cal é o seu contrasinal de Google?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Exemplo:</b> user@jabber.org"
+
+# rever
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "I_gnorar os erros do certificado SSL"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "Pri_oridade:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "Rec_urso:"
+
+# rever
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "Requírese o c_ifrado (TLS/SSL)"
+
+# rever
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "Usar o SS_L antigo"
+
+# rever
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Ignorar as configuracións do servidor"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "Cal é o seu identificador de Jabber?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Cal é o seu contrasinal de Jabber?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "Cal é o ID de Jabber que desexa?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Cal é o seu contrasinal de Jabber?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "Cal é o contrasinal de Jabber que desexa?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Exemplo:</b> usuario@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "Cal é o seu contrasinal para Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Cal é o seu contrasinal para Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "Enderezo de correo _electrónico:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "_Alcume:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "_Apelidos:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "_Nome:"
 
+# rever
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "Nome _publicado:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "ID para _Jabber:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Apelidos:"
+msgid "E-_mail address:"
+msgstr "Enderezo de correo _electrónico:"
 
-# rever
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "Nome _publicado:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "Nome de _usuario:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Exemplo:</b> usuaruio@meu.servidor.sip"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Nome de usuario para a autenticación:"
-
-# rever
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Descubrir ligazón"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "Descubrir o servidor STUN automaticamente"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Usar esta conta para chamar a teléfonos _fixos e móbiles"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Ignorar os erros TLS"
+msgid "NAT Traversal Options"
+msgstr "Opcións do NAT transversal"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Intervalo (segundos)"
+msgid "Proxy Options"
+msgstr "Opcións do proxy"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Opcións de Keep-Alive"
+msgid "Miscellaneous Options"
+msgstr "Opcións varias"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Enrutado aberto"
+msgid "STUN Server:"
+msgstr "Servidor STUN:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Mecanismo:"
+msgid "Discover the STUN server automatically"
+msgstr "Descubrir o servidor STUN automaticamente"
 
+# rever
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Opcións varias"
+msgid "Discover Binding"
+msgstr "Descubrir ligazón"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "Opcións do NAT transversal"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Servidor:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Opcións de Keep-Alive"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Porto:"
+msgid "Mechanism:"
+msgstr "Mecanismo:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Opcións do proxy"
+msgid "Interval (seconds)"
+msgstr "Intervalo (segundos)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Nome de usuario para a autenticación:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Transporte:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "Servidor STUN:"
+msgid "Loose Routing"
+msgstr "Enrutado aberto"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
-msgid "Server:"
-msgstr "Servidor:"
+msgid "Ignore TLS Errors"
+msgstr "Ignorar os erros TLS"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Transporte:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Usar esta conta para chamar a teléfonos _fixos e móbiles"
+msgid "Port:"
+msgstr "Porto:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "Cal é o contrasinal da súa conta SIP?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Cal é o seu ID de inicio de sesión SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "Nome de _usuario:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "Cal é o contrasinal da súa conta SIP?"
 
 # rever
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "I_D de Yahoo:"
+
+# rever
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "I_gnorar os convites para conferencias e salas de conversa"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+# rever
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "Configuración da lista de _salas:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "Cal é o seu ID para Yahoo?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "Cal é o seu contrasinal para Yahoo?"
 
 # rever
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "I_D de Yahoo:"
-
-# rever
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "Configuración da lista de _salas:"
-
-# rever
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1520,40 +1478,40 @@ msgstr "Este protocolo non admite as chamadas de emerxencia"
 msgid "You don't have enough credit in order to place this call"
 msgstr "Non ten crédito dabondo para facer esta chamada"
 
-#: ../libempathy-gtk/empathy-chat.c:706
+#: ../libempathy-gtk/empathy-chat.c:705
 msgid "Failed to open private chat"
 msgstr "Produciuse un fallo ao abrir un chat privado"
 
-#: ../libempathy-gtk/empathy-chat.c:764
+#: ../libempathy-gtk/empathy-chat.c:763
 msgid "Topic not supported on this conversation"
 msgstr "Ese asunto non se admite nesta conversación"
 
-#: ../libempathy-gtk/empathy-chat.c:770
+#: ../libempathy-gtk/empathy-chat.c:769
 msgid "You are not allowed to change the topic"
 msgstr "Non se lle permite cambiar o asunto"
 
-#: ../libempathy-gtk/empathy-chat.c:971
+#: ../libempathy-gtk/empathy-chat.c:970
 #, c-format
 msgid "“%s” is not a valid contact ID"
 msgstr "«%s» non é un ID de contacto válido"
 
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1065
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear, limpa todas as mensaxes da conversa actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1069
+#: ../libempathy-gtk/empathy-chat.c:1068
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <topic>, estabelece o asunto da conversa actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1072
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <chatroom id>, unirse a unha nova sala de conversa"
 
-#: ../libempathy-gtk/empathy-chat.c:1075
+#: ../libempathy-gtk/empathy-chat.c:1074
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <chatroom id>, unirse a unha nova sala de conversa"
 
-#: ../libempathy-gtk/empathy-chat.c:1079
+#: ../libempathy-gtk/empathy-chat.c:1078
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1561,23 +1519,23 @@ msgstr ""
 "/part [<chat room ID>] [<reason>]: abandonar a sala de char, por omisión a "
 "actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1082
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <contact id> [<message>], abre unha conversa privada"
 
-#: ../libempathy-gtk/empathy-chat.c:1086
+#: ../libempathy-gtk/empathy-chat.c:1085
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <contact id> <message>, abre unha conversa privada"
 
-#: ../libempathy-gtk/empathy-chat.c:1089
+#: ../libempathy-gtk/empathy-chat.c:1088
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <nickname>, cambia o seu nome de usuario no servidor actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1092
+#: ../libempathy-gtk/empathy-chat.c:1091
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <message>, envía unha mensaxe ACTION á conversa actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1095
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1587,11 +1545,11 @@ msgstr ""
 "unha mensaxe que comeza cunha '/'. Por exemplo: \"/say /join úsase para "
 "unirse a unha nova sala de conversa\""
 
-#: ../libempathy-gtk/empathy-chat.c:1100
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <ID do contacto>: mostra información sobre un contacto"
 
-#: ../libempathy-gtk/empathy-chat.c:1103
+#: ../libempathy-gtk/empathy-chat.c:1102
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1599,127 +1557,127 @@ msgstr ""
 "/help [<command>], mostra todas as ordes admitidas. Se <command> está "
 "definida, mostra o seu uso."
 
-#: ../libempathy-gtk/empathy-chat.c:1122
+#: ../libempathy-gtk/empathy-chat.c:1121
 #, c-format
 msgid "Usage: %s"
 msgstr "Uso: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1167
+#: ../libempathy-gtk/empathy-chat.c:1166
 msgid "Unknown command"
 msgstr "Orde descoñecida"
 
-#: ../libempathy-gtk/empathy-chat.c:1293
+#: ../libempathy-gtk/empathy-chat.c:1292
 msgid "Unknown command; see /help for the available commands"
 msgstr "Orde descoñecida, vexa /help para obter as ordes dispoñíbeis"
 
-#: ../libempathy-gtk/empathy-chat.c:1457
+#: ../libempathy-gtk/empathy-chat.c:1456
 msgid "insufficient balance to send message"
 msgstr "non ten balance suficiente para enviar a mensaxe"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:1461 ../libempathy-gtk/empathy-chat.c:1475
-#: ../libempathy-gtk/empathy-chat.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1460 ../libempathy-gtk/empathy-chat.c:1474
+#: ../libempathy-gtk/empathy-chat.c:1537
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Produciuse un erro ao enviar a mensaxe '%s': %s"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:1463 ../libempathy-gtk/empathy-chat.c:1480
-#: ../libempathy-gtk/empathy-chat.c:1542
+#: ../libempathy-gtk/empathy-chat.c:1462 ../libempathy-gtk/empathy-chat.c:1479
+#: ../libempathy-gtk/empathy-chat.c:1541
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Produciuse un erro ao enviar a mensaxe: %s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1469
+#: ../libempathy-gtk/empathy-chat.c:1468
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr ""
 "non ten balance dabondo para enviar a mensaxe <a href='%s'>Recargar</a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1509
+#: ../libempathy-gtk/empathy-chat.c:1508
 msgid "not capable"
 msgstr "non é posíbel"
 
-#: ../libempathy-gtk/empathy-chat.c:1516
+#: ../libempathy-gtk/empathy-chat.c:1515
 msgid "offline"
 msgstr "desconectado"
 
-#: ../libempathy-gtk/empathy-chat.c:1519
+#: ../libempathy-gtk/empathy-chat.c:1518
 msgid "invalid contact"
 msgstr "contacto incorrecto"
 
-#: ../libempathy-gtk/empathy-chat.c:1522
+#: ../libempathy-gtk/empathy-chat.c:1521
 msgid "permission denied"
 msgstr "permiso denegado"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:1525
+#: ../libempathy-gtk/empathy-chat.c:1524
 msgid "too long message"
 msgstr "a mensaxe é demasiado longa"
 
-#: ../libempathy-gtk/empathy-chat.c:1528
+#: ../libempathy-gtk/empathy-chat.c:1527
 msgid "not implemented"
 msgstr "non implementado"
 
-#: ../libempathy-gtk/empathy-chat.c:1532
+#: ../libempathy-gtk/empathy-chat.c:1531
 msgid "unknown"
 msgstr "descoñecido"
 
-#: ../libempathy-gtk/empathy-chat.c:1599 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1598 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "Asunto:"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:1611
+#: ../libempathy-gtk/empathy-chat.c:1610
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Cambiouse o asunto a: %s"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1612
 msgid "No topic defined"
 msgstr "Non se definiu un asunto"
 
-#: ../libempathy-gtk/empathy-chat.c:2126
+#: ../libempathy-gtk/empathy-chat.c:2125
 msgid "(No Suggestions)"
 msgstr "(Sen suxestións)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2194
+#: ../libempathy-gtk/empathy-chat.c:2193
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Engadir «%s» ao dicionario"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2231
+#: ../libempathy-gtk/empathy-chat.c:2230
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Engadir «%s» ao dicionario de %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2301
+#: ../libempathy-gtk/empathy-chat.c:2300
 msgid "Insert Smiley"
 msgstr "Inserir unha emoticona"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2319
-#: ../libempathy-gtk/empathy-ui-utils.c:1843
+#: ../libempathy-gtk/empathy-chat.c:2318
+#: ../libempathy-gtk/empathy-ui-utils.c:1868
 msgid "_Send"
 msgstr "_Enviar"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2373
+#: ../libempathy-gtk/empathy-chat.c:2375
 msgid "_Spelling Suggestions"
 msgstr "Suxestións de _ortografía"
 
-#: ../libempathy-gtk/empathy-chat.c:2462
+#: ../libempathy-gtk/empathy-chat.c:2464
 msgid "Failed to retrieve recent logs"
 msgstr "Produciuse un fallo ao obter os rexistros recentes"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:2599
+#: ../libempathy-gtk/empathy-chat.c:2601
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s desconectou"
@@ -1727,12 +1685,12 @@ msgstr "%s desconectou"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2606
+#: ../libempathy-gtk/empathy-chat.c:2608
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s foi expulsado por %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2609
+#: ../libempathy-gtk/empathy-chat.c:2611
 #, c-format
 msgid "%s was kicked"
 msgstr "%s foi expulsado"
@@ -1740,17 +1698,17 @@ msgstr "%s foi expulsado"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2617
+#: ../libempathy-gtk/empathy-chat.c:2619
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s foi vetado por %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2620
+#: ../libempathy-gtk/empathy-chat.c:2622
 #, c-format
 msgid "%s was banned"
 msgstr "%s foi excluído"
 
-#: ../libempathy-gtk/empathy-chat.c:2624
+#: ../libempathy-gtk/empathy-chat.c:2626
 #, c-format
 msgid "%s has left the room"
 msgstr "%s deixou a sala"
@@ -1760,18 +1718,18 @@ msgstr "%s deixou a sala"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2633
+#: ../libempathy-gtk/empathy-chat.c:2635
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:2658
+#: ../libempathy-gtk/empathy-chat.c:2660
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s uniuse á sala"
 
-#: ../libempathy-gtk/empathy-chat.c:2683
+#: ../libempathy-gtk/empathy-chat.c:2685
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s agora é coñecido como %s"
@@ -1779,90 +1737,91 @@ msgstr "%s agora é coñecido como %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2836
-#: ../src/empathy-streamed-media-window.c:1896
-#: ../src/empathy-event-manager.c:1260 ../src/empathy-call-window.c:1536
-#: ../src/empathy-call-window.c:1586 ../src/empathy-call-window.c:2632
+#: ../libempathy-gtk/empathy-chat.c:2846
+#: ../src/empathy-streamed-media-window.c:1889
+#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538
+#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631
 msgid "Disconnected"
 msgstr "Desconectado"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3482
+#: ../libempathy-gtk/empathy-chat.c:3492
 msgid "Would you like to store this password?"
 msgstr "Desexa gardar este contrasinal?"
 
-#: ../libempathy-gtk/empathy-chat.c:3488
+#: ../libempathy-gtk/empathy-chat.c:3498
 msgid "Remember"
 msgstr "Lembrar"
 
-#: ../libempathy-gtk/empathy-chat.c:3498
+#: ../libempathy-gtk/empathy-chat.c:3508
 msgid "Not now"
 msgstr "Agora non"
 
-#: ../libempathy-gtk/empathy-chat.c:3542
+#: ../libempathy-gtk/empathy-chat.c:3552
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Reintentar"
 
-#: ../libempathy-gtk/empathy-chat.c:3546
+#: ../libempathy-gtk/empathy-chat.c:3556
 msgid "Wrong password; please try again:"
 msgstr "O contrasinal é incorrecto, ténteo de novo:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3676
+#: ../libempathy-gtk/empathy-chat.c:3686
 msgid "This room is protected by a password:"
 msgstr "Esta sala está protexida por un contrasinal:"
 
-#: ../libempathy-gtk/empathy-chat.c:3703
+#: ../libempathy-gtk/empathy-chat.c:3713
 msgid "Join"
 msgstr "Unirse"
 
-#: ../libempathy-gtk/empathy-chat.c:3891 ../src/empathy-event-manager.c:1281
+#: ../libempathy-gtk/empathy-chat.c:3901 ../src/empathy-event-manager.c:1301
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../libempathy-gtk/empathy-chat.c:3946
+#: ../libempathy-gtk/empathy-chat.c:3956
 msgid "Conversation"
 msgstr "Conversa"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3951
+#: ../libempathy-gtk/empathy-chat.c:3961
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:436
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "Identificador descoñecido ou non válido"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:438
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "Bloqueo de contactos non dispoñíbel temporalmente"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:440
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "Bloqueo de contactos non dispoñíbel"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:442
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "Permiso denegado"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:446
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "Non foi posíbel bloquear o contacto"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:789
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "Editar os contactos bloqueados"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1441
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "Conta:"
 
@@ -1873,63 +1832,58 @@ msgstr "Contactos bloqueados"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Eliminar"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Copiar o enderezo da ligazón"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Abrir a ligazón"
 
 #. 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:417
 msgid "%A %B %d %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Editar a información de contacto"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
+#: ../libempathy-gtk/empathy-contact-dialogs.c:278
 msgid "Personal Information"
 msgstr "Información persoal"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:379
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Contacto novo"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:448
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Desexa bloquear a %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../libempathy-gtk/empathy-contact-dialogs.c:453
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr ""
 "Ten certeza de bloquear a «%s» para que non volva a contactar con vostede?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:458
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Bloquear"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../libempathy-gtk/empathy-contact-dialogs.c:476
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Informar de este contacto como abusivo"
@@ -1937,426 +1891,316 @@ msgstr[1] "_Informar destes contactos como abusivos"
 
 # rever
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "Decidir máis _adiante"
-
-# rever
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Solicitude de subscrición"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "_Bloquear usuario"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-list-view.c:1935
-#: ../libempathy-gtk/empathy-individual-view.c:2375
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "Está seguro de que quere eliminar o grupo '%s'?"
-
-# rever
-#: ../libempathy-gtk/empathy-contact-list-view.c:1937
-#: ../libempathy-gtk/empathy-individual-view.c:2378
-msgid "Removing group"
-msgstr "Eliminando o grupo"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-contact-list-view.c:2063
-#: ../libempathy-gtk/empathy-individual-view.c:2433
-#: ../libempathy-gtk/empathy-individual-view.c:2636
-msgid "_Remove"
-msgstr "_Eliminar"
-
-# rever
-#: ../libempathy-gtk/empathy-contact-list-view.c:2016
-#: ../libempathy-gtk/empathy-individual-view.c:2500
-#, 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:2018
-#: ../libempathy-gtk/empathy-individual-view.c:2521
-msgid "Removing contact"
-msgstr "Eliminando o contacto"
-
-# rever
-#: ../libempathy-gtk/empathy-contact-menu.c:212
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "Eng_adir un contacto…"
-
-# rever
-#: ../libempathy-gtk/empathy-contact-menu.c:292
-msgid "_Block Contact"
-msgstr "_Bloquear contacto"
-
-#. add chat button
-#: ../libempathy-gtk/empathy-contact-menu.c:321
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../libempathy-gtk/empathy-new-message-dialog.c:320
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "_Conversa"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:353
-#: ../libempathy-gtk/empathy-individual-menu.c:850
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_Audiochamada"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:386
-#: ../libempathy-gtk/empathy-individual-menu.c:895
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Videochamada"
-
-# rever
-#: ../libempathy-gtk/empathy-contact-menu.c:432
-#: ../libempathy-gtk/empathy-individual-menu.c:948
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "Conversas _previas"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:454
-#: ../libempathy-gtk/empathy-individual-menu.c:989
-msgid "Send File"
-msgstr "Enviar ficheiro"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:477
-#: ../libempathy-gtk/empathy-individual-menu.c:1031
-msgid "Share My Desktop"
-msgstr "Compartir o meu escritorio"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:506
-#: ../libempathy-gtk/empathy-individual-menu.c:1094
-msgid "Infor_mation"
-msgstr "Infor_mación"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:552
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "_Editar"
-
-# rever
-#: ../libempathy-gtk/empathy-contact-menu.c:606
-#: ../libempathy-gtk/empathy-individual-menu.c:1285
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "Invítao a vostede a esta sala"
-
-# rever
-#: ../libempathy-gtk/empathy-contact-menu.c:637
-#: ../libempathy-gtk/empathy-individual-menu.c:1331
-msgid "_Invite to Chat Room"
-msgstr "Conv_idar a sala de conversa"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "Decidir máis _adiante"
 
 # rever
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "Buscar contactos"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "Buscar:"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "_Engadir contacto"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "Non se atoparon contactos"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "A súa mensaxe de presentación:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Permítame ver cando está en liña. Grazas."
 
-#: ../libempathy-gtk/empathy-contact-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Canles:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:799
-#: ../libempathy-gtk/empathy-individual-widget.c:421
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "Código ISO de país:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:801
-#: ../libempathy-gtk/empathy-individual-widget.c:423
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "País:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:803
-#: ../libempathy-gtk/empathy-individual-widget.c:425
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "Rexión:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:805
-#: ../libempathy-gtk/empathy-individual-widget.c:427
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "Cidade:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:807
-#: ../libempathy-gtk/empathy-individual-widget.c:429
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "Área:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:809
-#: ../libempathy-gtk/empathy-individual-widget.c:431
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "Código postal:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:811
-#: ../libempathy-gtk/empathy-individual-widget.c:433
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Rúa:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:813
-#: ../libempathy-gtk/empathy-individual-widget.c:435
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "Edificio:"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-widget.c:815
-#: ../libempathy-gtk/empathy-individual-widget.c:437
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "_Andar:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:817
-#: ../libempathy-gtk/empathy-individual-widget.c:439
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Sala:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:819
-#: ../libempathy-gtk/empathy-individual-widget.c:441
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Texto:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:821
-#: ../libempathy-gtk/empathy-individual-widget.c:443
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Descrición:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:823
-#: ../libempathy-gtk/empathy-individual-widget.c:445
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:825
-#: ../libempathy-gtk/empathy-individual-widget.c:447
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "Nivel de precisión:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:827
-#: ../libempathy-gtk/empathy-individual-widget.c:449
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "Erro:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:829
-#: ../libempathy-gtk/empathy-individual-widget.c:451
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "Erro vertical (metros):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:831
-#: ../libempathy-gtk/empathy-individual-widget.c:453
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Erro horizontal (metros):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:833
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Velocidade:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:835
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "Orientación:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:837
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "Velocidade de incremento:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:839
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "Última actualización:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:841
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Lonxitude:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:843
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Latitude:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:845
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Altitude:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:898
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:559
-#: ../libempathy-gtk/empathy-individual-widget.c:574
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:33
 msgid "Location"
 msgstr "Localización"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:576
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:967
-#: ../libempathy-gtk/empathy-individual-widget.c:625
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y de %R UTC"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-widget.c:1049
-#: ../libempathy-gtk/empathy-individual-widget.c:867
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Gardar o avatar"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-widget.c:1105
-#: ../libempathy-gtk/empathy-individual-widget.c:925
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "Non foi posíbel gardar o avatar"
 
-# rever
-#: ../libempathy-gtk/empathy-contact-widget.c:1793
-#: ../libempathy-gtk/empathy-individual-menu.c:1066
-#: ../libempathy-gtk/empathy-individual-widget.c:1324
-msgid "Favorite"
-msgstr "Favorito"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
 msgid "Full name"
 msgstr "Nome completo"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
 msgid "Phone number"
 msgstr "Número de teléfono"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
 msgid "E-mail address"
 msgstr "Enderezo de correo electrónico"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
 msgid "Website"
 msgstr "Sitio web"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
 msgid "Birthday"
 msgstr "Aniversario"
 
 #. Note to translators: this is the caption for a string of the form "5
 #. * minutes ago", and refers to the time since the contact last interacted
 #. * with their IM client.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:111
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
 msgid "Last seen:"
 msgstr "Última actividade"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
 msgid "Connected from:"
 msgstr "Conectado desde:"
 
 # rever
 #. FIXME: once Idle implements SimplePresence using this information, we can
 #. * and should bin this.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:117
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
 msgid "Away message:"
 msgstr "Mensaxe de ausencia:"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
 msgid "work"
 msgstr "traballo"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
 msgid "home"
 msgstr "persoal"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
 msgid "mobile"
 msgstr "móbil"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
 msgid "voice"
 msgstr "voz"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
 msgid "preferred"
 msgstr "prefirido"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
 msgid "postal"
 msgstr "postal"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
 msgid "parcel"
 msgstr "grupo"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Localización</b> o (date)\t"
+#. Identifier to connect to Instant Messaging network
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
+msgid "Identifier:"
+msgstr "Identificador:"
 
 #. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1260
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
 msgid "Alias:"
 msgstr "Alias:"
 
-# rever
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Información do cliente"
-
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Cliente:"
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Localización</b> o (date)\t"
 
 # rever
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Contact Details"
 msgstr "Detalles do contacto"
 
-#. Identifier to connect to Instant Messaging network
-#. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1469
-msgid "Identifier:"
-msgstr "Identificador:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
 msgstr "Información solicitada…"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "Información do cliente"
+
+# rever
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "SO:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Versión:"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Cliente:"
+
 #: ../libempathy-gtk/empathy-groups-widget.c:333
 msgid "Groups"
 msgstr "Grupos"
@@ -2379,22 +2223,26 @@ msgid "Select"
 msgstr "Seleccionar"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1953
+#: ../src/empathy-roster-window.c:1919
 msgid "Group"
 msgstr "Grupo"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Bloquearase a seguinte identidade:"
 msgstr[1] "Bloquearanse as seguintes identidades:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Non é posíbel bloquear a seguinte identidade:"
 msgstr[1] "Non é posíbel bloquear as seguintes identidades:"
 
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Editar a información de contacto"
+
 # rever
 #. Translators: the heading at the top of the Information dialogue
 #: ../libempathy-gtk/empathy-individual-information-dialog.c:288
@@ -2402,58 +2250,104 @@ msgid "Linked Contacts"
 msgstr "Contactos ligados"
 
 # rever
-#: ../libempathy-gtk/empathy-individual-linker.c:370
+#: ../libempathy-gtk/empathy-individual-linker.c:372
 msgid "Select contacts to link"
 msgstr "Seleccione os contactos a ligar"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:444
+#: ../libempathy-gtk/empathy-individual-linker.c:447
 msgid "New contact preview"
 msgstr "Vista previa do contacto novo"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:488
+#: ../libempathy-gtk/empathy-individual-linker.c:491
 msgid "Contacts selected in the list on the left will be linked together."
 msgstr "Ligaranse entre si os contactos seleccionados na lista da esquerda"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:145
+#: ../libempathy-gtk/empathy-individual-menu.c:181
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:363
 msgid "Select account to use to place the call"
 msgstr "Seleccione a conta a usar para realizar a chamada"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1301
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:367
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-streamed-media-window.c:1288
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "Chamar"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:432
 msgid "Mobile"
 msgstr "Móbil"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:434
 msgid "Work"
 msgstr "Traballo"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:436
 msgid "HOME"
 msgstr "Casa"
 
+# rever
+#: ../libempathy-gtk/empathy-individual-menu.c:677
+msgid "_Block Contact"
+msgstr "_Bloquear contacto"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1055
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "_Conversa"
+
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:805
-#: ../libempathy-gtk/empathy-new-message-dialog.c:314
+#: ../libempathy-gtk/empathy-individual-menu.c:1090
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1143
+#: ../libempathy-gtk/empathy-individual-menu.c:1123
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Audiochamada"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1156
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Videochamada"
+
+# rever
+#: ../libempathy-gtk/empathy-individual-menu.c:1197
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "Conversas _previas"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1226
+msgid "Send File"
+msgstr "Enviar ficheiro"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1256
+msgid "Share My Desktop"
+msgstr "Compartir o meu escritorio"
+
+# rever
+#: ../libempathy-gtk/empathy-individual-menu.c:1282
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Favorito"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1310
+msgid "Infor_mation"
+msgstr "Infor_mación"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1359
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Editar"
@@ -2461,16 +2355,56 @@ msgstr "_Editar"
 # rever
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1169
+#: ../libempathy-gtk/empathy-individual-menu.c:1385
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "_Ligar contactos…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2340
+# rever
+#: ../libempathy-gtk/empathy-individual-menu.c:1501
+#: ../src/empathy-chat-window.c:1011
+msgid "Inviting you to this room"
+msgstr "Invítao a vostede a esta sala"
+
+# rever
+#: ../libempathy-gtk/empathy-individual-menu.c:1547
+msgid "_Invite to Chat Room"
+msgstr "Conv_idar a sala de conversa"
+
+# rever
+#: ../libempathy-gtk/empathy-individual-menu.c:1743
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "Eng_adir un contacto…"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2355
 msgid "Delete and _Block"
 msgstr "Eliminar e _bloquear"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2509
+# rever
+#: ../libempathy-gtk/empathy-individual-view.c:2390
+#, 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-individual-view.c:2393
+msgid "Removing group"
+msgstr "Eliminando o grupo"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2448
+#: ../libempathy-gtk/empathy-individual-view.c:2665
+msgid "_Remove"
+msgstr "_Eliminar"
+
+# rever
+#: ../libempathy-gtk/empathy-individual-view.c:2525
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Está seguro de quere eliminar o contacto '%s'?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2534
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2479,7 +2413,11 @@ msgstr ""
 "Desexa eliminar o contacto ligado %s? Teña en conta que eliminaranse tamén "
 "todos os contactos que forman este contacto ligado."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1608
+#: ../libempathy-gtk/empathy-individual-view.c:2546
+msgid "Removing contact"
+msgstr "Eliminando o contacto"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2490,23 +2428,23 @@ msgstr[1] "Contactos ligados que conteñen %u contactos"
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Localización</b> en (date)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "Conectado desde un teléfono ou un dispositivo móbil"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "Rede nova"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Seleccione unha rede IRC"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "Rei_niciar a lista de redes"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Seleccionar"
@@ -2564,251 +2502,257 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "_Desligar"
 
-#: ../libempathy-gtk/empathy-log-window.c:620
+#: ../libempathy-gtk/empathy-log-window.c:622
 msgid "History"
 msgstr "Historial"
 
-#: ../libempathy-gtk/empathy-log-window.c:675
+#: ../libempathy-gtk/empathy-log-window.c:677
 msgid "Show"
 msgstr "Mostrar"
 
-#: ../libempathy-gtk/empathy-log-window.c:697
+#: ../libempathy-gtk/empathy-log-window.c:699
 msgid "Search"
 msgstr "Buscar"
 
-#: ../libempathy-gtk/empathy-log-window.c:1145
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat in %s"
 msgstr "Conversar en %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1147
+#: ../libempathy-gtk/empathy-log-window.c:1152
 #, c-format
 msgid "Chat with %s"
 msgstr "Conversa con %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1197
-#: ../libempathy-gtk/empathy-log-window.c:1344
+#: ../libempathy-gtk/empathy-log-window.c:1202
+#: ../libempathy-gtk/empathy-log-window.c:1349
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e de %B de %Y ás %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1286
+#: ../libempathy-gtk/empathy-log-window.c:1291
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1292
+#: ../libempathy-gtk/empathy-log-window.c:1297
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1368
+#: ../libempathy-gtk/empathy-log-window.c:1373
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s segundo"
 msgstr[1] "%s segundos"
 
-#: ../libempathy-gtk/empathy-log-window.c:1375
+#: ../libempathy-gtk/empathy-log-window.c:1380
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s minuto"
 msgstr[1] "%s minutos"
 
-#: ../libempathy-gtk/empathy-log-window.c:1383
+#: ../libempathy-gtk/empathy-log-window.c:1388
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "A chamada levou %s, rematou ás %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1715
+#: ../libempathy-gtk/empathy-log-window.c:1722
 msgid "Today"
 msgstr "Hoxe"
 
-#: ../libempathy-gtk/empathy-log-window.c:1719
+#: ../libempathy-gtk/empathy-log-window.c:1726
 msgid "Yesterday"
 msgstr "Mañá"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1734
+#: ../libempathy-gtk/empathy-log-window.c:1741
 msgid "%e %B %Y"
 msgstr "%e de %B de %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1815
-#: ../libempathy-gtk/empathy-log-window.c:3430
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3489
 msgid "Anytime"
 msgstr "Calquera momento"
 
-#: ../libempathy-gtk/empathy-log-window.c:1902
-#: ../libempathy-gtk/empathy-log-window.c:2358
+#: ../libempathy-gtk/empathy-log-window.c:1918
+#: ../libempathy-gtk/empathy-log-window.c:2402
 msgid "Anyone"
 msgstr "Calquera persoa"
 
-#: ../libempathy-gtk/empathy-log-window.c:2671
+#: ../libempathy-gtk/empathy-log-window.c:2715
 msgid "Who"
 msgstr "Quen"
 
-#: ../libempathy-gtk/empathy-log-window.c:2875
+#: ../libempathy-gtk/empathy-log-window.c:2924
 msgid "When"
 msgstr "Cando"
 
-#: ../libempathy-gtk/empathy-log-window.c:2991
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Anything"
 msgstr "Calquera cousa"
 
-#: ../libempathy-gtk/empathy-log-window.c:2993
+#: ../libempathy-gtk/empathy-log-window.c:3042
 msgid "Text chats"
 msgstr "Conversas de texto"
 
-#: ../libempathy-gtk/empathy-log-window.c:2995
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../src/empathy-preferences.ui.h:23
 msgid "Calls"
 msgstr "Chamadas"
 
 # rever
-#: ../libempathy-gtk/empathy-log-window.c:3000
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Incoming calls"
 msgstr "Chamadas entrantes"
 
 # rever
-#: ../libempathy-gtk/empathy-log-window.c:3001
+#: ../libempathy-gtk/empathy-log-window.c:3050
 msgid "Outgoing calls"
 msgstr "Chamadas de voz saíntes"
 
-#: ../libempathy-gtk/empathy-log-window.c:3002
+#: ../libempathy-gtk/empathy-log-window.c:3051
 msgid "Missed calls"
 msgstr "Chamadas perdidas de %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:3024
+#: ../libempathy-gtk/empathy-log-window.c:3073
 msgid "What"
 msgstr "Que"
 
-#: ../libempathy-gtk/empathy-log-window.c:3719
+#: ../libempathy-gtk/empathy-log-window.c:3782
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Ten certeza de eliminar tódolos rexistros das conversas anteriores?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3723
+#: ../libempathy-gtk/empathy-log-window.c:3786
 msgid "Clear All"
 msgstr "Limpar todo"
 
-#: ../libempathy-gtk/empathy-log-window.c:3730
+#: ../libempathy-gtk/empathy-log-window.c:3793
 msgid "Delete from:"
 msgstr "Eliminar desde:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Cargando…</span>"
+msgid "_File"
+msgstr "_Ficheiro"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Conversa"
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_Edit"
+msgstr "_Editar"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "Eliminar todo o historial…"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Perfíl"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "V_ídeo"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Conversa"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "_Editar"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "V_ídeo"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_Ficheiro"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "páxina 2"
 
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Cargando…</span>"
+
 # rever
-#: ../libempathy-gtk/empathy-new-message-dialog.c:84
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
 msgid "The contact is offline"
 msgstr "O contacto está desconectado"
 
 # rever
-#: ../libempathy-gtk/empathy-new-message-dialog.c:86
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
 msgid "The specified contact is either invalid or unknown"
 msgstr "O contacto especificado é descoñecido ou non é válido"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:88
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
 msgid "The contact does not support this kind of conversation"
 msgstr "O contacto non admite este tipo de conversa"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:90
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
 msgid "The requested functionality is not implemented for this protocol"
 msgstr "A funcionalidade requirida non está implementada para este protocolo"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:96
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
 msgid "Could not start a conversation with the given contact"
 msgstr "Non foi posíbel iniciar unha conversa co contacto dado"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
 msgid "You are banned from this channel"
 msgstr "Vostede foi bloqueado nesta canle"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
 msgid "This channel is full"
 msgstr "Esta canel está completa"
 
 # rever
-#: ../libempathy-gtk/empathy-new-message-dialog.c:102
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
 msgid "You must be invited to join this channel"
 msgstr "Debe ter un convite para unirse a esta canle"
 
 # rever
-#: ../libempathy-gtk/empathy-new-message-dialog.c:104
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
 msgid "Can't proceed while disconnected"
 msgstr "Non é posíbel continuar mentres estea desconectado"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:106
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:112
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
 msgid "There was an error starting the conversation"
 msgstr "Produciuse un erro ao iniciar a conversa"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:291
-#: ../libempathy-gtk/empathy-new-call-dialog.c:203
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:202
 msgid "Enter a contact identifier or phone number:"
 msgstr "Escriba o identificador dun contacto ou un número de teléfono:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:334
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "Conversa nova"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:226
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "_Video Call"
 msgstr "Chamada de _vídeo"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:236
+#: ../libempathy-gtk/empathy-new-call-dialog.c:235
 msgid "_Audio Call"
 msgstr "Chamada de vo_z"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:246
+#: ../libempathy-gtk/empathy-new-call-dialog.c:245
 msgid "New Call"
 msgstr "Nova chamada"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "Fallou a autenticación  para a conta <b>%s</b>"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
 "Enter your password for account\n"
@@ -2864,22 +2808,22 @@ msgstr "Conta nova de %s"
 msgid "Find:"
 msgstr "Buscar:"
 
+# rever
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "_Coincidir con capitalización"
+msgid "_Previous"
+msgstr "_Anterior"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "Frase non atopada"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_Seguinte"
 
-# rever
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "_Coincidir con capitalización"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "_Anterior"
+msgid "Phrase not found"
+msgstr "Frase non atopada"
 
 # rever
 #: ../libempathy-gtk/empathy-sound-manager.c:51
@@ -3039,19 +2983,19 @@ msgstr "Lembrar esta elección para futuras conexións"
 msgid "Certificate Details"
 msgstr "Detalles do certificado"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1738
+#: ../libempathy-gtk/empathy-ui-utils.c:1742
 msgid "Unable to open URI"
 msgstr "Non foi posíbel abrir o URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1835
+#: ../libempathy-gtk/empathy-ui-utils.c:1860
 msgid "Select a file"
 msgstr "Seleccione un ficheiro"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1907
+#: ../libempathy-gtk/empathy-ui-utils.c:1935
 msgid "Insufficient free space to save file"
 msgstr "Non hai espazo suficiente para gardar o ficheiro"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1915
+#: ../libempathy-gtk/empathy-ui-utils.c:1943
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -3060,7 +3004,7 @@ msgstr ""
 "Requírense %s de espazo libre para gardar este ficheiro, pero só hai %s "
 "dispoñíbeis. Elixa outra localización."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1959
+#: ../libempathy-gtk/empathy-ui-utils.c:1987
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Ficheiro entrante de %s"
@@ -3233,34 +3177,34 @@ msgid "Vietnamese"
 msgstr "Vietnamita"
 
 # rever
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:203
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "Non hai mensaxe de erro"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:276
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "Mensaxe instantáneo (Empathy)"
 
 # rever
-#: ../src/empathy.c:433
+#: ../src/empathy.c:437
 msgid "Don't connect on startup"
 msgstr "Non conectarse ao inicio"
 
 # rever
-#: ../src/empathy.c:437
+#: ../src/empathy.c:441
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Non mostrar a lista de contactos nin outros diálogos no inicio"
 
 # rever
-#: ../src/empathy.c:452
+#: ../src/empathy.c:456
 msgid "- Empathy IM Client"
 msgstr " - Cliente de mensaxaría instantánea Empathy"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:643
 msgid "Error contacting the Account Manager"
 msgstr "Produciuse un erro ao contactar co Xestor de contas"
 
-#: ../src/empathy.c:641
+#: ../src/empathy.c:645
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3310,11 +3254,11 @@ msgstr ""
 "Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
 # rever
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "Un cliente de mensaxaría instantánea para o GNOME"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "Francisco Diéguez <frandieguez@ubuntu.com>, 2009, 2010.\n"
@@ -3357,37 +3301,38 @@ msgstr ""
 "deste asistente e engadir as contas máis tarde desde o menú Editar."
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
+#: ../src/empathy-account-assistant.c:1274
 msgid "An error occurred"
 msgstr "Produciuse un erro"
 
-#: ../src/empathy-account-assistant.c:467
+#: ../src/empathy-account-assistant.c:469
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
 msgid "What kind of chat account do you have?"
 msgstr "Que clase de conta de chat ten?"
 
-#: ../src/empathy-account-assistant.c:473
+#: ../src/empathy-account-assistant.c:475
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "Ten algunha outra conta de chat que queira estabelecer?"
 
-#: ../src/empathy-account-assistant.c:479
+#: ../src/empathy-account-assistant.c:481
 msgid "Enter your account details"
 msgstr "Introduza os seus detalles de conta"
 
 # rever
-#: ../src/empathy-account-assistant.c:484
+#: ../src/empathy-account-assistant.c:486
 msgid "What kind of chat account do you want to create?"
 msgstr "Que clase de conta de chat quere crear?"
 
 # rever
-#: ../src/empathy-account-assistant.c:490
+#: ../src/empathy-account-assistant.c:492
 msgid "Do you want to create other chat accounts?"
 msgstr "Quere crear outras contas de chat?"
 
-#: ../src/empathy-account-assistant.c:497
+#: ../src/empathy-account-assistant.c:499
 msgid "Enter the details for the new account"
 msgstr "Introduza os detalles para a nova conta"
 
-#: ../src/empathy-account-assistant.c:612
+#: ../src/empathy-account-assistant.c:614
 msgid ""
 "With Empathy you can chat with people online nearby and with friends and "
 "colleagues who use Google Talk, AIM, Windows Live and many other chat "
@@ -3398,41 +3343,41 @@ msgstr ""
 "que usen Google Talk, AIM, Windows Live e calquera outro programa de chat. "
 "Cun micrófono ou unha cámara web tamén pode ter chamadas de audio ou vídeo."
 
-#: ../src/empathy-account-assistant.c:629
+#: ../src/empathy-account-assistant.c:631
 msgid "Do you have an account you've been using with another chat program?"
 msgstr "Ten algunha outra conta que estea usando con outro programa de chat?"
 
-#: ../src/empathy-account-assistant.c:652
+#: ../src/empathy-account-assistant.c:655
 msgid "Yes, import my account details from "
 msgstr "Si, importar os detalles da miña conta desde "
 
-#: ../src/empathy-account-assistant.c:673
+#: ../src/empathy-account-assistant.c:676
 msgid "Yes, I'll enter my account details now"
 msgstr "Si, introducirei os meus detalles de conta agora"
 
-#: ../src/empathy-account-assistant.c:695
+#: ../src/empathy-account-assistant.c:698
 msgid "No, I want a new account"
 msgstr "Non, quero crear unha conta nova"
 
-#: ../src/empathy-account-assistant.c:705
+#: ../src/empathy-account-assistant.c:708
 msgid "No, I just want to see people online nearby for now"
 msgstr "Non, só quero ver á xente conectada que estea próxima por agora"
 
-#: ../src/empathy-account-assistant.c:726
+#: ../src/empathy-account-assistant.c:729
 msgid "Select the accounts you want to import:"
 msgstr "Seleccione as contas que quere importar:"
 
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
+#: ../src/empathy-account-assistant.c:816
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "Yes"
 msgstr "Si"
 
-#: ../src/empathy-account-assistant.c:820
+#: ../src/empathy-account-assistant.c:823
 msgid "No, that's all for now"
 msgstr "Non, isto é todo por agora"
 
-#: ../src/empathy-account-assistant.c:1085
+#: ../src/empathy-account-assistant.c:1088
 msgid ""
 "Empathy can automatically discover and chat with the people connected on the "
 "same network as you. If you want to use this feature, please check that the "
@@ -3445,16 +3390,16 @@ msgstr ""
 "detalles máis tarde ou desactivar esta característica usando o diálogo "
 "\"Contas\""
 
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
+#: ../src/empathy-account-assistant.c:1094
+#: ../src/empathy-account-assistant.c:1150
 msgid "Edit->Accounts"
 msgstr "Editar->Contas"
 
-#: ../src/empathy-account-assistant.c:1107
+#: ../src/empathy-account-assistant.c:1110
 msgid "I do _not want to enable this feature for now"
 msgstr "_Non quero activar esta característica por agora"
 
-#: ../src/empathy-account-assistant.c:1143
+#: ../src/empathy-account-assistant.c:1146
 msgid ""
 "You won't be able to chat with people connected to your local network, as "
 "telepathy-salut is not installed. If you want to enable this feature, please "
@@ -3466,89 +3411,97 @@ msgstr ""
 "Se quere activar esta característica, instale o paquete telepathy-salut e "
 "cree unha conta de Persoas próximas desde o diálogo Contas"
 
-#: ../src/empathy-account-assistant.c:1149
+#: ../src/empathy-account-assistant.c:1152
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut non está instalado"
 
-#: ../src/empathy-account-assistant.c:1195
+#: ../src/empathy-account-assistant.c:1198
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "Asistente de contas de mensaxaría e VoIP"
 
-#: ../src/empathy-account-assistant.c:1229
+#: ../src/empathy-account-assistant.c:1232
 msgid "Welcome to Empathy"
 msgstr "Benvido/a ao Empathy"
 
 # rever
-#: ../src/empathy-account-assistant.c:1238
+#: ../src/empathy-account-assistant.c:1241
 msgid "Import your existing accounts"
 msgstr "_Importar as súas contas existentes"
 
-#: ../src/empathy-account-assistant.c:1256
+#: ../src/empathy-account-assistant.c:1259
 msgid "Please enter personal details"
 msgstr "Insira os detalles persoais"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:69
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Hai modificacións sen gardar respecto da súa conta %s."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:73
 msgid "Your new account has not been saved yet."
 msgstr "A súa nova conta aínda non foi gardada."
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1320
+#: ../src/empathy-accounts-dialog.c:352
+#: ../src/empathy-streamed-media-window.c:757
+#: ../src/empathy-call-window.c:1325
 msgid "Connecting…"
 msgstr "Conectando…"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:393
 #, c-format
 msgid "Offline — %s"
 msgstr "Desconectado — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:405
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Desconectado — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:416
 msgid "Offline — No Network Connection"
 msgstr "Desconectado — Sen conexión de rede"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:423
 msgid "Unknown Status"
 msgstr "Estado descoñecido"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:435
 msgid "Offline — Account Disabled"
 msgstr "Desconectado — Conta desactivada"
 
 # rever
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"Vai crear unha conta nova, e descartaranse os seus cambios \n"
-"Está seguro de que quere proceder?"
+#: ../src/empathy-accounts-dialog.c:538
+msgid "Edit Connection Parameters"
+msgstr "Editar os parámetros da conexión"
+
+#: ../src/empathy-accounts-dialog.c:701
+msgid "Failed to retrieve your personal information from the server."
+msgstr "Produciuse un fallo ao recuperar a súa información persoal do servidor"
+
+#: ../src/empathy-accounts-dialog.c:707
+msgid "Go online to edit your personal information."
+msgstr "Conéctese para editar a súa información persoal"
+
+#: ../src/empathy-accounts-dialog.c:792
+msgid "_Edit Connection Parameters..."
+msgstr "_Editar os parámetros da conexión…"
 
 # rever
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:1293
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Está seguro de que quere eliminar o grupo '%s' do seu computador?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1297
 msgid "This will not remove your account on the server."
 msgstr "Isto non eliminará a súa conta no servidor."
 
 # rever
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1533
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3557,16 +3510,16 @@ msgstr ""
 "Está seguro de que quere proceder?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1744
 msgid "_Enable"
 msgstr "_Activar"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1745
 msgid "_Disable"
 msgstr "_Desactivar"
 
 # rever
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2255
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3579,21 +3532,16 @@ msgstr ""
 msgid "Add…"
 msgstr "Engadir…"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "Cargando a información da conta"
-
-# rever
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "Non hai ningún protocolo instalado"
+msgid "_Import…"
+msgstr "_Importar…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
 msgid "Protocol:"
 msgstr "Protocolo:"
 
 # rever
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3601,16 +3549,21 @@ msgstr ""
 "Para engadir unha conta nova primeiro ten que instalar unha infraestrutura "
 "para cada protocolo que quere usar."
 
+# rever
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol installed"
+msgstr "Non hai ningún protocolo instalado"
+
 #: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "_Importar…"
+msgid "Loading account information"
+msgstr "Cargando a información da conta"
 
 # rever
-#: ../src/empathy-auth-client.c:251
+#: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
 msgstr "- Cliente de autenticación Empathy"
 
-#: ../src/empathy-auth-client.c:267
+#: ../src/empathy-auth-client.c:302
 msgid "Empathy authentication client"
 msgstr "Cliente de autenticación Empathy"
 
@@ -3628,101 +3581,101 @@ msgstr "- Cliente de son/vídeo Empathy"
 msgid "Empathy Audio/Video Client"
 msgstr "Cliente de son/vídeo Empathy"
 
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:433
 msgid "Contrast"
 msgstr "Contraste"
 
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:436
 msgid "Brightness"
 msgstr "Brillo"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:439
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:545
 msgid "Volume"
 msgstr "Volume"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1097
 msgid "_Sidebar"
 msgstr "Barra _lateral"
 
 # rever
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1117
 msgid "Audio input"
 msgstr "Entrada de audio"
 
 # rever
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1121
 msgid "Video input"
 msgstr "Entrada de vídeo"
 
-#: ../src/empathy-streamed-media-window.c:1142
+#: ../src/empathy-streamed-media-window.c:1129
 msgid "Dialpad"
 msgstr "Marcador"
 
 # rever
-#: ../src/empathy-streamed-media-window.c:1153
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Details"
 msgstr "Detalles do contacto"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1222
-#: ../src/empathy-call-window.c:1929
+#: ../src/empathy-streamed-media-window.c:1209
+#: ../src/empathy-call-window.c:1927
 #, c-format
 msgid "Call with %s"
 msgstr "Chamar con %s"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2173
+#: ../src/empathy-streamed-media-window.c:1442
+#: ../src/empathy-call-window.c:2171
 msgid "The IP address as seen by the machine"
 msgstr "O enderezo IP como é visto polo computador"
 
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2175
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2173
 msgid "The IP address as seen by a server on the Internet"
 msgstr "O enderezo IP como é visto por un servidor na Internet"
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2177
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2175
 msgid "The IP address of the peer as seen by the other side"
 msgstr "O enderezo IP do par como é visto pola outra parte"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2179
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2177
 msgid "The IP address of a relay server"
 msgstr "O enderezo IP dun servidor de desvío"
 
-#: ../src/empathy-streamed-media-window.c:1463
-#: ../src/empathy-call-window.c:2181
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2179
 msgid "The IP address of the multicast group"
 msgstr "O enderezo IP do grupo multicast"
 
-#: ../src/empathy-streamed-media-window.c:1845
-#: ../src/empathy-streamed-media-window.c:1848
-#: ../src/empathy-streamed-media-window.c:1851
-#: ../src/empathy-streamed-media-window.c:1854
+#: ../src/empathy-streamed-media-window.c:1838
+#: ../src/empathy-streamed-media-window.c:1841
+#: ../src/empathy-streamed-media-window.c:1844
+#: ../src/empathy-streamed-media-window.c:1847
 msgctxt "codec"
 msgid "Unknown"
 msgstr "Descoñecido"
 
 # rever
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2146
+#: ../src/empathy-streamed-media-window.c:2139
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Conectado — %d:%02dm"
 
 # rever
-#: ../src/empathy-streamed-media-window.c:2207
-#: ../src/empathy-call-window.c:2984
+#: ../src/empathy-streamed-media-window.c:2200
+#: ../src/empathy-call-window.c:3033
 msgid "Technical Details"
 msgstr "Detalles técnicos"
 
-#: ../src/empathy-streamed-media-window.c:2245
-#: ../src/empathy-call-window.c:3023
+#: ../src/empathy-streamed-media-window.c:2238
+#: ../src/empathy-call-window.c:3072
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3731,8 +3684,8 @@ msgstr ""
 "O software de %s non entende algúns dos formatos de video admitidos polo seu "
 "computador"
 
-#: ../src/empathy-streamed-media-window.c:2250
-#: ../src/empathy-call-window.c:3028
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:3077
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3741,8 +3694,8 @@ msgstr ""
 "O software de %s non entende algúns dos formatos de vídeo admitidos polo seu "
 "computador"
 
-#: ../src/empathy-streamed-media-window.c:2256
-#: ../src/empathy-call-window.c:3034
+#: ../src/empathy-streamed-media-window.c:2249
+#: ../src/empathy-call-window.c:3083
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3751,25 +3704,25 @@ msgstr ""
 "Non é posíbel estabelecer unha conexión a %s. Un deles pode estar nunha rede "
 "que non permite conexións directas."
 
-#: ../src/empathy-streamed-media-window.c:2262
-#: ../src/empathy-call-window.c:3040
+#: ../src/empathy-streamed-media-window.c:2255
+#: ../src/empathy-call-window.c:3089
 msgid "There was a failure on the network"
 msgstr "Produciuse un fallo na rede"
 
-#: ../src/empathy-streamed-media-window.c:2266
-#: ../src/empathy-call-window.c:3044
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3093
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "Non ten instalados os formatos de audio necesarios neste computador"
 
-#: ../src/empathy-streamed-media-window.c:2269
-#: ../src/empathy-call-window.c:3047
+#: ../src/empathy-streamed-media-window.c:2262
+#: ../src/empathy-call-window.c:3096
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "Non ten instalados os formatos de vídeo necesarios neste computador"
 
-#: ../src/empathy-streamed-media-window.c:2279
-#: ../src/empathy-call-window.c:3059
+#: ../src/empathy-streamed-media-window.c:2272
+#: ../src/empathy-call-window.c:3108
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3780,161 +3733,161 @@ msgstr ""
 "href=«%s»>Informe de este erro</a> e anexe os rexistros que pode ollar na "
 "xanela «Depurar» no menú Axuda."
 
-#: ../src/empathy-streamed-media-window.c:2287
-#: ../src/empathy-call-window.c:3068
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3117
 msgid "There was a failure in the call engine"
 msgstr "Produciuse un fallo ao chamar ao motor"
 
-#: ../src/empathy-streamed-media-window.c:2290
-#: ../src/empathy-call-window.c:3071
+#: ../src/empathy-streamed-media-window.c:2283
+#: ../src/empathy-call-window.c:3120
 msgid "The end of the stream was reached"
 msgstr "Chegouse ao final do fluxo"
 
-#: ../src/empathy-streamed-media-window.c:2330
-#: ../src/empathy-call-window.c:3111
+#: ../src/empathy-streamed-media-window.c:2323
+#: ../src/empathy-call-window.c:3160
 msgid "Can't establish audio stream"
 msgstr "Non é posíbel estabelecer un fluxo de audio"
 
-#: ../src/empathy-streamed-media-window.c:2340
-#: ../src/empathy-call-window.c:3121
+#: ../src/empathy-streamed-media-window.c:2333
+#: ../src/empathy-call-window.c:3170
 msgid "Can't establish video stream"
 msgstr "Non é posíbel estabelecer un fluxo de vídeo"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "Auto"
+msgid "_Call"
+msgstr "_Chamar"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Códec de decodificación:"
+msgid "_Microphone"
+msgstr "_Micrófono"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "Desactivar cámara"
+msgid "_Camera"
+msgstr "_Cámara"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "Desactivar o marcador"
+msgid "_Settings"
+msgstr "_Configuracións"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Códec de codificación:"
+#: ../src/empathy-roster-window-menubar.ui.h:18
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "_Ver"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Colgar"
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:28
+msgid "_Help"
+msgstr "A_xuda"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Colgar chamada actual"
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Contents"
+msgstr "_Contidos"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Candidato local:"
+#: ../src/empathy-roster-window-menubar.ui.h:30
+msgid "_Debug"
+msgstr "_Depuración"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "Maximizarme"
+msgid "Swap camera"
+msgstr "Trocar cámara"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "Minimizarme"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Candidato remoto:"
+msgid "Maximise me"
+msgstr "Maximizarme"
 
-# rever
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "Enviar audio"
+msgid "Disable camera"
+msgstr "Desactivar cámara"
 
-# rever
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "Enviar vídeo"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Colgar"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "Mostrar marcador"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Colgar chamada actual"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Videochamada"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "Iniciar vídeochamada"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "Iniciar chamada de son"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Trocar cámara"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Activar/desactivar transmisión de audio"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "Activar/desactivar transmisión de vídeo"
+msgid "Show dialpad"
+msgstr "Mostrar marcador"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2581 ../src/empathy-call-window.c:2582
-#: ../src/empathy-call-window.c:2583 ../src/empathy-call-window.c:2584
-msgid "Unknown"
-msgstr "Descoñecido"
+msgid "Display the dialpad"
+msgstr "Desactivar o marcador"
+
+# rever
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "Enviar vídeo"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "Videochamada"
+msgid "Toggle video transmission"
+msgstr "Activar/desactivar transmisión de vídeo"
 
+# rever
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_Chamar"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Enviar audio"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "_Cámara"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "_Contidos"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Activar/desactivar transmisión de audio"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "_Depuración"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Códec de codificación:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "A_xuda"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581
+#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583
+msgid "Unknown"
+msgstr "Descoñecido"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Códec de decodificación:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "_Micrófono"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Candidato remoto:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "_Configuracións"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Candidato local:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:22
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "_Ver"
+msgid "Audio"
+msgstr "Auto"
 
 #: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
 #, c-format
@@ -3982,68 +3935,68 @@ msgid "Typing a message."
 msgstr "Escribindo unha mensaxe."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "_Limpo"
+msgid "_Conversation"
+msgstr "_Conversa"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "C_ontacto"
+msgid "C_lear"
+msgstr "_Limpo"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "Inse_rir unha emoticona"
 
+# rever
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "Sala de conversa _favorita"
+
+# rever
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "Invitar _participante…"
+msgid "Notify for All Messages"
+msgstr "Notificar todas as mensaxes"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "Mover a lapela á _esquerda"
+# rever
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "Mo_strar a lista de contactos"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Mover a lapela á _dereita"
+msgid "Invite _Participant…"
+msgstr "Invitar _participante…"
 
-# rever
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Notificar todas as mensaxes"
+msgid "C_ontact"
+msgstr "C_ontacto"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Conversa"
-
-#: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "Des_prender lapela"
+msgid "_Tabs"
+msgstr "_Lapelas"
 
 # rever
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "Sala de conversa _favorita"
+#: ../src/empathy-chat-window.ui.h:11
+msgid "_Previous Tab"
+msgstr "Lapela _anterior"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "Lapela _seguinte"
 
-# rever
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "Lapela _anterior"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "_Desfacer o peche da lapela"
 
-# rever
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "Mo_strar a lista de contactos"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Mover a lapela á _esquerda"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "_Lapelas"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Mover a lapela á _dereita"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "_Desfacer o peche da lapela"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "Des_prender lapela"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -4059,111 +4012,111 @@ msgid "Auto-Connect"
 msgstr "Conectar automaticamente"
 
 # rever
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "Xestionar as salas preferidas"
 
 # rever
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:523
 msgid "Incoming video call"
 msgstr "Chamada de vídeo entrante"
 
 # rever
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1553
+#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555
 msgid "Incoming call"
 msgstr "Chamada entrante"
 
 # rever
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s solicítalle unha videochamada. Desexa responderlle?"
 
 # rever
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:528
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s estao chamando. Quérelle responder?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1559
+#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732
+#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Chamada entrante de %s"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:556
 msgid "_Reject"
 msgstr "_Rexeitar"
 
 # rever
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572
 msgid "_Answer"
 msgstr "_Responder"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:572
 msgid "_Answer with video"
 msgstr "_Responder con vídeo"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1559
+#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765
+#: ../src/empathy-call-window.c:1561
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Videochamada entrante de %s"
 
 # rever
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:838
 msgid "Room invitation"
 msgstr "Convite para unha sala"
 
 # rever
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:840
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Invitación a unirse a %s"
 
 # rever
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:847
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s estao convidando a unirse a %s"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:855
 msgid "_Decline"
 msgstr "_Declinar"
 
-#: ../src/empathy-event-manager.c:858
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:860
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_Unirse"
 
 # rever
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:887
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s convidouno a unirse a %s"
 
 # rever
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:893
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Vostede foi convidado a unirse a %s"
 
 # rever
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:944
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Transferencia de ficheiro entrante de %s"
 
-#: ../src/empathy-event-manager.c:1145 ../src/empathy-main-window.c:378
+#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:371
 msgid "Password required"
 msgstr "Requírese o contrasinal"
 
-#: ../src/empathy-event-manager.c:1210
+#: ../src/empathy-event-manager.c:1217
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s solicita permiso para ver cando vostede está dispoñíbel"
 
-#: ../src/empathy-event-manager.c:1214
+#: ../src/empathy-event-manager.c:1223
 #, c-format
 msgid ""
 "\n"
@@ -4173,44 +4126,44 @@ msgstr ""
 "Mensaxe: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Descoñecido"
 
 # rever
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s de %s en %s/s"
 
 # rever
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, 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:306
+#: ../src/empathy-ft-manager.c:305
 #, 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:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Enviando «%s» a %s"
@@ -4218,30 +4171,30 @@ msgstr "Enviando «%s» a %s"
 # rever
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Produciuse un erro ao recibir «%s» de %s"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "Produciuse un erro ao recibir un ficheiro"
 
 # rever
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Produciuse un erro ao enviar «%s» a %s"
 
 # rever
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "Produciuse un erro ao enviar un ficheiro"
 
 # rever
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "recibiuse «%s» de %s"
@@ -4249,39 +4202,39 @@ msgstr "recibiuse «%s» de %s"
 # rever
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "enviado «%s» a %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "Transferencia de ficheiros rematada"
 
 # rever
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "Agardando pola resposta do outro participante"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Verificando a integridade de «%s»"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Aplicando o hash «%s»"
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "Ficheiro"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "Restantes"
 
@@ -4311,172 +4264,173 @@ msgid "Import Accounts"
 msgstr "Importar contas"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:315
 msgid "Import"
 msgstr "Importar"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:324
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:348
 msgid "Source"
 msgstr "Orixe"
 
-#: ../src/empathy-main-window.c:395
+#: ../src/empathy-roster-window.c:388
 msgid "Provide Password"
 msgstr "Escriba o seu contrasinal"
 
-#: ../src/empathy-main-window.c:401
+#: ../src/empathy-roster-window.c:394
 msgid "Disconnect"
 msgstr "Desconectar"
 
 # rever
-#: ../src/empathy-main-window.c:638
+#: ../src/empathy-roster-window.c:626
 msgid "No match found"
 msgstr "Non se atopou ningunha coincidencia."
 
-#: ../src/empathy-main-window.c:746
+#: ../src/empathy-roster-window.c:733
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr ""
 "As contas de %s non se poden usar até que non teña actualizado o seu "
 "software %s."
 
-#: ../src/empathy-main-window.c:814
+#: ../src/empathy-roster-window.c:799
 msgid "Update software..."
 msgstr "Actualizar software…"
 
-#: ../src/empathy-main-window.c:820 ../src/empathy-main-window.c:941
+#: ../src/empathy-roster-window.c:805 ../src/empathy-roster-window.c:922
 msgid "Close"
 msgstr "Pechar"
 
-#: ../src/empathy-main-window.c:929
+#: ../src/empathy-roster-window.c:910
 msgid "Reconnect"
 msgstr "Reconectar"
 
-#: ../src/empathy-main-window.c:935
+#: ../src/empathy-roster-window.c:916
 msgid "Edit Account"
 msgstr "Editar a conta"
 
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:1074
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1060
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Recargar %s (%s)…"
 
-#: ../src/empathy-main-window.c:1121
+#: ../src/empathy-roster-window.c:1106
 msgid "Top up account credit"
 msgstr "Recargar o saldo da conta"
 
 #. top up button
-#: ../src/empathy-main-window.c:1192
+#: ../src/empathy-roster-window.c:1178
 msgid "Top Up..."
 msgstr "Recargar…"
 
-#: ../src/empathy-main-window.c:1935
+#: ../src/empathy-roster-window.c:1901
 msgid "Contact"
 msgstr "Contacto"
 
-#: ../src/empathy-main-window.c:2310
+#: ../src/empathy-roster-window.c:2296
 msgid "Contact List"
 msgstr "Lista de contactos"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "Contactos no mapa"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_Nova conversa…"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "Crédito"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "Nova _chamada…"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "_Buscar na lista de contactos"
+# rever
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "_Buscar contactos…"
+
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "Trans_ferencias de ficheiros"
 
 # rever
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "Unirse a pre_feridos"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "Mostrar os contactos _desconectados"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "Xestionar as preferidas"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "Mostrar os p_rotocolos"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "Tamañ_o normal"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Crédito"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "Nova _chamada…"
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "Contactos no mapa"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Tamaño normal con _avatares"
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "_Contas"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Personal Information"
+msgstr "Información _persoal"
+
+# rever
+#: ../src/empathy-roster-window-menubar.ui.h:15
+msgid "_Blocked Contacts"
+msgstr "Contactos _bloqueados"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:16
 msgid "P_references"
 msgstr "P_referencias"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "Mostrar os p_rotocolos"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+msgid "Find in Contact _List"
+msgstr "_Buscar na lista de contactos"
 
 # rever
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Name"
 msgstr "Ordenar por _nome"
 
 # rever
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:20
 msgid "Sort by _Status"
 msgstr "Ordenar por es_tado"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "_Contas"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "Normal Size With _Avatars"
+msgstr "Tamaño normal con _avatares"
 
-# rever
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "Contactos _bloqueados"
+#: ../src/empathy-roster-window-menubar.ui.h:22
+msgid "N_ormal Size"
+msgstr "Tamañ_o normal"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:23
 msgid "_Compact Size"
 msgstr "Ta_maño compacto"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "Trans_ferencias de ficheiros"
+#: ../src/empathy-roster-window-menubar.ui.h:24
+msgid "_Room"
+msgstr "Sa_la"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:25
 msgid "_Join…"
 msgstr "_Unirse…"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "_Nova conversa…"
-
 # rever
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "Mostrar os contactos _desconectados"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "Información _persoal"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "Sa_la"
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Join _Favorites"
+msgstr "Unirse a pre_feridos"
 
-# rever
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "_Buscar contactos…"
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "Manage Favorites"
+msgstr "Xestionar as preferidas"
 
 # rever
 #: ../src/empathy-new-chatroom-dialog.c:369
@@ -4489,7 +4443,7 @@ msgstr "Membros"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:623
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4502,22 +4456,22 @@ msgstr ""
 "Contrasinal requirido: %s\n"
 "Membros: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Non"
 
-#: ../src/empathy-new-chatroom-dialog.c:654
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "Non foi posíbel arrincar a lista da sala"
 
-#: ../src/empathy-new-chatroom-dialog.c:664
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "Non foi posíbel deter a lista da sala"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "Non foi posíbel ler a lista da sala"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Unirse á sala"
 
 # rever
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
@@ -4527,8 +4481,12 @@ msgstr ""
 "Introduza o nome da sala aquí para unirse ou prema nunha ou máis salas da "
 "lista."
 
-# rever
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "Sa_la:"
+
+# rever
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -4536,148 +4494,145 @@ 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:5
-msgid "Join Room"
-msgstr "Unirse á sala"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "Non foi posíbel ler a lista da sala"
 
 # rever
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Lista de _salas"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "Sa_la:"
-
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Mensaxe recibida"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "Mensaxe enviada"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "Conversa nova"
 
 # rever
-#: ../src/empathy-preferences.c:172
+#: ../src/empathy-preferences.c:169
 msgid "Contact goes online"
 msgstr "O contacto conéctase"
 
 # rever
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "O contacto desconéctase"
 
 # rever
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "Conta conectada"
 
 # rever
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "Conta desconectada"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "Idioma"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:725
 msgid "Juliet"
 msgstr "Xulieta"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:732
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:738
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Oh, Romeo, Romeo!, ¿onde estás que non te vexo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:741
 msgid "Deny thy father and refuse thy name;"
 msgstr "Nega ao teu pai e rexeita o teu nome;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:744
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Ou, se non queres, xúrame tan só que me amas"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:747
 msgid "And I'll no longer be a Capulet."
 msgstr "Y deixarei eu de ser unha Capuleto."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:750
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Debo escoitar máis ou contestar ao dito?"
 
 # rever
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:753
 msgid "Juliet has disconnected"
 msgstr "Xulieta desconectouse"
 
-#: ../src/empathy-preferences.c:1175
+#: ../src/empathy-preferences.c:1157
 msgid "Preferences"
 msgstr "Preferencias"
 
+# rever
 #: ../src/empathy-preferences.ui.h:1
-msgid "Appearance"
-msgstr "Aparencia"
+msgid "Show _smileys as images"
+msgstr "Mostrar as _emoticonas como imaxes"
+
+# rever
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "Mostrar a _lista de contactos nas salas"
 
 #: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Comportamento"
+msgid "Appearance"
+msgstr "Aparencia"
 
 # rever
+#: ../src/empathy-preferences.ui.h:4
+msgid "_Open new chats in separate windows"
+msgstr "A_brir as conversas novas en xanelas separadas"
+
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "T_ema da conversa:"
+msgid "Display incoming events in the notification area"
+msgstr "Mostrar os eventos de entrada na área de notificación"
 
 # rever
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "Desactivar as notificacións cando se estea _ausente ou ocupado"
+msgid "_Automatically connect on startup"
+msgstr "_Conectar automaticamente ao iniciar"
 
-# rever
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "Desactivar os sons cando se estea _ausente ou ocupado"
+msgid "Log conversations"
+msgstr "Rexistrar conversas"
 
 #: ../src/empathy-preferences.ui.h:8
-msgid "Display incoming events in the notification area"
-msgstr "Mostrar os eventos de entrada na área de notificación"
+msgid "Behavior"
+msgstr "Comportamento"
 
 #: ../src/empathy-preferences.ui.h:9
-msgid ""
-"Echo cancellation helps to make your voice sound clearer to the other "
-"person, but may cause problems on some computers. If you or the other person "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"A cancelación de eco axúdalle a facer o son da súa voz máis claro ás outras "
-"persoas pero pode causar problemas nalgúns computadores. Se vostede ou outra "
-"persoa escoita ruidos estranos ou ten problemas técnicos durante as chamadas "
-"tente desactivando a cancelación do eco e reiniciando a chamada."
+msgid "General"
+msgstr "Xeral"
 
 # rever
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "Activar as notificacións cando un contacto está conectado"
+msgid "_Enable bubble notifications"
+msgstr "_Activar as burbullas de notificación"
 
 # rever
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "Activar as notificacións cando un contacto está desconectado"
+msgid "Disable notifications when _away or busy"
+msgstr "Desactivar as notificacións cando se estea _ausente ou ocupado"
 
 # rever
 #: ../src/empathy-preferences.ui.h:12
@@ -4686,43 +4641,58 @@ msgstr "Activar as notificacións cando a _conversa non está enfocada"
 
 # rever
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "Activar a verificación ortográfica para os idiomas:"
+msgid "Enable notifications when a contact comes online"
+msgstr "Activar as notificacións cando un contacto está conectado"
 
+# rever
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "Xeral"
+msgid "Enable notifications when a contact goes offline"
+msgstr "Activar as notificacións cando un contacto está desconectado"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "Nivel de entrada:"
+msgid "Notifications"
+msgstr "Notificacións"
 
+# rever
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "Volume de entrada:"
+msgid "_Enable sound notifications"
+msgstr "_Activar as notificacións de son"
 
+# rever
+#: ../src/empathy-preferences.ui.h:17
+msgid "Disable sounds when _away or busy"
+msgstr "Desactivar os sons cando se estea _ausente ou ocupado"
+
+# rever
 #: ../src/empathy-preferences.ui.h:18
-msgid "Location sources:"
-msgstr "Fontes de localización:"
+msgid "Play sound for events"
+msgstr "Reproducir un son para os eventos"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Log conversations"
-msgstr "Rexistrar conversas"
+msgid "Sounds"
+msgstr "Sons"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Notifications"
-msgstr "Notificacións"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Usar cancelación de _eco para mellorar a calidade da chamada"
 
-# rever
 #: ../src/empathy-preferences.ui.h:21
-msgid "Play sound for events"
-msgstr "Reproducir un son para os eventos"
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"A cancelación de eco axúdalle a facer o son da súa voz máis claro ás outras "
+"persoas pero pode causar problemas nalgúns computadores. Se vostede ou outra "
+"persoa escoita ruidos estranos ou ten problemas técnicos durante as chamadas "
+"tente desactivando a cancelación do eco e reiniciando a chamada."
 
-#: ../src/empathy-preferences.ui.h:22
-msgid "Privacy"
-msgstr "Privacidade"
+#: ../src/empathy-preferences.ui.h:24
+msgid "_Publish location to my contacts"
+msgstr "_Publicar a miña localización aos meus contactos"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:25
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -4732,147 +4702,123 @@ msgstr ""
 "a súa cidade, rexión e país serán publicados. As coordenadas GPS serán "
 "aproximadas a 1 valor decimal."
 
-# rever
-#: ../src/empathy-preferences.ui.h:24
-msgid "Show _smileys as images"
-msgstr "Mostrar as _emoticonas como imaxes"
-
-# rever
-#: ../src/empathy-preferences.ui.h:25
-msgid "Show contact _list in rooms"
-msgstr "Mostrar a _lista de contactos nas salas"
-
-#: ../src/empathy-preferences.ui.h:26
-msgid "Sounds"
-msgstr "Sons"
-
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:27
-msgid "Spell Checking"
-msgstr "Verificación ortográfica"
+msgid "_Reduce location accuracy"
+msgstr "_Reducir a precisión de localización"
 
-# rever
 #: ../src/empathy-preferences.ui.h:28
-msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr ""
-"A lista de idiomas reflicte só naqueles idiomas para os que ten un "
-"dicionario instalado."
+msgid "Privacy"
+msgstr "Privacidade"
 
 #: ../src/empathy-preferences.ui.h:29
-msgid "Themes"
-msgstr "Temas"
+msgid "_GPS"
+msgstr "_GPS"
 
+# rever
 #: ../src/empathy-preferences.ui.h:30
-msgid "Use _echo cancellation to improve call quality"
-msgstr "Usar cancelación de _eco para mellorar a calidade da chamada"
+msgid "_Cellphone"
+msgstr "_Teléfono móbil"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "Variant:"
-msgstr "Variante:"
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Rede (IP, Wifi)"
 
-# rever
 #: ../src/empathy-preferences.ui.h:32
-msgid "_Automatically connect on startup"
-msgstr "_Conectar automaticamente ao iniciar"
-
-# rever
-#: ../src/empathy-preferences.ui.h:33
-msgid "_Cellphone"
-msgstr "_Teléfono móbil"
+msgid "Location sources:"
+msgstr "Fontes de localización:"
 
 # rever
 #: ../src/empathy-preferences.ui.h:34
-msgid "_Enable bubble notifications"
-msgstr "_Activar as burbullas de notificación"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"A lista de idiomas reflicte só naqueles idiomas para os que ten un "
+"dicionario instalado."
 
 # rever
 #: ../src/empathy-preferences.ui.h:35
-msgid "_Enable sound notifications"
-msgstr "_Activar as notificacións de son"
+msgid "Enable spell checking for languages:"
+msgstr "Activar a verificación ortográfica para os idiomas:"
 
 #: ../src/empathy-preferences.ui.h:36
-msgid "_GPS"
-msgstr "_GPS"
+msgid "Spell Checking"
+msgstr "Verificación ortográfica"
 
+# rever
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_Rede (IP, Wifi)"
+msgid "Chat Th_eme:"
+msgstr "T_ema da conversa:"
 
-# rever
 #: ../src/empathy-preferences.ui.h:38
-msgid "_Open new chats in separate windows"
-msgstr "A_brir as conversas novas en xanelas separadas"
+msgid "Variant:"
+msgstr "Variante:"
 
 #: ../src/empathy-preferences.ui.h:39
-msgid "_Publish location to my contacts"
-msgstr "_Publicar a miña localización aos meus contactos"
-
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:41
-msgid "_Reduce location accuracy"
-msgstr "_Reducir a precisión de localización"
+msgid "Themes"
+msgstr "Temas"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Estado"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "_Saír"
 
-# rever
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Chamar ao contacto de novo"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Cámara desactivada"
+msgid "Redial"
+msgstr "Remarcación"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Cámara activada"
+msgid "V_ideo"
+msgstr "V_ídeo"
+
+# rever
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Vídeo desactivado"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Desactivar cámara e deter o envío do vídeo"
+msgid "Video Preview"
+msgstr "Previsualizar o vídeo"
 
+# rever
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Activar cámara e enviar o vídeo"
+msgid "Video On"
+msgstr "Vídeo activado"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Activar cámara pero non enviar o vídeo"
+# rever
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Chamar ao contacto de novo"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Previsualizar"
+msgid "Camera Off"
+msgstr "Cámara desactivada"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Remarcación"
+msgid "Disable camera and stop sending video"
+msgstr "Desactivar cámara e deter o envío do vídeo"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ídeo"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Previsualizar"
 
-# rever
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Vídeo desactivado"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Activar cámara pero non enviar o vídeo"
 
-# rever
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Vídeo activado"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Cámara activada"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Previsualizar o vídeo"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Activar cámara e enviar o vídeo"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Vista de mapa de contactos"
 
@@ -4940,16 +4886,16 @@ msgstr ""
 "O xestor de conexión seleccionado non é compatíbel coa extensión de "
 "depuración remota."
 
-#: ../src/empathy-invite-participant-dialog.c:197
-#: ../src/empathy-invite-participant-dialog.c:225
+#: ../src/empathy-invite-participant-dialog.c:200
+#: ../src/empathy-invite-participant-dialog.c:228
 msgid "Invite Participant"
 msgstr "Invitar participante"
 
-#: ../src/empathy-invite-participant-dialog.c:198
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Seleccione o contacto que quere invitar á conversa:"
 
-#: ../src/empathy-invite-participant-dialog.c:221
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite"
 msgstr "Invitar"
 
@@ -5005,40 +4951,40 @@ msgstr "Depurador de Empathy"
 msgid "- Empathy Chat Client"
 msgstr "- Cliente de conversa Empathy"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:190
 msgid "Respond"
 msgstr "Responder"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1563
+#: ../src/empathy-notifications-approver.c:204
+#: ../src/empathy-call-window.c:1565
 msgid "Reject"
 msgstr "Rexeitar"
 
 # rever
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1564
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-call-window.c:1566
 msgid "Answer"
 msgstr "Responder"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:214
 msgid "Answer with video"
 msgstr "Responder con vídeo"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:232
 msgid "Decline"
 msgstr "Declinar"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:226
+#: ../src/empathy-notifications-approver.c:237
 msgid "Accept"
 msgstr "Aceptar"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:260
+#: ../src/empathy-notifications-approver.c:247
 msgid "Provide"
 msgstr "Fornecer"
 
@@ -5049,39 +4995,39 @@ msgstr "%s tentou chamarlle, pero vostede estaba noutra chamada."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1173 ../src/empathy-call-window.c:1196
+#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2880
+#: ../src/empathy-call-window.c:2929
 msgid "On hold"
 msgstr "En espera"
 
-#: ../src/empathy-call-window.c:2883
+#: ../src/empathy-call-window.c:2932
 msgid "Mute"
 msgstr "Silenciar"
 
-#: ../src/empathy-call-window.c:2885
+#: ../src/empathy-call-window.c:2934
 msgid "Duration"
 msgstr "Duración"
 
 # rever
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2888
+#: ../src/empathy-call-window.c:2937
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:3158
+#: ../src/empathy-call-window.c:3207
 #, c-format
 msgid "Your current balance is %s."
 msgstr "O seu balance actual é %s."
 
-#: ../src/empathy-call-window.c:3162
+#: ../src/empathy-call-window.c:3211
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "Non ten crédito dabondo para facer esta chamada."
 
-#: ../src/empathy-call-window.c:3164
+#: ../src/empathy-call-window.c:3213
 msgid "Top Up"
 msgstr "Recargar"
 
@@ -5090,6 +5036,58 @@ msgid "_Match case"
 msgstr "_Coincidir con capitalización"
 
 # rever
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "Engadindo conta nova"
+
+#~ msgid "Call volume"
+#~ msgstr "Volume da chamada"
+
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "Volume da chamada, como porcentaxe."
+
+#~ msgid "Socket type not supported"
+#~ msgstr "O tipo de socket non é compatíbel"
+
+# rever
+#~ msgid "My Web Accounts"
+#~ msgstr "As miñas contas web"
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "A conta %s edítase mediante %s."
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "Non é posíbel editar a conta %s en Empathy."
+
+# rever
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "Iniciar My Web Accounts"
+
+#~ msgid "Edit %s"
+#~ msgstr "Editar %s"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "Ca_ncelar"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "_Editar"
+
+# rever
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "Vai crear unha conta nova, e descartaranse os seus cambios \n"
+#~ "Está seguro de que quere proceder?"
+
+#~ msgid "Input level:"
+#~ msgstr "Nivel de entrada:"
+
+#~ msgid "Input volume:"
+#~ msgstr "Volume de entrada:"
+
+# rever
 #~ msgid "Contact ID:"
 #~ msgstr "ID do contacto:"
 
diff --git a/po/nb.po b/po/nb.po
index db39bbf28..b35b7a09a 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,14 +1,14 @@
 # Norwegian (bokmål) translation of empathy.
 # Copyright © 2003-2005 Free Software Foundation, Inc.
-# Kjartan Maraas <kmaraas@gnome.org>, 2003-2011.
+# Kjartan Maraas <kmaraas@gnome.org>, 2003-2012.
 # Sigurd Gartmann <sigurdga@yahoo-inc.com>, 2005, 2006.
 # Torstein Adolf Winterseth <kvikende@fsfe.org>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy 3.3.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-01 18:12+0100\n"
-"PO-Revision-Date: 2011-12-01 18:13+0100\n"
+"POT-Creation-Date: 2012-01-16 17:05+0100\n"
+"PO-Revision-Date: 2012-01-16 17:07+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: no\n"
@@ -19,473 +19,473 @@ msgstr ""
 "X-Generator: Lokalize 1.1\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "Prat på Google Talk, Facebook, MSN og mange andre pratetjenester"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "Lynmeldingsklient"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Empathy internettmeldinger"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "Lynmeldingsklient"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Prat på Google Talk, Facebook, MSN og mange andre pratetjenester"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Alltid åpne et eget vindu til nye samtaler."
+msgid "Connection managers should be used"
+msgstr "Tilkoblingshåndterer skal brukes"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Camera device"
-msgstr "Kameraenhet"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr "Om tilkoblingshåndterere skal brukes til å koble til/fra automatisk."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Camera position"
-msgstr "Kameraposisjon"
+msgid "Empathy should auto-connect on startup"
+msgstr "Empathy skal koble til automatisk ved oppstart"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"Tegn som skal legges til etter kallenavn når fullføring av kallenavn med "
-"tabulator benyttes i gruppeprat."
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Om Empathy skal logge inn til dine kontoer automatisk ved oppstart."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Chat window theme"
-msgstr "Tema for samtalevindu"
+msgid "Empathy should auto-away when idle"
+msgstr "Empathy skal sette bortestatus automatisk ved inaktivitet"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
-msgid "Chat window theme variant"
-msgstr "Temavariant for samtalevindu"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
-"Kommaseparert liste over stavekontrollspråk som skal brukes (f.eks \"no, en, "
-"fr, nl\")."
+"Om Empathy skal bytte til bortemodus automatisk hvis bruker ikke er aktiv."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+msgid "Empathy default download folder"
+msgstr "Forvalgt nedlastingsmappe for Empathy"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Compact contact list"
-msgstr "Kompakt kontaktliste"
+msgid "The default folder to save file transfers in."
+msgstr "Forvalgt mappe for lagring av filoverføringer."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid "Connection managers should be used"
-msgstr "Tilkoblingshåndterer skal brukes"
+msgid "Show offline contacts"
+msgstr "Vis frakoblede kontakter"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Contact list sort criterion"
-msgstr "Sorteringskriterier for kontaktliste"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Om kontakter som er frakoblet skal vises i kontaktlisten."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "D-Bus object path of the last account selected to join a room."
-msgstr "D-Bus objektsti for siste konto valgt for å bli med i et rom."
+msgid "Show avatars"
+msgstr "Vis personbilder"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr "Forvalgt kameraenhet til bruk for videosamtaler. F.eks. /dev/video0."
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "Om bilder av kontakter skal vises i kontaktlisten og samtalevinduer."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default directory to select an avatar image from"
-msgstr "Forvalgt mappe for personbilde"
+msgid "Show protocols"
+msgstr "Vis protokoller"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Disable popup notifications when away"
-msgstr "Slå av varsling når du er borte"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "Om protokoller for kontakter skal vises i kontaktlisten."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable sounds when away"
-msgstr "Slå av lyder når du er borte"
+msgid "Show Balance in contact list"
+msgstr "Vis saldo i kontaktliste"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Display incoming events in the status area"
-msgstr "Vis innkommende hendelser i statusområdet"
+msgid "Whether to show account balances in the contact list."
+msgstr "Om saldo for konto skal vises i kontaktlisten."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"Vis innkommende hendelser i statusområdet. Hvis denne er «false» vises disse "
-"til bruker med det samme."
+msgid "Compact contact list"
+msgstr "Kompakt kontaktliste"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Echo cancellation support"
-msgstr "Støtte for utlikning av ekko"
+msgid "Whether to show the contact list in compact mode."
+msgstr "Om kontaktlisten skal vises i kompakt modus."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Empathy can publish the user's location"
-msgstr "Empathy kan publisere brukers plassering"
+msgid "Hide main window"
+msgstr "Skjul hovedvinduet"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy kan bruke GPS til å gjette plassering"
+msgid "Hide the main window."
+msgstr "Skjul hovedvinduet."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy kan bruke mobilnettverk til å gjette plassering"
+msgid "Default directory to select an avatar image from"
+msgstr "Forvalgt mappe for personbilde"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy kan bruke nettverket til å gjette plassering"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "Den forrige mappen et personbilde ble valgt fra."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy default download folder"
-msgstr "Forvalgt nedlastingsmappe for Empathy"
+msgid "Open new chats in separate windows"
+msgstr "Åpne nye samtaler i egne vinduer"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy should auto-away when idle"
-msgstr "Empathy skal sette bortestatus automatisk ved inaktivitet"
+msgid "Always open a separate chat window for new chats."
+msgstr "Alltid åpne et eget vindu til nye samtaler."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy should auto-connect on startup"
-msgstr "Empathy skal koble til automatisk ved oppstart"
+msgid "Display incoming events in the status area"
+msgstr "Vis innkommende hendelser i statusområdet"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Empathy skal redusere nøyaktighet for plasseringenseri"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Vis innkommende hendelser i statusområdet. Hvis denne er «false» vises disse "
+"til bruker med det samme."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr ""
-"Empathy skal bruke personbildet for kontakten som ikon for pratevinduet"
+msgid "The position for the chat window side pane"
+msgstr "Posisjon for pratevinduets sidelinje"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Enable WebKit Developer Tools"
-msgstr "Slå på utviklerverktøy for WebKit"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "Lagret posisjon (i pikselr) for pratevinduets sideområde."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Enable popup notifications for new messages"
-msgstr "Aktiver varsling oppsprettmeldinger for nye meldinger"
+msgid "Contact list sort criterion"
+msgstr "Sorteringskriterier for kontaktliste"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable spell checker"
-msgstr "Bruk stavekontroll"
+msgid ""
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's name with the value \"name\". A value of \"state\" will sort "
+"the contact list by state."
+msgstr ""
+"Hvilke kriterier som skal brukes ved sortering av kontaktlisten. Forvalg er "
+"å sortere kontakter etter verdien «name». Hvis man bruker «state» vil "
+"kontaktlisten sorteres etter kontaktens tilstand."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Hide main window"
-msgstr "Skjul hovedvinduet"
+msgid "Use notification sounds"
+msgstr "Bruk varslingslyder"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Hide the main window."
-msgstr "Skjul hovedvinduet."
+msgid "Whether to play a sound to notify of events."
+msgstr "Om lyder skal spilles av for å varsle om hendelser."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Last account selected in Join Room dialog"
-msgstr "Siste konto valgt i dialogen «Bli med i rom»"
+msgid "Disable sounds when away"
+msgstr "Slå av lyder når du er borte"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Nick completed character"
-msgstr "Tegn for fullføring av kallenavn"
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Om lyder skal spilles av når du er borte eller opptatt."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Open new chats in separate windows"
-msgstr "Åpne nye samtaler i egne vinduer"
+msgid "Play a sound for incoming messages"
+msgstr "Spill av lyd når meldinger kommer inn"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Path of the Adium theme to use"
-msgstr "Sti til Adium-tema som skal brukes"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Om lyder skal spilles av for å varsle om innkommende meldinger."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "Sti til Adium-tema skal brukes hvis tema for prat er Adium."
+msgid "Play a sound for outgoing messages"
+msgstr "Spill av lyd for utgående meldinger"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Play a sound for incoming messages"
-msgstr "Spill av lyd når meldinger kommer inn"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Om lyder skal spilles av for å varsle om utgående meldinger."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for new conversations"
 msgstr "Spill av lyd ved nye samtaler"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for outgoing messages"
-msgstr "Spill av lyd for utgående meldinger"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Om lyder skal spilles av for å varsle om nye samtaler."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound when a contact logs in"
 msgstr "Spill av lyd når kontakter logger inn"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs out"
-msgstr "Spill av lyd når kontakter logger ut"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr ""
+"Om en lyd skal spilles av for å varsle om at kontakter logger inn på "
+"nettverket."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when we log in"
-msgstr "Spill av lyd når du logger inn"
+msgid "Play a sound when a contact logs out"
+msgstr "Spill av lyd når kontakter logger ut"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log out"
-msgstr "Spill av lyd når du logger ut"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr ""
+"Om en lyd skal spilles av for å varsle at kontakter logger ut av nettverket."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "Vis varsling når prat ikke er fokusert"
+msgid "Play a sound when we log in"
+msgstr "Spill av lyd når du logger inn"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications when a contact logs in"
-msgstr "Vis varsling når en kontakt logger inn"
+msgid "Whether to play a sound when logging into a network."
+msgstr "Om lyder skal spilles av når du logger inn på et nettverk."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs out"
-msgstr "Vis varsling når en kontakt logger ut"
+msgid "Play a sound when we log out"
+msgstr "Spill av lyd når du logger ut"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Position the camera preview should be during a call."
-msgstr "Posisjon for kameraforhåndsvisning under en samtale."
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Om lyder skal spilles av når du logger ut av et nettverk."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Show Balance in contact list"
-msgstr "Vis saldo i kontaktliste"
+msgid "Enable popup notifications for new messages"
+msgstr "Aktiver varsling oppsprettmeldinger for nye meldinger"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show avatars"
-msgstr "Vis personbilder"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "Om varsling skal vises når en ny melding mottas."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show contact list in rooms"
-msgstr "Vis kontaktliste i rom"
+msgid "Disable popup notifications when away"
+msgstr "Slå av varsling når du er borte"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show hint about closing the main window"
-msgstr "Vis hint om lukking av hovedvinduet"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "Om varsling skal vises når du er borte eller opptatt."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show offline contacts"
-msgstr "Vis frakoblede kontakter"
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Vis varsling når prat ikke er fokusert"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show protocols"
-msgstr "Vis protokoller"
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Om varsling skal vises når en melding mottas selv om pratevinduet er åpent "
+"men ikke har fokus."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Spell checking languages"
-msgstr "Stavekontrollspråk"
+msgid "Pop up notifications when a contact logs in"
+msgstr "Vis varsling når en kontakt logger inn"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "The default folder to save file transfers in."
-msgstr "Forvalgt mappe for lagring av filoverføringer."
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "Om et varsel skal vises når en kontakt er kobler fra."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The last directory that an avatar image was chosen from."
-msgstr "Den forrige mappen et personbilde ble valgt fra."
+msgid "Pop up notifications when a contact logs out"
+msgstr "Vis varsling når en kontakt logger ut"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The position for the chat window side pane"
-msgstr "Posisjon for pratevinduets sidelinje"
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "Om varsel skal vises når en kontakt kobler fra."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "Lagret posisjon (i pikselr) for pratevinduets sideområde."
+msgid "Use graphical smileys"
+msgstr "Vis smilefjes grafisk"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "Temaet som brukes til å vise samtaler."
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Om smilefjes skal konverteres til grafiske bilder i samtaler."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr "Temavariant som brukes til å vise samtale i pratevinduer."
+msgid "Show contact list in rooms"
+msgstr "Vis kontaktliste i rom"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid "Use graphical smileys"
-msgstr "Vis smilefjes grafisk"
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Om kontaktlisten skal vises i praterom."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "Use notification sounds"
-msgstr "Bruk varslingslyder"
+msgid "Chat window theme"
+msgstr "Tema for samtalevindu"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use theme for chat rooms"
-msgstr "Bruk tema for samtalerom"
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "Temaet som brukes til å vise samtaler."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Om Empathy kan publisere brukers plassering til kontakter."
+msgid "Chat window theme variant"
+msgstr "Temavariant for samtalevindu"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Om Empathy kan bruke GPS for å gjette plassering."
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "Temavariant som brukes til å vise samtale i pratevinduer."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Om Empathy kan bruke mobilnettverk for å gjette plassering."
+msgid "Path of the Adium theme to use"
+msgstr "Sti til Adium-tema som skal brukes"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Om Empathy kan bruke nettverket for å gjette plassering."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "Sti til Adium-tema skal brukes hvis tema for prat er Adium."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Om Empathy skal logge inn til dine kontoer automatisk ved oppstart."
+msgid "Enable WebKit Developer Tools"
+msgstr "Slå på utviklerverktøy for WebKit"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr ""
-"Om Empathy skal bytte til bortemodus automatisk hvis bruker ikke er aktiv."
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "Om utviklerverktøy for WebKit, som Web Inspector, skal slås på."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"Om Empathy skal redusere nøyaktighet for plassering av personvernhensyn."
+msgid "Use theme for chat rooms"
+msgstr "Bruk tema for samtalerom"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr ""
-"Om Empathy skal bruke personbilde for kontakten som ikon for pratevinduet."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Om tema skal brukes for praterom eller ikke."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "Om utviklerverktøy for WebKit, som Web Inspector, skal slås på."
+msgid "Spell checking languages"
+msgstr "Stavekontrollspråk"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr "Om tilkoblingshåndterere skal brukes til å koble til/fra automatisk."
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr ""
+"Kommaseparert liste over stavekontrollspråk som skal brukes (f.eks \"no, en, "
+"fr, nl\")."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+msgid "Enable spell checker"
+msgstr "Bruk stavekontroll"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "Om stavekontroll skal sjekke ord mot de språkene du ønsker å bruke."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Om smilefjes skal konverteres til grafiske bilder i samtaler."
-
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "Hvorvidt Pulseaudio's filter for utlikning av ekko skal slås på."
+msgid "Nick completed character"
+msgstr "Tegn for fullføring av kallenavn"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to play a sound to notify of contacts logging into the network."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
 msgstr ""
-"Om en lyd skal spilles av for å varsle om at kontakter logger inn på "
-"nettverket."
+"Tegn som skal legges til etter kallenavn når fullføring av kallenavn med "
+"tabulator benyttes i gruppeprat."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr ""
-"Om en lyd skal spilles av for å varsle at kontakter logger ut av nettverket."
+"Empathy skal bruke personbildet for kontakten som ikon for pratevinduet"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of events."
-msgstr "Om lyder skal spilles av for å varsle om hendelser."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr ""
+"Om Empathy skal bruke personbilde for kontakten som ikon for pratevinduet."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Om lyder skal spilles av for å varsle om innkommende meldinger."
+msgid "Last account selected in Join Room dialog"
+msgstr "Siste konto valgt i dialogen «Bli med i rom»"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Om lyder skal spilles av for å varsle om nye samtaler."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "D-Bus objektsti for siste konto valgt for å bli med i et rom."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Om lyder skal spilles av for å varsle om utgående meldinger."
+msgid "Camera device"
+msgstr "Kameraenhet"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound when logging into a network."
-msgstr "Om lyder skal spilles av når du logger inn på et nettverk."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "Forvalgt kameraenhet til bruk for videosamtaler. F.eks. /dev/video0."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Om lyder skal spilles av når du logger ut av et nettverk."
+msgid "Camera position"
+msgstr "Kameraposisjon"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Om lyder skal spilles av når du er borte eller opptatt."
+msgid "Position the camera preview should be during a call."
+msgstr "Posisjon for kameraforhåndsvisning under en samtale."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "Om varsel skal vises når en kontakt kobler fra."
+msgid "Echo cancellation support"
+msgstr "Støtte for utlikning av ekko"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "Om et varsel skal vises når en kontakt er kobler fra."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Hvorvidt Pulseaudio's filter for utlikning av ekko skal slås på."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"Om varsling skal vises når en melding mottas selv om pratevinduet er åpent "
-"men ikke har fokus."
+msgid "Show hint about closing the main window"
+msgstr "Vis hint om lukking av hovedvinduet"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "Om varsling skal vises når en ny melding mottas."
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
+msgstr ""
+"Om meldingsdialog om lukking av vinduet med «x»-knappen i tittelfeltet skal "
+"vises."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid "Whether to show account balances in the contact list."
-msgstr "Om saldo for konto skal vises i kontaktlisten."
+msgid "Empathy can publish the user's location"
+msgstr "Empathy kan publisere brukers plassering"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "Om bilder av kontakter skal vises i kontaktlisten og samtalevinduer."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Om Empathy kan publisere brukers plassering til kontakter."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "Om kontakter som er frakoblet skal vises i kontaktlisten."
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy kan bruke nettverket til å gjette plassering"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid "Whether to show popup notifications when away or busy."
-msgstr "Om varsling skal vises når du er borte eller opptatt."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Om Empathy kan bruke nettverket for å gjette plassering."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "Om protokoller for kontakter skal vises i kontaktlisten."
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy kan bruke mobilnettverk til å gjette plassering"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Om kontaktlisten skal vises i praterom."
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Om Empathy kan bruke mobilnettverk for å gjette plassering."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show the contact list in compact mode."
-msgstr "Om kontaktlisten skal vises i kompakt modus."
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy kan bruke GPS til å gjette plassering"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"Om meldingsdialog om lukking av vinduet med «x»-knappen i tittelfeltet skal "
-"vises."
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Om Empathy kan bruke GPS for å gjette plassering."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to use the theme for chat rooms."
-msgstr "Om tema skal brukes for praterom eller ikke."
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy skal redusere nøyaktighet for plasseringenseri"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
-"Hvilke kriterier som skal brukes ved sortering av kontaktlisten. Forvalg er "
-"å sortere kontakter etter verdien «name». Hvis man bruker «state» vil "
-"kontaktlisten sorteres etter kontaktens tilstand."
-
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Håndter meldings- og VoIP-kontoer"
+"Om Empathy skal redusere nøyaktighet for plassering av personvernhensyn."
 
 #. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2312
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2406
 msgid "Messaging and VoIP Accounts"
 msgstr "Meldings- og VoIP-kontoer"
 
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Håndter meldings- og VoIP-kontoer"
+
 #: ../libempathy/empathy-ft-handler.c:736
 msgid "No reason was specified"
 msgstr "Ingen årsak oppgitt"
@@ -510,7 +510,7 @@ msgstr "Feil under overføring av filen"
 msgid "The other participant is unable to transfer the file"
 msgstr "Avsender kan ikke overføre filen"
 
-#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:311
 msgid "Unknown reason"
 msgstr "Ukjent årsak"
 
@@ -546,139 +546,139 @@ msgstr "Samtale med %s"
 msgid "Call from %s"
 msgstr "Samtale fra %s"
 
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:231
 msgid "Available"
 msgstr "Tilgjengelig"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:233
 msgid "Busy"
 msgstr "Opptatt"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:236
 msgid "Away"
 msgstr "Borte"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:238
 msgid "Invisible"
 msgstr "Usynlig"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:240
 msgid "Offline"
 msgstr "Frakoblet"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:243
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:283
 msgid "No reason specified"
 msgstr "Ingen årsak oppgitt"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:341
 msgid "Status is set to offline"
 msgstr "Status er satt til frakoblet"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:321
 #: ../libempathy-gtk/empathy-call-utils.c:49
-#: ../libempathy-gtk/empathy-new-message-dialog.c:82
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Nettverksfeil"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
 msgid "Authentication failed"
 msgstr "Autentiseringen feilet"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Encryption error"
 msgstr "Krypteringsfeil"
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:293
 msgid "Name in use"
 msgstr "Navn i bruk"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:295 ../libempathy/empathy-utils.c:327
 msgid "Certificate not provided"
 msgstr "Sertifikat ikke oppgitt"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate untrusted"
 msgstr "Stoler ikke på sertifikat"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate expired"
 msgstr "Sertifikat utgått"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate not activated"
 msgstr "Sertifikat ikke aktivert"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate hostname mismatch"
 msgstr "Feil vertsnavn i forhold til sertifikat"
 
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate fingerprint mismatch"
 msgstr "Fingeravtrykk stemmer ikke for sertifikat"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate self-signed"
 msgstr "Selvsignert sertifikat"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:309
 msgid "Certificate error"
 msgstr "Sertifikatsfeil"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:343
 msgid "Encryption is not available"
 msgstr "Kryptering er ikke tilgjengelig"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:345
 msgid "Certificate is invalid"
 msgstr "Sertifikatet ikke ugyldig"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:347
 msgid "Connection has been refused"
 msgstr "Tilkobling nektes"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection can't be established"
 msgstr "Tilkobling kan ikke etableres"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection has been lost"
 msgstr "Tilkobling mistet"
 
-#: ../libempathy/empathy-utils.c:354
+#: ../libempathy/empathy-utils.c:353
 msgid "This resource is already connected to the server"
 msgstr "Denne ressursen er allerede koblet til tjeneren"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:355
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Tilkoblingen er erstattet med en ny tilkobling som bruker samme ressurs"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:358
 msgid "The account already exists on the server"
 msgstr "Kontoen eksisterer allerede på tjeneren"
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:360
 msgid "Server is currently too busy to handle the connection"
 msgstr "Tjeneren er for opptatt til å håndtere tilkoblingen"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:362
 msgid "Certificate has been revoked"
 msgstr "Sertifikatet er trukket tilbake"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:364
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Sertifikatet bruker en usikker cipher-algoritme eller er kryptografisk svakt"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:367
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -686,23 +686,23 @@ msgstr ""
 "Lengden på tjenersertifikatet eller dybden på sertifikatkjeden på tjeneren "
 "oversteg grensen som settes av kryptografibiblioteket"
 
-#: ../libempathy/empathy-utils.c:372
+#: ../libempathy/empathy-utils.c:371
 msgid "Your software is too old"
 msgstr "Programvaren din er for gammel"
 
-#: ../libempathy/empathy-utils.c:531
+#: ../libempathy/empathy-utils.c:530
 msgid "People Nearby"
 msgstr "Personer i nærheten"
 
-#: ../libempathy/empathy-utils.c:536
+#: ../libempathy/empathy-utils.c:535
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:564
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:566
+#: ../libempathy/empathy-utils.c:565
 msgid "Facebook Chat"
 msgstr "Facebook-prat"
 
@@ -752,220 +752,192 @@ msgstr[1] "%d måneder siden"
 msgid "in the future"
 msgstr "i fremtiden"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:688
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Alle kontoer"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:335
 msgid "Account"
 msgstr "Konto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "Passord"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Tjener"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-account-widget.c:776
-#: ../libempathy-gtk/empathy-account-widget.c:828
+#: ../libempathy-gtk/empathy-account-widget.c:763
+#: ../libempathy-gtk/empathy-account-widget.c:815
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1182
-msgid "My Web Accounts"
-msgstr "Mine nettkontoer"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1199
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "Konto %s er redigert via %s."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1205
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "Konto %s kan ikke redigeres i Empathy."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1224
-msgid "Launch My Web Accounts"
-msgstr "Start Mine nettkontoer"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1232
-#, c-format
-msgid "Edit %s"
-msgstr "Rediger %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1582
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1396
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Brukernavn:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1900
+#: ../libempathy-gtk/empathy-account-widget.c:1708
 msgid "A_pply"
 msgstr "_Bruk"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1930
+#: ../libempathy-gtk/empathy-account-widget.c:1737
 msgid "L_og in"
 msgstr "L_ogg inn"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2004
+#: ../libempathy-gtk/empathy-account-widget.c:1810
 msgid "This account already exists on the server"
 msgstr "Denne kontoen eksisterer allerede på tjeneren"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2007
+#: ../libempathy-gtk/empathy-account-widget.c:1814
 msgid "Create a new account on the server"
 msgstr "Lag en ny konto på tjeneren"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2201
-msgid "Ca_ncel"
-msgstr "A_vbryt"
-
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2479
+#: ../libempathy-gtk/empathy-account-widget.c:2239
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s av %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2505
+#: ../libempathy-gtk/empathy-account-widget.c:2265
 #, c-format
 msgid "%s Account"
 msgstr "%s-konto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2509
+#: ../libempathy-gtk/empathy-account-widget.c:2269
 msgid "New account"
 msgstr "Ny konto"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Eksempel:</b> MittSkjermNavn       "
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "_Passord:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "Avansert"
+msgid "Screen _Name:"
+msgstr "Skjerm_navn:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Eksempel:</b> MittSkjermNavn       "
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "_Passord:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Husk passord"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Husk passord"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Port:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-base-password-dialog.c:261
-msgid "Remember password"
-msgstr "Husk passord"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "Skjerm_navn:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Tjener:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "HVa er ditt AIM-passord?"
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Avansert"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "Hva er ditt skjermnavn for AIM?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Port:"
+msgid "What is your AIM password?"
+msgstr "HVa er ditt AIM-passord?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Tjener:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Eksempel:</b> brukernavn"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Husk passord"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "InnloggingsI_D:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Eksempel:</b> brukernavn"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "Hva er din bruker-ID for GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "Hva er ditt passord for GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Eksempel:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "Tegn_sett:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "Hva er din UIN for ICQ?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "Hva er ditt passord for ICQ?"
 
@@ -1002,11 +974,23 @@ msgstr "Alternativer"
 msgid "None"
 msgstr "Ingen"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Nettverk"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "Nettverk:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Character set:"
 msgstr "Tegnsett:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "Tjenere"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -1014,14 +998,6 @@ msgstr ""
 "De fleste IRC-tjenere krever ikke et passord, så ikke oppgi et passord hvis "
 "du ikke er sikker."
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "Nettverk"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "Nettverk:"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Kallenavn:"
@@ -1038,48 +1014,20 @@ msgstr "Melding ved frakobling:"
 msgid "Real name:"
 msgstr "Virkelig navn:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Tjenere"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "Hva er ditt kallenavn på IRC?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Hvilket IRC-nettverk?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Eksempel:</b> bruker@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Eksempel:</b> bruker@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "Kr_yptering kreves (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "I_gnorer feil med SSL-sertifikater"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Overstyr innstillinger for tjener"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "Priori_tet"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "Hva er ditt kallenavn på IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "_Ressurs:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "Hva er ditt brukernavn for Facebook?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1091,179 +1039,203 @@ msgstr ""
 "Bruk <a href=\"http://www.facebook.com/username/\">denne siden</a> for å "
 "velge et brukernavn på Facebook hvis du ikke har et."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "Bruk gammel SS_L"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "Hva er ditt passord for Facebook?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "Hva er ditt brukernavn for Facebook?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "Hva er din Google-ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Eksempel:</b> bruker@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "Hva er ditt passord for Google?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Eksempel:</b> bruker@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "I_gnorer feil med SSL-sertifikater"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "Priori_tet"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "_Ressurs:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "Kr_yptering kreves (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "Bruk gammel SS_L"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Overstyr innstillinger for tjener"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "Hva er din Jabber-ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Hva er ditt passord for Jabber?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "Hvilken Jabber-ID ønsker du?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Hva er ditt passord for Jabber?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "Hvilket passord ønsker du for Jabber?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Eksempel:</b> bruker@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "Hva er din ID på Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Hva er ditt passord for Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "E-_postadresse:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "_Kallenavn:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "_Etternavn:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "_Fornavn:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "_Publisert navn:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "_Jabber-ID:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Etternavn:"
+msgid "E-_mail address:"
+msgstr "E-_postadresse:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "_Publisert navn:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "Br_ukernavn:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Eksempel:</b> bruker@min.sip.server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Brukernavn for autentisering:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Oppdag binding"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "Søk opp STUN-tjener automatisk"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Bruk denne kontoen til å ringe opp fasttelefoner og mobiltelefoner"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Overse TLS-feil"
+msgid "NAT Traversal Options"
+msgstr "Alternativer for NAT"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Intervall (sekunder)"
+msgid "Proxy Options"
+msgstr "Alternativer for proxy"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Alternativer for Keep-Alive"
+msgid "Miscellaneous Options"
+msgstr "Forskjellige alternativer"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Løs ruting"
+msgid "STUN Server:"
+msgstr "STUN-tjener:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Mekanisme:"
+msgid "Discover the STUN server automatically"
+msgstr "Søk opp STUN-tjener automatisk"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Forskjellige alternativer"
+msgid "Discover Binding"
+msgstr "Oppdag binding"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "Alternativer for NAT"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Tjener:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Alternativer for Keep-Alive"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Port:"
+msgid "Mechanism:"
+msgstr "Mekanisme:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Alternativer for proxy"
+msgid "Interval (seconds)"
+msgstr "Intervall (sekunder)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Brukernavn for autentisering:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Transport:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "STUN-tjener:"
+msgid "Loose Routing"
+msgstr "Løs ruting"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
-msgid "Server:"
-msgstr "Tjener:"
+msgid "Ignore TLS Errors"
+msgstr "Overse TLS-feil"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Transport:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Bruk denne kontoen til å ringe opp fasttelefoner og mobiltelefoner"
+msgid "Port:"
+msgstr "Port:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "Hva er passordet for din SIP-konto?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Hva er din påloggings-ID for SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "Br_ukernavn:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "Hva er passordet for din SIP-konto?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo!-I_D:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "I_gnorer invitasjoner til konferanser og praterom"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "Locale for _romliste:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "Hva er din Yahoo!-ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "Hva er ditt passord for Yahoo!?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Yahoo!-I_D:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "Locale for _romliste:"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1326,40 +1298,40 @@ msgstr "Nødsamtaler er ikke støttet på denne protokollen"
 msgid "You don't have enough credit in order to place this call"
 msgstr "Du har ikke nok kreditt til å starte denne samtalen"
 
-#: ../libempathy-gtk/empathy-chat.c:706
+#: ../libempathy-gtk/empathy-chat.c:705
 msgid "Failed to open private chat"
 msgstr "Klarte ikke å åpne privat prat"
 
-#: ../libempathy-gtk/empathy-chat.c:764
+#: ../libempathy-gtk/empathy-chat.c:763
 msgid "Topic not supported on this conversation"
 msgstr "Emne er ikke støttet for denne samtalen"
 
-#: ../libempathy-gtk/empathy-chat.c:770
+#: ../libempathy-gtk/empathy-chat.c:769
 msgid "You are not allowed to change the topic"
 msgstr "Du har ikke lov til å bytte emne"
 
-#: ../libempathy-gtk/empathy-chat.c:971
+#: ../libempathy-gtk/empathy-chat.c:970
 #, c-format
 msgid "“%s” is not a valid contact ID"
 msgstr "«%s» er ikke en gyldig kontakt-ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1065
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: tøm alle meldinger fra aktiv samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1069
+#: ../libempathy-gtk/empathy-chat.c:1068
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <emne>: sett emne for aktiv samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1072
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ID for praterom>: bli med i et nytt praterom"
 
-#: ../libempathy-gtk/empathy-chat.c:1075
+#: ../libempathy-gtk/empathy-chat.c:1074
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <prateroms-ID>: bli med i et nytt praterom"
 
-#: ../libempathy-gtk/empathy-chat.c:1079
+#: ../libempathy-gtk/empathy-chat.c:1078
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1367,23 +1339,23 @@ msgstr ""
 "/part [<praterom-ID>] [<årsak>]: forlat praterommet, forvalg er det aktive "
 "rommet"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1082
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <kontakt-ID> [<melding>]: åpne en privat samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1086
+#: ../libempathy-gtk/empathy-chat.c:1085
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <kontakt-ID> <melding>: åpne en privat samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1089
+#: ../libempathy-gtk/empathy-chat.c:1088
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <kallenavn>: bytt kallenavn på denne tjeneren"
 
-#: ../libempathy-gtk/empathy-chat.c:1092
+#: ../libempathy-gtk/empathy-chat.c:1091
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <melding>: send en HANDLINGS-melding til aktiv samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1095
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1393,11 +1365,11 @@ msgstr ""
 "sende en melding som starter med tegnet «/». For eksempel: «/say /join "
 "brukes til å bli med i et nytt praterom»"
 
-#: ../libempathy-gtk/empathy-chat.c:1100
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <kontakt-ID>: vis informasjon om en kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1103
+#: ../libempathy-gtk/empathy-chat.c:1102
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1405,120 +1377,120 @@ msgstr ""
 "/help [<kommando>]: vis alle støttede kommandoer. Vis hjelp for <kommando> "
 "hvis den er definert."
 
-#: ../libempathy-gtk/empathy-chat.c:1122
+#: ../libempathy-gtk/empathy-chat.c:1121
 #, c-format
 msgid "Usage: %s"
 msgstr "Bruk: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1167
+#: ../libempathy-gtk/empathy-chat.c:1166
 msgid "Unknown command"
 msgstr "Ukjent kommando"
 
-#: ../libempathy-gtk/empathy-chat.c:1293
+#: ../libempathy-gtk/empathy-chat.c:1292
 msgid "Unknown command; see /help for the available commands"
 msgstr "Ukjent kommando; se /help for tilgjengelige kommandoer"
 
-#: ../libempathy-gtk/empathy-chat.c:1457
+#: ../libempathy-gtk/empathy-chat.c:1456
 msgid "insufficient balance to send message"
 msgstr "ikke nok kreditt til å sende melding"
 
-#: ../libempathy-gtk/empathy-chat.c:1461 ../libempathy-gtk/empathy-chat.c:1475
-#: ../libempathy-gtk/empathy-chat.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1460 ../libempathy-gtk/empathy-chat.c:1474
+#: ../libempathy-gtk/empathy-chat.c:1537
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Feil ved sending av melding «%s»: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1463 ../libempathy-gtk/empathy-chat.c:1480
-#: ../libempathy-gtk/empathy-chat.c:1542
+#: ../libempathy-gtk/empathy-chat.c:1462 ../libempathy-gtk/empathy-chat.c:1479
+#: ../libempathy-gtk/empathy-chat.c:1541
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Feil ved sending av melding: %s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1469
+#: ../libempathy-gtk/empathy-chat.c:1468
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "ikke nok kreditt til å sende melding. <a href='%s'>Fyll på</a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1509
+#: ../libempathy-gtk/empathy-chat.c:1508
 msgid "not capable"
 msgstr "ikke kapabel"
 
-#: ../libempathy-gtk/empathy-chat.c:1516
+#: ../libempathy-gtk/empathy-chat.c:1515
 msgid "offline"
 msgstr "frakoblet"
 
-#: ../libempathy-gtk/empathy-chat.c:1519
+#: ../libempathy-gtk/empathy-chat.c:1518
 msgid "invalid contact"
 msgstr "ugyldig kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1522
+#: ../libempathy-gtk/empathy-chat.c:1521
 msgid "permission denied"
 msgstr "tilgang nektet"
 
-#: ../libempathy-gtk/empathy-chat.c:1525
+#: ../libempathy-gtk/empathy-chat.c:1524
 msgid "too long message"
 msgstr "meldingen er for lang"
 
-#: ../libempathy-gtk/empathy-chat.c:1528
+#: ../libempathy-gtk/empathy-chat.c:1527
 msgid "not implemented"
 msgstr "ikke implementert"
 
-#: ../libempathy-gtk/empathy-chat.c:1532
+#: ../libempathy-gtk/empathy-chat.c:1531
 msgid "unknown"
 msgstr "ukjent"
 
-#: ../libempathy-gtk/empathy-chat.c:1599 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1598 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "Emne:"
 
-#: ../libempathy-gtk/empathy-chat.c:1611
+#: ../libempathy-gtk/empathy-chat.c:1610
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Emnet er satt til: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1612
 msgid "No topic defined"
 msgstr "Emne ikke definert"
 
-#: ../libempathy-gtk/empathy-chat.c:2126
+#: ../libempathy-gtk/empathy-chat.c:2125
 msgid "(No Suggestions)"
 msgstr "(Ingen forslag)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2194
+#: ../libempathy-gtk/empathy-chat.c:2193
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Legg til «%s» i ordboken"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2231
+#: ../libempathy-gtk/empathy-chat.c:2230
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Legg til «%s» i ordbok for %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2301
+#: ../libempathy-gtk/empathy-chat.c:2300
 msgid "Insert Smiley"
 msgstr "Sett inn smilefjes"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2319
+#: ../libempathy-gtk/empathy-chat.c:2318
 #: ../libempathy-gtk/empathy-ui-utils.c:1868
 msgid "_Send"
 msgstr "_Send"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2376
+#: ../libempathy-gtk/empathy-chat.c:2375
 msgid "_Spelling Suggestions"
 msgstr "_Staveforslag"
 
-#: ../libempathy-gtk/empathy-chat.c:2465
+#: ../libempathy-gtk/empathy-chat.c:2464
 msgid "Failed to retrieve recent logs"
 msgstr "Klarte ikke å hente siste logger"
 
-#: ../libempathy-gtk/empathy-chat.c:2602
+#: ../libempathy-gtk/empathy-chat.c:2601
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s har koblet fra"
@@ -1526,12 +1498,12 @@ msgstr "%s har koblet fra"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2609
+#: ../libempathy-gtk/empathy-chat.c:2608
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s ble sparket av %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2612
+#: ../libempathy-gtk/empathy-chat.c:2611
 #, c-format
 msgid "%s was kicked"
 msgstr "%s ble sparket"
@@ -1539,17 +1511,17 @@ msgstr "%s ble sparket"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2620
+#: ../libempathy-gtk/empathy-chat.c:2619
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s ble bannlyst av %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2623
+#: ../libempathy-gtk/empathy-chat.c:2622
 #, c-format
 msgid "%s was banned"
 msgstr "%s ble bannlyst"
 
-#: ../libempathy-gtk/empathy-chat.c:2627
+#: ../libempathy-gtk/empathy-chat.c:2626
 #, c-format
 msgid "%s has left the room"
 msgstr "%s har forlatt rommet"
@@ -1559,17 +1531,17 @@ msgstr "%s har forlatt rommet"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2636
+#: ../libempathy-gtk/empathy-chat.c:2635
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2661
+#: ../libempathy-gtk/empathy-chat.c:2660
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s har blitt med i rommet"
 
-#: ../libempathy-gtk/empathy-chat.c:2686
+#: ../libempathy-gtk/empathy-chat.c:2685
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s er nå kjent som %s"
@@ -1577,7 +1549,7 @@ msgstr "%s er nå kjent som %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2847
+#: ../libempathy-gtk/empathy-chat.c:2846
 #: ../src/empathy-streamed-media-window.c:1889
 #: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538
 #: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631
@@ -1585,82 +1557,82 @@ msgid "Disconnected"
 msgstr "Koblet fra"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3493
+#: ../libempathy-gtk/empathy-chat.c:3492
 msgid "Would you like to store this password?"
 msgstr "Vil du lagre dette passordet?"
 
-#: ../libempathy-gtk/empathy-chat.c:3499
+#: ../libempathy-gtk/empathy-chat.c:3498
 msgid "Remember"
 msgstr "Husk"
 
-#: ../libempathy-gtk/empathy-chat.c:3509
+#: ../libempathy-gtk/empathy-chat.c:3508
 msgid "Not now"
 msgstr "Ikke nå"
 
-#: ../libempathy-gtk/empathy-chat.c:3553
+#: ../libempathy-gtk/empathy-chat.c:3552
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Prøv igjen"
 
-#: ../libempathy-gtk/empathy-chat.c:3557
+#: ../libempathy-gtk/empathy-chat.c:3556
 msgid "Wrong password; please try again:"
 msgstr "Feil passord; vennligst prøv igjen:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3687
+#: ../libempathy-gtk/empathy-chat.c:3686
 msgid "This room is protected by a password:"
 msgstr "Dette rommet er beskyttet med et passord:"
 
-#: ../libempathy-gtk/empathy-chat.c:3714
+#: ../libempathy-gtk/empathy-chat.c:3713
 msgid "Join"
 msgstr "Bli med"
 
-#: ../libempathy-gtk/empathy-chat.c:3902 ../src/empathy-event-manager.c:1301
+#: ../libempathy-gtk/empathy-chat.c:3901 ../src/empathy-event-manager.c:1301
 msgid "Connected"
 msgstr "Koblet til"
 
-#: ../libempathy-gtk/empathy-chat.c:3957
+#: ../libempathy-gtk/empathy-chat.c:3956
 msgid "Conversation"
 msgstr "Samtale"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3962
+#: ../libempathy-gtk/empathy-chat.c:3961
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:265
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "Ukjent eller ugyldig identifikator"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:267
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "Blokkering av kontakter midlertidig utilgjengelig"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:269
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "Blokkering av kontakter er ikke tilgjengelig"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:271
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "Tilgang nektet"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:275
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "Kunne ikke blokkere kontakt"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:622
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "Rediger blokkerte kontakter"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:506
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1475
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "Konto:"
 
@@ -1670,7 +1642,7 @@ msgstr "Blokkerte kontakter"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Fjern"
@@ -1693,122 +1665,50 @@ msgstr "_Åpne lenke"
 msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:287
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Endre kontaktinformasjon"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:338
+#: ../libempathy-gtk/empathy-contact-dialogs.c:278
 msgid "Personal Information"
 msgstr "Personlig informasjon"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:439
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:379
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:508
-#: ../libempathy-gtk/empathy-individual-dialogs.c:198
+#: ../libempathy-gtk/empathy-contact-dialogs.c:448
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Blokker %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:513
-#: ../libempathy-gtk/empathy-individual-dialogs.c:253
+#: ../libempathy-gtk/empathy-contact-dialogs.c:453
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "Er du sikker på at du vil blokkere «%s» fra å kontakte deg igjen?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:518
-#: ../libempathy-gtk/empathy-individual-dialogs.c:275
+#: ../libempathy-gtk/empathy-contact-dialogs.c:458
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Blokker"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:536
-#: ../libempathy-gtk/empathy-individual-dialogs.c:284
+#: ../libempathy-gtk/empathy-contact-dialogs.c:476
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Rapporter denne kontakten"
 msgstr[1] "_Rapporter disse kontaktene"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "A_vgjør senere"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Abonnementsforespørsel"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "_Blokker bruker"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:207
-#: ../libempathy-gtk/empathy-individual-menu.c:1559
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "_Legg til kontakt …"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:282
-msgid "_Block Contact"
-msgstr "_Blokker kontakt"
-
-#. add chat button
-#: ../libempathy-gtk/empathy-contact-menu.c:311
-#: ../libempathy-gtk/empathy-individual-menu.c:790
-#: ../libempathy-gtk/empathy-new-message-dialog.c:320
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "_Prat"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:343
-#: ../libempathy-gtk/empathy-individual-menu.c:882
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_Lydsamtale"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:376
-#: ../libempathy-gtk/empathy-individual-menu.c:927
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Videosamtale"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:422
-#: ../libempathy-gtk/empathy-individual-menu.c:980
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "_Tidligere samtaler"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:444
-#: ../libempathy-gtk/empathy-individual-menu.c:1021
-msgid "Send File"
-msgstr "Send fil"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:467
-#: ../libempathy-gtk/empathy-individual-menu.c:1063
-msgid "Share My Desktop"
-msgstr "Del mitt skrivebord"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:496
-#: ../libempathy-gtk/empathy-individual-menu.c:1126
-msgid "Infor_mation"
-msgstr "Infor_masjon"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:536
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "R_ediger"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:590
-#: ../libempathy-gtk/empathy-individual-menu.c:1317
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "Inviterer deg til dette rommet"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:621
-#: ../libempathy-gtk/empathy-individual-menu.c:1363
-msgid "_Invite to Chat Room"
-msgstr "_Inviter til praterom"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "A_vgjør senere"
 
 #. Title
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:499
@@ -1835,167 +1735,161 @@ msgstr "Melding der du introduserer deg selv:"
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Vennligst la meg så når du er tilkoblet. Takk!"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:571
+#: ../libempathy-gtk/empathy-contact-widget.c:569
 #: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Kanaler:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-contact-widget.c:749
 #: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "ISO-kode for land:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-contact-widget.c:751
 #: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "Land:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-contact-widget.c:753
 #: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "Tilstand:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-contact-widget.c:755
 #: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "By:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-contact-widget.c:757
 #: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "Område:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-contact-widget.c:759
 #: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "Postkode:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-contact-widget.c:761
 #: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Gate:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-contact-widget.c:763
 #: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "Bygning:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-contact-widget.c:765
 #: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "Etasje:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-contact-widget.c:767
 #: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Rom:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-contact-widget.c:769
 #: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Tekst:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-contact-widget.c:771
 #: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-contact-widget.c:773
 #: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-contact-widget.c:775
 #: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "Nøyaktighetsnivå:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-contact-widget.c:777
 #: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "Feil:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-contact-widget.c:779
 #: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "Vertikal feil (meter):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-contact-widget.c:781
 #: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Horisontal feil (meter):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-contact-widget.c:783
 #: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Hastighet:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-contact-widget.c:785
 #: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "Retning:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-contact-widget.c:787
 #: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "Klatrehastighet:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-contact-widget.c:789
 #: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "Sist oppdatert:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-contact-widget.c:791
 #: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Lengdegrad:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-contact-widget.c:793
 #: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Breddegrad:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:797
+#: ../libempathy-gtk/empathy-contact-widget.c:795
 #: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Høyde:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:850
-#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
 #: ../libempathy-gtk/empathy-individual-widget.c:593
 #: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:33
 msgid "Location"
 msgstr "Sted"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:867
+#: ../libempathy-gtk/empathy-contact-widget.c:865
 #: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-contact-widget.c:917
 #: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y, %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1001
-#: ../libempathy-gtk/empathy-individual-widget.c:901
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Lagre personbilder"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1057
-#: ../libempathy-gtk/empathy-individual-widget.c:959
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "Kan ikke lagre personbilde"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1745
-#: ../libempathy-gtk/empathy-individual-menu.c:1098
-#: ../libempathy-gtk/empathy-individual-widget.c:1358
-msgid "Favorite"
-msgstr "Favoritt"
-
 #: ../libempathy-gtk/empathy-contactinfo-utils.c:104
 msgid "Full name"
 msgstr "Fullt navn"
@@ -2061,49 +1955,49 @@ msgstr "post"
 msgid "parcel"
 msgstr "pakke"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Plassering</b> (dato)\t"
+#. Identifier to connect to Instant Messaging network
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
+msgid "Identifier:"
+msgstr "Identifikator:"
 
 #. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1294
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
 msgid "Alias:"
 msgstr "Alias:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Klientinformasjon"
-
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Klient:"
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Plassering</b> (dato)\t"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Contact Details"
 msgstr "Kontaktdetaljer"
 
-#. Identifier to connect to Instant Messaging network
-#. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1503
-msgid "Identifier:"
-msgstr "Identifikator:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
 msgstr "Forespurt informasjon …"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "Klientinformasjon"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Versjon:"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Klient:"
+
 #: ../libempathy-gtk/empathy-groups-widget.c:333
 msgid "Groups"
 msgstr "Grupper"
@@ -2126,22 +2020,26 @@ msgid "Select"
 msgstr "Velg"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1952
+#: ../src/empathy-roster-window.c:1919
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:258
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Følgende identitet vil bli blokkert:"
 msgstr[1] "Følgende identiteter vil bli blokkert:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:265
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Følgende identitet kan ikke blokkeres:"
 msgstr[1] "Følgende identiteter kan ikke blokkeres:"
 
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Endre kontaktinformasjon"
+
 #. Translators: the heading at the top of the Information dialogue
 #: ../libempathy-gtk/empathy-individual-information-dialog.c:288
 msgid "Linked Contacts"
@@ -2162,79 +2060,136 @@ msgstr "Kontakter som velges i listen til venstre vil bli koblet sammen."
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:149
+#: ../libempathy-gtk/empathy-individual-menu.c:181
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-individual-menu.c:363
 msgid "Select account to use to place the call"
 msgstr "Velg en konto til bruk for samtalen"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:317
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:367
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-streamed-media-window.c:1288
-#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "Ring"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:432
 msgid "Mobile"
 msgstr "Mobil"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:384
+#: ../libempathy-gtk/empathy-individual-menu.c:434
 msgid "Work"
 msgstr "Arbeid"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:386
+#: ../libempathy-gtk/empathy-individual-menu.c:436
 msgid "HOME"
 msgstr "Hjemme"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:677
+msgid "_Block Contact"
+msgstr "_Blokker kontakt"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1055
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "_Prat"
+
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:837
-#: ../libempathy-gtk/empathy-new-message-dialog.c:314
+#: ../libempathy-gtk/empathy-individual-menu.c:1090
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1175
+#: ../libempathy-gtk/empathy-individual-menu.c:1123
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Lydsamtale"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1156
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Videosamtale"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1197
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "_Tidligere samtaler"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1226
+msgid "Send File"
+msgstr "Send fil"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1256
+msgid "Share My Desktop"
+msgstr "Del mitt skrivebord"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1282
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Favoritt"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1310
+msgid "Infor_mation"
+msgstr "Infor_masjon"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1359
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "R_ediger"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1201
+#: ../libempathy-gtk/empathy-individual-menu.c:1385
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "Koble kontakter …"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2355
+#: ../libempathy-gtk/empathy-individual-menu.c:1501
+#: ../src/empathy-chat-window.c:1011
+msgid "Inviting you to this room"
+msgstr "Inviterer deg til dette rommet"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1547
+msgid "_Invite to Chat Room"
+msgstr "_Inviter til praterom"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1743
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "_Legg til kontakt …"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2301
 msgid "Delete and _Block"
 msgstr "Slett og _blokker"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2390
+#: ../libempathy-gtk/empathy-individual-view.c:2336
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Vil du virkelig fjerne gruppen «%s»?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2393
+#: ../libempathy-gtk/empathy-individual-view.c:2339
 msgid "Removing group"
 msgstr "Fjerner gruppe"
 
 #. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2448
-#: ../libempathy-gtk/empathy-individual-view.c:2665
+#: ../libempathy-gtk/empathy-individual-view.c:2394
+#: ../libempathy-gtk/empathy-individual-view.c:2611
 msgid "_Remove"
 msgstr "Fje_rn"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2525
+#: ../libempathy-gtk/empathy-individual-view.c:2471
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Vil du virkelig fjerne kontakten «%s»?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2534
+#: ../libempathy-gtk/empathy-individual-view.c:2480
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2243,11 +2198,11 @@ msgstr ""
 "Vil du virkelig fjerne lenket kontakt «%s»? Merk at dette vil fjerne alle "
 "kontaktene den lenkede kontakten består av."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2546
+#: ../libempathy-gtk/empathy-individual-view.c:2492
 msgid "Removing contact"
 msgstr "Fjerner kontakt"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1642
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2258,23 +2213,23 @@ msgstr[1] "Lenket kontakt som inneholder %u kontakter"
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Plassering</b> (dato)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "Tilkoblet fra en telefon eller mobil enhet"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "Nytt nettverk"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Velg et IRC-nettverk"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "Nullstill _nettverksliste"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Velg"
@@ -2330,241 +2285,241 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "_Fjern kobling"
 
-#: ../libempathy-gtk/empathy-log-window.c:621
+#: ../libempathy-gtk/empathy-log-window.c:622
 msgid "History"
 msgstr "Historikk"
 
-#: ../libempathy-gtk/empathy-log-window.c:676
+#: ../libempathy-gtk/empathy-log-window.c:677
 msgid "Show"
 msgstr "Vis"
 
-#: ../libempathy-gtk/empathy-log-window.c:698
+#: ../libempathy-gtk/empathy-log-window.c:699
 msgid "Search"
 msgstr "Søk"
 
-#: ../libempathy-gtk/empathy-log-window.c:1147
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat in %s"
 msgstr "Prat i %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1149
+#: ../libempathy-gtk/empathy-log-window.c:1152
 #, c-format
 msgid "Chat with %s"
 msgstr "Prat med %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1199
-#: ../libempathy-gtk/empathy-log-window.c:1346
+#: ../libempathy-gtk/empathy-log-window.c:1202
+#: ../libempathy-gtk/empathy-log-window.c:1349
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1288
+#: ../libempathy-gtk/empathy-log-window.c:1291
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1294
+#: ../libempathy-gtk/empathy-log-window.c:1297
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1370
+#: ../libempathy-gtk/empathy-log-window.c:1373
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s sekund"
 msgstr[1] "%s sekunder"
 
-#: ../libempathy-gtk/empathy-log-window.c:1377
+#: ../libempathy-gtk/empathy-log-window.c:1380
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s minutt"
 msgstr[1] "%s minutter"
 
-#: ../libempathy-gtk/empathy-log-window.c:1385
+#: ../libempathy-gtk/empathy-log-window.c:1388
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Samtalen tok %s, avsluttet %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1719
+#: ../libempathy-gtk/empathy-log-window.c:1722
 msgid "Today"
 msgstr "I dag"
 
-#: ../libempathy-gtk/empathy-log-window.c:1723
+#: ../libempathy-gtk/empathy-log-window.c:1726
 msgid "Yesterday"
 msgstr "I går"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1738
+#: ../libempathy-gtk/empathy-log-window.c:1741
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1826
-#: ../libempathy-gtk/empathy-log-window.c:3458
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3489
 msgid "Anytime"
 msgstr "Når som helst"
 
-#: ../libempathy-gtk/empathy-log-window.c:1915
-#: ../libempathy-gtk/empathy-log-window.c:2371
+#: ../libempathy-gtk/empathy-log-window.c:1918
+#: ../libempathy-gtk/empathy-log-window.c:2402
 msgid "Anyone"
 msgstr "Hvem som helst"
 
-#: ../libempathy-gtk/empathy-log-window.c:2684
+#: ../libempathy-gtk/empathy-log-window.c:2715
 msgid "Who"
 msgstr "Hvem"
 
-#: ../libempathy-gtk/empathy-log-window.c:2893
+#: ../libempathy-gtk/empathy-log-window.c:2924
 msgid "When"
 msgstr "Når"
 
-#: ../libempathy-gtk/empathy-log-window.c:3009
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Anything"
 msgstr "Hva som helst"
 
-#: ../libempathy-gtk/empathy-log-window.c:3011
+#: ../libempathy-gtk/empathy-log-window.c:3042
 msgid "Text chats"
 msgstr "Tekstsamtaler"
 
-#: ../libempathy-gtk/empathy-log-window.c:3013
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../src/empathy-preferences.ui.h:23
 msgid "Calls"
 msgstr "Samtaler"
 
-#: ../libempathy-gtk/empathy-log-window.c:3018
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Incoming calls"
 msgstr "Innkommende samtaler"
 
-#: ../libempathy-gtk/empathy-log-window.c:3019
+#: ../libempathy-gtk/empathy-log-window.c:3050
 msgid "Outgoing calls"
 msgstr "Utgående samtaler"
 
-#: ../libempathy-gtk/empathy-log-window.c:3020
+#: ../libempathy-gtk/empathy-log-window.c:3051
 msgid "Missed calls"
 msgstr "Tapte samtaler"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3073
 msgid "What"
 msgstr "Hva"
 
-#: ../libempathy-gtk/empathy-log-window.c:3751
+#: ../libempathy-gtk/empathy-log-window.c:3782
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Er du sikker på at du vil slette alle logger av tidligere samtaler?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3755
+#: ../libempathy-gtk/empathy-log-window.c:3786
 msgid "Clear All"
 msgstr "Tøm alle"
 
-#: ../libempathy-gtk/empathy-log-window.c:3762
+#: ../libempathy-gtk/empathy-log-window.c:3793
 msgid "Delete from:"
 msgstr "Slett fra:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Laster …</span>"
+msgid "_File"
+msgstr "_Fil"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Prat"
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_Edit"
+msgstr "_Rediger"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "Slett all historikk …"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Profil"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "Video"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Prat"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "_Rediger"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Video"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_Fil"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "side 2"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:84
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Laster …</span>"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
 msgid "The contact is offline"
 msgstr "Kontakten er koblet fra"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:86
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
 msgid "The specified contact is either invalid or unknown"
 msgstr "Valgt kontakt er ugyldig eller ukjent"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:88
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
 msgid "The contact does not support this kind of conversation"
 msgstr "Kontakten støtter ikke denne type samtale"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:90
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
 msgid "The requested functionality is not implemented for this protocol"
 msgstr "Forespurt funksjonalitet er ikke implementert for denne protokollen"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:96
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
 msgid "Could not start a conversation with the given contact"
 msgstr "Kunne ikke starte en samtale med oppgitt kontakt"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
 msgid "You are banned from this channel"
 msgstr "Du er bannlyst fra denne kanalen"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
 msgid "This channel is full"
 msgstr "Kanalen er full"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:102
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
 msgid "You must be invited to join this channel"
 msgstr "Du må bli invitert til å bli med i denne kanalen"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:104
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
 msgid "Can't proceed while disconnected"
 msgstr "Kan ikke fortsette da du er koblet fra"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:106
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
 msgid "Permission denied"
 msgstr "Tilgang nektet"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:112
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
 msgid "There was an error starting the conversation"
 msgstr "Det oppsto en feil ved start av samtalen"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:291
-#: ../libempathy-gtk/empathy-new-call-dialog.c:203
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:202
 msgid "Enter a contact identifier or phone number:"
 msgstr "Oppgi en kontaktidentifikator eller telefonnummer:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:334
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "Ny samtale"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:226
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "_Video Call"
 msgstr "_Videosamtale"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:236
+#: ../libempathy-gtk/empathy-new-call-dialog.c:235
 msgid "_Audio Call"
 msgstr "_Lydsamtale"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:246
+#: ../libempathy-gtk/empathy-new-call-dialog.c:245
 msgid "New Call"
 msgstr "Ny samtale"
 
@@ -2630,20 +2585,20 @@ msgid "Find:"
 msgstr "Finn:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "_Skill mellom små/store bokstaver"
+msgid "_Previous"
+msgstr "_Forrige"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "Teksten ble ikke funnet"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_Neste"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "_Skill mellom små/store bokstaver"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "_Forrige"
+msgid "Phrase not found"
+msgstr "Teksten ble ikke funnet"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -3050,11 +3005,11 @@ msgstr ""
 "Hvis ikke så skriv til Free Software Foundation, Inc., 51 Franklin Street, "
 "Fifth Floor, Boston, MA 02110-1301159, USA."
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "En meldingsklient for GNOME"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "Kjartan Maraas\n"
@@ -3092,35 +3047,36 @@ msgstr ""
 "avslutte assistenten og legge til kontoer senere fra Rediger-menyen."
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1272
+#: ../src/empathy-account-assistant.c:1274
 msgid "An error occurred"
 msgstr "En feil oppsto"
 
-#: ../src/empathy-account-assistant.c:467
+#: ../src/empathy-account-assistant.c:469
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
 msgid "What kind of chat account do you have?"
 msgstr "Hvilken type konto har du?"
 
-#: ../src/empathy-account-assistant.c:473
+#: ../src/empathy-account-assistant.c:475
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "Har du noen andre lynmeldingskontoer du vil sette opp?"
 
-#: ../src/empathy-account-assistant.c:479
+#: ../src/empathy-account-assistant.c:481
 msgid "Enter your account details"
 msgstr "Oppgi detaljer for konto"
 
-#: ../src/empathy-account-assistant.c:484
+#: ../src/empathy-account-assistant.c:486
 msgid "What kind of chat account do you want to create?"
 msgstr "Hvilken type lynmeldingskonto vil du lage?"
 
-#: ../src/empathy-account-assistant.c:490
+#: ../src/empathy-account-assistant.c:492
 msgid "Do you want to create other chat accounts?"
 msgstr "Vil du lage flere lynmeldingskontoer?"
 
-#: ../src/empathy-account-assistant.c:497
+#: ../src/empathy-account-assistant.c:499
 msgid "Enter the details for the new account"
 msgstr "Oppgi detaljer for den nye kontoen"
 
-#: ../src/empathy-account-assistant.c:612
+#: ../src/empathy-account-assistant.c:614
 msgid ""
 "With Empathy you can chat with people online nearby and with friends and "
 "colleagues who use Google Talk, AIM, Windows Live and many other chat "
@@ -3132,41 +3088,41 @@ msgstr ""
 "prateprogrammer. Hvis du har en mikrofon eller et nettkamera kan du også ha "
 "lyd- og bildesamtaler."
 
-#: ../src/empathy-account-assistant.c:629
+#: ../src/empathy-account-assistant.c:631
 msgid "Do you have an account you've been using with another chat program?"
 msgstr "Har du en konto som du har brukt med et annet lynmeldingsprogram?"
 
-#: ../src/empathy-account-assistant.c:653
+#: ../src/empathy-account-assistant.c:655
 msgid "Yes, import my account details from "
 msgstr "Ja, importer mine kontodetaljer fra "
 
-#: ../src/empathy-account-assistant.c:674
+#: ../src/empathy-account-assistant.c:676
 msgid "Yes, I'll enter my account details now"
 msgstr "Ja, jeg vil skrive inn mine kontodetaljer nå"
 
-#: ../src/empathy-account-assistant.c:696
+#: ../src/empathy-account-assistant.c:698
 msgid "No, I want a new account"
 msgstr "Nei, jeg vil ha en ny konto"
 
-#: ../src/empathy-account-assistant.c:706
+#: ../src/empathy-account-assistant.c:708
 msgid "No, I just want to see people online nearby for now"
 msgstr "Nei, jeg vil bare se personer i nærheten foreløpig"
 
-#: ../src/empathy-account-assistant.c:727
+#: ../src/empathy-account-assistant.c:729
 msgid "Select the accounts you want to import:"
 msgstr "Velg kontoer du vil importere:"
 
-#: ../src/empathy-account-assistant.c:814
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
+#: ../src/empathy-account-assistant.c:816
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "Yes"
 msgstr "Ja"
 
-#: ../src/empathy-account-assistant.c:821
+#: ../src/empathy-account-assistant.c:823
 msgid "No, that's all for now"
 msgstr "Nei, det var alt for nå"
 
-#: ../src/empathy-account-assistant.c:1086
+#: ../src/empathy-account-assistant.c:1088
 msgid ""
 "Empathy can automatically discover and chat with the people connected on the "
 "same network as you. If you want to use this feature, please check that the "
@@ -3178,16 +3134,16 @@ msgstr ""
 "under er riktige. Du kan lett endre disse detaljene senere eller slå av "
 "funksjonen i «Konto»-dialogen"
 
-#: ../src/empathy-account-assistant.c:1092
-#: ../src/empathy-account-assistant.c:1148
+#: ../src/empathy-account-assistant.c:1094
+#: ../src/empathy-account-assistant.c:1150
 msgid "Edit->Accounts"
 msgstr "Rediger->Kontoer"
 
-#: ../src/empathy-account-assistant.c:1108
+#: ../src/empathy-account-assistant.c:1110
 msgid "I do _not want to enable this feature for now"
 msgstr "Jeg vil ikke slå på de_nne funksjonen nå"
 
-#: ../src/empathy-account-assistant.c:1144
+#: ../src/empathy-account-assistant.c:1146
 msgid ""
 "You won't be able to chat with people connected to your local network, as "
 "telepathy-salut is not installed. If you want to enable this feature, please "
@@ -3199,85 +3155,93 @@ msgstr ""
 "funksjonen må du installere pakken telepathy-salut og opprette en «Folk i "
 "nærheten»-konto i Konto-dialogen"
 
-#: ../src/empathy-account-assistant.c:1150
+#: ../src/empathy-account-assistant.c:1152
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut er ikke installert"
 
-#: ../src/empathy-account-assistant.c:1196
+#: ../src/empathy-account-assistant.c:1198
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "Assistent for meldings- og VoIP-kontoer"
 
-#: ../src/empathy-account-assistant.c:1230
+#: ../src/empathy-account-assistant.c:1232
 msgid "Welcome to Empathy"
 msgstr "Velkommen til Empathy"
 
-#: ../src/empathy-account-assistant.c:1239
+#: ../src/empathy-account-assistant.c:1241
 msgid "Import your existing accounts"
 msgstr "Importer dine eksisterende kontoer"
 
-#: ../src/empathy-account-assistant.c:1257
+#: ../src/empathy-account-assistant.c:1259
 msgid "Please enter personal details"
 msgstr "Vennligst oppgi personlige detaljer"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:69
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Det finnes ikke-lagrede endringer for din %s-konto."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:73
 msgid "Your new account has not been saved yet."
 msgstr "Din nye konto er ikke lagret ennå."
 
-#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-accounts-dialog.c:352
 #: ../src/empathy-streamed-media-window.c:757
 #: ../src/empathy-call-window.c:1325
 msgid "Connecting…"
 msgstr "Kobler til …"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:393
 #, c-format
 msgid "Offline — %s"
 msgstr "Frakoblet - %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:405
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Koblet fra - %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:416
 msgid "Offline — No Network Connection"
 msgstr "Frakoblet - Ingen nettverkstilkobling"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:423
 msgid "Unknown Status"
 msgstr "Ukjent status"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:435
 msgid "Offline — Account Disabled"
 msgstr "Frakoblet - Konto deaktivert"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"Du er i ferd med å lage en ny konto hvilket vil forkaste\n"
-"dine endringer. Er du sikker på at du vil fortsette?"
+#: ../src/empathy-accounts-dialog.c:538
+msgid "Edit Connection Parameters"
+msgstr "Rediger parametere for tilkobling"
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:701
+msgid "Failed to retrieve your personal information from the server."
+msgstr "Klarte ikke å hente din personlige informasjon fra tjeneren."
+
+#: ../src/empathy-accounts-dialog.c:707
+msgid "Go online to edit your personal information."
+msgstr "Rediger din personlige informasjon på nettet."
+
+#: ../src/empathy-accounts-dialog.c:792
+msgid "_Edit Connection Parameters..."
+msgstr "R_ediger parametere for tilkoblingen …"
+
+#: ../src/empathy-accounts-dialog.c:1293
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Vil du fjerne %s fra din datamaskin?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1297
 msgid "This will not remove your account on the server."
 msgstr "Dette vil ikke fjerne din konto på tjeneren."
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1533
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3286,15 +3250,15 @@ msgstr ""
 "dine endringer. Er du sikker på at du vil fortsette?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1744
 msgid "_Enable"
 msgstr "Slå _på"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1745
 msgid "_Disable"
 msgstr "Slå _av"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2255
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3306,19 +3270,15 @@ msgstr ""
 msgid "Add…"
 msgstr "Legg til …"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "Laster kontoinformasjon"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "Ingen protokoll installert"
+msgid "_Import…"
+msgstr "_Importer …"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3326,15 +3286,19 @@ msgstr ""
 "Du må installere en motor for hver protokoll du ønsker å bruke før du legger "
 "til en ny konto."
 
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol installed"
+msgstr "Ingen protokoll installert"
+
 #: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "_Importer …"
+msgid "Loading account information"
+msgstr "Laster kontoinformasjon"
 
-#: ../src/empathy-auth-client.c:284
+#: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
 msgstr "- Empathy autentiseringsklient"
 
-#: ../src/empathy-auth-client.c:300
+#: ../src/empathy-auth-client.c:302
 msgid "Empathy authentication client"
 msgstr "Empathy autentiseringsklient"
 
@@ -3521,139 +3485,139 @@ msgstr "Kan ikke etablere lydstrøm"
 msgid "Can't establish video stream"
 msgstr "Kan ikke etablere videostrøm"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "Lyd"
+msgid "_Call"
+msgstr "_Ring"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Kodek for dekoding:"
+msgid "_Microphone"
+msgstr "_Mikrofon"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "Slå av kamera"
+msgid "_Camera"
+msgstr "_Kamera"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "Vis ringetastatur"
+msgid "_Settings"
+msgstr "Inn_stillinger"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Kodek for koding:"
+#: ../src/empathy-roster-window-menubar.ui.h:18
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "_Vis"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Legg på"
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:28
+msgid "_Help"
+msgstr "_Hjelp"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Legg på denne samtalen"
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Contents"
+msgstr "_Innhold"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Lokal kandidat:"
+#: ../src/empathy-roster-window-menubar.ui.h:30
+msgid "_Debug"
+msgstr "_Feilsøk"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "Maksimer meg"
+msgid "Swap camera"
+msgstr "Bytt kamera"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "Minimer meg"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Ekstern kandidat:"
+msgid "Maximise me"
+msgstr "Maksimer meg"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "Send lyd"
+msgid "Disable camera"
+msgstr "Slå av kamera"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "Send video"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Legg på"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "Vis ringetastatur"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Legg på denne samtalen"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Videosamtale"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "Start en videosamtale"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "Start en lydsamtale"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Bytt kamera"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Slå av/på overføring av lyd"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "Slå av/på overføring av video"
+msgid "Show dialpad"
+msgstr "Vis ringetastatur"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581
-#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583
-msgid "Unknown"
-msgstr "Ukjent"
+msgid "Display the dialpad"
+msgstr "Vis ringetastatur"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "Send video"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "Videosamtale"
+msgid "Toggle video transmission"
+msgstr "Slå av/på overføring av video"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_Ring"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Send lyd"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "_Kamera"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "_Innhold"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Slå av/på overføring av lyd"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "_Feilsøk"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Kodek for koding:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "_Hjelp"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581
+#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583
+msgid "Unknown"
+msgstr "Ukjent"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Kodek for dekoding:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "_Mikrofon"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Ekstern kandidat:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "Inn_stillinger"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Lokal kandidat:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:22
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "_Vis"
+msgid "Audio"
+msgstr "Lyd"
 
 #: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
 #, c-format
@@ -3699,64 +3663,64 @@ msgid "Typing a message."
 msgstr "Skriver en melding"
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "_Tøm"
+msgid "_Conversation"
+msgstr "_Samtale"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "K_ontakt"
+msgid "C_lear"
+msgstr "_Tøm"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "Sett inn _smilefjes"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "_Favoritt-praterom"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "Inviter _deltaker …"
+msgid "Notify for All Messages"
+msgstr "Varsle for alle meldinger"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "Flytt fane til _venstre"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "Vi_s kontaktliste"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Flytt fane til høy_re"
+msgid "Invite _Participant…"
+msgstr "Inviter _deltaker …"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Varsle for alle meldinger"
+msgid "C_ontact"
+msgstr "K_ontakt"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Samtale"
+msgid "_Tabs"
+msgstr "_Faner"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "Riv _løs fane"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "_Favoritt-praterom"
+msgid "_Previous Tab"
+msgstr "_Forrige samtaler"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "_Neste fane"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "_Forrige samtaler"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "Angre l_ukk fane"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "Vi_s kontaktliste"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Flytt fane til _venstre"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "_Faner"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Flytt fane til høy_re"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "Angre l_ukk fane"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "Riv _løs fane"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3770,7 +3734,7 @@ msgstr "Rom"
 msgid "Auto-Connect"
 msgstr "Koble til automatisk"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "Håndter favorittrom"
 
@@ -3835,7 +3799,7 @@ msgid "_Decline"
 msgstr "_Avslå"
 
 #: ../src/empathy-event-manager.c:860
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_Bli med"
 
@@ -3854,7 +3818,7 @@ msgstr "Du har blitt invitert til å bli med i %s"
 msgid "Incoming file transfer from %s"
 msgstr "Innkommende filoverføring fra %s"
 
-#: ../src/empathy-event-manager.c:1147 ../src/empathy-main-window.c:377
+#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:371
 msgid "Password required"
 msgstr "Passord kreves"
 
@@ -3994,163 +3958,164 @@ msgid "Import Accounts"
 msgstr "Importer kontoer"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:315
 msgid "Import"
 msgstr "Importer"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:324
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:348
 msgid "Source"
 msgstr "Kilde"
 
-#: ../src/empathy-main-window.c:394
+#: ../src/empathy-roster-window.c:388
 msgid "Provide Password"
 msgstr "Oppgi passord"
 
-#: ../src/empathy-main-window.c:400
+#: ../src/empathy-roster-window.c:394
 msgid "Disconnect"
 msgstr "Koble fra"
 
-#: ../src/empathy-main-window.c:637
+#: ../src/empathy-roster-window.c:626
 msgid "No match found"
 msgstr "Ingen treff funnet"
 
-#: ../src/empathy-main-window.c:745
+#: ../src/empathy-roster-window.c:733
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr "Beklager %s-kontoer kan ikke brukes før %s-programvaren er oppdatert."
 
-#: ../src/empathy-main-window.c:813
+#: ../src/empathy-roster-window.c:799
 msgid "Update software..."
 msgstr "Oppdater programvare …"
 
-#: ../src/empathy-main-window.c:819 ../src/empathy-main-window.c:940
+#: ../src/empathy-roster-window.c:805 ../src/empathy-roster-window.c:922
 msgid "Close"
 msgstr "Lukk"
 
-#: ../src/empathy-main-window.c:928
+#: ../src/empathy-roster-window.c:910
 msgid "Reconnect"
 msgstr "Koble til på nytt"
 
-#: ../src/empathy-main-window.c:934
+#: ../src/empathy-roster-window.c:916
 msgid "Edit Account"
 msgstr "Rediger konto"
 
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:1073
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1060
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Fyll opp %s (%s) …"
 
-#: ../src/empathy-main-window.c:1120
+#: ../src/empathy-roster-window.c:1106
 msgid "Top up account credit"
 msgstr "Fyll opp kreditt for konto"
 
 #. top up button
-#: ../src/empathy-main-window.c:1191
+#: ../src/empathy-roster-window.c:1178
 msgid "Top Up..."
 msgstr "Fyll opp …"
 
-#: ../src/empathy-main-window.c:1934
+#: ../src/empathy-roster-window.c:1901
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../src/empathy-main-window.c:2309
+#: ../src/empathy-roster-window.c:2296
 msgid "Contact List"
 msgstr "Kontaktliste"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "Kontakter på et _kart"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_Ny samtale …"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "Kredittsaldo"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "Ny _samtale …"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "Finn i kontakt_liste"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "_Søk etter kontakter …"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "Bli med i _favoritter"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "_Filoverføringer"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "Håndter favoritter"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "Frak_oblede kontakter"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "N_ormal størrelse"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "Vis p_rotokoller"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "Ny _samtale …"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Kredittsaldo"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Normal størrelse med _avatarer"
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "Kontakter på et _kart"
+
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "_Kontoer"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Personal Information"
+msgstr "Personlig _informasjon"
+
+#: ../src/empathy-roster-window-menubar.ui.h:15
+msgid "_Blocked Contacts"
+msgstr "_Blokkerte kontakter"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:16
 msgid "P_references"
 msgstr "B_rukervalg"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "Vis p_rotokoller"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+msgid "Find in Contact _List"
+msgstr "Finn i kontakt_liste"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Name"
 msgstr "Sorter på _navn"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:20
 msgid "Sort by _Status"
 msgstr "Sorter på _status"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "_Kontoer"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "Normal Size With _Avatars"
+msgstr "Normal størrelse med _avatarer"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "_Blokkerte kontakter"
+#: ../src/empathy-roster-window-menubar.ui.h:22
+msgid "N_ormal Size"
+msgstr "N_ormal størrelse"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:23
 msgid "_Compact Size"
 msgstr "_Kompakt størrelse"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "_Filoverføringer"
+#: ../src/empathy-roster-window-menubar.ui.h:24
+msgid "_Room"
+msgstr "_Rom"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:25
 msgid "_Join…"
 msgstr "_Bli med …"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "_Ny samtale …"
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "Frak_oblede kontakter"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "Personlig _informasjon"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "_Rom"
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Join _Favorites"
+msgstr "Bli med i _favoritter"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "_Søk etter kontakter …"
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "Manage Favorites"
+msgstr "Håndter favoritter"
 
 #: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
@@ -4162,7 +4127,7 @@ msgstr "Medlemmer"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:623
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4175,22 +4140,22 @@ msgstr ""
 "Passord kreves: %s\n"
 "Medlemmer: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Nei"
 
-#: ../src/empathy-new-chatroom-dialog.c:654
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "Kunne ikke starte romliste"
 
-#: ../src/empathy-new-chatroom-dialog.c:664
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "Kune ikke stoppe romliste"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "Kunne ikke laste romliste"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Bli med i rom"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
@@ -4200,6 +4165,10 @@ msgstr ""
 "listen."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "_Rom:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -4207,18 +4176,14 @@ msgstr ""
 "Oppgi tjener som er vert for rommet, eller la stå tom hvis rommet er på "
 "aktiv kontos tjener"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Bli med i rom"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "Kunne ikke laste romliste"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Romliste"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "_Rom:"
-
 #: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Melding mottatt"
@@ -4296,219 +4261,219 @@ msgid "Preferences"
 msgstr "Brukervalg"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "Vis _smilefjes som bilder"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "Vis kontakt_liste i rom"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Utseende"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Oppførsel"
+#: ../src/empathy-preferences.ui.h:4
+msgid "_Open new chats in separate windows"
+msgstr "_Åpne nye samtaler i egne vinduer"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "Samtale_tema:"
+msgid "Display incoming events in the notification area"
+msgstr "Vis innkommende hendelser i varslingsområdet"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "Slå av varsling når du er borte eller oppt_att"
+msgid "_Automatically connect on startup"
+msgstr "Koble til _automatisk ved oppstart"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "Slå av lyder når du er b_orte eller opptatt"
+msgid "Log conversations"
+msgstr "Logg samtaler"
 
 #: ../src/empathy-preferences.ui.h:8
-msgid "Display incoming events in the notification area"
-msgstr "Vis innkommende hendelser i varslingsområdet"
+msgid "Behavior"
+msgstr "Oppførsel"
 
 #: ../src/empathy-preferences.ui.h:9
-msgid ""
-"Echo cancellation helps to make your voice sound clearer to the other "
-"person, but may cause problems on some computers. If you or the other person "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"Utlikning av ekko kan hjelpe å gjøre lyd for tale klarere for den andre "
-"personene, men kan forårsake problemer på noen datamaskiner. Hvis du eller "
-"den andre personen hører rare lyder eller feil under samtaler kan du prøve å "
-"slå av utlikning av ekko og starte samtalen på nytt."
+msgid "General"
+msgstr "Generelt"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "Slå på varsling når en kontakt kobler seg til"
+msgid "_Enable bubble notifications"
+msgstr "_Aktiver varsling med bobler"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "Slå på varsling når en kontakt kobler seg fra"
+msgid "Disable notifications when _away or busy"
+msgstr "Slå av varsling når du er borte eller oppt_att"
 
 #: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Aktiver varsling når _prat ikke er fokusert"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "Slå på stavekontroll for språk:"
+msgid "Enable notifications when a contact comes online"
+msgstr "Slå på varsling når en kontakt kobler seg til"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "Generelt"
+msgid "Enable notifications when a contact goes offline"
+msgstr "Slå på varsling når en kontakt kobler seg fra"
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Notifications"
+msgstr "Varsling"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Location sources:"
-msgstr "Kilder for steder:"
+msgid "_Enable sound notifications"
+msgstr "_Aktiver varsling med lyder"
 
 #: ../src/empathy-preferences.ui.h:17
-msgid "Log conversations"
-msgstr "Logg samtaler"
+msgid "Disable sounds when _away or busy"
+msgstr "Slå av lyder når du er b_orte eller opptatt"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Notifications"
-msgstr "Varsling"
-
-#: ../src/empathy-preferences.ui.h:19
 msgid "Play sound for events"
 msgstr "Spill av lyd for hendelser"
 
+#: ../src/empathy-preferences.ui.h:19
+msgid "Sounds"
+msgstr "Lyder"
+
 #: ../src/empathy-preferences.ui.h:20
-msgid "Privacy"
-msgstr "Personvern"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Bruk _ekkokansellering for å forbedre kvaliteten på samtalen"
 
 #: ../src/empathy-preferences.ui.h:21
 msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
 msgstr ""
-"Redusert nøyaktighet for plassering betyr at kun by, område og land vil "
-"publisert. GPS-koordinater vil ha nøyaktighet lik en desimalplass."
-
-#: ../src/empathy-preferences.ui.h:22
-msgid "Show _smileys as images"
-msgstr "Vis _smilefjes som bilder"
-
-#: ../src/empathy-preferences.ui.h:23
-msgid "Show contact _list in rooms"
-msgstr "Vis kontakt_liste i rom"
+"Utlikning av ekko kan hjelpe å gjøre lyd for tale klarere for den andre "
+"personene, men kan forårsake problemer på noen datamaskiner. Hvis du eller "
+"den andre personen hører rare lyder eller feil under samtaler kan du prøve å "
+"slå av utlikning av ekko og starte samtalen på nytt."
 
 #: ../src/empathy-preferences.ui.h:24
-msgid "Sounds"
-msgstr "Lyder"
+msgid "_Publish location to my contacts"
+msgstr "_Publiser plassering til mine kontakter"
 
 #: ../src/empathy-preferences.ui.h:25
-msgid "Spell Checking"
-msgstr "Stavekontroll"
-
-#: ../src/empathy-preferences.ui.h:26
 msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
 msgstr ""
-"Listen med språk viser bare de språkene det er installert ordliste for."
+"Redusert nøyaktighet for plassering betyr at kun by, område og land vil "
+"publisert. GPS-koordinater vil ha nøyaktighet lik en desimalplass."
 
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:27
-msgid "Themes"
-msgstr "Temaer"
+msgid "_Reduce location accuracy"
+msgstr "_Reduser nøyaktighet for plassering"
 
 #: ../src/empathy-preferences.ui.h:28
-msgid "Use _echo cancellation to improve call quality"
-msgstr "Bruk _ekkokansellering for å forbedre kvaliteten på samtalen"
+msgid "Privacy"
+msgstr "Personvern"
 
 #: ../src/empathy-preferences.ui.h:29
-msgid "Variant:"
-msgstr "Variant:"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "_Automatically connect on startup"
-msgstr "Koble til _automatisk ved oppstart"
-
-#: ../src/empathy-preferences.ui.h:31
 msgid "_Cellphone"
 msgstr "_Mobiltelefon"
 
-#: ../src/empathy-preferences.ui.h:32
-msgid "_Enable bubble notifications"
-msgstr "_Aktiver varsling med bobler"
+#: ../src/empathy-preferences.ui.h:31
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Nettverk (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:33
-msgid "_Enable sound notifications"
-msgstr "_Aktiver varsling med lyder"
+#: ../src/empathy-preferences.ui.h:32
+msgid "Location sources:"
+msgstr "Kilder for steder:"
 
 #: ../src/empathy-preferences.ui.h:34
-msgid "_GPS"
-msgstr "_GPS"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"Listen med språk viser bare de språkene det er installert ordliste for."
 
 #: ../src/empathy-preferences.ui.h:35
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_Nettverk (IP, Wi-Fi)"
+msgid "Enable spell checking for languages:"
+msgstr "Slå på stavekontroll for språk:"
 
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Open new chats in separate windows"
-msgstr "_Åpne nye samtaler i egne vinduer"
+msgid "Spell Checking"
+msgstr "Stavekontroll"
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Publish location to my contacts"
-msgstr "_Publiser plassering til mine kontakter"
+msgid "Chat Th_eme:"
+msgstr "Samtale_tema:"
+
+#: ../src/empathy-preferences.ui.h:38
+msgid "Variant:"
+msgstr "Variant:"
 
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:39
-msgid "_Reduce location accuracy"
-msgstr "_Reduser nøyaktighet for plassering"
+msgid "Themes"
+msgstr "Temaer"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Status"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "_Avslutt"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Ring kontakten igjen"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Kamera av"
+msgid "Redial"
+msgstr "Ring på nytt"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Kamera på"
+msgid "V_ideo"
+msgstr "V_ideo"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Video av"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Slå av kamera og stopp sending av video"
+msgid "Video Preview"
+msgstr "Forhåndsvis video"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Slå på kamera og send video"
+msgid "Video On"
+msgstr "Video på"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Slå på kamera men ikke send video"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Ring kontakten igjen"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Forhåndsvis"
+msgid "Camera Off"
+msgstr "Kamera av"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Ring på nytt"
+msgid "Disable camera and stop sending video"
+msgstr "Slå av kamera og stopp sending av video"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ideo"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Forhåndsvis"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Video av"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Slå på kamera men ikke send video"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Video på"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Kamera på"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Forhåndsvis video"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Slå på kamera og send video"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Kartvisning for kontakter"
 
@@ -4575,16 +4540,16 @@ msgid ""
 msgstr ""
 "Valgt tilkoblingshåndterer støtter ikke utvidelse for ekstern feilsøking."
 
-#: ../src/empathy-invite-participant-dialog.c:198
-#: ../src/empathy-invite-participant-dialog.c:226
+#: ../src/empathy-invite-participant-dialog.c:200
+#: ../src/empathy-invite-participant-dialog.c:228
 msgid "Invite Participant"
 msgstr "Inviter deltaker"
 
-#: ../src/empathy-invite-participant-dialog.c:199
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Velg en kontakt å invitere til samtalen:"
 
-#: ../src/empathy-invite-participant-dialog.c:222
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite"
 msgstr "Inviter"
 
@@ -4717,3 +4682,7 @@ msgstr "Fyll opp"
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "Skill _mellom små/store bokstaver"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "Legger til ny konto"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 0bb97f1f6..12ebb28c5 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy 3.3.1\n"
+"Project-Id-Version: empathy 3.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-12 19:09+0800\n"
-"PO-Revision-Date: 2011-11-12 19:10+0800\n"
+"POT-Creation-Date: 2012-01-14 20:22+0800\n"
+"PO-Revision-Date: 2012-01-14 20:23+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
 "Language: zh_TW\n"
@@ -40,425 +40,417 @@ msgid "Always open a separate chat window for new chats."
 msgstr "永遠為每個新的聊天開啟新的聊天視窗。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "通話音量"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "通話音量，為百分比。"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid "Camera device"
 msgstr "攝影機裝置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
 msgid "Camera position"
 msgstr "攝影機位置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr "在羣組聊天中使用網名補齊 (tab) 時要加到網名之後的字符。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
 msgid "Chat window theme"
 msgstr "聊天視窗佈景主題"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid "Chat window theme variant"
 msgstr "聊天視窗佈景主題樣式"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr "以逗號分隔要使用拼字檢查的語言清單 (如：「 en, fr, nl」)。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Compact contact list"
 msgstr "精簡聯絡人清單"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid "Connection managers should be used"
 msgstr "使用連線管理程式"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Contact list sort criterion"
 msgstr "聯絡人清單排序準則"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "D-Bus object path of the last account selected to join a room."
 msgstr "上次要加入聊天室所選取帳號的 D-Bus 物件路徑。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr "要用於視像通話的預設攝影機裝置，例：/dev/video0。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Default directory to select an avatar image from"
 msgstr "用來選擇大頭貼圖片的預設目錄"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Disable popup notifications when away"
 msgstr "當狀態為離開時停用彈出式通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable sounds when away"
 msgstr "當狀態為離開時停用音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Display incoming events in the status area"
 msgstr "在狀態區域顯示收到事件"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
 msgstr "在狀態區域顯示收到事件。如果不啟用的話，收到事件會直接呈現給使用者。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid "Echo cancellation support"
 msgstr "回音消除支援"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Empathy can publish the user's location"
 msgstr "Empathy 可以發布使用者的位置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy 可以利用 GPS 來推測位置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy 可以利用流動電話網絡基地臺來推測位置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy 可以利用網絡來推測位置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy default download folder"
 msgstr "Empathy 預設下載資料夾"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy should auto-away when idle"
 msgstr "Empathy 當閒置時應該自動設為離開"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy 啟動時自動連線"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy 應降低位置的準確度"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy 要使用聯絡人的大頭貼做為聊天視窗圖示"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Enable WebKit Developer Tools"
 msgstr "啟用 WebKit 開發者工具"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Enable popup notifications for new messages"
 msgstr "啟用新訊息的彈出式通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable spell checker"
 msgstr "啟用拼字檢查程式"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Hide main window"
 msgstr "隱藏主視窗"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Hide the main window."
 msgstr "隱藏主視窗。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Last account selected in Join Room dialog"
 msgstr "上次在「參加聊天室」對話盒選取的帳號"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Nick completed character"
 msgstr "網名補齊字符"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Open new chats in separate windows"
 msgstr "在個別視窗開啟新的聊天"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Path of the Adium theme to use"
 msgstr "要使用的 Adium 佈景主題路徑"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "如果聊天室使用的主題是 Adium 時要使用的 Adium 佈景主題路徑。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Play a sound for incoming messages"
 msgstr "收到訊息時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for new conversations"
 msgstr "當開啟新的談話時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for outgoing messages"
 msgstr "送出訊息時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound when a contact logs in"
 msgstr "當聯絡人登入時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs out"
 msgstr "當有聯絡人登出時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when we log in"
 msgstr "當我們登入時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log out"
 msgstr "當我們登出時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "如果聊天視窗失去焦點則彈出通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications when a contact logs in"
 msgstr "當聯絡人登入時彈出通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs out"
 msgstr "當聯絡人登出時彈出通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Position the camera preview should be during a call."
 msgstr "通話時攝影機預覽應該擺放的位置。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "Show Balance in contact list"
 msgstr "於聯絡人清單內顯示餘額"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Show avatars"
 msgstr "顯示大頭貼"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show contact list in rooms"
 msgstr "在聊天室顯示聯絡人清單"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show hint about closing the main window"
 msgstr "關閉主視窗時顯示提示"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show offline contacts"
 msgstr "顯示離線聯絡人"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show protocols"
 msgstr "顯示協定"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Spell checking languages"
 msgstr "拼字檢查的語言"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "The default folder to save file transfers in."
 msgstr "用來儲存檔案傳輸接收檔案的預設資料夾。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The last directory that an avatar image was chosen from."
 msgstr "上次選擇大頭貼圖片的目錄。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The position for the chat window side pane"
 msgstr "聊天視窗側窗格的位置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "聊天視窗側窗格的儲存位置 (單位為像素)。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "用來顯示在聊天視窗中談話的佈景主題。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr "用來在聊天視窗顯示談話的佈景主題樣式。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "Use graphical smileys"
 msgstr "使用圖片式表情符號"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use notification sounds"
 msgstr "使用通知音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use theme for chat rooms"
 msgstr "在聊天室使用佈景主題"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Empathy 是否要將使用者的位置發布給他的聯絡人。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Empathy 是否使用 GPS 來推測位置。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Empathy 是否使用流動電話網絡來推測位置。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Empathy 是否使用網絡來推測位置。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Empathy 是否應在啟動時自動登入你的帳號。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr "Empathy 是否應在使用者閒置時自動切換為離開模式。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "Empathy 是否基於私隱的理由減低位置的準確度。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "Empathy 是否使用聯絡人大頭貼做為聊天視窗圖示。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "是否啟用 WebKit 開發者工具，例如 Web Inspector。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
 msgstr "是否使用連線管理程式自動斷線或重新連線。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "是否以你設定的語言檢查輸入有無錯字。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "是否將談話中的表情符號轉換為圖片形式。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr "是否要啟用 Pulseaudio 的回音消除過濾器。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "是否播放音效來通知有聯絡人登入網絡。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "是否播放音效來通知有聯絡人登出網絡。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of events."
 msgstr "是否播放音效來通知有事件發生。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "是否播放音效來通知有收到訊息。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "是否播放音效來通知新的談話。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "是否播放音效來通知有送出訊息。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound when logging into a network."
 msgstr "當登入某網絡時是否播放音效。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound when logging out of a network."
 msgstr "當登出某網絡時是否播放音效。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play sound notifications when away or busy."
 msgstr "當狀態為離開或忙碌時是否播放音效通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "當聯絡人離線時是否顯示彈出式通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "當聯絡人上線時是否顯示彈出式通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
 msgstr "收到新訊息時是否顯示彈出式通知 (即使已開啟聊天視窗，但沒有獲得焦點)。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "當收到新訊息時是否顯示彈出式通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid "Whether to show account balances in the contact list."
 msgstr "是否要在聯絡人清單內顯示帳戶餘額。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "是否在聯絡人清單與聊天視窗顯示聯絡人大頭貼。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "是否在聯絡人清單中顯示離線的聯絡人。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid "Whether to show popup notifications when away or busy."
 msgstr "當狀態為離開或忙碌時是否顯示彈出式通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "是否要在聯絡人清單內顯示聯絡人使用協定。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show the contact list in chat rooms."
 msgstr "是否在聊天室中顯示聯絡人清單。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show the contact list in compact mode."
 msgstr "是否以精簡模式顯示聯絡人清單。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
 msgstr "是否在使用標題列的「x」按鈕關閉主視窗時，顯示訊息對話窗。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to use the theme for chat rooms."
 msgstr "是否為聊天室使用佈景主題。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -471,23 +463,51 @@ msgstr "管理訊息與 VoIP 帳號"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2312
+#: ../src/empathy-accounts-dialog.c:2406
 msgid "Messaging and VoIP Accounts"
 msgstr "訊息與 VoIP 帳號"
 
-#: ../libempathy/empathy-ft-handler.c:838
+#: ../libempathy/empathy-ft-handler.c:736
+msgid "No reason was specified"
+msgstr "沒有指定原因"
+
+#: ../libempathy/empathy-ft-handler.c:739
+msgid "The change in state was requested"
+msgstr "已要求更改狀態"
+
+#: ../libempathy/empathy-ft-handler.c:742
+msgid "You canceled the file transfer"
+msgstr "你已取消檔案傳輸"
+
+#: ../libempathy/empathy-ft-handler.c:745
+msgid "The other participant canceled the file transfer"
+msgstr "其他的參與者取消了檔案傳輸"
+
+#: ../libempathy/empathy-ft-handler.c:748
+msgid "Error while trying to transfer the file"
+msgstr "嘗試傳輸檔案時發生錯誤"
+
+#: ../libempathy/empathy-ft-handler.c:751
+msgid "The other participant is unable to transfer the file"
+msgstr "其他的參與者無法傳輸該檔案"
+
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:311
+msgid "Unknown reason"
+msgstr "不明原因"
+
+#: ../libempathy/empathy-ft-handler.c:917
 msgid "File transfer completed, but the file was corrupted"
 msgstr "檔案傳輸完畢，但是檔案已損毀"
 
-#: ../libempathy/empathy-ft-handler.c:1124
+#: ../libempathy/empathy-ft-handler.c:1203
 msgid "File transfer not supported by remote contact"
 msgstr "遠端聯絡人不支援檔案傳輸"
 
-#: ../libempathy/empathy-ft-handler.c:1180
+#: ../libempathy/empathy-ft-handler.c:1259
 msgid "The selected file is not a regular file"
 msgstr "選取的檔案不是正規的檔案"
 
-#: ../libempathy/empathy-ft-handler.c:1189
+#: ../libempathy/empathy-ft-handler.c:1268
 msgid "The selected file is empty"
 msgstr "選取的檔案是空白的"
 
@@ -507,191 +527,159 @@ msgstr "已播打 %s"
 msgid "Call from %s"
 msgstr "%s 的來電"
 
-#: ../libempathy/empathy-tp-file.c:258
-msgid "Socket type not supported"
-msgstr "Socket 類型不支援"
-
-#: ../libempathy/empathy-tp-file.c:377
-msgid "No reason was specified"
-msgstr "沒有指定原因"
-
-#: ../libempathy/empathy-tp-file.c:380
-msgid "The change in state was requested"
-msgstr "已要求更改狀態"
-
-#: ../libempathy/empathy-tp-file.c:383
-msgid "You canceled the file transfer"
-msgstr "你已取消檔案傳輸"
-
-#: ../libempathy/empathy-tp-file.c:386
-msgid "The other participant canceled the file transfer"
-msgstr "其他的參與者取消了檔案傳輸"
-
-#: ../libempathy/empathy-tp-file.c:389
-msgid "Error while trying to transfer the file"
-msgstr "嘗試傳輸檔案時發生錯誤"
-
-#: ../libempathy/empathy-tp-file.c:392
-msgid "The other participant is unable to transfer the file"
-msgstr "其他的參與者無法傳輸該檔案"
-
-#: ../libempathy/empathy-tp-file.c:395 ../libempathy/empathy-utils.c:312
-msgid "Unknown reason"
-msgstr "不明原因"
-
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:231
 msgid "Available"
 msgstr "有空"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:233
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:236
 msgid "Away"
 msgstr "離開"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:238
 msgid "Invisible"
 msgstr "隱藏"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:240
 msgid "Offline"
 msgstr "離線"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:243
 msgctxt "presence"
 msgid "Unknown"
 msgstr "未知"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:283
 msgid "No reason specified"
 msgstr "沒有指定原因"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:341
 msgid "Status is set to offline"
 msgstr "狀態設為離線"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:321
 #: ../libempathy-gtk/empathy-call-utils.c:49
-#: ../libempathy-gtk/empathy-new-message-dialog.c:82
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "網絡錯誤"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
 msgid "Authentication failed"
 msgstr "驗證失敗"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Encryption error"
 msgstr "加密發生錯誤"
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:293
 msgid "Name in use"
 msgstr "使用中的名稱"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:295 ../libempathy/empathy-utils.c:327
 msgid "Certificate not provided"
 msgstr "沒有提供證書"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate untrusted"
 msgstr "證書不被信任"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate expired"
 msgstr "證書已逾期"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate not activated"
 msgstr "證書尚未使用"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate hostname mismatch"
 msgstr "證書主機名稱不符"
 
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate fingerprint mismatch"
 msgstr "證書指紋檔不符"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate self-signed"
 msgstr "證書為自我簽署"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:309
 msgid "Certificate error"
 msgstr "證書錯誤"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:343
 msgid "Encryption is not available"
 msgstr "加密無法使用"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:345
 msgid "Certificate is invalid"
 msgstr "證書無效"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:347
 msgid "Connection has been refused"
 msgstr "連線遭拒"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection can't be established"
 msgstr "無法建立連線"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection has been lost"
 msgstr "已失去連線"
 
-#: ../libempathy/empathy-utils.c:354
+#: ../libempathy/empathy-utils.c:353
 msgid "This resource is already connected to the server"
 msgstr "此資源已連接至該伺服器"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:355
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "連線已被使用相同資源的新連線取代"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:358
 msgid "The account already exists on the server"
 msgstr "該帳號已經存在於伺服器上"
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:360
 msgid "Server is currently too busy to handle the connection"
 msgstr "伺服器目前過於忙碌以致於無法處理該連線"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:362
 msgid "Certificate has been revoked"
 msgstr "已撤銷證書"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:364
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "證書使用不安全的密碼演算法，或是密碼處理上較弱"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:367
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 msgstr "伺服器證書的長度，或是伺服器證書鏈的深度超過密碼函式庫所能處理的範圍"
 
-#: ../libempathy/empathy-utils.c:372
+#: ../libempathy/empathy-utils.c:371
 msgid "Your software is too old"
 msgstr "你的軟件過舊"
 
-#: ../libempathy/empathy-utils.c:531
+#: ../libempathy/empathy-utils.c:530
 msgid "People Nearby"
 msgstr "附近的人"
 
-#: ../libempathy/empathy-utils.c:536
+#: ../libempathy/empathy-utils.c:535
 msgid "Yahoo! Japan"
 msgstr "Yahoo! 日本"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:564
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:566
+#: ../libempathy/empathy-utils.c:565
 msgid "Facebook Chat"
 msgstr "Facebook 聊天"
 
@@ -739,98 +727,70 @@ msgstr "未來"
 msgid "All accounts"
 msgstr "所有帳號"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:335
 msgid "Account"
 msgstr "帳號"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "密碼"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "伺服器"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "連接埠"
 
-#: ../libempathy-gtk/empathy-account-widget.c:776
-#: ../libempathy-gtk/empathy-account-widget.c:828
+#: ../libempathy-gtk/empathy-account-widget.c:763
+#: ../libempathy-gtk/empathy-account-widget.c:815
 #, c-format
 msgid "%s:"
 msgstr "%s："
 
-#: ../libempathy-gtk/empathy-account-widget.c:1182
-msgid "My Web Accounts"
-msgstr "我的網絡帳號"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1199
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "%s 帳號已透過 %s 修改。"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1205
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "%s 帳號無法於 Empathy 內修改。"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1224
-msgid "Launch My Web Accounts"
-msgstr "啟動我的網絡帳號"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1232
-#, c-format
-msgid "Edit %s"
-msgstr "編輯 %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1582
+#: ../libempathy-gtk/empathy-account-widget.c:1396
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "使用者名稱："
 
-#: ../libempathy-gtk/empathy-account-widget.c:1900
+#: ../libempathy-gtk/empathy-account-widget.c:1708
 msgid "A_pply"
 msgstr "套用(_A)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1930
+#: ../libempathy-gtk/empathy-account-widget.c:1737
 msgid "L_og in"
 msgstr "登入(_O)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2004
+#: ../libempathy-gtk/empathy-account-widget.c:1810
 msgid "This account already exists on the server"
 msgstr "此帳號已經存在這個伺服器上"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2007
+#: ../libempathy-gtk/empathy-account-widget.c:1814
 msgid "Create a new account on the server"
 msgstr "在這個伺服器上建立新的帳號"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2199
-msgid "Ca_ncel"
-msgstr "取消(_N)"
-
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2477
+#: ../libempathy-gtk/empathy-account-widget.c:2239
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%2$s 上的 %1$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2503
+#: ../libempathy-gtk/empathy-account-widget.c:2265
 #, c-format
 msgid "%s Account"
 msgstr "%s 帳號"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2507
+#: ../libempathy-gtk/empathy-account-widget.c:2269
 msgid "New account"
 msgstr "新增帳號"
 
@@ -878,7 +838,7 @@ msgstr "記住密碼"
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
 msgid "Remember password"
 msgstr "記住密碼"
 
@@ -1200,7 +1160,7 @@ msgid "STUN Server:"
 msgstr "STUN 伺服器："
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
 msgid "Server:"
 msgstr "伺服器："
 
@@ -1306,192 +1266,192 @@ msgstr "此協定不支援緊急通話功能"
 msgid "You don't have enough credit in order to place this call"
 msgstr "你的存額不足以買下該通話。"
 
-#: ../libempathy-gtk/empathy-chat.c:706
+#: ../libempathy-gtk/empathy-chat.c:705
 msgid "Failed to open private chat"
 msgstr "開啟私人聊天失敗"
 
-#: ../libempathy-gtk/empathy-chat.c:764
+#: ../libempathy-gtk/empathy-chat.c:763
 msgid "Topic not supported on this conversation"
 msgstr "此談話的主題不被支援"
 
-#: ../libempathy-gtk/empathy-chat.c:770
+#: ../libempathy-gtk/empathy-chat.c:769
 msgid "You are not allowed to change the topic"
 msgstr "你不被允許更改這個主題"
 
-#: ../libempathy-gtk/empathy-chat.c:971
+#: ../libempathy-gtk/empathy-chat.c:970
 #, c-format
 msgid "“%s” is not a valid contact ID"
 msgstr "「%s」不是有效的聯絡人 ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1065
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear：清除目前談話的所有訊息"
 
-#: ../libempathy-gtk/empathy-chat.c:1069
+#: ../libempathy-gtk/empathy-chat.c:1068
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <主題>：設置目前談話的主題"
 
-#: ../libempathy-gtk/empathy-chat.c:1072
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <聊天室 ID>：參加新的聊天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1075
+#: ../libempathy-gtk/empathy-chat.c:1074
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <聊天室 ID>：參加新的聊天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1079
+#: ../libempathy-gtk/empathy-chat.c:1078
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr "/part [<聊天室 ID>] [<原因>]：離開聊天室，預設為目前的聊天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1082
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <聯絡人 ID> [<訊息>]：開啟私人聊天"
 
-#: ../libempathy-gtk/empathy-chat.c:1086
+#: ../libempathy-gtk/empathy-chat.c:1085
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <聯絡人 ID> <訊息>：開啟私人聊天"
 
-#: ../libempathy-gtk/empathy-chat.c:1089
+#: ../libempathy-gtk/empathy-chat.c:1088
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <網名>：更改在目前伺服器上的你的網名"
 
-#: ../libempathy-gtk/empathy-chat.c:1092
+#: ../libempathy-gtk/empathy-chat.c:1091
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <訊息>：送出一個 ACTION 訊息到目前的談話中"
 
-#: ../libempathy-gtk/empathy-chat.c:1095
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
 msgstr "/say <訊息>：送出 <訊息> 到目前的談話中。這用於傳送以「/」開頭的訊息。舉例來說：「/say /join 是用來參加新的聊天室」"
 
-#: ../libempathy-gtk/empathy-chat.c:1100
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <聯絡人 ID>：顯示聯絡人的相關資訊"
 
-#: ../libempathy-gtk/empathy-chat.c:1103
+#: ../libempathy-gtk/empathy-chat.c:1102
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr "/help [<命令>]：顯示所有支援的指令。如果有定義這個 <命令> 的話，便顯示它的用法。"
 
-#: ../libempathy-gtk/empathy-chat.c:1122
+#: ../libempathy-gtk/empathy-chat.c:1121
 #, c-format
 msgid "Usage: %s"
 msgstr "用法：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1167
+#: ../libempathy-gtk/empathy-chat.c:1166
 msgid "Unknown command"
 msgstr "未知的命令"
 
-#: ../libempathy-gtk/empathy-chat.c:1293
+#: ../libempathy-gtk/empathy-chat.c:1292
 msgid "Unknown command; see /help for the available commands"
 msgstr "未知的指令；請參見 /help 以取得可用的指令"
 
-#: ../libempathy-gtk/empathy-chat.c:1457
+#: ../libempathy-gtk/empathy-chat.c:1456
 msgid "insufficient balance to send message"
 msgstr "餘額不足以傳送訊息"
 
-#: ../libempathy-gtk/empathy-chat.c:1461 ../libempathy-gtk/empathy-chat.c:1475
-#: ../libempathy-gtk/empathy-chat.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1460 ../libempathy-gtk/empathy-chat.c:1474
+#: ../libempathy-gtk/empathy-chat.c:1537
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "傳送訊息「%s」時發生錯誤：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1463 ../libempathy-gtk/empathy-chat.c:1480
-#: ../libempathy-gtk/empathy-chat.c:1542
+#: ../libempathy-gtk/empathy-chat.c:1462 ../libempathy-gtk/empathy-chat.c:1479
+#: ../libempathy-gtk/empathy-chat.c:1541
 #, c-format
 msgid "Error sending message: %s"
 msgstr "傳送訊息時發生錯誤：%s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1469
+#: ../libempathy-gtk/empathy-chat.c:1468
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "餘額不足以傳送訊息。<a href='%s'>加值</a>。"
 
-#: ../libempathy-gtk/empathy-chat.c:1509
+#: ../libempathy-gtk/empathy-chat.c:1508
 msgid "not capable"
 msgstr "無法"
 
-#: ../libempathy-gtk/empathy-chat.c:1516
+#: ../libempathy-gtk/empathy-chat.c:1515
 msgid "offline"
 msgstr "離線"
 
-#: ../libempathy-gtk/empathy-chat.c:1519
+#: ../libempathy-gtk/empathy-chat.c:1518
 msgid "invalid contact"
 msgstr "無效的聯絡人"
 
-#: ../libempathy-gtk/empathy-chat.c:1522
+#: ../libempathy-gtk/empathy-chat.c:1521
 msgid "permission denied"
 msgstr "權限被拒絕"
 
-#: ../libempathy-gtk/empathy-chat.c:1525
+#: ../libempathy-gtk/empathy-chat.c:1524
 msgid "too long message"
 msgstr "太長的訊息"
 
-#: ../libempathy-gtk/empathy-chat.c:1528
+#: ../libempathy-gtk/empathy-chat.c:1527
 msgid "not implemented"
 msgstr "未實作"
 
-#: ../libempathy-gtk/empathy-chat.c:1532
+#: ../libempathy-gtk/empathy-chat.c:1531
 msgid "unknown"
 msgstr "不明"
 
-#: ../libempathy-gtk/empathy-chat.c:1599 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1598 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "主題："
 
-#: ../libempathy-gtk/empathy-chat.c:1611
+#: ../libempathy-gtk/empathy-chat.c:1610
 #, c-format
 msgid "Topic set to: %s"
 msgstr "主題設定為: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1612
 msgid "No topic defined"
 msgstr "尚未定義主題"
 
-#: ../libempathy-gtk/empathy-chat.c:2126
+#: ../libempathy-gtk/empathy-chat.c:2125
 msgid "(No Suggestions)"
 msgstr "(沒有建議)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2194
+#: ../libempathy-gtk/empathy-chat.c:2193
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "加入「%s」至字典"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2231
+#: ../libempathy-gtk/empathy-chat.c:2230
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "加入「%s」至 %s 字典"
 
-#: ../libempathy-gtk/empathy-chat.c:2301
+#: ../libempathy-gtk/empathy-chat.c:2300
 msgid "Insert Smiley"
 msgstr "插入表情符號"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2319
-#: ../libempathy-gtk/empathy-ui-utils.c:1867
+#: ../libempathy-gtk/empathy-chat.c:2318
+#: ../libempathy-gtk/empathy-ui-utils.c:1868
 msgid "_Send"
 msgstr "傳送(_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2376
+#: ../libempathy-gtk/empathy-chat.c:2375
 msgid "_Spelling Suggestions"
 msgstr "拼字建議(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2465
+#: ../libempathy-gtk/empathy-chat.c:2464
 msgid "Failed to retrieve recent logs"
 msgstr "無法取得最近的日誌"
 
-#: ../libempathy-gtk/empathy-chat.c:2602
+#: ../libempathy-gtk/empathy-chat.c:2601
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 已斷線"
@@ -1499,12 +1459,12 @@ msgstr "%s 已斷線"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2609
+#: ../libempathy-gtk/empathy-chat.c:2608
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s 被 %2$s 踢出去"
 
-#: ../libempathy-gtk/empathy-chat.c:2612
+#: ../libempathy-gtk/empathy-chat.c:2611
 #, c-format
 msgid "%s was kicked"
 msgstr "%s 被踢出"
@@ -1512,17 +1472,17 @@ msgstr "%s 被踢出"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2620
+#: ../libempathy-gtk/empathy-chat.c:2619
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s 被 %2$s 設為黑名單"
 
-#: ../libempathy-gtk/empathy-chat.c:2623
+#: ../libempathy-gtk/empathy-chat.c:2622
 #, c-format
 msgid "%s was banned"
 msgstr "%s 被設為黑名單"
 
-#: ../libempathy-gtk/empathy-chat.c:2627
+#: ../libempathy-gtk/empathy-chat.c:2626
 #, c-format
 msgid "%s has left the room"
 msgstr "%s 已經離開此聊天室"
@@ -1532,17 +1492,17 @@ msgstr "%s 已經離開此聊天室"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2636
+#: ../libempathy-gtk/empathy-chat.c:2635
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2661
+#: ../libempathy-gtk/empathy-chat.c:2660
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s 已經參加此聊天室"
 
-#: ../libempathy-gtk/empathy-chat.c:2686
+#: ../libempathy-gtk/empathy-chat.c:2685
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 現在被稱為 %s"
@@ -1550,79 +1510,80 @@ msgstr "%s 現在被稱為 %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2839
-#: ../src/empathy-streamed-media-window.c:1886
-#: ../src/empathy-event-manager.c:1260 ../src/empathy-call-window.c:1539
-#: ../src/empathy-call-window.c:1589 ../src/empathy-call-window.c:2635
+#: ../libempathy-gtk/empathy-chat.c:2846
+#: ../src/empathy-streamed-media-window.c:1889
+#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538
+#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631
 msgid "Disconnected"
 msgstr "已斷線"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3485
+#: ../libempathy-gtk/empathy-chat.c:3492
 msgid "Would you like to store this password?"
 msgstr "你想要儲存此密碼？"
 
-#: ../libempathy-gtk/empathy-chat.c:3491
+#: ../libempathy-gtk/empathy-chat.c:3498
 msgid "Remember"
 msgstr "記住"
 
-#: ../libempathy-gtk/empathy-chat.c:3501
+#: ../libempathy-gtk/empathy-chat.c:3508
 msgid "Not now"
 msgstr "現在不要"
 
-#: ../libempathy-gtk/empathy-chat.c:3545
+#: ../libempathy-gtk/empathy-chat.c:3552
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "重試"
 
-#: ../libempathy-gtk/empathy-chat.c:3549
+#: ../libempathy-gtk/empathy-chat.c:3556
 msgid "Wrong password; please try again:"
 msgstr "密碼錯誤；請再試一次："
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3679
+#: ../libempathy-gtk/empathy-chat.c:3686
 msgid "This room is protected by a password:"
 msgstr "此聊天室已被密碼保護："
 
-#: ../libempathy-gtk/empathy-chat.c:3706
+#: ../libempathy-gtk/empathy-chat.c:3713
 msgid "Join"
 msgstr "參加"
 
-#: ../libempathy-gtk/empathy-chat.c:3894 ../src/empathy-event-manager.c:1281
+#: ../libempathy-gtk/empathy-chat.c:3901 ../src/empathy-event-manager.c:1301
 msgid "Connected"
 msgstr "成功連線"
 
-#: ../libempathy-gtk/empathy-chat.c:3949
+#: ../libempathy-gtk/empathy-chat.c:3956
 msgid "Conversation"
 msgstr "談話"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3954
+#: ../libempathy-gtk/empathy-chat.c:3961
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:265
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "未知或無效的識別身分"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:267
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "聯絡人封鎖暫時無法使用"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:269
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "聯絡人封鎖無法使用"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:271
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "已拒絕授權"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:275
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "無法封鎖聯絡人"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:622
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "編輯封鎖的聯絡人"
 
@@ -1630,7 +1591,7 @@ msgstr "編輯封鎖的聯絡人"
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:506
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1441
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid "Account:"
@@ -1665,39 +1626,34 @@ msgstr "開啟連結(_O)"
 msgid "%A %B %d %Y"
 msgstr "%Y %B %d %A"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:287
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "編輯聯絡人資訊"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:338
+#: ../libempathy-gtk/empathy-contact-dialogs.c:278
 msgid "Personal Information"
 msgstr "個人資料"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:439
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:379
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "新增聯絡人"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:508
-#: ../libempathy-gtk/empathy-individual-dialogs.c:198
+#: ../libempathy-gtk/empathy-contact-dialogs.c:448
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "封鎖 %s？"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:513
-#: ../libempathy-gtk/empathy-individual-dialogs.c:253
+#: ../libempathy-gtk/empathy-contact-dialogs.c:453
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "你確定想要封鎖「%s」讓他無法再與你聯絡嗎？"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:518
-#: ../libempathy-gtk/empathy-individual-dialogs.c:275
+#: ../libempathy-gtk/empathy-contact-dialogs.c:458
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "封鎖(_B)"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:536
-#: ../libempathy-gtk/empathy-individual-dialogs.c:284
+#: ../libempathy-gtk/empathy-contact-dialogs.c:476
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "回報這些聯絡人濫用帳號(_R)"
@@ -1714,102 +1670,6 @@ msgstr "訂閱要求"
 msgid "_Block User"
 msgstr "封鎖使用者(_B)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1935
-#: ../libempathy-gtk/empathy-individual-view.c:2375
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "是否想要移除羣組「%s」？"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1937
-#: ../libempathy-gtk/empathy-individual-view.c:2378
-msgid "Removing group"
-msgstr "正在移除羣組"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-contact-list-view.c:2059
-#: ../libempathy-gtk/empathy-individual-view.c:2433
-#: ../libempathy-gtk/empathy-individual-view.c:2636
-msgid "_Remove"
-msgstr "移除(_R)"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2015
-#: ../libempathy-gtk/empathy-individual-view.c:2500
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "是否想要移除聯絡人「%s」？"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2017
-#: ../libempathy-gtk/empathy-individual-view.c:2521
-msgid "Removing contact"
-msgstr "正在移除聯絡人"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:212
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "加入聯絡人(_A)…"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:287
-msgid "_Block Contact"
-msgstr "封鎖聯絡人(_B)"
-
-#. add chat button
-#: ../libempathy-gtk/empathy-contact-menu.c:316
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../libempathy-gtk/empathy-new-message-dialog.c:320
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "聊天(_C)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:348
-#: ../libempathy-gtk/empathy-individual-menu.c:850
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "語音通話(_A)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:381
-#: ../libempathy-gtk/empathy-individual-menu.c:895
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "視像通話(_V)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:427
-#: ../libempathy-gtk/empathy-individual-menu.c:948
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "過往談話(_P)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:449
-#: ../libempathy-gtk/empathy-individual-menu.c:989
-msgid "Send File"
-msgstr "傳送檔案"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:472
-#: ../libempathy-gtk/empathy-individual-menu.c:1031
-msgid "Share My Desktop"
-msgstr "分享我的桌面"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:501
-#: ../libempathy-gtk/empathy-individual-menu.c:1094
-msgid "Infor_mation"
-msgstr "資訊(_M)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:547
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "編輯(_E)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:601
-#: ../libempathy-gtk/empathy-individual-menu.c:1285
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "邀請你到這個聊天室"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:632
-#: ../libempathy-gtk/empathy-individual-menu.c:1331
-msgid "_Invite to Chat Room"
-msgstr "邀請到聊天室(_I)"
-
 #. Title
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
@@ -1835,228 +1695,223 @@ msgstr "你的訊息"
 msgid "Please let me see when you're online. Thanks!"
 msgstr "當你上線時請讓我知道。感謝！"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "頻道："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:799
-#: ../libempathy-gtk/empathy-individual-widget.c:421
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "國家 ISO 碼："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:801
-#: ../libempathy-gtk/empathy-individual-widget.c:423
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "國家："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:803
-#: ../libempathy-gtk/empathy-individual-widget.c:425
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "州："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:805
-#: ../libempathy-gtk/empathy-individual-widget.c:427
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "市："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:807
-#: ../libempathy-gtk/empathy-individual-widget.c:429
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "區域："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:809
-#: ../libempathy-gtk/empathy-individual-widget.c:431
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "郵遞區號："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:811
-#: ../libempathy-gtk/empathy-individual-widget.c:433
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "街："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:813
-#: ../libempathy-gtk/empathy-individual-widget.c:435
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "建築："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:815
-#: ../libempathy-gtk/empathy-individual-widget.c:437
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "樓層："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:817
-#: ../libempathy-gtk/empathy-individual-widget.c:439
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "室："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:819
-#: ../libempathy-gtk/empathy-individual-widget.c:441
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "文字："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:821
-#: ../libempathy-gtk/empathy-individual-widget.c:443
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "描述："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:823
-#: ../libempathy-gtk/empathy-individual-widget.c:445
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:825
-#: ../libempathy-gtk/empathy-individual-widget.c:447
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "準確度等級："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:827
-#: ../libempathy-gtk/empathy-individual-widget.c:449
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "錯誤："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:829
-#: ../libempathy-gtk/empathy-individual-widget.c:451
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "垂直誤差 (米)："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:831
-#: ../libempathy-gtk/empathy-individual-widget.c:453
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "水平誤差 (米)："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:833
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "速度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:835
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "方位："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:837
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "爬升速度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:839
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "上次更新於："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:841
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "經度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:843
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "緯度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:845
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "緯度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:898
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:559
-#: ../libempathy-gtk/empathy-individual-widget.c:574
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:15
 msgid "Location"
 msgstr "位置"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:576
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s，%s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:967
-#: ../libempathy-gtk/empathy-individual-widget.c:625
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%Y %B %e 於 %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1049
-#: ../libempathy-gtk/empathy-individual-widget.c:867
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "儲存大頭貼"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1105
-#: ../libempathy-gtk/empathy-individual-widget.c:925
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "無法儲存大頭貼"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1793
-#: ../libempathy-gtk/empathy-individual-menu.c:1066
-#: ../libempathy-gtk/empathy-individual-widget.c:1324
-msgid "Favorite"
-msgstr "喜好"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
 msgid "Full name"
 msgstr "全名"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
 msgid "Phone number"
 msgstr "電話號碼"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
 msgid "E-mail address"
 msgstr "電子信箱位址"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
 msgid "Website"
 msgstr "網站"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
 msgid "Birthday"
 msgstr "生日"
 
 #. Note to translators: this is the caption for a string of the form "5
 #. * minutes ago", and refers to the time since the contact last interacted
 #. * with their IM client.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:111
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
 msgid "Last seen:"
 msgstr "上次看見："
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
 msgid "Connected from:"
 msgstr "已連接從："
 
 #. FIXME: once Idle implements SimplePresence using this information, we can
 #. * and should bin this.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:117
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
 msgid "Away message:"
 msgstr "離開訊息："
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
 msgid "work"
 msgstr "工作"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
 msgid "home"
 msgstr "住家"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
 msgid "mobile"
 msgstr "行動"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
 msgid "voice"
 msgstr "聲音"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
 msgid "preferred"
 msgstr "偏好"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
 msgid "postal"
 msgstr "郵遞"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
 msgid "parcel"
 msgstr "包裹"
 
@@ -2066,7 +1921,7 @@ msgstr "<b>位置</b> 於 (date)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1260
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
 msgid "Alias:"
 msgstr "別名："
 
@@ -2086,7 +1941,7 @@ msgstr "聯絡人詳細資料"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1469
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "識別身分："
 
@@ -2123,100 +1978,185 @@ msgid "Select"
 msgstr "選取"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1953
+#: ../src/empathy-roster-window.c:1919
 msgid "Group"
 msgstr "羣組"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:258
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "下列識別身分將被封鎖："
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:265
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "下列識別身分無法被封鎖："
 
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "編輯聯絡人資訊"
+
 #. Translators: the heading at the top of the Information dialogue
 #: ../libempathy-gtk/empathy-individual-information-dialog.c:288
 msgid "Linked Contacts"
 msgstr "連結聯絡羣"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:370
+#: ../libempathy-gtk/empathy-individual-linker.c:372
 msgid "Select contacts to link"
 msgstr "選取要連結的聯絡人"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:444
+#: ../libempathy-gtk/empathy-individual-linker.c:447
 msgid "New contact preview"
 msgstr "新增聯絡人預覽"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:488
+#: ../libempathy-gtk/empathy-individual-linker.c:491
 msgid "Contacts selected in the list on the left will be linked together."
 msgstr "在清單左方的所選聯絡人將連結在一起。"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:145
+#: ../libempathy-gtk/empathy-individual-menu.c:181
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:363
 msgid "Select account to use to place the call"
 msgstr "選取要用來放置通話的帳號"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-individual-menu.c:367
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1285
+#: ../src/empathy-streamed-media-window.c:1288
 #: ../src/empathy-call-window.ui.h:2
 msgid "Call"
 msgstr "通話"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:432
 msgid "Mobile"
 msgstr "流動電話"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:434
 msgid "Work"
 msgstr "工作"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:436
 msgid "HOME"
 msgstr "住家"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:677
+msgid "_Block Contact"
+msgstr "封鎖聯絡人(_B)"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1055
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "_Chat"
+msgstr "聊天(_C)"
+
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:805
-#: ../libempathy-gtk/empathy-new-message-dialog.c:314
+#: ../libempathy-gtk/empathy-individual-menu.c:1090
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1143
+#: ../libempathy-gtk/empathy-individual-menu.c:1123
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "語音通話(_A)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1156
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "視像通話(_V)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1197
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Previous Conversations"
+msgstr "過往談話(_P)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1226
+msgid "Send File"
+msgstr "傳送檔案"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1256
+msgid "Share My Desktop"
+msgstr "分享我的桌面"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1282
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "喜好"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1310
+msgid "Infor_mation"
+msgstr "資訊(_M)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1359
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "編輯(_E)"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1169
+#: ../libempathy-gtk/empathy-individual-menu.c:1385
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "連結聯絡人(_L)…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2340
+#: ../libempathy-gtk/empathy-individual-menu.c:1501
+#: ../src/empathy-chat-window.c:1011
+msgid "Inviting you to this room"
+msgstr "邀請你到這個聊天室"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1547
+msgid "_Invite to Chat Room"
+msgstr "邀請到聊天室(_I)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1743
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Add Contact…"
+msgstr "加入聯絡人(_A)…"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2355
 msgid "Delete and _Block"
 msgstr "刪除並封鎖(_B)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2509
+#: ../libempathy-gtk/empathy-individual-view.c:2390
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "是否想要移除羣組「%s」？"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2393
+msgid "Removing group"
+msgstr "正在移除羣組"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2448
+#: ../libempathy-gtk/empathy-individual-view.c:2665
+msgid "_Remove"
+msgstr "移除(_R)"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2525
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "是否想要移除聯絡人「%s」？"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2534
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
 "remove all the contacts which make up this linked contact."
 msgstr "你真的想要移除連結聯絡人「%s」嗎？請注意這會移除所有構成此連結聯絡羣的聯絡人。"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1608
+#: ../libempathy-gtk/empathy-individual-view.c:2546
+msgid "Removing contact"
+msgstr "正在移除聯絡人"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2230,19 +2170,19 @@ msgstr "<b>位置</b> 於 (日期)"
 msgid "Online from a phone or mobile device"
 msgstr "從手機或流動通訊器材上線"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "新增網絡"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "選擇 IRC 網絡"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "重設網絡清單(_N)"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "選取"
@@ -2296,133 +2236,133 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "取消連結(_U)"
 
-#: ../libempathy-gtk/empathy-log-window.c:620
+#: ../libempathy-gtk/empathy-log-window.c:622
 msgid "History"
 msgstr "歷史"
 
-#: ../libempathy-gtk/empathy-log-window.c:675
+#: ../libempathy-gtk/empathy-log-window.c:677
 msgid "Show"
 msgstr "顯示"
 
-#: ../libempathy-gtk/empathy-log-window.c:697
+#: ../libempathy-gtk/empathy-log-window.c:699
 msgid "Search"
 msgstr "搜尋"
 
-#: ../libempathy-gtk/empathy-log-window.c:1145
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat in %s"
 msgstr "於 %s 內聊天"
 
-#: ../libempathy-gtk/empathy-log-window.c:1147
+#: ../libempathy-gtk/empathy-log-window.c:1152
 #, c-format
 msgid "Chat with %s"
 msgstr "與 %s 聊天中"
 
-#: ../libempathy-gtk/empathy-log-window.c:1197
-#: ../libempathy-gtk/empathy-log-window.c:1344
+#: ../libempathy-gtk/empathy-log-window.c:1202
+#: ../libempathy-gtk/empathy-log-window.c:1349
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%Y %B %d %A"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1286
+#: ../libempathy-gtk/empathy-log-window.c:1291
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1292
+#: ../libempathy-gtk/empathy-log-window.c:1297
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s：</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1368
+#: ../libempathy-gtk/empathy-log-window.c:1373
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s 秒"
 
-#: ../libempathy-gtk/empathy-log-window.c:1375
+#: ../libempathy-gtk/empathy-log-window.c:1380
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s 分鐘"
 
-#: ../libempathy-gtk/empathy-log-window.c:1383
+#: ../libempathy-gtk/empathy-log-window.c:1388
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "通話時間 %s，結束於 %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1715
+#: ../libempathy-gtk/empathy-log-window.c:1722
 msgid "Today"
 msgstr "今日"
 
-#: ../libempathy-gtk/empathy-log-window.c:1719
+#: ../libempathy-gtk/empathy-log-window.c:1726
 msgid "Yesterday"
 msgstr "昨日"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1734
+#: ../libempathy-gtk/empathy-log-window.c:1741
 msgid "%e %B %Y"
 msgstr "%Y年%B%e日"
 
-#: ../libempathy-gtk/empathy-log-window.c:1815
-#: ../libempathy-gtk/empathy-log-window.c:3430
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3489
 msgid "Anytime"
 msgstr "任何時間"
 
-#: ../libempathy-gtk/empathy-log-window.c:1902
-#: ../libempathy-gtk/empathy-log-window.c:2358
+#: ../libempathy-gtk/empathy-log-window.c:1918
+#: ../libempathy-gtk/empathy-log-window.c:2402
 msgid "Anyone"
 msgstr "任一個"
 
-#: ../libempathy-gtk/empathy-log-window.c:2671
+#: ../libempathy-gtk/empathy-log-window.c:2715
 msgid "Who"
 msgstr "誰"
 
-#: ../libempathy-gtk/empathy-log-window.c:2875
+#: ../libempathy-gtk/empathy-log-window.c:2924
 msgid "When"
 msgstr "何時"
 
-#: ../libempathy-gtk/empathy-log-window.c:2991
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Anything"
 msgstr "任何事"
 
-#: ../libempathy-gtk/empathy-log-window.c:2993
+#: ../libempathy-gtk/empathy-log-window.c:3042
 msgid "Text chats"
 msgstr "文字聊天"
 
-#: ../libempathy-gtk/empathy-log-window.c:2995
+#: ../libempathy-gtk/empathy-log-window.c:3044
 #: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "通話"
 
-#: ../libempathy-gtk/empathy-log-window.c:3000
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Incoming calls"
 msgstr "來電"
 
-#: ../libempathy-gtk/empathy-log-window.c:3001
+#: ../libempathy-gtk/empathy-log-window.c:3050
 msgid "Outgoing calls"
 msgstr "播出"
 
-#: ../libempathy-gtk/empathy-log-window.c:3002
+#: ../libempathy-gtk/empathy-log-window.c:3051
 msgid "Missed calls"
 msgstr "漏接來電"
 
-#: ../libempathy-gtk/empathy-log-window.c:3024
+#: ../libempathy-gtk/empathy-log-window.c:3073
 msgid "What"
 msgstr "什麼"
 
-#: ../libempathy-gtk/empathy-log-window.c:3719
+#: ../libempathy-gtk/empathy-log-window.c:3782
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "你確定要刪除過往談話的所有紀錄嗎？"
 
-#: ../libempathy-gtk/empathy-log-window.c:3723
+#: ../libempathy-gtk/empathy-log-window.c:3786
 msgid "Clear All"
 msgstr "清除全部"
 
-#: ../libempathy-gtk/empathy-log-window.c:3730
+#: ../libempathy-gtk/empathy-log-window.c:3793
 msgid "Delete from:"
 msgstr "刪除從："
 
@@ -2451,7 +2391,7 @@ msgstr "視像"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
 #: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
+#: ../src/empathy-roster-window-menubar.ui.h:20
 msgid "_Edit"
 msgstr "編輯(_E)"
 
@@ -2463,76 +2403,82 @@ msgstr "檔案(_F)"
 msgid "page 2"
 msgstr "頁面 2"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:84
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
 msgid "The contact is offline"
 msgstr "聯絡人已經離線"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:86
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
 msgid "The specified contact is either invalid or unknown"
 msgstr "指定的聯絡人無效或未知"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:88
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
 msgid "The contact does not support this kind of conversation"
 msgstr "該聯絡人不支援這類談話"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:90
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
 msgid "The requested functionality is not implemented for this protocol"
 msgstr "請求的功能尚未在此協定中實作"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:96
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
 msgid "Could not start a conversation with the given contact"
 msgstr "無法啟動與給定聯絡人的談話"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
 msgid "You are banned from this channel"
 msgstr "你被此頻道禁封"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
 msgid "This channel is full"
 msgstr "此頻道已滿"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:102
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
 msgid "You must be invited to join this channel"
 msgstr "你必須被邀請才能參加此頻道"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:104
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
 msgid "Can't proceed while disconnected"
 msgstr "斷線時無法處理"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:106
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
 msgid "Permission denied"
 msgstr "許可被拒絕"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:112
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
 msgid "There was an error starting the conversation"
 msgstr "啟動談話時發生錯誤"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:291
-#: ../libempathy-gtk/empathy-new-call-dialog.c:203
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:202
 msgid "Enter a contact identifier or phone number:"
 msgstr "請輸入聯絡人辨識身份或電話號碼："
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:334
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "新增談話"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:226
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "_Video Call"
 msgstr "視像通話(_V)"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:236
+#: ../libempathy-gtk/empathy-new-call-dialog.c:235
 msgid "_Audio Call"
 msgstr "語音通話(_A)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:246
+#: ../libempathy-gtk/empathy-new-call-dialog.c:245
 msgid "New Call"
 msgstr "新增通話"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "<b>%s</b> 帳號驗證失敗"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
 "Enter your password for account\n"
@@ -2743,26 +2689,26 @@ msgstr "請記住此選擇以供未來連線使用"
 msgid "Certificate Details"
 msgstr "證書詳細資料"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1741
+#: ../libempathy-gtk/empathy-ui-utils.c:1742
 msgid "Unable to open URI"
 msgstr "無法開啓 URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1859
+#: ../libempathy-gtk/empathy-ui-utils.c:1860
 msgid "Select a file"
 msgstr "選擇一個檔案"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1934
+#: ../libempathy-gtk/empathy-ui-utils.c:1935
 msgid "Insufficient free space to save file"
 msgstr "空間不足以儲存檔案"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1942
+#: ../libempathy-gtk/empathy-ui-utils.c:1943
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 msgstr "需要 %s 的空間以儲存此檔案，但僅有 %s 可用。請選擇其他位置。"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1986
+#: ../libempathy-gtk/empathy-ui-utils.c:1987
 #, c-format
 msgid "Incoming file from %s"
 msgstr "收到來自 %s 的檔案"
@@ -2934,31 +2880,31 @@ msgstr "西歐語系"
 msgid "Vietnamese"
 msgstr "越南文"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:203
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "沒有錯誤訊息"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:276
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "即時通訊 (Empathy)"
 
-#: ../src/empathy.c:433
+#: ../src/empathy.c:437
 msgid "Don't connect on startup"
 msgstr "啟動時不要自動連線"
 
-#: ../src/empathy.c:437
+#: ../src/empathy.c:441
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "啟動時不顯示聯絡人清單或任何其他對話窗"
 
-#: ../src/empathy.c:452
+#: ../src/empathy.c:456
 msgid "- Empathy IM Client"
 msgstr "- Empathy 即時通用戶端"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:643
 msgid "Error contacting the Account Manager"
 msgstr "聯絡帳號管理程式時發生錯誤"
 
-#: ../src/empathy.c:641
+#: ../src/empathy.c:645
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2993,11 +2939,11 @@ msgid ""
 "Street, Fifth Floor, Boston, MA 02110-130159 USA"
 msgstr "你應該已經和 Empathy 一起收到一份 GNU 通用公共許可證的副本；如果還沒有，寫信給： Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "GNOME 的即時訊息用戶端程式"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "如對翻譯有任何意見，請送一封電子郵件給\n"
@@ -3037,35 +2983,36 @@ msgid ""
 msgstr "你可以回到前頁再次輸入帳號的詳細資料或結束此助理，稍後再從「編輯」選單加入帳號。"
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
+#: ../src/empathy-account-assistant.c:1274
 msgid "An error occurred"
 msgstr "發生錯誤"
 
-#: ../src/empathy-account-assistant.c:467
+#: ../src/empathy-account-assistant.c:469
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
 msgid "What kind of chat account do you have?"
 msgstr "你的聊天帳號是哪一種？"
 
-#: ../src/empathy-account-assistant.c:473
+#: ../src/empathy-account-assistant.c:475
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "你還想要設定其他的聊天帳號嗎？"
 
-#: ../src/empathy-account-assistant.c:479
+#: ../src/empathy-account-assistant.c:481
 msgid "Enter your account details"
 msgstr "請輸入你的帳號詳細資料"
 
-#: ../src/empathy-account-assistant.c:484
+#: ../src/empathy-account-assistant.c:486
 msgid "What kind of chat account do you want to create?"
 msgstr "你想要建立何種聊天帳號？"
 
-#: ../src/empathy-account-assistant.c:490
+#: ../src/empathy-account-assistant.c:492
 msgid "Do you want to create other chat accounts?"
 msgstr "是否想要建立其他聊天帳號？"
 
-#: ../src/empathy-account-assistant.c:497
+#: ../src/empathy-account-assistant.c:499
 msgid "Enter the details for the new account"
 msgstr "請輸入新帳號的詳細資料"
 
-#: ../src/empathy-account-assistant.c:612
+#: ../src/empathy-account-assistant.c:614
 msgid ""
 "With Empathy you can chat with people online nearby and with friends and "
 "colleagues who use Google Talk, AIM, Windows Live and many other chat "
@@ -3073,41 +3020,41 @@ msgid ""
 "calls."
 msgstr "使用 Empathy 可以在網上跟附近的人聊天，或是和使用 Google Talk、AIM、Windows Live 等其他聊天程式的朋友和同事聊天。利用麥克風或網絡攝影機還可以進行語音或視像通話。"
 
-#: ../src/empathy-account-assistant.c:629
+#: ../src/empathy-account-assistant.c:631
 msgid "Do you have an account you've been using with another chat program?"
 msgstr "你是否有使用其他聊天程式的帳號？"
 
-#: ../src/empathy-account-assistant.c:652
+#: ../src/empathy-account-assistant.c:655
 msgid "Yes, import my account details from "
 msgstr "是的，請匯入我的帳號詳細資料於"
 
-#: ../src/empathy-account-assistant.c:673
+#: ../src/empathy-account-assistant.c:676
 msgid "Yes, I'll enter my account details now"
 msgstr "是的，我現在要輸入帳號的詳細資料"
 
-#: ../src/empathy-account-assistant.c:695
+#: ../src/empathy-account-assistant.c:698
 msgid "No, I want a new account"
 msgstr "不，我想要新的帳號"
 
-#: ../src/empathy-account-assistant.c:705
+#: ../src/empathy-account-assistant.c:708
 msgid "No, I just want to see people online nearby for now"
 msgstr "不，我現在只想看看附近有誰上線"
 
-#: ../src/empathy-account-assistant.c:726
+#: ../src/empathy-account-assistant.c:729
 msgid "Select the accounts you want to import:"
 msgstr "選擇要匯入的帳號："
 
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
+#: ../src/empathy-account-assistant.c:816
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "Yes"
 msgstr "是"
 
-#: ../src/empathy-account-assistant.c:820
+#: ../src/empathy-account-assistant.c:823
 msgid "No, that's all for now"
 msgstr "不，目前就這樣"
 
-#: ../src/empathy-account-assistant.c:1085
+#: ../src/empathy-account-assistant.c:1088
 msgid ""
 "Empathy can automatically discover and chat with the people connected on the "
 "same network as you. If you want to use this feature, please check that the "
@@ -3115,16 +3062,16 @@ msgid ""
 "disable this feature by using the 'Accounts' dialog"
 msgstr "Empathy 可以自動探索與你連線到相同網絡上的人們，並且和他們聊天。如果你想要使用此功能，請檢查下列詳細資料是否正確。你也可以在以後簡單地更改這些細節，或是用「帳號」對話窗來停用此功能"
 
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
+#: ../src/empathy-account-assistant.c:1094
+#: ../src/empathy-account-assistant.c:1150
 msgid "Edit->Accounts"
 msgstr "編輯 -> 帳號"
 
-#: ../src/empathy-account-assistant.c:1107
+#: ../src/empathy-account-assistant.c:1110
 msgid "I do _not want to enable this feature for now"
 msgstr "我現在不想要啟用這項功能(_N)"
 
-#: ../src/empathy-account-assistant.c:1143
+#: ../src/empathy-account-assistant.c:1146
 msgid ""
 "You won't be able to chat with people connected to your local network, as "
 "telepathy-salut is not installed. If you want to enable this feature, please "
@@ -3132,85 +3079,93 @@ msgid ""
 "the Accounts dialog"
 msgstr "你無法與連線到你本機網絡的人們聊天，因為 telepathy-salut 尚未安裝。如果你想要啟用此功能，請安裝 telepathy-salut 套件，並從「帳號」對話窗建立「附近的人」帳號"
 
-#: ../src/empathy-account-assistant.c:1149
+#: ../src/empathy-account-assistant.c:1152
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut 尚未安裝"
 
-#: ../src/empathy-account-assistant.c:1195
+#: ../src/empathy-account-assistant.c:1198
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "訊息與 VoIP 帳號助理"
 
-#: ../src/empathy-account-assistant.c:1229
+#: ../src/empathy-account-assistant.c:1232
 msgid "Welcome to Empathy"
 msgstr "歡迎使用 Empathy"
 
-#: ../src/empathy-account-assistant.c:1238
+#: ../src/empathy-account-assistant.c:1241
 msgid "Import your existing accounts"
 msgstr "匯入現有的帳號"
 
-#: ../src/empathy-account-assistant.c:1256
+#: ../src/empathy-account-assistant.c:1259
 msgid "Please enter personal details"
 msgstr "請輸入個人詳細資料"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:69
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "有與你的 %s 帳號相關的修改尚未儲存。"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:73
 msgid "Your new account has not been saved yet."
 msgstr "尚未儲存你的新帳號。"
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:755
-#: ../src/empathy-call-window.c:1326
+#: ../src/empathy-accounts-dialog.c:352
+#: ../src/empathy-streamed-media-window.c:757
+#: ../src/empathy-call-window.c:1325
 msgid "Connecting…"
 msgstr "連線中…"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:393
 #, c-format
 msgid "Offline — %s"
 msgstr "離線 — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:405
 #, c-format
 msgid "Disconnected — %s"
 msgstr "已斷線 — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:416
 msgid "Offline — No Network Connection"
 msgstr "離線 — 無網絡連線"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:423
 msgid "Unknown Status"
 msgstr "未知的狀態"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:435
 msgid "Offline — Account Disabled"
 msgstr "離線 — 帳號已停用"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"你即將建立新的帳號，這樣會放棄\n"
-"你所做的更改。確定要繼續？"
+#: ../src/empathy-accounts-dialog.c:538
+msgid "Edit Connection Parameters"
+msgstr "編輯連線參數"
+
+#: ../src/empathy-accounts-dialog.c:701
+msgid "Failed to retrieve your personal information from the server."
+msgstr "無法從伺服器擷取你的個人資料。"
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:707
+msgid "Go online to edit your personal information."
+msgstr "上線以編輯你的個人資料。"
+
+#: ../src/empathy-accounts-dialog.c:792
+msgid "_Edit Connection Parameters..."
+msgstr "編輯連線參數(_E)..."
+
+#: ../src/empathy-accounts-dialog.c:1293
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "是否想要從你的電腦上移除羣組 %s？"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1297
 msgid "This will not remove your account on the server."
 msgstr "這不會移除伺服器上的你的帳號。"
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1533
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3219,15 +3174,15 @@ msgstr ""
 "你所做的更改。確定要繼續？"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1744
 msgid "_Enable"
 msgstr "啟用(_E)"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1745
 msgid "_Disable"
 msgstr "停用(_D)"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2255
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3261,11 +3216,11 @@ msgstr "要加入新的帳號，你必須先安裝每個會用到的通訊協定
 msgid "_Import…"
 msgstr "匯入(_I)…"
 
-#: ../src/empathy-auth-client.c:251
+#: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
 msgstr "- Empathy 認證用戶端"
 
-#: ../src/empathy-auth-client.c:267
+#: ../src/empathy-auth-client.c:302
 msgid "Empathy authentication client"
 msgstr "Empathy 認證用戶端"
 
@@ -3281,137 +3236,137 @@ msgstr "- Empathy 音訊視像用戶端"
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy 音訊視像用戶端"
 
-#: ../src/empathy-streamed-media-window.c:432
+#: ../src/empathy-streamed-media-window.c:433
 msgid "Contrast"
 msgstr "對比"
 
-#: ../src/empathy-streamed-media-window.c:435
+#: ../src/empathy-streamed-media-window.c:436
 msgid "Brightness"
 msgstr "亮度"
 
-#: ../src/empathy-streamed-media-window.c:438
+#: ../src/empathy-streamed-media-window.c:439
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:543
+#: ../src/empathy-streamed-media-window.c:545
 msgid "Volume"
 msgstr "音量"
 
-#: ../src/empathy-streamed-media-window.c:1094
+#: ../src/empathy-streamed-media-window.c:1097
 msgid "_Sidebar"
 msgstr "側邊欄(_S)"
 
-#: ../src/empathy-streamed-media-window.c:1114
+#: ../src/empathy-streamed-media-window.c:1117
 msgid "Audio input"
 msgstr "音效輸入"
 
-#: ../src/empathy-streamed-media-window.c:1118
+#: ../src/empathy-streamed-media-window.c:1121
 msgid "Video input"
 msgstr "視像輸入"
 
-#: ../src/empathy-streamed-media-window.c:1126
+#: ../src/empathy-streamed-media-window.c:1129
 msgid "Dialpad"
 msgstr "播號盤"
 
-#: ../src/empathy-streamed-media-window.c:1137
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Details"
 msgstr "詳細資料"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1206
-#: ../src/empathy-call-window.c:1932
+#: ../src/empathy-streamed-media-window.c:1209
+#: ../src/empathy-call-window.c:1927
 #, c-format
 msgid "Call with %s"
 msgstr "與 %s 通話中"
 
-#: ../src/empathy-streamed-media-window.c:1439
-#: ../src/empathy-call-window.c:2176
+#: ../src/empathy-streamed-media-window.c:1442
+#: ../src/empathy-call-window.c:2171
 msgid "The IP address as seen by the machine"
 msgstr "機器看見的 IP 位址"
 
-#: ../src/empathy-streamed-media-window.c:1441
-#: ../src/empathy-call-window.c:2178
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2173
 msgid "The IP address as seen by a server on the Internet"
 msgstr "互聯網上的伺服器看見的 IP 位址"
 
-#: ../src/empathy-streamed-media-window.c:1443
-#: ../src/empathy-call-window.c:2180
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2175
 msgid "The IP address of the peer as seen by the other side"
 msgstr "其他端看見的點的 IP 位址"
 
-#: ../src/empathy-streamed-media-window.c:1445
-#: ../src/empathy-call-window.c:2182
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2177
 msgid "The IP address of a relay server"
 msgstr "中繼伺服器的 IP 位址"
 
-#: ../src/empathy-streamed-media-window.c:1447
-#: ../src/empathy-call-window.c:2184
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2179
 msgid "The IP address of the multicast group"
 msgstr "多點廣播羣組的 IP 位址"
 
-#: ../src/empathy-streamed-media-window.c:1835
 #: ../src/empathy-streamed-media-window.c:1838
 #: ../src/empathy-streamed-media-window.c:1841
 #: ../src/empathy-streamed-media-window.c:1844
+#: ../src/empathy-streamed-media-window.c:1847
 msgctxt "codec"
 msgid "Unknown"
 msgstr "未知"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2136
+#: ../src/empathy-streamed-media-window.c:2139
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "已連線 — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2197
-#: ../src/empathy-call-window.c:3045
+#: ../src/empathy-streamed-media-window.c:2200
+#: ../src/empathy-call-window.c:3033
 msgid "Technical Details"
 msgstr "技術細節"
 
-#: ../src/empathy-streamed-media-window.c:2235
-#: ../src/empathy-call-window.c:3084
+#: ../src/empathy-streamed-media-window.c:2238
+#: ../src/empathy-call-window.c:3072
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr "%s 的軟件不瞭解任何你電腦上所支援的音訊格式"
 
-#: ../src/empathy-streamed-media-window.c:2240
-#: ../src/empathy-call-window.c:3089
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:3077
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr "%s 的軟件不瞭解任何你電腦上所支援的視像格式"
 
-#: ../src/empathy-streamed-media-window.c:2246
-#: ../src/empathy-call-window.c:3095
+#: ../src/empathy-streamed-media-window.c:2249
+#: ../src/empathy-call-window.c:3083
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
 "does not allow direct connections."
 msgstr "無法和 %s 建立連線。你們其中之一可能在一個不允許直接連線的網絡之上。"
 
-#: ../src/empathy-streamed-media-window.c:2252
-#: ../src/empathy-call-window.c:3101
+#: ../src/empathy-streamed-media-window.c:2255
+#: ../src/empathy-call-window.c:3089
 msgid "There was a failure on the network"
 msgstr "這個網絡上有錯誤發生"
 
-#: ../src/empathy-streamed-media-window.c:2256
-#: ../src/empathy-call-window.c:3105
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3093
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "此通話所必要的音訊格式尚未在你的電腦上安裝"
 
-#: ../src/empathy-streamed-media-window.c:2259
-#: ../src/empathy-call-window.c:3108
+#: ../src/empathy-streamed-media-window.c:2262
+#: ../src/empathy-call-window.c:3096
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "此通話所必要的視像格式尚未在你的電腦上安裝"
 
-#: ../src/empathy-streamed-media-window.c:2269
-#: ../src/empathy-call-window.c:3120
+#: ../src/empathy-streamed-media-window.c:2272
+#: ../src/empathy-call-window.c:3108
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3419,23 +3374,23 @@ msgid ""
 "the Help menu."
 msgstr "在 Telepathy 元件中發生未預期的狀況。請<a href=\"%s\">匯報這個錯誤</a>並附上從求助選單內的「除錯」視窗中所收集的紀錄。"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:3129
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3117
 msgid "There was a failure in the call engine"
 msgstr "通話引擎內有錯誤發生"
 
-#: ../src/empathy-streamed-media-window.c:2280
-#: ../src/empathy-call-window.c:3132
+#: ../src/empathy-streamed-media-window.c:2283
+#: ../src/empathy-call-window.c:3120
 msgid "The end of the stream was reached"
 msgstr "已達串流末端"
 
-#: ../src/empathy-streamed-media-window.c:2320
-#: ../src/empathy-call-window.c:3172
+#: ../src/empathy-streamed-media-window.c:2323
+#: ../src/empathy-call-window.c:3160
 msgid "Can't establish audio stream"
 msgstr "無法建立音訊串流"
 
-#: ../src/empathy-streamed-media-window.c:2330
-#: ../src/empathy-call-window.c:3182
+#: ../src/empathy-streamed-media-window.c:2333
+#: ../src/empathy-call-window.c:3170
 msgid "Can't establish video stream"
 msgstr "無法建立視像串流"
 
@@ -3526,8 +3481,8 @@ msgstr "切換視像傳播"
 
 #: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2584 ../src/empathy-call-window.c:2585
-#: ../src/empathy-call-window.c:2586 ../src/empathy-call-window.c:2587
+#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581
+#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583
 msgid "Unknown"
 msgstr "不明"
 
@@ -3545,17 +3500,17 @@ msgid "_Camera"
 msgstr "攝影機(_C)"
 
 #: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "_Contents"
 msgstr "內容(_C)"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "_Debug"
 msgstr "偵錯(_D)"
 
 #: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Help"
 msgstr "求助(_H)"
 
@@ -3568,7 +3523,7 @@ msgid "_Settings"
 msgstr "設定值(_S)"
 
 #: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-roster-window-menubar.ui.h:30
 #: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "檢視(_V)"
@@ -3687,96 +3642,96 @@ msgstr "自動連線"
 msgid "Manage Favorite Rooms"
 msgstr "管理喜好的聊天室"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:523
 msgid "Incoming video call"
 msgstr "傳入的視像通話"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1556
+#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555
 msgid "Incoming call"
 msgstr "來電"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s 要與你進行視像通話。你是否要接聽？"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:528
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s 要與你進行通話。你是否要接聽？"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1562
+#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732
+#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s 的來電"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:556
 msgid "_Reject"
 msgstr "拒絕(_R)"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572
 msgid "_Answer"
 msgstr "接聽(_A)"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:572
 msgid "_Answer with video"
 msgstr "以視像接聽(_A)"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1562
+#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765
+#: ../src/empathy-call-window.c:1561
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "來自 %s 的視像通話"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:838
 msgid "Room invitation"
 msgstr "聊天室邀請"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:840
 #, c-format
 msgid "Invitation to join %s"
 msgstr "邀請參加 %s"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:847
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s 正在邀請你參加 %s"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:855
 msgid "_Decline"
 msgstr "拒絕(_D)"
 
-#: ../src/empathy-event-manager.c:858
+#: ../src/empathy-event-manager.c:860
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "參加(_J)"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:887
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s 曾邀請你參加 %s"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:893
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "你被邀請參加 %s"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:944
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "收到來自 %s 的檔案傳輸"
 
-#: ../src/empathy-event-manager.c:1145 ../src/empathy-main-window.c:378
+#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:371
 msgid "Password required"
 msgstr "需要密碼"
 
-#: ../src/empathy-event-manager.c:1210
+#: ../src/empathy-event-manager.c:1217
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s 想要得到查看你是否上線的許可"
 
-#: ../src/empathy-event-manager.c:1214
+#: ../src/empathy-event-manager.c:1223
 #, c-format
 msgid ""
 "\n"
@@ -3786,105 +3741,105 @@ msgstr ""
 "訊息：%s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "不明"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s / %s 於 %s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s / %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "正在接收 %2$s 送出的「%1$s」"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "正在傳送「%s」給 %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "從 %2$s 接收「%1$s」時發生錯誤"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "接收檔案時發生錯誤"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "傳送「%s」給 %s 時發生錯誤"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "傳送檔案時發生錯誤"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "「%s」接收自 %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "「%s」傳送給 %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "檔案傳輸完畢"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "正在等待其他參與者的回應"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "正在檢查檔案「%s」的完整性"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "正在計算「%s」雜湊值"
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "檔案"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "剩餘"
 
@@ -3907,161 +3862,162 @@ msgid "Import Accounts"
 msgstr "匯入帳號"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:315
 msgid "Import"
 msgstr "匯入"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:324
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:348
 msgid "Source"
 msgstr "來源"
 
-#: ../src/empathy-main-window.c:395
+#: ../src/empathy-roster-window.c:388
 msgid "Provide Password"
 msgstr "提供密碼"
 
-#: ../src/empathy-main-window.c:401
+#: ../src/empathy-roster-window.c:394
 msgid "Disconnect"
 msgstr "斷線"
 
-#: ../src/empathy-main-window.c:638
+#: ../src/empathy-roster-window.c:626
 msgid "No match found"
 msgstr "找不到符合項目"
 
-#: ../src/empathy-main-window.c:746
+#: ../src/empathy-roster-window.c:733
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr "很抱歉，%s 帳號無法使用，除非你的 %s 軟件已更新。"
 
-#: ../src/empathy-main-window.c:814
+#: ../src/empathy-roster-window.c:799
 msgid "Update software..."
 msgstr "更新軟件..."
 
-#: ../src/empathy-main-window.c:820 ../src/empathy-main-window.c:941
+#: ../src/empathy-roster-window.c:805 ../src/empathy-roster-window.c:922
 msgid "Close"
 msgstr "關閉"
 
-#: ../src/empathy-main-window.c:929
+#: ../src/empathy-roster-window.c:910
 msgid "Reconnect"
 msgstr "重新連接"
 
-#: ../src/empathy-main-window.c:935
+#: ../src/empathy-roster-window.c:916
 msgid "Edit Account"
 msgstr "編輯帳號"
 
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:1074
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1060
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "加值 %s (%s)..."
 
-#: ../src/empathy-main-window.c:1121
+#: ../src/empathy-roster-window.c:1106
 msgid "Top up account credit"
 msgstr "加值帳號存額"
 
 #. top up button
-#: ../src/empathy-main-window.c:1192
+#: ../src/empathy-roster-window.c:1178
 msgid "Top Up..."
 msgstr "加值..."
 
-#: ../src/empathy-main-window.c:1935
+#: ../src/empathy-roster-window.c:1901
 msgid "Contact"
 msgstr "聯絡人"
 
-#: ../src/empathy-main-window.c:2310
+#: ../src/empathy-roster-window.c:2296
 msgid "Contact List"
 msgstr "聯絡人清單"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
+#: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "聯絡人地圖(_M)"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
+#: ../src/empathy-roster-window-menubar.ui.h:2
 msgid "Credit Balance"
 msgstr "儲值餘額"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
+#: ../src/empathy-roster-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "於聯絡人清單內尋找(_L)"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
+#: ../src/empathy-roster-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "參加喜好聊天室(_F)"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
+#: ../src/empathy-roster-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "管理喜好"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
+#: ../src/empathy-roster-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "正常大小(_O)"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-roster-window-menubar.ui.h:7
+#: ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "新增通話(_C)…"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
+#: ../src/empathy-roster-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "正常大小與大頭貼(_A)"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "偏好設定(_R)"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
+#: ../src/empathy-roster-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "顯示協定(_R)"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "根據名稱排序(_N)"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "根據狀態排序(_S)"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
+#: ../src/empathy-roster-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "帳號(_A)"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "被封鎖的聯絡人"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "精簡大小(_C)"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
+#: ../src/empathy-roster-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "檔案傳輸(_F)"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "參加(_J)…"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-roster-window-menubar.ui.h:24
 #: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "新增談話(_N)…"
 
-#: ../src/empathy-main-window-menubar.ui.h:25
+#: ../src/empathy-roster-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "離線聯絡人(_O)"
 
-#: ../src/empathy-main-window-menubar.ui.h:26
+#: ../src/empathy-roster-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "個人資料(_P)"
 
-#: ../src/empathy-main-window-menubar.ui.h:28
+#: ../src/empathy-roster-window-menubar.ui.h:28
 msgid "_Room"
 msgstr "聊天室(_R)"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
+#: ../src/empathy-roster-window-menubar.ui.h:29
 msgid "_Search for Contacts…"
 msgstr "搜尋聯絡人(_S)…"
 
@@ -4075,7 +4031,7 @@ msgstr "成員"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:623
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4088,16 +4044,16 @@ msgstr ""
 "需要密碼：%s\n"
 "成員：%s"
 
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "否"
 
-#: ../src/empathy-new-chatroom-dialog.c:654
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "無法開始列出聊天室清單"
 
-#: ../src/empathy-new-chatroom-dialog.c:664
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "無法停止列出聊天室清單"
 
@@ -4128,79 +4084,79 @@ msgstr "聊天室清單"
 msgid "_Room:"
 msgstr "聊天室(_R)："
 
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "訊息已收到"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "訊息已送出"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "新增談話"
 
-#: ../src/empathy-preferences.c:172
+#: ../src/empathy-preferences.c:169
 msgid "Contact goes online"
 msgstr "聯絡人上線"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "聯絡人離線"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "帳號已連線"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "帳號已斷線"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "語言"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:725
 msgid "Juliet"
 msgstr "祝英台"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:732
 msgid "Romeo"
 msgstr "梁山伯"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:738
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "白玉環與蝴蝶墜，為何不能夫妻配？"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:741
 msgid "Deny thy father and refuse thy name;"
 msgstr "豈知你我自作主，無人當它是聘媒。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:744
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "豈知好事成虛話，棒打鴛鴦兩離分。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:747
 msgid "And I'll no longer be a Capulet."
 msgstr "爹爹許了馬家婚，心已碎，意難伸。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:750
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "將來有命終相見，無命今生不相逄。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:753
 msgid "Juliet has disconnected"
 msgstr "祝英台已斷線"
 
-#: ../src/empathy-preferences.c:1175
+#: ../src/empathy-preferences.c:1157
 msgid "Preferences"
 msgstr "偏好設定"
 
@@ -4256,109 +4212,101 @@ msgstr "為語言啟用拼字檢查："
 msgid "General"
 msgstr "一般"
 
-#: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "輸入等級："
-
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "輸入音量："
-
-#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "位置來源："
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:17
 msgid "Log conversations"
 msgstr "紀錄談話"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:18
 msgid "Notifications"
 msgstr "通知"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:19
 msgid "Play sound for events"
 msgstr "播放事件音效"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:20
 msgid "Privacy"
 msgstr "私隱"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:21
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
 "decimal place."
 msgstr "降低位置準確度意指除了你所在的城市、洲和國家會被公開之外，不會提供其他訊息。GPS 的座標準確度將會降為個位數。"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:22
 msgid "Show _smileys as images"
 msgstr "將表情符號以圖片顯示(_S)"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:23
 msgid "Show contact _list in rooms"
 msgstr "在聊天室顯示聯絡人清單(_L)"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "音效"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:25
 msgid "Spell Checking"
 msgstr "拼字檢查"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:26
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "這裏的語言清單只反映出你已經安裝字典的語言。"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:27
 msgid "Themes"
 msgstr "佈景主題"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:28
 msgid "Use _echo cancellation to improve call quality"
 msgstr "使用回音消除來改善通話品質(_E)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:29
 msgid "Variant:"
 msgstr "樣式："
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:30
 msgid "_Automatically connect on startup"
 msgstr "啟動時自動連線(_A)"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Cellphone"
 msgstr "手機(_C)"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Enable bubble notifications"
 msgstr "啟用氣泡式通知(_E)"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable sound notifications"
 msgstr "啟用音效通知(_E)"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:34
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:35
 msgid "_Network (IP, Wi-Fi)"
 msgstr "網絡 (IP, Wi-Fi)(_N)"
 
-#: ../src/empathy-preferences.ui.h:38
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Open new chats in separate windows"
 msgstr "在個別視窗開啟新的聊天(_O)"
 
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Publish location to my contacts"
 msgstr "對我的聯絡人公開位置(_P)"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:41
+#: ../src/empathy-preferences.ui.h:39
 msgid "_Reduce location accuracy"
 msgstr "降低位置準確度(_R)"
 
@@ -4418,7 +4366,7 @@ msgstr "視像開啟"
 msgid "Video Preview"
 msgstr "視像預覽"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "聯絡人地圖檢視"
 
@@ -4484,16 +4432,16 @@ msgid ""
 "extension."
 msgstr "選取的連線管理程式不支援遠端偵錯擴充功能。"
 
-#: ../src/empathy-invite-participant-dialog.c:197
-#: ../src/empathy-invite-participant-dialog.c:225
+#: ../src/empathy-invite-participant-dialog.c:200
+#: ../src/empathy-invite-participant-dialog.c:228
 msgid "Invite Participant"
 msgstr "邀請參與"
 
-#: ../src/empathy-invite-participant-dialog.c:198
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Choose a contact to invite into the conversation:"
 msgstr "選擇想要邀請進入談話的聯絡人："
 
-#: ../src/empathy-invite-participant-dialog.c:221
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite"
 msgstr "邀請"
 
@@ -4547,13 +4495,13 @@ msgid "Respond"
 msgstr "回應"
 
 #: ../src/empathy-notifications-approver.c:204
-#: ../src/empathy-call-window.c:1566
+#: ../src/empathy-call-window.c:1565
 msgid "Reject"
 msgstr "拒絕"
 
 #: ../src/empathy-notifications-approver.c:209
 #: ../src/empathy-notifications-approver.c:214
-#: ../src/empathy-call-window.c:1567
+#: ../src/empathy-call-window.c:1566
 msgid "Answer"
 msgstr "接聽"
 
@@ -4585,38 +4533,38 @@ msgstr "%s 剛剛播打給你，但你正與他人通話。"
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1173 ../src/empathy-call-window.c:1196
+#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195
 msgid "i"
 msgstr "訊"
 
-#: ../src/empathy-call-window.c:2941
+#: ../src/empathy-call-window.c:2929
 msgid "On hold"
 msgstr "保留"
 
-#: ../src/empathy-call-window.c:2944
+#: ../src/empathy-call-window.c:2932
 msgid "Mute"
 msgstr "靜音"
 
-#: ../src/empathy-call-window.c:2946
+#: ../src/empathy-call-window.c:2934
 msgid "Duration"
 msgstr "時間"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2949
+#: ../src/empathy-call-window.c:2937
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:3219
+#: ../src/empathy-call-window.c:3207
 #, c-format
 msgid "Your current balance is %s."
 msgstr "你目前的餘額為 %s。"
 
-#: ../src/empathy-call-window.c:3223
+#: ../src/empathy-call-window.c:3211
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "很抱歉，你的存額不足以進行該通話。"
 
-#: ../src/empathy-call-window.c:3225
+#: ../src/empathy-call-window.c:3213
 msgid "Top Up"
 msgstr "加值"
 
@@ -4624,6 +4572,54 @@ msgstr "加值"
 msgid "_Match case"
 msgstr "比對大小寫(_M)"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "新增帳號"
+
+#~ msgid "Call volume"
+#~ msgstr "通話音量"
+
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "通話音量，為百分比。"
+
+#~ msgid "Socket type not supported"
+#~ msgstr "Socket 類型不支援"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "我的網路帳號"
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "%s 帳號已透過 %s 修改。"
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "%s 帳號無法於 Empathy 內修改。"
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "啟動我的網路帳號"
+
+#~ msgid "Edit %s"
+#~ msgstr "編輯 %s"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "取消(_N)"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "編輯(_E)"
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "您即將建立新的帳號，這樣會放棄\n"
+#~ "您所做的變更。確定要繼續？"
+
+#~ msgid "Input level:"
+#~ msgstr "輸入等級："
+
+#~ msgid "Input volume:"
+#~ msgstr "輸入音量："
+
 #~ msgid "Empathy has migrated butterfly logs"
 #~ msgstr "Empathy 已轉移 butterfly 日誌"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 26d7e05aa..45ccd3b39 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy 3.3.1\n"
+"Project-Id-Version: empathy 3.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-12 19:09+0800\n"
-"PO-Revision-Date: 2011-11-12 13:49+0800\n"
+"POT-Creation-Date: 2012-01-14 20:22+0800\n"
+"PO-Revision-Date: 2012-01-14 00:38+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
 "Language-Team: Chinese (traditional) <chinese-l10n@googlegroups.com>\n"
 "Language: zh_TW\n"
@@ -40,425 +40,417 @@ msgid "Always open a separate chat window for new chats."
 msgstr "永遠為每個新的聊天開啟新的聊天視窗。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "通話音量"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "通話音量，為百分比。"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid "Camera device"
 msgstr "攝影機裝置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
 msgid "Camera position"
 msgstr "攝影機位置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr "在群組聊天中使用暱稱補齊 (tab) 時要加到暱稱之後的字元。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
 msgid "Chat window theme"
 msgstr "聊天視窗佈景主題"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid "Chat window theme variant"
 msgstr "聊天視窗佈景主題樣式"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr "以逗號分隔要使用拼字檢查的語言清單 (如：「 en, fr, nl」)。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Compact contact list"
 msgstr "精簡連絡人清單"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid "Connection managers should be used"
 msgstr "使用連線管理程式"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Contact list sort criterion"
 msgstr "連絡人清單排序準則"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "D-Bus object path of the last account selected to join a room."
 msgstr "上次要加入聊天室所選取帳號的 D-Bus 物件路徑。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr "要用於視訊通話的預設攝影機裝置，例：/dev/video0。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Default directory to select an avatar image from"
 msgstr "用來選擇大頭貼圖片的預設目錄"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Disable popup notifications when away"
 msgstr "當狀態為離開時停用彈出式通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable sounds when away"
 msgstr "當狀態為離開時停用音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Display incoming events in the status area"
 msgstr "在狀態區域顯示收到事件"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
 msgstr "在狀態區域顯示收到事件。如果不啟用的話，收到事件會直接呈現給使用者。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid "Echo cancellation support"
 msgstr "回音消除支援"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Empathy can publish the user's location"
 msgstr "Empathy 可以發布使用者的位置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy 可以利用 GPS 來推測位置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy 可以利用行動電話網路基地臺來推測位置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy 可以利用網路來推測位置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy default download folder"
 msgstr "Empathy 預設下載資料夾"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy should auto-away when idle"
 msgstr "Empathy 當閒置時應該自動設為離開"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy 啟動時自動連線"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy 應降低位置的準確度"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy 要使用連絡人的大頭貼做為聊天視窗圖示"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Enable WebKit Developer Tools"
 msgstr "啟用 WebKit 開發者工具"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Enable popup notifications for new messages"
 msgstr "啟用新訊息的彈出式通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable spell checker"
 msgstr "啟用拼字檢查程式"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Hide main window"
 msgstr "隱藏主視窗"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Hide the main window."
 msgstr "隱藏主視窗。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Last account selected in Join Room dialog"
 msgstr "上次在「參加聊天室」對話盒選取的帳號"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Nick completed character"
 msgstr "暱稱補齊字元"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Open new chats in separate windows"
 msgstr "在個別視窗開啟新的聊天"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Path of the Adium theme to use"
 msgstr "要使用的 Adium 佈景主題路徑"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "如果聊天室使用的主題是 Adium 時要使用的 Adium 佈景主題路徑。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Play a sound for incoming messages"
 msgstr "收到訊息時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for new conversations"
 msgstr "當開啟新的談話時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for outgoing messages"
 msgstr "送出訊息時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound when a contact logs in"
 msgstr "當連絡人登入時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs out"
 msgstr "當有連絡人登出時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when we log in"
 msgstr "當我們登入時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log out"
 msgstr "當我們登出時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "如果聊天視窗失去焦點則彈出通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications when a contact logs in"
 msgstr "當連絡人登入時彈出通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs out"
 msgstr "當連絡人登出時彈出通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Position the camera preview should be during a call."
 msgstr "通話時攝影機預覽應該擺放的位置。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "Show Balance in contact list"
 msgstr "於聯絡人清單內顯示餘額"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Show avatars"
 msgstr "顯示大頭貼"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show contact list in rooms"
 msgstr "在聊天室顯示連絡人清單"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show hint about closing the main window"
 msgstr "關閉主視窗時顯示提示"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show offline contacts"
 msgstr "顯示離線連絡人"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show protocols"
 msgstr "顯示協定"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Spell checking languages"
 msgstr "拼字檢查的語言"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "The default folder to save file transfers in."
 msgstr "用來儲存檔案傳輸接收檔案的預設資料夾。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The last directory that an avatar image was chosen from."
 msgstr "上次選擇大頭貼圖片的目錄。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The position for the chat window side pane"
 msgstr "聊天視窗側窗格的位置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "聊天視窗側窗格的儲存位置 (單位為像素)。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "用來顯示在聊天視窗中談話的佈景主題。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr "用來在聊天視窗顯示談話的佈景主題樣式。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "Use graphical smileys"
 msgstr "使用圖片式表情符號"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use notification sounds"
 msgstr "使用通知音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use theme for chat rooms"
 msgstr "在聊天室使用佈景主題"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Empathy 是否要將使用者的位置發布給他的連絡人。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Empathy 是否使用 GPS 來推測位置。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Empathy 是否使用行動電話網路來推測位置。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Empathy 是否使用網路來推測位置。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Empathy 是否應在啟動時自動登入您的帳號。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr "Empathy 是否應在使用者閒置時自動切換為離開模式。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "Empathy 是否基於隱私的理由減低位置的準確度。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "Empathy 是否使用連絡人大頭貼做為聊天視窗圖示。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "是否啟用 WebKit 開發者工具，例如 Web Inspector。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
 msgstr "是否使用連線管理程式自動斷線或重新連線。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "是否以您設定的語言檢查輸入有無錯字。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "是否將談話中的表情符號轉換為圖片形式。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr "是否要啟用 Pulseaudio 的回音消除過濾器。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "是否播放音效來通知有連絡人登入網路。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "是否播放音效來通知有連絡人登出網路。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of events."
 msgstr "是否播放音效來通知有事件發生。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "是否播放音效來通知有收到訊息。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "是否播放音效來通知新的談話。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "是否播放音效來通知有送出訊息。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound when logging into a network."
 msgstr "當登入某網路時是否播放音效。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound when logging out of a network."
 msgstr "當登出某網路時是否播放音效。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play sound notifications when away or busy."
 msgstr "當狀態為離開或忙碌時是否播放音效通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "當連絡人離線時是否顯示彈出式通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "當連絡人上線時是否顯示彈出式通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
 msgstr "收到新訊息時是否顯示彈出式通知 (即使已開啟聊天視窗，但沒有獲得焦點)。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "當收到新訊息時是否顯示彈出式通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid "Whether to show account balances in the contact list."
 msgstr "是否要在聯絡人清單內顯示帳戶餘額。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "是否在連絡人清單與聊天視窗顯示連絡人大頭貼。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "是否在連絡人清單中顯示離線的連絡人。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid "Whether to show popup notifications when away or busy."
 msgstr "當狀態為離開或忙碌時是否顯示彈出式通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "是否要在聯絡人清單內顯示聯絡人使用協定。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show the contact list in chat rooms."
 msgstr "是否在聊天室中顯示連絡人清單。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show the contact list in compact mode."
 msgstr "是否以精簡模式顯示連絡人清單。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
 msgstr "是否在使用標題列的「x」按鈕關閉主視窗時，顯示訊息對話窗。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to use the theme for chat rooms."
 msgstr "是否為聊天室使用佈景主題。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -473,23 +465,51 @@ msgstr "管理訊息與 VoIP 帳號"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2312
+#: ../src/empathy-accounts-dialog.c:2406
 msgid "Messaging and VoIP Accounts"
 msgstr "訊息與 VoIP 帳號"
 
-#: ../libempathy/empathy-ft-handler.c:838
+#: ../libempathy/empathy-ft-handler.c:736
+msgid "No reason was specified"
+msgstr "沒有指定原因"
+
+#: ../libempathy/empathy-ft-handler.c:739
+msgid "The change in state was requested"
+msgstr "已要求變更狀態"
+
+#: ../libempathy/empathy-ft-handler.c:742
+msgid "You canceled the file transfer"
+msgstr "您已取消檔案傳輸"
+
+#: ../libempathy/empathy-ft-handler.c:745
+msgid "The other participant canceled the file transfer"
+msgstr "其他的參與者取消了檔案傳輸"
+
+#: ../libempathy/empathy-ft-handler.c:748
+msgid "Error while trying to transfer the file"
+msgstr "嘗試傳輸檔案時發生錯誤"
+
+#: ../libempathy/empathy-ft-handler.c:751
+msgid "The other participant is unable to transfer the file"
+msgstr "其他的參與者無法傳輸該檔案"
+
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:311
+msgid "Unknown reason"
+msgstr "不明原因"
+
+#: ../libempathy/empathy-ft-handler.c:917
 msgid "File transfer completed, but the file was corrupted"
 msgstr "檔案傳輸完畢，但是檔案已損毀"
 
-#: ../libempathy/empathy-ft-handler.c:1124
+#: ../libempathy/empathy-ft-handler.c:1203
 msgid "File transfer not supported by remote contact"
 msgstr "遠端連絡人不支援檔案傳輸"
 
-#: ../libempathy/empathy-ft-handler.c:1180
+#: ../libempathy/empathy-ft-handler.c:1259
 msgid "The selected file is not a regular file"
 msgstr "選取的檔案不是正規的檔案"
 
-#: ../libempathy/empathy-ft-handler.c:1189
+#: ../libempathy/empathy-ft-handler.c:1268
 msgid "The selected file is empty"
 msgstr "選取的檔案是空白的"
 
@@ -509,191 +529,159 @@ msgstr "已播打 %s"
 msgid "Call from %s"
 msgstr "%s 的來電"
 
-#: ../libempathy/empathy-tp-file.c:258
-msgid "Socket type not supported"
-msgstr "Socket 類型不支援"
-
-#: ../libempathy/empathy-tp-file.c:377
-msgid "No reason was specified"
-msgstr "沒有指定原因"
-
-#: ../libempathy/empathy-tp-file.c:380
-msgid "The change in state was requested"
-msgstr "已要求變更狀態"
-
-#: ../libempathy/empathy-tp-file.c:383
-msgid "You canceled the file transfer"
-msgstr "您已取消檔案傳輸"
-
-#: ../libempathy/empathy-tp-file.c:386
-msgid "The other participant canceled the file transfer"
-msgstr "其他的參與者取消了檔案傳輸"
-
-#: ../libempathy/empathy-tp-file.c:389
-msgid "Error while trying to transfer the file"
-msgstr "嘗試傳輸檔案時發生錯誤"
-
-#: ../libempathy/empathy-tp-file.c:392
-msgid "The other participant is unable to transfer the file"
-msgstr "其他的參與者無法傳輸該檔案"
-
-#: ../libempathy/empathy-tp-file.c:395 ../libempathy/empathy-utils.c:312
-msgid "Unknown reason"
-msgstr "不明原因"
-
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:231
 msgid "Available"
 msgstr "有空"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:233
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:236
 msgid "Away"
 msgstr "離開"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:238
 msgid "Invisible"
 msgstr "隱藏"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:240
 msgid "Offline"
 msgstr "離線"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:243
 msgctxt "presence"
 msgid "Unknown"
 msgstr "未知"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:283
 msgid "No reason specified"
 msgstr "沒有指定原因"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:341
 msgid "Status is set to offline"
 msgstr "狀態設為離線"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:321
 #: ../libempathy-gtk/empathy-call-utils.c:49
-#: ../libempathy-gtk/empathy-new-message-dialog.c:82
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "網路錯誤"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
 msgid "Authentication failed"
 msgstr "驗證失敗"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Encryption error"
 msgstr "加密發生錯誤"
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:293
 msgid "Name in use"
 msgstr "使用中的名稱"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:295 ../libempathy/empathy-utils.c:327
 msgid "Certificate not provided"
 msgstr "沒有提供憑證"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate untrusted"
 msgstr "憑證不被信任"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate expired"
 msgstr "憑證已逾期"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate not activated"
 msgstr "憑證尚未使用"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate hostname mismatch"
 msgstr "憑證主機名稱不符"
 
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate fingerprint mismatch"
 msgstr "憑證指紋檔不符"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate self-signed"
 msgstr "憑證為自我簽署"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:309
 msgid "Certificate error"
 msgstr "憑證錯誤"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:343
 msgid "Encryption is not available"
 msgstr "加密無法使用"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:345
 msgid "Certificate is invalid"
 msgstr "憑證無效"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:347
 msgid "Connection has been refused"
 msgstr "連線遭拒"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection can't be established"
 msgstr "無法建立連線"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection has been lost"
 msgstr "已失去連線"
 
-#: ../libempathy/empathy-utils.c:354
+#: ../libempathy/empathy-utils.c:353
 msgid "This resource is already connected to the server"
 msgstr "此資源已連接至該伺服器"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:355
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "連線已被使用相同資源的新連線取代"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:358
 msgid "The account already exists on the server"
 msgstr "該帳號已經存在於伺服器上"
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:360
 msgid "Server is currently too busy to handle the connection"
 msgstr "伺服器目前過於忙碌以致於無法處理該連線"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:362
 msgid "Certificate has been revoked"
 msgstr "已撤銷憑證"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:364
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "憑證使用不安全的密碼演算法，或是密碼處理上較弱"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:367
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 msgstr "伺服器憑證的長度，或是伺服器憑證鏈的深度超過密碼函式庫所能處理的範圍"
 
-#: ../libempathy/empathy-utils.c:372
+#: ../libempathy/empathy-utils.c:371
 msgid "Your software is too old"
 msgstr "您的軟體過舊"
 
-#: ../libempathy/empathy-utils.c:531
+#: ../libempathy/empathy-utils.c:530
 msgid "People Nearby"
 msgstr "附近的人"
 
-#: ../libempathy/empathy-utils.c:536
+#: ../libempathy/empathy-utils.c:535
 msgid "Yahoo! Japan"
 msgstr "Yahoo! 日本"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:564
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:566
+#: ../libempathy/empathy-utils.c:565
 msgid "Facebook Chat"
 msgstr "Facebook 聊天"
 
@@ -741,98 +729,70 @@ msgstr "未來"
 msgid "All accounts"
 msgstr "所有帳號"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:335
 msgid "Account"
 msgstr "帳號"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "密碼"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "伺服器"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "連接埠"
 
-#: ../libempathy-gtk/empathy-account-widget.c:776
-#: ../libempathy-gtk/empathy-account-widget.c:828
+#: ../libempathy-gtk/empathy-account-widget.c:763
+#: ../libempathy-gtk/empathy-account-widget.c:815
 #, c-format
 msgid "%s:"
 msgstr "%s："
 
-#: ../libempathy-gtk/empathy-account-widget.c:1182
-msgid "My Web Accounts"
-msgstr "我的網路帳號"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1199
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "%s 帳號已透過 %s 修改。"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1205
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "%s 帳號無法於 Empathy 內修改。"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1224
-msgid "Launch My Web Accounts"
-msgstr "啟動我的網路帳號"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1232
-#, c-format
-msgid "Edit %s"
-msgstr "編輯 %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1582
+#: ../libempathy-gtk/empathy-account-widget.c:1396
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "使用者名稱："
 
-#: ../libempathy-gtk/empathy-account-widget.c:1900
+#: ../libempathy-gtk/empathy-account-widget.c:1708
 msgid "A_pply"
 msgstr "套用(_A)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1930
+#: ../libempathy-gtk/empathy-account-widget.c:1737
 msgid "L_og in"
 msgstr "登入(_O)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2004
+#: ../libempathy-gtk/empathy-account-widget.c:1810
 msgid "This account already exists on the server"
 msgstr "此帳號已經存在這個伺服器上"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2007
+#: ../libempathy-gtk/empathy-account-widget.c:1814
 msgid "Create a new account on the server"
 msgstr "在這個伺服器上建立新的帳號"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2199
-msgid "Ca_ncel"
-msgstr "取消(_N)"
-
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2477
+#: ../libempathy-gtk/empathy-account-widget.c:2239
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%2$s 上的 %1$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2503
+#: ../libempathy-gtk/empathy-account-widget.c:2265
 #, c-format
 msgid "%s Account"
 msgstr "%s 帳號"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2507
+#: ../libempathy-gtk/empathy-account-widget.c:2269
 msgid "New account"
 msgstr "新增帳號"
 
@@ -880,7 +840,7 @@ msgstr "記住密碼"
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
 msgid "Remember password"
 msgstr "記住密碼"
 
@@ -1203,7 +1163,7 @@ msgid "STUN Server:"
 msgstr "STUN 伺服器："
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
 msgid "Server:"
 msgstr "伺服器："
 
@@ -1309,62 +1269,62 @@ msgstr "此協定不支援緊急通話功能"
 msgid "You don't have enough credit in order to place this call"
 msgstr "您的存額不足以買下該通話。"
 
-#: ../libempathy-gtk/empathy-chat.c:706
+#: ../libempathy-gtk/empathy-chat.c:705
 msgid "Failed to open private chat"
 msgstr "開啟私人聊天失敗"
 
-#: ../libempathy-gtk/empathy-chat.c:764
+#: ../libempathy-gtk/empathy-chat.c:763
 msgid "Topic not supported on this conversation"
 msgstr "此談話的主題不被支援"
 
-#: ../libempathy-gtk/empathy-chat.c:770
+#: ../libempathy-gtk/empathy-chat.c:769
 msgid "You are not allowed to change the topic"
 msgstr "您不被允許變更這個主題"
 
-#: ../libempathy-gtk/empathy-chat.c:971
+#: ../libempathy-gtk/empathy-chat.c:970
 #, c-format
 msgid "“%s” is not a valid contact ID"
 msgstr "「%s」不是有效的連絡人 ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1065
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear：清除目前談話的所有訊息"
 
-#: ../libempathy-gtk/empathy-chat.c:1069
+#: ../libempathy-gtk/empathy-chat.c:1068
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <主題>：設置目前談話的主題"
 
-#: ../libempathy-gtk/empathy-chat.c:1072
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <聊天室 ID>：參加新的聊天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1075
+#: ../libempathy-gtk/empathy-chat.c:1074
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <聊天室 ID>：參加新的聊天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1079
+#: ../libempathy-gtk/empathy-chat.c:1078
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr "/part [<聊天室 ID>] [<原因>]：離開聊天室，預設為目前的聊天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1082
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <聯絡人 ID> [<訊息>]：開啟私人聊天"
 
-#: ../libempathy-gtk/empathy-chat.c:1086
+#: ../libempathy-gtk/empathy-chat.c:1085
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <聯絡人 ID> <訊息>：開啟私人聊天"
 
-#: ../libempathy-gtk/empathy-chat.c:1089
+#: ../libempathy-gtk/empathy-chat.c:1088
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <暱稱>：變更在目前伺服器上的您的暱稱"
 
-#: ../libempathy-gtk/empathy-chat.c:1092
+#: ../libempathy-gtk/empathy-chat.c:1091
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <訊息>：送出一個 ACTION 訊息到目前的談話中"
 
-#: ../libempathy-gtk/empathy-chat.c:1095
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1373,11 +1333,11 @@ msgstr ""
 "/say <訊息>：送出 <訊息> 到目前的談話中。這用於傳送以「/」開頭的訊息。舉例來"
 "說：「/say /join 是用來參加新的聊天室」"
 
-#: ../libempathy-gtk/empathy-chat.c:1100
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <聯絡人 ID>：顯示聯絡人的相關資訊"
 
-#: ../libempathy-gtk/empathy-chat.c:1103
+#: ../libempathy-gtk/empathy-chat.c:1102
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1385,120 +1345,120 @@ msgstr ""
 "/help [<命令>]：顯示所有支援的指令。如果有定義這個 <命令> 的話，便顯示它的用"
 "法。"
 
-#: ../libempathy-gtk/empathy-chat.c:1122
+#: ../libempathy-gtk/empathy-chat.c:1121
 #, c-format
 msgid "Usage: %s"
 msgstr "用法：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1167
+#: ../libempathy-gtk/empathy-chat.c:1166
 msgid "Unknown command"
 msgstr "未知的命令"
 
-#: ../libempathy-gtk/empathy-chat.c:1293
+#: ../libempathy-gtk/empathy-chat.c:1292
 msgid "Unknown command; see /help for the available commands"
 msgstr "未知的指令；請參見 /help 以取得可用的指令"
 
-#: ../libempathy-gtk/empathy-chat.c:1457
+#: ../libempathy-gtk/empathy-chat.c:1456
 msgid "insufficient balance to send message"
 msgstr "餘額不足以傳送訊息"
 
-#: ../libempathy-gtk/empathy-chat.c:1461 ../libempathy-gtk/empathy-chat.c:1475
-#: ../libempathy-gtk/empathy-chat.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1460 ../libempathy-gtk/empathy-chat.c:1474
+#: ../libempathy-gtk/empathy-chat.c:1537
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "傳送訊息「%s」時發生錯誤：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1463 ../libempathy-gtk/empathy-chat.c:1480
-#: ../libempathy-gtk/empathy-chat.c:1542
+#: ../libempathy-gtk/empathy-chat.c:1462 ../libempathy-gtk/empathy-chat.c:1479
+#: ../libempathy-gtk/empathy-chat.c:1541
 #, c-format
 msgid "Error sending message: %s"
 msgstr "傳送訊息時發生錯誤：%s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1469
+#: ../libempathy-gtk/empathy-chat.c:1468
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "餘額不足以傳送訊息。<a href='%s'>加值</a>。"
 
-#: ../libempathy-gtk/empathy-chat.c:1509
+#: ../libempathy-gtk/empathy-chat.c:1508
 msgid "not capable"
 msgstr "無法"
 
-#: ../libempathy-gtk/empathy-chat.c:1516
+#: ../libempathy-gtk/empathy-chat.c:1515
 msgid "offline"
 msgstr "離線"
 
-#: ../libempathy-gtk/empathy-chat.c:1519
+#: ../libempathy-gtk/empathy-chat.c:1518
 msgid "invalid contact"
 msgstr "無效的連絡人"
 
-#: ../libempathy-gtk/empathy-chat.c:1522
+#: ../libempathy-gtk/empathy-chat.c:1521
 msgid "permission denied"
 msgstr "權限被拒絕"
 
-#: ../libempathy-gtk/empathy-chat.c:1525
+#: ../libempathy-gtk/empathy-chat.c:1524
 msgid "too long message"
 msgstr "太長的訊息"
 
-#: ../libempathy-gtk/empathy-chat.c:1528
+#: ../libempathy-gtk/empathy-chat.c:1527
 msgid "not implemented"
 msgstr "未實作"
 
-#: ../libempathy-gtk/empathy-chat.c:1532
+#: ../libempathy-gtk/empathy-chat.c:1531
 msgid "unknown"
 msgstr "不明"
 
-#: ../libempathy-gtk/empathy-chat.c:1599 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1598 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "主題："
 
-#: ../libempathy-gtk/empathy-chat.c:1611
+#: ../libempathy-gtk/empathy-chat.c:1610
 #, c-format
 msgid "Topic set to: %s"
 msgstr "主題設定為: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1612
 msgid "No topic defined"
 msgstr "尚未定義主題"
 
-#: ../libempathy-gtk/empathy-chat.c:2126
+#: ../libempathy-gtk/empathy-chat.c:2125
 msgid "(No Suggestions)"
 msgstr "(沒有建議)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2194
+#: ../libempathy-gtk/empathy-chat.c:2193
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "加入「%s」至字典"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2231
+#: ../libempathy-gtk/empathy-chat.c:2230
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "加入「%s」至 %s 字典"
 
-#: ../libempathy-gtk/empathy-chat.c:2301
+#: ../libempathy-gtk/empathy-chat.c:2300
 msgid "Insert Smiley"
 msgstr "插入表情符號"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2319
-#: ../libempathy-gtk/empathy-ui-utils.c:1867
+#: ../libempathy-gtk/empathy-chat.c:2318
+#: ../libempathy-gtk/empathy-ui-utils.c:1868
 msgid "_Send"
 msgstr "傳送(_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2376
+#: ../libempathy-gtk/empathy-chat.c:2375
 msgid "_Spelling Suggestions"
 msgstr "拼字建議(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2465
+#: ../libempathy-gtk/empathy-chat.c:2464
 msgid "Failed to retrieve recent logs"
 msgstr "無法取得最近的日誌"
 
-#: ../libempathy-gtk/empathy-chat.c:2602
+#: ../libempathy-gtk/empathy-chat.c:2601
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 已斷線"
@@ -1506,12 +1466,12 @@ msgstr "%s 已斷線"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2609
+#: ../libempathy-gtk/empathy-chat.c:2608
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s 被 %2$s 踢出去"
 
-#: ../libempathy-gtk/empathy-chat.c:2612
+#: ../libempathy-gtk/empathy-chat.c:2611
 #, c-format
 msgid "%s was kicked"
 msgstr "%s 被踢出"
@@ -1519,17 +1479,17 @@ msgstr "%s 被踢出"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2620
+#: ../libempathy-gtk/empathy-chat.c:2619
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s 被 %2$s 設為黑名單"
 
-#: ../libempathy-gtk/empathy-chat.c:2623
+#: ../libempathy-gtk/empathy-chat.c:2622
 #, c-format
 msgid "%s was banned"
 msgstr "%s 被設為黑名單"
 
-#: ../libempathy-gtk/empathy-chat.c:2627
+#: ../libempathy-gtk/empathy-chat.c:2626
 #, c-format
 msgid "%s has left the room"
 msgstr "%s 已經離開此聊天室"
@@ -1539,17 +1499,17 @@ msgstr "%s 已經離開此聊天室"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2636
+#: ../libempathy-gtk/empathy-chat.c:2635
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2661
+#: ../libempathy-gtk/empathy-chat.c:2660
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s 已經參加此聊天室"
 
-#: ../libempathy-gtk/empathy-chat.c:2686
+#: ../libempathy-gtk/empathy-chat.c:2685
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 現在被稱為 %s"
@@ -1557,79 +1517,80 @@ msgstr "%s 現在被稱為 %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2839
-#: ../src/empathy-streamed-media-window.c:1886
-#: ../src/empathy-event-manager.c:1260 ../src/empathy-call-window.c:1539
-#: ../src/empathy-call-window.c:1589 ../src/empathy-call-window.c:2635
+#: ../libempathy-gtk/empathy-chat.c:2846
+#: ../src/empathy-streamed-media-window.c:1889
+#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538
+#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631
 msgid "Disconnected"
 msgstr "已斷線"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3485
+#: ../libempathy-gtk/empathy-chat.c:3492
 msgid "Would you like to store this password?"
 msgstr "您想要儲存此密碼？"
 
-#: ../libempathy-gtk/empathy-chat.c:3491
+#: ../libempathy-gtk/empathy-chat.c:3498
 msgid "Remember"
 msgstr "記住"
 
-#: ../libempathy-gtk/empathy-chat.c:3501
+#: ../libempathy-gtk/empathy-chat.c:3508
 msgid "Not now"
 msgstr "現在不要"
 
-#: ../libempathy-gtk/empathy-chat.c:3545
+#: ../libempathy-gtk/empathy-chat.c:3552
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "重試"
 
-#: ../libempathy-gtk/empathy-chat.c:3549
+#: ../libempathy-gtk/empathy-chat.c:3556
 msgid "Wrong password; please try again:"
 msgstr "密碼錯誤；請再試一次："
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3679
+#: ../libempathy-gtk/empathy-chat.c:3686
 msgid "This room is protected by a password:"
 msgstr "此聊天室已被密碼保護："
 
-#: ../libempathy-gtk/empathy-chat.c:3706
+#: ../libempathy-gtk/empathy-chat.c:3713
 msgid "Join"
 msgstr "參加"
 
-#: ../libempathy-gtk/empathy-chat.c:3894 ../src/empathy-event-manager.c:1281
+#: ../libempathy-gtk/empathy-chat.c:3901 ../src/empathy-event-manager.c:1301
 msgid "Connected"
 msgstr "成功連線"
 
-#: ../libempathy-gtk/empathy-chat.c:3949
+#: ../libempathy-gtk/empathy-chat.c:3956
 msgid "Conversation"
 msgstr "談話"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3954
+#: ../libempathy-gtk/empathy-chat.c:3961
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:265
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "未知或無效的識別身分"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:267
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "聯絡人封鎖暫時無法使用"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:269
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "聯絡人封鎖無法使用"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:271
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "已拒絕授權"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:275
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "無法封鎖聯絡人"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:622
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "編輯封鎖的聯絡人"
 
@@ -1637,7 +1598,7 @@ msgstr "編輯封鎖的聯絡人"
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:506
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1441
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid "Account:"
@@ -1672,39 +1633,34 @@ msgstr "開啟連結(_O)"
 msgid "%A %B %d %Y"
 msgstr "%Y %B %d %A"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:287
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "編輯連絡人資訊"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:338
+#: ../libempathy-gtk/empathy-contact-dialogs.c:278
 msgid "Personal Information"
 msgstr "個人資訊"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:439
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:379
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "新增連絡人"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:508
-#: ../libempathy-gtk/empathy-individual-dialogs.c:198
+#: ../libempathy-gtk/empathy-contact-dialogs.c:448
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "封鎖 %s？"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:513
-#: ../libempathy-gtk/empathy-individual-dialogs.c:253
+#: ../libempathy-gtk/empathy-contact-dialogs.c:453
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "您確定想要封鎖「%s」讓他無法再與您聯絡嗎？"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:518
-#: ../libempathy-gtk/empathy-individual-dialogs.c:275
+#: ../libempathy-gtk/empathy-contact-dialogs.c:458
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "封鎖(_B)"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:536
-#: ../libempathy-gtk/empathy-individual-dialogs.c:284
+#: ../libempathy-gtk/empathy-contact-dialogs.c:476
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "回報這些聯絡人濫用帳號(_R)"
@@ -1721,102 +1677,6 @@ msgstr "訂閱要求"
 msgid "_Block User"
 msgstr "封鎖使用者(_B)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1935
-#: ../libempathy-gtk/empathy-individual-view.c:2375
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "是否想要移除群組「%s」？"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1937
-#: ../libempathy-gtk/empathy-individual-view.c:2378
-msgid "Removing group"
-msgstr "正在移除群組"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-contact-list-view.c:2059
-#: ../libempathy-gtk/empathy-individual-view.c:2433
-#: ../libempathy-gtk/empathy-individual-view.c:2636
-msgid "_Remove"
-msgstr "移除(_R)"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2015
-#: ../libempathy-gtk/empathy-individual-view.c:2500
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "是否想要移除連絡人「%s」？"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2017
-#: ../libempathy-gtk/empathy-individual-view.c:2521
-msgid "Removing contact"
-msgstr "正在移除連絡人"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:212
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "加入聯絡人(_A)…"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:287
-msgid "_Block Contact"
-msgstr "封鎖聯絡人(_B)"
-
-#. add chat button
-#: ../libempathy-gtk/empathy-contact-menu.c:316
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../libempathy-gtk/empathy-new-message-dialog.c:320
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "聊天(_C)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:348
-#: ../libempathy-gtk/empathy-individual-menu.c:850
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "語音通話(_A)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:381
-#: ../libempathy-gtk/empathy-individual-menu.c:895
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "視訊通話(_V)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:427
-#: ../libempathy-gtk/empathy-individual-menu.c:948
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "過往談話(_P)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:449
-#: ../libempathy-gtk/empathy-individual-menu.c:989
-msgid "Send File"
-msgstr "傳送檔案"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:472
-#: ../libempathy-gtk/empathy-individual-menu.c:1031
-msgid "Share My Desktop"
-msgstr "分享我的桌面"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:501
-#: ../libempathy-gtk/empathy-individual-menu.c:1094
-msgid "Infor_mation"
-msgstr "資訊(_M)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:547
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "編輯(_E)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:601
-#: ../libempathy-gtk/empathy-individual-menu.c:1285
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "邀請您到這個聊天室"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:632
-#: ../libempathy-gtk/empathy-individual-menu.c:1331
-msgid "_Invite to Chat Room"
-msgstr "邀請到聊天室(_I)"
-
 #. Title
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
@@ -1842,228 +1702,223 @@ msgstr "您的訊息"
 msgid "Please let me see when you're online. Thanks!"
 msgstr "當您上線時請讓我知道。感謝！"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "頻道："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:799
-#: ../libempathy-gtk/empathy-individual-widget.c:421
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "國家 ISO 碼："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:801
-#: ../libempathy-gtk/empathy-individual-widget.c:423
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "國家："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:803
-#: ../libempathy-gtk/empathy-individual-widget.c:425
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "州："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:805
-#: ../libempathy-gtk/empathy-individual-widget.c:427
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "市："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:807
-#: ../libempathy-gtk/empathy-individual-widget.c:429
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "區域："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:809
-#: ../libempathy-gtk/empathy-individual-widget.c:431
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "郵遞區號："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:811
-#: ../libempathy-gtk/empathy-individual-widget.c:433
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "街："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:813
-#: ../libempathy-gtk/empathy-individual-widget.c:435
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "建築："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:815
-#: ../libempathy-gtk/empathy-individual-widget.c:437
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "樓層："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:817
-#: ../libempathy-gtk/empathy-individual-widget.c:439
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "室："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:819
-#: ../libempathy-gtk/empathy-individual-widget.c:441
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "文字："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:821
-#: ../libempathy-gtk/empathy-individual-widget.c:443
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "描述："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:823
-#: ../libempathy-gtk/empathy-individual-widget.c:445
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:825
-#: ../libempathy-gtk/empathy-individual-widget.c:447
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "準確度等級："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:827
-#: ../libempathy-gtk/empathy-individual-widget.c:449
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "錯誤："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:829
-#: ../libempathy-gtk/empathy-individual-widget.c:451
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "垂直誤差 (公尺)："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:831
-#: ../libempathy-gtk/empathy-individual-widget.c:453
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "水平誤差 (公尺)："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:833
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "速度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:835
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "方位："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:837
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "爬升速度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:839
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "上次更新於："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:841
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "經度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:843
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "緯度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:845
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "緯度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:898
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:559
-#: ../libempathy-gtk/empathy-individual-widget.c:574
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:15
 msgid "Location"
 msgstr "位置"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:576
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s，%s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:967
-#: ../libempathy-gtk/empathy-individual-widget.c:625
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%Y %B %e 於 %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1049
-#: ../libempathy-gtk/empathy-individual-widget.c:867
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "儲存大頭貼"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1105
-#: ../libempathy-gtk/empathy-individual-widget.c:925
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "無法儲存大頭貼"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1793
-#: ../libempathy-gtk/empathy-individual-menu.c:1066
-#: ../libempathy-gtk/empathy-individual-widget.c:1324
-msgid "Favorite"
-msgstr "喜好"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
 msgid "Full name"
 msgstr "全名"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
 msgid "Phone number"
 msgstr "電話號碼"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
 msgid "E-mail address"
 msgstr "電子信箱位址"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
 msgid "Website"
 msgstr "網站"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
 msgid "Birthday"
 msgstr "生日"
 
 #. Note to translators: this is the caption for a string of the form "5
 #. * minutes ago", and refers to the time since the contact last interacted
 #. * with their IM client.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:111
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
 msgid "Last seen:"
 msgstr "上次看見："
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
 msgid "Connected from:"
 msgstr "已連接從："
 
 #. FIXME: once Idle implements SimplePresence using this information, we can
 #. * and should bin this.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:117
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
 msgid "Away message:"
 msgstr "離開訊息："
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
 msgid "work"
 msgstr "工作"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
 msgid "home"
 msgstr "住家"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
 msgid "mobile"
 msgstr "行動"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
 msgid "voice"
 msgstr "聲音"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
 msgid "preferred"
 msgstr "偏好"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
 msgid "postal"
 msgstr "郵遞"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
 msgid "parcel"
 msgstr "包裹"
 
@@ -2073,7 +1928,7 @@ msgstr "<b>位置</b> 於 (date)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1260
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
 msgid "Alias:"
 msgstr "別名："
 
@@ -2093,7 +1948,7 @@ msgstr "連絡人詳細資料"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1469
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "識別身分："
 
@@ -2131,93 +1986,174 @@ msgid "Select"
 msgstr "選取"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1953
+#: ../src/empathy-roster-window.c:1919
 msgid "Group"
 msgstr "群組"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:258
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "下列識別身分將被封鎖："
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:265
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "下列識別身分無法被封鎖："
 
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "編輯連絡人資訊"
+
 #. Translators: the heading at the top of the Information dialogue
 #: ../libempathy-gtk/empathy-individual-information-dialog.c:288
 msgid "Linked Contacts"
 msgstr "連結聯絡群"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:370
+#: ../libempathy-gtk/empathy-individual-linker.c:372
 msgid "Select contacts to link"
 msgstr "選取要連結的連絡人"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:444
+#: ../libempathy-gtk/empathy-individual-linker.c:447
 msgid "New contact preview"
 msgstr "新增連絡人預覽"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:488
+#: ../libempathy-gtk/empathy-individual-linker.c:491
 msgid "Contacts selected in the list on the left will be linked together."
 msgstr "在清單左方的所選聯絡人將連結在一起。"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:145
+#: ../libempathy-gtk/empathy-individual-menu.c:181
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:363
 msgid "Select account to use to place the call"
 msgstr "選取要用來放置通話的帳號"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-individual-menu.c:367
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1285
+#: ../src/empathy-streamed-media-window.c:1288
 #: ../src/empathy-call-window.ui.h:2
 msgid "Call"
 msgstr "通話"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:432
 msgid "Mobile"
 msgstr "行動電話"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:434
 msgid "Work"
 msgstr "工作"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:436
 msgid "HOME"
 msgstr "住家"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:677
+msgid "_Block Contact"
+msgstr "封鎖聯絡人(_B)"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1055
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "_Chat"
+msgstr "聊天(_C)"
+
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:805
-#: ../libempathy-gtk/empathy-new-message-dialog.c:314
+#: ../libempathy-gtk/empathy-individual-menu.c:1090
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1143
+#: ../libempathy-gtk/empathy-individual-menu.c:1123
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "語音通話(_A)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1156
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "視訊通話(_V)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1197
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Previous Conversations"
+msgstr "過往談話(_P)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1226
+msgid "Send File"
+msgstr "傳送檔案"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1256
+msgid "Share My Desktop"
+msgstr "分享我的桌面"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1282
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "喜好"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1310
+msgid "Infor_mation"
+msgstr "資訊(_M)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1359
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "編輯(_E)"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1169
+#: ../libempathy-gtk/empathy-individual-menu.c:1385
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "連結聯絡人(_L)…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2340
+#: ../libempathy-gtk/empathy-individual-menu.c:1501
+#: ../src/empathy-chat-window.c:1011
+msgid "Inviting you to this room"
+msgstr "邀請您到這個聊天室"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1547
+msgid "_Invite to Chat Room"
+msgstr "邀請到聊天室(_I)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1743
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Add Contact…"
+msgstr "加入聯絡人(_A)…"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2355
 msgid "Delete and _Block"
 msgstr "刪除並封鎖(_B)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2509
+#: ../libempathy-gtk/empathy-individual-view.c:2390
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "是否想要移除群組「%s」？"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2393
+msgid "Removing group"
+msgstr "正在移除群組"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2448
+#: ../libempathy-gtk/empathy-individual-view.c:2665
+msgid "_Remove"
+msgstr "移除(_R)"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2525
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "是否想要移除連絡人「%s」？"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2534
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2226,7 +2162,11 @@ msgstr ""
 "您真的想要移除連結聯絡人「%s」嗎？請注意這會移除所有構成此連結聯絡群的聯絡"
 "人。"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1608
+#: ../libempathy-gtk/empathy-individual-view.c:2546
+msgid "Removing contact"
+msgstr "正在移除連絡人"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2240,19 +2180,19 @@ msgstr "<b>位置</b> 於 (日期)"
 msgid "Online from a phone or mobile device"
 msgstr "從手機或行動裝置上線"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "新增網路"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "選擇 IRC 網路"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "重設網路清單(_N)"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "選取"
@@ -2307,133 +2247,133 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "取消連結(_U)"
 
-#: ../libempathy-gtk/empathy-log-window.c:620
+#: ../libempathy-gtk/empathy-log-window.c:622
 msgid "History"
 msgstr "歷史"
 
-#: ../libempathy-gtk/empathy-log-window.c:675
+#: ../libempathy-gtk/empathy-log-window.c:677
 msgid "Show"
 msgstr "顯示"
 
-#: ../libempathy-gtk/empathy-log-window.c:697
+#: ../libempathy-gtk/empathy-log-window.c:699
 msgid "Search"
 msgstr "搜尋"
 
-#: ../libempathy-gtk/empathy-log-window.c:1145
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat in %s"
 msgstr "於 %s 內聊天"
 
-#: ../libempathy-gtk/empathy-log-window.c:1147
+#: ../libempathy-gtk/empathy-log-window.c:1152
 #, c-format
 msgid "Chat with %s"
 msgstr "與 %s 聊天中"
 
-#: ../libempathy-gtk/empathy-log-window.c:1197
-#: ../libempathy-gtk/empathy-log-window.c:1344
+#: ../libempathy-gtk/empathy-log-window.c:1202
+#: ../libempathy-gtk/empathy-log-window.c:1349
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%Y %B %d %A"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1286
+#: ../libempathy-gtk/empathy-log-window.c:1291
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1292
+#: ../libempathy-gtk/empathy-log-window.c:1297
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s：</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1368
+#: ../libempathy-gtk/empathy-log-window.c:1373
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s 秒"
 
-#: ../libempathy-gtk/empathy-log-window.c:1375
+#: ../libempathy-gtk/empathy-log-window.c:1380
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s 分鐘"
 
-#: ../libempathy-gtk/empathy-log-window.c:1383
+#: ../libempathy-gtk/empathy-log-window.c:1388
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "通話時間 %s，結束於 %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1715
+#: ../libempathy-gtk/empathy-log-window.c:1722
 msgid "Today"
 msgstr "今日"
 
-#: ../libempathy-gtk/empathy-log-window.c:1719
+#: ../libempathy-gtk/empathy-log-window.c:1726
 msgid "Yesterday"
 msgstr "昨日"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1734
+#: ../libempathy-gtk/empathy-log-window.c:1741
 msgid "%e %B %Y"
 msgstr "%Y年%B%e日"
 
-#: ../libempathy-gtk/empathy-log-window.c:1815
-#: ../libempathy-gtk/empathy-log-window.c:3430
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3489
 msgid "Anytime"
 msgstr "任何時間"
 
-#: ../libempathy-gtk/empathy-log-window.c:1902
-#: ../libempathy-gtk/empathy-log-window.c:2358
+#: ../libempathy-gtk/empathy-log-window.c:1918
+#: ../libempathy-gtk/empathy-log-window.c:2402
 msgid "Anyone"
 msgstr "任一個"
 
-#: ../libempathy-gtk/empathy-log-window.c:2671
+#: ../libempathy-gtk/empathy-log-window.c:2715
 msgid "Who"
 msgstr "誰"
 
-#: ../libempathy-gtk/empathy-log-window.c:2875
+#: ../libempathy-gtk/empathy-log-window.c:2924
 msgid "When"
 msgstr "何時"
 
-#: ../libempathy-gtk/empathy-log-window.c:2991
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Anything"
 msgstr "任何事"
 
-#: ../libempathy-gtk/empathy-log-window.c:2993
+#: ../libempathy-gtk/empathy-log-window.c:3042
 msgid "Text chats"
 msgstr "文字聊天"
 
-#: ../libempathy-gtk/empathy-log-window.c:2995
+#: ../libempathy-gtk/empathy-log-window.c:3044
 #: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "通話"
 
-#: ../libempathy-gtk/empathy-log-window.c:3000
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Incoming calls"
 msgstr "來電"
 
-#: ../libempathy-gtk/empathy-log-window.c:3001
+#: ../libempathy-gtk/empathy-log-window.c:3050
 msgid "Outgoing calls"
 msgstr "播出"
 
-#: ../libempathy-gtk/empathy-log-window.c:3002
+#: ../libempathy-gtk/empathy-log-window.c:3051
 msgid "Missed calls"
 msgstr "漏接來電"
 
-#: ../libempathy-gtk/empathy-log-window.c:3024
+#: ../libempathy-gtk/empathy-log-window.c:3073
 msgid "What"
 msgstr "什麼"
 
-#: ../libempathy-gtk/empathy-log-window.c:3719
+#: ../libempathy-gtk/empathy-log-window.c:3782
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "您確定要刪除過往談話的所有紀錄嗎？"
 
-#: ../libempathy-gtk/empathy-log-window.c:3723
+#: ../libempathy-gtk/empathy-log-window.c:3786
 msgid "Clear All"
 msgstr "清除全部"
 
-#: ../libempathy-gtk/empathy-log-window.c:3730
+#: ../libempathy-gtk/empathy-log-window.c:3793
 msgid "Delete from:"
 msgstr "刪除從："
 
@@ -2462,7 +2402,7 @@ msgstr "視訊"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
 #: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
+#: ../src/empathy-roster-window-menubar.ui.h:20
 msgid "_Edit"
 msgstr "編輯(_E)"
 
@@ -2474,76 +2414,82 @@ msgstr "檔案(_F)"
 msgid "page 2"
 msgstr "頁面 2"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:84
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
 msgid "The contact is offline"
 msgstr "聯絡人已經離線"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:86
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
 msgid "The specified contact is either invalid or unknown"
 msgstr "指定的聯絡人無效或未知"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:88
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
 msgid "The contact does not support this kind of conversation"
 msgstr "該聯絡人不支援這類談話"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:90
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
 msgid "The requested functionality is not implemented for this protocol"
 msgstr "請求的功能尚未在此協定中實作"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:96
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
 msgid "Could not start a conversation with the given contact"
 msgstr "無法啟動與給定聯絡人的談話"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
 msgid "You are banned from this channel"
 msgstr "您被此頻道禁封"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
 msgid "This channel is full"
 msgstr "此頻道已滿"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:102
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
 msgid "You must be invited to join this channel"
 msgstr "您必須被邀請才能參加此頻道"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:104
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
 msgid "Can't proceed while disconnected"
 msgstr "斷線時無法處理"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:106
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
 msgid "Permission denied"
 msgstr "許可被拒絕"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:112
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
 msgid "There was an error starting the conversation"
 msgstr "啟動談話時發生錯誤"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:291
-#: ../libempathy-gtk/empathy-new-call-dialog.c:203
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:202
 msgid "Enter a contact identifier or phone number:"
 msgstr "請輸入聯絡人辨識身份或電話號碼："
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:334
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "新增談話"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:226
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "_Video Call"
 msgstr "視訊通話(_V)"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:236
+#: ../libempathy-gtk/empathy-new-call-dialog.c:235
 msgid "_Audio Call"
 msgstr "語音通話(_A)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:246
+#: ../libempathy-gtk/empathy-new-call-dialog.c:245
 msgid "New Call"
 msgstr "新增通話"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "<b>%s</b> 帳號驗證失敗"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
 "Enter your password for account\n"
@@ -2754,26 +2700,26 @@ msgstr "請記住此選擇以供未來連線使用"
 msgid "Certificate Details"
 msgstr "憑證詳細資料"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1741
+#: ../libempathy-gtk/empathy-ui-utils.c:1742
 msgid "Unable to open URI"
 msgstr "無法開啓 URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1859
+#: ../libempathy-gtk/empathy-ui-utils.c:1860
 msgid "Select a file"
 msgstr "選擇一個檔案"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1934
+#: ../libempathy-gtk/empathy-ui-utils.c:1935
 msgid "Insufficient free space to save file"
 msgstr "空間不足以儲存檔案"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1942
+#: ../libempathy-gtk/empathy-ui-utils.c:1943
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 msgstr "需要 %s 的空間以儲存此檔案，但僅有 %s 可用。請選擇其他位置。"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1986
+#: ../libempathy-gtk/empathy-ui-utils.c:1987
 #, c-format
 msgid "Incoming file from %s"
 msgstr "收到來自 %s 的檔案"
@@ -2945,31 +2891,31 @@ msgstr "西歐語系"
 msgid "Vietnamese"
 msgstr "越南文"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:203
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "沒有錯誤訊息"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:276
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "即時通訊 (Empathy)"
 
-#: ../src/empathy.c:433
+#: ../src/empathy.c:437
 msgid "Don't connect on startup"
 msgstr "啟動時不要自動連線"
 
-#: ../src/empathy.c:437
+#: ../src/empathy.c:441
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "啟動時不顯示連絡人清單或任何其他對話窗"
 
-#: ../src/empathy.c:452
+#: ../src/empathy.c:456
 msgid "- Empathy IM Client"
 msgstr "- Empathy 即時通用戶端"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:643
 msgid "Error contacting the Account Manager"
 msgstr "聯絡帳號管理程式時發生錯誤"
 
-#: ../src/empathy.c:641
+#: ../src/empathy.c:645
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3012,11 +2958,11 @@ msgstr ""
 "給： Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, "
 "Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "GNOME 的即時訊息用戶端程式"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "如對翻譯有任何意見，請送一封電子郵件給\n"
@@ -3058,35 +3004,36 @@ msgstr ""
 "號。"
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
+#: ../src/empathy-account-assistant.c:1274
 msgid "An error occurred"
 msgstr "發生錯誤"
 
-#: ../src/empathy-account-assistant.c:467
+#: ../src/empathy-account-assistant.c:469
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
 msgid "What kind of chat account do you have?"
 msgstr "您的聊天帳號是哪一種？"
 
-#: ../src/empathy-account-assistant.c:473
+#: ../src/empathy-account-assistant.c:475
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "您還想要設定其他的聊天帳號嗎？"
 
-#: ../src/empathy-account-assistant.c:479
+#: ../src/empathy-account-assistant.c:481
 msgid "Enter your account details"
 msgstr "請輸入您的帳號詳細資料"
 
-#: ../src/empathy-account-assistant.c:484
+#: ../src/empathy-account-assistant.c:486
 msgid "What kind of chat account do you want to create?"
 msgstr "您想要建立何種聊天帳號？"
 
-#: ../src/empathy-account-assistant.c:490
+#: ../src/empathy-account-assistant.c:492
 msgid "Do you want to create other chat accounts?"
 msgstr "是否想要建立其他聊天帳號？"
 
-#: ../src/empathy-account-assistant.c:497
+#: ../src/empathy-account-assistant.c:499
 msgid "Enter the details for the new account"
 msgstr "請輸入新帳號的詳細資料"
 
-#: ../src/empathy-account-assistant.c:612
+#: ../src/empathy-account-assistant.c:614
 msgid ""
 "With Empathy you can chat with people online nearby and with friends and "
 "colleagues who use Google Talk, AIM, Windows Live and many other chat "
@@ -3097,41 +3044,41 @@ msgstr ""
 "Live 等其他聊天程式的朋友和同事聊天。利用麥克風或網路攝影機還可以進行語音或視"
 "訊通話。"
 
-#: ../src/empathy-account-assistant.c:629
+#: ../src/empathy-account-assistant.c:631
 msgid "Do you have an account you've been using with another chat program?"
 msgstr "您是否有使用其他聊天程式的帳號？"
 
-#: ../src/empathy-account-assistant.c:652
+#: ../src/empathy-account-assistant.c:655
 msgid "Yes, import my account details from "
 msgstr "是的，請匯入我的帳號詳細資料於"
 
-#: ../src/empathy-account-assistant.c:673
+#: ../src/empathy-account-assistant.c:676
 msgid "Yes, I'll enter my account details now"
 msgstr "是的，我現在要輸入帳號的詳細資料"
 
-#: ../src/empathy-account-assistant.c:695
+#: ../src/empathy-account-assistant.c:698
 msgid "No, I want a new account"
 msgstr "不，我想要新的帳號"
 
-#: ../src/empathy-account-assistant.c:705
+#: ../src/empathy-account-assistant.c:708
 msgid "No, I just want to see people online nearby for now"
 msgstr "不，我現在只想看看附近有誰上線"
 
-#: ../src/empathy-account-assistant.c:726
+#: ../src/empathy-account-assistant.c:729
 msgid "Select the accounts you want to import:"
 msgstr "選擇要匯入的帳號："
 
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
+#: ../src/empathy-account-assistant.c:816
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "Yes"
 msgstr "是"
 
-#: ../src/empathy-account-assistant.c:820
+#: ../src/empathy-account-assistant.c:823
 msgid "No, that's all for now"
 msgstr "不，目前就這樣"
 
-#: ../src/empathy-account-assistant.c:1085
+#: ../src/empathy-account-assistant.c:1088
 msgid ""
 "Empathy can automatically discover and chat with the people connected on the "
 "same network as you. If you want to use this feature, please check that the "
@@ -3142,16 +3089,16 @@ msgstr ""
 "用此功能，請檢查下列詳細資料是否正確。您也可以在以後簡單地變更這些細節，或是"
 "用「帳號」對話窗來停用此功能"
 
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
+#: ../src/empathy-account-assistant.c:1094
+#: ../src/empathy-account-assistant.c:1150
 msgid "Edit->Accounts"
 msgstr "編輯 -> 帳號"
 
-#: ../src/empathy-account-assistant.c:1107
+#: ../src/empathy-account-assistant.c:1110
 msgid "I do _not want to enable this feature for now"
 msgstr "我現在不想要啟用這項功能(_N)"
 
-#: ../src/empathy-account-assistant.c:1143
+#: ../src/empathy-account-assistant.c:1146
 msgid ""
 "You won't be able to chat with people connected to your local network, as "
 "telepathy-salut is not installed. If you want to enable this feature, please "
@@ -3162,85 +3109,93 @@ msgstr ""
 "啟用此功能，請安裝 telepathy-salut 套件，並從「帳號」對話窗建立「附近的人」帳"
 "號"
 
-#: ../src/empathy-account-assistant.c:1149
+#: ../src/empathy-account-assistant.c:1152
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut 尚未安裝"
 
-#: ../src/empathy-account-assistant.c:1195
+#: ../src/empathy-account-assistant.c:1198
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "訊息與 VoIP 帳號助理"
 
-#: ../src/empathy-account-assistant.c:1229
+#: ../src/empathy-account-assistant.c:1232
 msgid "Welcome to Empathy"
 msgstr "歡迎使用 Empathy"
 
-#: ../src/empathy-account-assistant.c:1238
+#: ../src/empathy-account-assistant.c:1241
 msgid "Import your existing accounts"
 msgstr "匯入現有的帳號"
 
-#: ../src/empathy-account-assistant.c:1256
+#: ../src/empathy-account-assistant.c:1259
 msgid "Please enter personal details"
 msgstr "請輸入個人詳細資料"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:69
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "有與您的 %s 帳號相關的修改尚未儲存。"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:73
 msgid "Your new account has not been saved yet."
 msgstr "尚未儲存您的新帳號。"
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:755
-#: ../src/empathy-call-window.c:1326
+#: ../src/empathy-accounts-dialog.c:352
+#: ../src/empathy-streamed-media-window.c:757
+#: ../src/empathy-call-window.c:1325
 msgid "Connecting…"
 msgstr "連線中…"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:393
 #, c-format
 msgid "Offline — %s"
 msgstr "離線 — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:405
 #, c-format
 msgid "Disconnected — %s"
 msgstr "已斷線 — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:416
 msgid "Offline — No Network Connection"
 msgstr "離線 — 無網路連線"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:423
 msgid "Unknown Status"
 msgstr "未知的狀態"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:435
 msgid "Offline — Account Disabled"
 msgstr "離線 — 帳號已停用"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"您即將建立新的帳號，這樣會放棄\n"
-"您所做的變更。確定要繼續？"
+#: ../src/empathy-accounts-dialog.c:538
+msgid "Edit Connection Parameters"
+msgstr "編輯連線參數"
+
+#: ../src/empathy-accounts-dialog.c:701
+msgid "Failed to retrieve your personal information from the server."
+msgstr "無法從伺服器擷取您的個人資訊。"
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:707
+msgid "Go online to edit your personal information."
+msgstr "上線以編輯您的個人資訊。"
+
+#: ../src/empathy-accounts-dialog.c:792
+msgid "_Edit Connection Parameters..."
+msgstr "編輯連線參數(_E)..."
+
+#: ../src/empathy-accounts-dialog.c:1293
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "是否想要從您的電腦上移除群組 %s？"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1297
 msgid "This will not remove your account on the server."
 msgstr "這不會移除伺服器上的您的帳號。"
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1533
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3249,15 +3204,15 @@ msgstr ""
 "您所做的變更。確定要繼續？"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1744
 msgid "_Enable"
 msgstr "啟用(_E)"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1745
 msgid "_Disable"
 msgstr "停用(_D)"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2255
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3291,11 +3246,11 @@ msgstr "要加入新的帳號，您必須先安裝每個會用到的通訊協定
 msgid "_Import…"
 msgstr "匯入(_I)…"
 
-#: ../src/empathy-auth-client.c:251
+#: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
 msgstr "- Empathy 認證用戶端"
 
-#: ../src/empathy-auth-client.c:267
+#: ../src/empathy-auth-client.c:302
 msgid "Empathy authentication client"
 msgstr "Empathy 認證用戶端"
 
@@ -3311,137 +3266,137 @@ msgstr "- Empathy 音訊視訊用戶端"
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy 音訊視訊用戶端"
 
-#: ../src/empathy-streamed-media-window.c:432
+#: ../src/empathy-streamed-media-window.c:433
 msgid "Contrast"
 msgstr "對比"
 
-#: ../src/empathy-streamed-media-window.c:435
+#: ../src/empathy-streamed-media-window.c:436
 msgid "Brightness"
 msgstr "亮度"
 
-#: ../src/empathy-streamed-media-window.c:438
+#: ../src/empathy-streamed-media-window.c:439
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:543
+#: ../src/empathy-streamed-media-window.c:545
 msgid "Volume"
 msgstr "音量"
 
-#: ../src/empathy-streamed-media-window.c:1094
+#: ../src/empathy-streamed-media-window.c:1097
 msgid "_Sidebar"
 msgstr "側邊欄(_S)"
 
-#: ../src/empathy-streamed-media-window.c:1114
+#: ../src/empathy-streamed-media-window.c:1117
 msgid "Audio input"
 msgstr "音效輸入"
 
-#: ../src/empathy-streamed-media-window.c:1118
+#: ../src/empathy-streamed-media-window.c:1121
 msgid "Video input"
 msgstr "視訊輸入"
 
-#: ../src/empathy-streamed-media-window.c:1126
+#: ../src/empathy-streamed-media-window.c:1129
 msgid "Dialpad"
 msgstr "播號盤"
 
-#: ../src/empathy-streamed-media-window.c:1137
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Details"
 msgstr "詳細資料"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1206
-#: ../src/empathy-call-window.c:1932
+#: ../src/empathy-streamed-media-window.c:1209
+#: ../src/empathy-call-window.c:1927
 #, c-format
 msgid "Call with %s"
 msgstr "與 %s 通話中"
 
-#: ../src/empathy-streamed-media-window.c:1439
-#: ../src/empathy-call-window.c:2176
+#: ../src/empathy-streamed-media-window.c:1442
+#: ../src/empathy-call-window.c:2171
 msgid "The IP address as seen by the machine"
 msgstr "機器看見的 IP 位址"
 
-#: ../src/empathy-streamed-media-window.c:1441
-#: ../src/empathy-call-window.c:2178
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2173
 msgid "The IP address as seen by a server on the Internet"
 msgstr "網際網路上的伺服器看見的 IP 位址"
 
-#: ../src/empathy-streamed-media-window.c:1443
-#: ../src/empathy-call-window.c:2180
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2175
 msgid "The IP address of the peer as seen by the other side"
 msgstr "其他端看見的點的 IP 位址"
 
-#: ../src/empathy-streamed-media-window.c:1445
-#: ../src/empathy-call-window.c:2182
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2177
 msgid "The IP address of a relay server"
 msgstr "中繼伺服器的 IP 位址"
 
-#: ../src/empathy-streamed-media-window.c:1447
-#: ../src/empathy-call-window.c:2184
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2179
 msgid "The IP address of the multicast group"
 msgstr "多點廣播群組的 IP 位址"
 
-#: ../src/empathy-streamed-media-window.c:1835
 #: ../src/empathy-streamed-media-window.c:1838
 #: ../src/empathy-streamed-media-window.c:1841
 #: ../src/empathy-streamed-media-window.c:1844
+#: ../src/empathy-streamed-media-window.c:1847
 msgctxt "codec"
 msgid "Unknown"
 msgstr "未知"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2136
+#: ../src/empathy-streamed-media-window.c:2139
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "已連線 — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2197
-#: ../src/empathy-call-window.c:3045
+#: ../src/empathy-streamed-media-window.c:2200
+#: ../src/empathy-call-window.c:3033
 msgid "Technical Details"
 msgstr "技術細節"
 
-#: ../src/empathy-streamed-media-window.c:2235
-#: ../src/empathy-call-window.c:3084
+#: ../src/empathy-streamed-media-window.c:2238
+#: ../src/empathy-call-window.c:3072
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr "%s 的軟體不瞭解任何您電腦上所支援的音訊格式"
 
-#: ../src/empathy-streamed-media-window.c:2240
-#: ../src/empathy-call-window.c:3089
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:3077
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr "%s 的軟體不瞭解任何您電腦上所支援的視訊格式"
 
-#: ../src/empathy-streamed-media-window.c:2246
-#: ../src/empathy-call-window.c:3095
+#: ../src/empathy-streamed-media-window.c:2249
+#: ../src/empathy-call-window.c:3083
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
 "does not allow direct connections."
 msgstr "無法和 %s 建立連線。您們其中之一可能在一個不允許直接連線的網路之上。"
 
-#: ../src/empathy-streamed-media-window.c:2252
-#: ../src/empathy-call-window.c:3101
+#: ../src/empathy-streamed-media-window.c:2255
+#: ../src/empathy-call-window.c:3089
 msgid "There was a failure on the network"
 msgstr "這個網路上有錯誤發生"
 
-#: ../src/empathy-streamed-media-window.c:2256
-#: ../src/empathy-call-window.c:3105
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3093
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "此通話所必要的音訊格式尚未在您的電腦上安裝"
 
-#: ../src/empathy-streamed-media-window.c:2259
-#: ../src/empathy-call-window.c:3108
+#: ../src/empathy-streamed-media-window.c:2262
+#: ../src/empathy-call-window.c:3096
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "此通話所必要的視訊格式尚未在您的電腦上安裝"
 
-#: ../src/empathy-streamed-media-window.c:2269
-#: ../src/empathy-call-window.c:3120
+#: ../src/empathy-streamed-media-window.c:2272
+#: ../src/empathy-call-window.c:3108
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3451,23 +3406,23 @@ msgstr ""
 "在 Telepathy 元件中發生未預期的狀況。請<a href=\"%s\">回報這個錯誤</a>並附上"
 "從求助選單內的「除錯」視窗中所收集的紀錄。"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:3129
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3117
 msgid "There was a failure in the call engine"
 msgstr "通話引擎內有錯誤發生"
 
-#: ../src/empathy-streamed-media-window.c:2280
-#: ../src/empathy-call-window.c:3132
+#: ../src/empathy-streamed-media-window.c:2283
+#: ../src/empathy-call-window.c:3120
 msgid "The end of the stream was reached"
 msgstr "已達串流末端"
 
-#: ../src/empathy-streamed-media-window.c:2320
-#: ../src/empathy-call-window.c:3172
+#: ../src/empathy-streamed-media-window.c:2323
+#: ../src/empathy-call-window.c:3160
 msgid "Can't establish audio stream"
 msgstr "無法建立音訊串流"
 
-#: ../src/empathy-streamed-media-window.c:2330
-#: ../src/empathy-call-window.c:3182
+#: ../src/empathy-streamed-media-window.c:2333
+#: ../src/empathy-call-window.c:3170
 msgid "Can't establish video stream"
 msgstr "無法建立視訊串流"
 
@@ -3558,8 +3513,8 @@ msgstr "切換視訊傳播"
 
 #: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2584 ../src/empathy-call-window.c:2585
-#: ../src/empathy-call-window.c:2586 ../src/empathy-call-window.c:2587
+#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581
+#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583
 msgid "Unknown"
 msgstr "不明"
 
@@ -3577,17 +3532,17 @@ msgid "_Camera"
 msgstr "攝影機(_C)"
 
 #: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "_Contents"
 msgstr "內容(_C)"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "_Debug"
 msgstr "偵錯(_D)"
 
 #: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Help"
 msgstr "求助(_H)"
 
@@ -3600,7 +3555,7 @@ msgid "_Settings"
 msgstr "設定值(_S)"
 
 #: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-roster-window-menubar.ui.h:30
 #: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "檢視(_V)"
@@ -3719,96 +3674,96 @@ msgstr "自動連線"
 msgid "Manage Favorite Rooms"
 msgstr "管理喜好的聊天室"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:523
 msgid "Incoming video call"
 msgstr "傳入的視訊通話"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1556
+#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555
 msgid "Incoming call"
 msgstr "來電"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s 要與您進行視訊通話。您是否要接聽？"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:528
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s 要與您進行通話。您是否要接聽？"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1562
+#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732
+#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s 的來電"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:556
 msgid "_Reject"
 msgstr "拒絕(_R)"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572
 msgid "_Answer"
 msgstr "接聽(_A)"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:572
 msgid "_Answer with video"
 msgstr "以視訊接聽(_A)"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1562
+#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765
+#: ../src/empathy-call-window.c:1561
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "來自 %s 的視訊通話"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:838
 msgid "Room invitation"
 msgstr "聊天室邀請"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:840
 #, c-format
 msgid "Invitation to join %s"
 msgstr "邀請參加 %s"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:847
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s 正在邀請您參加 %s"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:855
 msgid "_Decline"
 msgstr "拒絕(_D)"
 
-#: ../src/empathy-event-manager.c:858
+#: ../src/empathy-event-manager.c:860
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "參加(_J)"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:887
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s 曾邀請您參加 %s"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:893
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "您被邀請參加 %s"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:944
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "收到來自 %s 的檔案傳輸"
 
-#: ../src/empathy-event-manager.c:1145 ../src/empathy-main-window.c:378
+#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:371
 msgid "Password required"
 msgstr "需要密碼"
 
-#: ../src/empathy-event-manager.c:1210
+#: ../src/empathy-event-manager.c:1217
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s 想要得到查看您是否上線的許可"
 
-#: ../src/empathy-event-manager.c:1214
+#: ../src/empathy-event-manager.c:1223
 #, c-format
 msgid ""
 "\n"
@@ -3818,105 +3773,105 @@ msgstr ""
 "訊息：%s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "不明"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s / %s 於 %s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s / %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "正在接收 %2$s 送出的「%1$s」"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "正在傳送「%s」給 %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "從 %2$s 接收「%1$s」時發生錯誤"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "接收檔案時發生錯誤"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "傳送「%s」給 %s 時發生錯誤"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "傳送檔案時發生錯誤"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "「%s」接收自 %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "「%s」傳送給 %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "檔案傳輸完畢"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "正在等待其他參與者的回應"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "正在檢查檔案「%s」的完整性"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "正在計算「%s」雜湊值"
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "檔案"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "剩餘"
 
@@ -3939,161 +3894,162 @@ msgid "Import Accounts"
 msgstr "匯入帳號"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:315
 msgid "Import"
 msgstr "匯入"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:324
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:348
 msgid "Source"
 msgstr "來源"
 
-#: ../src/empathy-main-window.c:395
+#: ../src/empathy-roster-window.c:388
 msgid "Provide Password"
 msgstr "提供密碼"
 
-#: ../src/empathy-main-window.c:401
+#: ../src/empathy-roster-window.c:394
 msgid "Disconnect"
 msgstr "斷線"
 
-#: ../src/empathy-main-window.c:638
+#: ../src/empathy-roster-window.c:626
 msgid "No match found"
 msgstr "找不到符合項目"
 
-#: ../src/empathy-main-window.c:746
+#: ../src/empathy-roster-window.c:733
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr "很抱歉，%s 帳號無法使用，除非您的 %s 軟體已更新。"
 
-#: ../src/empathy-main-window.c:814
+#: ../src/empathy-roster-window.c:799
 msgid "Update software..."
 msgstr "更新軟體..."
 
-#: ../src/empathy-main-window.c:820 ../src/empathy-main-window.c:941
+#: ../src/empathy-roster-window.c:805 ../src/empathy-roster-window.c:922
 msgid "Close"
 msgstr "關閉"
 
-#: ../src/empathy-main-window.c:929
+#: ../src/empathy-roster-window.c:910
 msgid "Reconnect"
 msgstr "重新連接"
 
-#: ../src/empathy-main-window.c:935
+#: ../src/empathy-roster-window.c:916
 msgid "Edit Account"
 msgstr "編輯帳號"
 
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:1074
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1060
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "加值 %s (%s)..."
 
-#: ../src/empathy-main-window.c:1121
+#: ../src/empathy-roster-window.c:1106
 msgid "Top up account credit"
 msgstr "加值帳號存額"
 
 #. top up button
-#: ../src/empathy-main-window.c:1192
+#: ../src/empathy-roster-window.c:1178
 msgid "Top Up..."
 msgstr "加值..."
 
-#: ../src/empathy-main-window.c:1935
+#: ../src/empathy-roster-window.c:1901
 msgid "Contact"
 msgstr "連絡人"
 
-#: ../src/empathy-main-window.c:2310
+#: ../src/empathy-roster-window.c:2296
 msgid "Contact List"
 msgstr "連絡人清單"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
+#: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "連絡人地圖(_M)"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
+#: ../src/empathy-roster-window-menubar.ui.h:2
 msgid "Credit Balance"
 msgstr "儲值餘額"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
+#: ../src/empathy-roster-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "於連絡人清單內尋找(_L)"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
+#: ../src/empathy-roster-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "參加喜好聊天室(_F)"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
+#: ../src/empathy-roster-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "管理喜好"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
+#: ../src/empathy-roster-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "正常大小(_O)"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-roster-window-menubar.ui.h:7
+#: ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "新增通話(_C)…"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
+#: ../src/empathy-roster-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "正常大小與大頭貼(_A)"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "偏好設定(_R)"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
+#: ../src/empathy-roster-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "顯示協定(_R)"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "依名稱排序(_N)"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "依狀態排序(_S)"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
+#: ../src/empathy-roster-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "帳號(_A)"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "被封鎖的聯絡人"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "精簡大小(_C)"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
+#: ../src/empathy-roster-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "檔案傳輸(_F)"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "參加(_J)…"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-roster-window-menubar.ui.h:24
 #: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "新增談話(_N)…"
 
-#: ../src/empathy-main-window-menubar.ui.h:25
+#: ../src/empathy-roster-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "離線連絡人(_O)"
 
-#: ../src/empathy-main-window-menubar.ui.h:26
+#: ../src/empathy-roster-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "個人資訊(_P)"
 
-#: ../src/empathy-main-window-menubar.ui.h:28
+#: ../src/empathy-roster-window-menubar.ui.h:28
 msgid "_Room"
 msgstr "聊天室(_R)"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
+#: ../src/empathy-roster-window-menubar.ui.h:29
 msgid "_Search for Contacts…"
 msgstr "搜尋聯絡人(_S)…"
 
@@ -4107,7 +4063,7 @@ msgstr "成員"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:623
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4120,16 +4076,16 @@ msgstr ""
 "需要密碼：%s\n"
 "成員：%s"
 
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "否"
 
-#: ../src/empathy-new-chatroom-dialog.c:654
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "無法開始列出聊天室清單"
 
-#: ../src/empathy-new-chatroom-dialog.c:664
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "無法停止列出聊天室清單"
 
@@ -4161,79 +4117,79 @@ msgstr "聊天室清單"
 msgid "_Room:"
 msgstr "聊天室(_R)："
 
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "訊息已收到"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "訊息已送出"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "新增談話"
 
-#: ../src/empathy-preferences.c:172
+#: ../src/empathy-preferences.c:169
 msgid "Contact goes online"
 msgstr "連絡人上線"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "連絡人離線"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "帳號已連線"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "帳號已斷線"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "語言"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:725
 msgid "Juliet"
 msgstr "祝英台"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:732
 msgid "Romeo"
 msgstr "梁山伯"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:738
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "白玉環與蝴蝶墜，為何不能夫妻配？"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:741
 msgid "Deny thy father and refuse thy name;"
 msgstr "豈知你我自作主，無人當它是聘媒。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:744
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "豈知好事成虛話，棒打鴛鴦兩離分。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:747
 msgid "And I'll no longer be a Capulet."
 msgstr "爹爹許了馬家婚，心已碎，意難伸。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:750
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "將來有命終相見，無命今生不相逄。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:753
 msgid "Juliet has disconnected"
 msgstr "祝英台已斷線"
 
-#: ../src/empathy-preferences.c:1175
+#: ../src/empathy-preferences.c:1157
 msgid "Preferences"
 msgstr "偏好設定"
 
@@ -4292,35 +4248,27 @@ msgstr "為語言啟用拼字檢查："
 msgid "General"
 msgstr "一般"
 
-#: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "輸入等級："
-
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "輸入音量："
-
-#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "位置來源："
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:17
 msgid "Log conversations"
 msgstr "紀錄談話"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:18
 msgid "Notifications"
 msgstr "通知"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:19
 msgid "Play sound for events"
 msgstr "播放事件音效"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:20
 msgid "Privacy"
 msgstr "隱私"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:21
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -4329,74 +4277,74 @@ msgstr ""
 "降低位置準確度意指除了您所在的城市、洲和國家會被公開之外，不會提供其他訊息。"
 "GPS 的座標準確度將會降為個位數。"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:22
 msgid "Show _smileys as images"
 msgstr "將表情符號以圖片顯示(_S)"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:23
 msgid "Show contact _list in rooms"
 msgstr "在聊天室顯示連絡人清單(_L)"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "音效"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:25
 msgid "Spell Checking"
 msgstr "拼字檢查"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:26
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "這裡的語言清單只反映出您已經安裝字典的語言。"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:27
 msgid "Themes"
 msgstr "佈景主題"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:28
 msgid "Use _echo cancellation to improve call quality"
 msgstr "使用回音消除來改善通話品質(_E)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:29
 msgid "Variant:"
 msgstr "樣式："
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:30
 msgid "_Automatically connect on startup"
 msgstr "啟動時自動連線(_A)"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Cellphone"
 msgstr "手機(_C)"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Enable bubble notifications"
 msgstr "啟用氣泡式通知(_E)"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable sound notifications"
 msgstr "啟用音效通知(_E)"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:34
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:35
 msgid "_Network (IP, Wi-Fi)"
 msgstr "網路 (IP, Wi-Fi)(_N)"
 
-#: ../src/empathy-preferences.ui.h:38
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Open new chats in separate windows"
 msgstr "在個別視窗開啟新的聊天(_O)"
 
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Publish location to my contacts"
 msgstr "對我的連絡人公開位置(_P)"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:41
+#: ../src/empathy-preferences.ui.h:39
 msgid "_Reduce location accuracy"
 msgstr "降低位置準確度(_R)"
 
@@ -4456,7 +4404,7 @@ msgstr "視訊開啟"
 msgid "Video Preview"
 msgstr "視訊預覽"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "連絡人地圖檢視"
 
@@ -4522,16 +4470,16 @@ msgid ""
 "extension."
 msgstr "選取的連線管理程式不支援遠端偵錯擴充功能。"
 
-#: ../src/empathy-invite-participant-dialog.c:197
-#: ../src/empathy-invite-participant-dialog.c:225
+#: ../src/empathy-invite-participant-dialog.c:200
+#: ../src/empathy-invite-participant-dialog.c:228
 msgid "Invite Participant"
 msgstr "邀請參與"
 
-#: ../src/empathy-invite-participant-dialog.c:198
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Choose a contact to invite into the conversation:"
 msgstr "選擇想要邀請進入談話的聯絡人："
 
-#: ../src/empathy-invite-participant-dialog.c:221
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite"
 msgstr "邀請"
 
@@ -4585,13 +4533,13 @@ msgid "Respond"
 msgstr "回應"
 
 #: ../src/empathy-notifications-approver.c:204
-#: ../src/empathy-call-window.c:1566
+#: ../src/empathy-call-window.c:1565
 msgid "Reject"
 msgstr "拒絕"
 
 #: ../src/empathy-notifications-approver.c:209
 #: ../src/empathy-notifications-approver.c:214
-#: ../src/empathy-call-window.c:1567
+#: ../src/empathy-call-window.c:1566
 msgid "Answer"
 msgstr "接聽"
 
@@ -4623,38 +4571,38 @@ msgstr "%s 剛剛播打給您，但您正與他人通話。"
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1173 ../src/empathy-call-window.c:1196
+#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195
 msgid "i"
 msgstr "訊"
 
-#: ../src/empathy-call-window.c:2941
+#: ../src/empathy-call-window.c:2929
 msgid "On hold"
 msgstr "保留"
 
-#: ../src/empathy-call-window.c:2944
+#: ../src/empathy-call-window.c:2932
 msgid "Mute"
 msgstr "靜音"
 
-#: ../src/empathy-call-window.c:2946
+#: ../src/empathy-call-window.c:2934
 msgid "Duration"
 msgstr "時間"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2949
+#: ../src/empathy-call-window.c:2937
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:3219
+#: ../src/empathy-call-window.c:3207
 #, c-format
 msgid "Your current balance is %s."
 msgstr "您目前的餘額為 %s。"
 
-#: ../src/empathy-call-window.c:3223
+#: ../src/empathy-call-window.c:3211
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "很抱歉，您的存額不足以進行該通話。"
 
-#: ../src/empathy-call-window.c:3225
+#: ../src/empathy-call-window.c:3213
 msgid "Top Up"
 msgstr "加值"
 
@@ -4662,6 +4610,54 @@ msgstr "加值"
 msgid "_Match case"
 msgstr "比對大小寫(_M)"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "新增帳號"
+
+#~ msgid "Call volume"
+#~ msgstr "通話音量"
+
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "通話音量，為百分比。"
+
+#~ msgid "Socket type not supported"
+#~ msgstr "Socket 類型不支援"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "我的網路帳號"
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "%s 帳號已透過 %s 修改。"
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "%s 帳號無法於 Empathy 內修改。"
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "啟動我的網路帳號"
+
+#~ msgid "Edit %s"
+#~ msgstr "編輯 %s"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "取消(_N)"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "編輯(_E)"
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "您即將建立新的帳號，這樣會放棄\n"
+#~ "您所做的變更。確定要繼續？"
+
+#~ msgid "Input level:"
+#~ msgstr "輸入等級："
+
+#~ msgid "Input volume:"
+#~ msgstr "輸入音量："
+
 #~ msgid "Empathy has migrated butterfly logs"
 #~ msgstr "Empathy 已轉移 butterfly 日誌"
 
diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c
index 629363a06..f45474cf2 100644
--- a/src/empathy-roster-window.c
+++ b/src/empathy-roster-window.c
@@ -1294,9 +1294,6 @@ roster_window_connection_changed_cb (TpAccount  *account,
     {
       empathy_sound_manager_play (self->priv->sound_mgr, GTK_WIDGET (self),
               EMPATHY_SOUND_ACCOUNT_DISCONNECTED);
-
-      /* remove balance action if required */
-      roster_window_remove_balance_action (self, account);
     }
 
   if (current == TP_CONNECTION_STATUS_CONNECTED)
@@ -1306,7 +1303,6 @@ roster_window_connection_changed_cb (TpAccount  *account,
 
       /* Account connected without error, remove error message if any */
       roster_window_remove_error (self, account);
-      roster_window_setup_balance (self, account);
     }
 }
 
@@ -2053,30 +2049,62 @@ roster_window_account_removed_cb (TpAccountManager  *manager,
 }
 
 static void
+account_connection_notify_cb (TpAccount *account,
+    GParamSpec *spec,
+    EmpathyRosterWindow *self)
+{
+  TpConnection *conn;
+
+  conn = tp_account_get_connection (account);
+
+  if (conn != NULL)
+    {
+      roster_window_setup_balance (self, account);
+    }
+  else
+    {
+      /* remove balance action if required */
+      roster_window_remove_balance_action (self, account);
+    }
+}
+
+static void
+add_account (EmpathyRosterWindow *self,
+    TpAccount *account)
+{
+  gulong handler_id;
+
+  handler_id = GPOINTER_TO_UINT (g_hash_table_lookup (
+    self->priv->status_changed_handlers, account));
+
+  /* connect signal only if it was not connected yet */
+  if (handler_id != 0)
+    return;
+
+  handler_id = g_signal_connect (account, "status-changed",
+    G_CALLBACK (roster_window_connection_changed_cb), self);
+
+  g_hash_table_insert (self->priv->status_changed_handlers,
+    account, GUINT_TO_POINTER (handler_id));
+
+  /* roster_window_setup_balance() relies on the TpConnection to be ready on
+   * the TpAccount so we connect this signal as well. */
+  tp_g_signal_connect_object (account, "notify::connection",
+      G_CALLBACK (account_connection_notify_cb), self, 0);
+
+  roster_window_setup_balance (self, account);
+}
+
+static void
 roster_window_account_validity_changed_cb (TpAccountManager  *manager,
     TpAccount *account,
     gboolean valid,
     EmpathyRosterWindow *self)
 {
   if (valid)
-    {
-      gulong handler_id;
-      handler_id = GPOINTER_TO_UINT (g_hash_table_lookup (
-        self->priv->status_changed_handlers, account));
-
-      /* connect signal only if it was not connected yet */
-      if (handler_id == 0)
-        {
-          handler_id = g_signal_connect (account,
-            "status-changed",
-            G_CALLBACK (roster_window_connection_changed_cb),
-            self);
-          g_hash_table_insert (self->priv->status_changed_handlers,
-            account, GUINT_TO_POINTER (handler_id));
-        }
-    }
-
-  roster_window_account_removed_cb (manager, account, self);
+    add_account (self, account);
+  else
+    roster_window_account_removed_cb (manager, account, self);
 }
 
 static void
@@ -2137,15 +2165,8 @@ account_manager_prepared_cb (GObject *source_object,
   for (j = accounts; j != NULL; j = j->next)
     {
       TpAccount *account = TP_ACCOUNT (j->data);
-      gulong handler_id;
 
-      handler_id = g_signal_connect (account, "status-changed",
-          G_CALLBACK (roster_window_connection_changed_cb),
-          self);
-      g_hash_table_insert (self->priv->status_changed_handlers,
-          account, GUINT_TO_POINTER (handler_id));
-
-      roster_window_setup_balance (self, account);
+      add_account (self, account);
     }
 
   g_signal_connect (manager, "account-validity-changed",