Updated Galician translations

1 files changed, 1324 insertions, 1329 deletions

diff --git a/help/gl/gl.po b/help/gl/gl.po
index 1f95bc2fd..2b0680790 100644
--- a/help/gl/gl.po
+++ b/help/gl/gl.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy.help.master\n"
-"POT-Creation-Date: 2010-07-14 20:40+0200\n"
-"PO-Revision-Date: 2010-07-25 16:24+0200\n"
+"POT-Creation-Date: 2010-07-25 16:31+0200\n"
+"PO-Revision-Date: 2010-07-27 01:09+0200\n"
 "Last-Translator: Fran Diéguez <frandieguez@ubuntu.com>\n"
 "Language-Team: Galician <gnome-gl-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -13,86 +13,89 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: ../C/video-call.page:10(desc)
+#. 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:45(None) C/video-call.page:63(None)
+#: C/audio-video.page:70(None) C/audio-call.page:65(None)
+msgid "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
+msgstr ""
+"@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
+
+#: C/video-call.page:10(desc)
 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/share-desktop.page:13(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/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-join-room.page:16(name) ../C/irc-join-pwd.page:17(name)
-#: ../C/irc-commands.page:10(name) ../C/introduction.page:13(name)
-#: ../C/index.page:18(name) ../C/import-account.page:23(name)
-#: ../C/hide-contacts.page:11(name) ../C/group-conversations.page:19(name)
-#: ../C/geolocation-what-is.page:18(name) ../C/geolocation-turn.page:18(name)
-#: ../C/geolocation-supported.page:16(name)
-#: ../C/geolocation-privacy.page:17(name) ../C/geolocation.page:17(name)
-#: ../C/geolocation-not-showing.page:17(name)
-#: ../C/favorite-rooms.page:14(name) ../C/disable-account.page:20(name)
-#: ../C/create-account.page:18(name) ../C/audio-video.page:17(name)
-#: ../C/audio-call.page:18(name) ../C/add-account.page:20(name)
+#: C/video-call.page:21(name) C/status-icons.page:16(name)
+#: C/share-desktop.page:13(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/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-join-room.page:16(name) C/irc-join-pwd.page:17(name)
+#: C/irc-commands.page:10(name) C/introduction.page:13(name)
+#: C/index.page:18(name) C/import-account.page:23(name)
+#: C/hide-contacts.page:11(name) C/group-conversations.page:19(name)
+#: C/geolocation-what-is.page:18(name) C/geolocation-turn.page:18(name)
+#: C/geolocation-supported.page:16(name) C/geolocation-privacy.page:17(name)
+#: C/geolocation.page:17(name) C/geolocation-not-showing.page:17(name)
+#: C/favorite-rooms.page:14(name) C/disable-account.page:20(name)
+#: C/create-account.page:18(name) C/audio-video.page:17(name)
+#: C/audio-call.page:18(name) C/add-account.page:20(name)
 msgid "Milo Casagrande"
 msgstr "Milo Casagrande"
 
-#: ../C/video-call.page:22(email) ../C/status-icons.page:17(email)
-#: ../C/share-desktop.page:14(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/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-join-room.page:17(email)
-#: ../C/irc-join-pwd.page:18(email) ../C/irc-commands.page:11(email)
-#: ../C/introduction.page:14(email) ../C/index.page:19(email)
-#: ../C/import-account.page:24(email) ../C/hide-contacts.page:12(email)
-#: ../C/group-conversations.page:20(email)
-#: ../C/geolocation-what-is.page:19(email)
-#: ../C/geolocation-turn.page:19(email)
-#: ../C/geolocation-supported.page:17(email)
-#: ../C/geolocation-privacy.page:18(email) ../C/geolocation.page:18(email)
-#: ../C/geolocation-not-showing.page:18(email)
-#: ../C/favorite-rooms.page:15(email) ../C/disable-account.page:21(email)
-#: ../C/create-account.page:19(email) ../C/audio-video.page:18(email)
-#: ../C/audio-call.page:19(email) ../C/add-account.page:21(email)
+#: C/video-call.page:22(email) C/status-icons.page:17(email)
+#: C/share-desktop.page:14(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/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-join-room.page:17(email) C/irc-join-pwd.page:18(email)
+#: C/irc-commands.page:11(email) C/introduction.page:14(email)
+#: C/index.page:19(email) C/import-account.page:24(email)
+#: C/hide-contacts.page:12(email) C/group-conversations.page:20(email)
+#: C/geolocation-what-is.page:19(email) C/geolocation-turn.page:19(email)
+#: C/geolocation-supported.page:17(email) C/geolocation-privacy.page:18(email)
+#: C/geolocation.page:18(email) C/geolocation-not-showing.page:18(email)
+#: C/favorite-rooms.page:15(email) C/disable-account.page:21(email)
+#: C/create-account.page:19(email) C/audio-video.page:18(email)
+#: C/audio-call.page:19(email) C/add-account.page:21(email)
 msgid "milo@ubuntu.com"
 msgstr "milo@ubuntu.com"
 
-#: ../C/video-call.page:25(p) ../C/status-icons.page:24(p)
-#: ../C/share-desktop.page:17(p) ../C/set-custom-status.page:23(p)
-#: ../C/send-message.page:20(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/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-join-room.page:20(p) ../C/irc-join-pwd.page:21(p)
-#: ../C/irc-commands.page:14(p) ../C/introduction.page:17(p)
-#: ../C/index.page:22(p) ../C/import-account.page:31(p)
-#: ../C/hide-contacts.page:15(p) ../C/group-conversations.page:23(p)
-#: ../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.page:21(p) ../C/geolocation-not-showing.page:21(p)
-#: ../C/favorite-rooms.page:18(p) ../C/disable-account.page:28(p)
-#: ../C/create-account.page:22(p) ../C/change-status.page:23(p)
-#: ../C/audio-video.page:21(p) ../C/audio-call.page:22(p)
-#: ../C/add-contact.page:22(p) ../C/add-account.page:28(p)
-#: ../C/accounts-window.page:22(p) ../C/account-jabber.page:18(p)
-#: ../C/account-irc.page:20(p)
+#: C/video-call.page:25(p) C/status-icons.page:24(p)
+#: C/share-desktop.page:17(p) C/set-custom-status.page:23(p)
+#: C/send-message.page:20(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/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-join-room.page:20(p) C/irc-join-pwd.page:21(p)
+#: C/irc-commands.page:14(p) C/introduction.page:17(p) C/index.page:22(p)
+#: C/import-account.page:31(p) C/hide-contacts.page:15(p)
+#: C/group-conversations.page:23(p) 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.page:21(p)
+#: C/geolocation-not-showing.page:21(p) C/favorite-rooms.page:18(p)
+#: C/disable-account.page:28(p) C/create-account.page:22(p)
+#: C/change-status.page:23(p) C/audio-video.page:21(p) C/audio-call.page:22(p)
+#: C/add-contact.page:22(p) C/add-account.page:28(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:35(title)
+#: C/video-call.page:35(title)
 msgid "Start a video conversation"
 msgstr "Comezar unha conversa de vídeo"
 
-#: ../C/video-call.page:37(p)
+#: C/video-call.page:37(p)
 msgid ""
 "If you have a webcam, you can call your contacts and have an video "
 "conversation with them. This features only works with certain types of "
@@ -104,230 +107,181 @@ msgstr ""
 "só funcionarán con certos tipos de contas, e require que outra persoa teña "
 "un aplicativo que admita as videochamadas."
 
-#: ../C/video-call.page:44(gui) ../C/share-desktop.page:47(gui)
-#: ../C/set-custom-status.page:47(gui) ../C/set-custom-status.page:83(gui)
-#: ../C/set-custom-status.page:165(gui) ../C/send-message.page:36(gui)
-#: ../C/send-file.page:41(gui) ../C/remove-account.page:42(gui)
-#: ../C/prev-conv.page:67(gui) ../C/prev-conv.page:96(gui)
-#: ../C/prev-conv.page:122(gui) ../C/irc-nick-password.page:50(gui)
-#: ../C/irc-join-room.page:40(gui) ../C/hide-contacts.page:8(gui)
-#: ../C/hide-contacts.page:31(gui) ../C/group-conversations.page:59(gui)
-#: ../C/group-conversations.page:92(gui)
-#: ../C/group-conversations.page:123(gui) ../C/favorite-rooms.page:67(gui)
-#: ../C/favorite-rooms.page:102(gui) ../C/disable-account.page:48(gui)
-#: ../C/change-status.page:42(gui) ../C/audio-call.page:46(gui)
-#: ../C/add-account.page:48(gui)
-msgid "Contact List"
-msgstr "Lista de contactos"
-
-#: ../C/video-call.page:45(media) ../C/video-call.page:63(media)
-#: ../C/audio-call.page:65(media)
-msgid "video call"
-msgstr "vídeochamada"
-
-#: ../C/video-call.page:46(gui) ../C/video-call.page:47(gui)
-msgid "Video Call"
-msgstr "Vídeochamada"
-
-#: ../C/video-call.page:44(p) ../C/audio-call.page:46(p)
-msgid ""
-"From the <placeholder-1/> window, click the <placeholder-2/> icon next to "
-"the name of the contact you wish to call and choose <placeholder-3/>. "
-"Alternatively, right click the contact and choose <placeholder-4/>."
+#: C/video-call.page:44(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>. Alternatively, right click the contact and "
+"choose <gui style=\"menuitem\">Video Call</gui>."
 msgstr ""
 "Desde a xanela <placeholder-1/>, prema a icona <placeholder-2/> ao lado do "
 "nome do contacto ao que quere chamar e seleccione <placeholder-3/>. De forma "
 "alternativa, prema co botón dereito e seleccione <placeholder-4/>."
 
-#: ../C/video-call.page:51(gui) ../C/audio-call.page:53(gui)
-msgid "Connected"
-msgstr "Conectado"
-
-#: ../C/video-call.page:50(p) ../C/audio-call.page:52(p)
+#: C/video-call.page:50(p) C/audio-call.page:52(p)
 msgid ""
 "A new window will open. When the connection is established, you will see "
-"<placeholder-1/> at the bottom of the window, along with the total "
+"<gui>Connected</gui> at the bottom of the window, along with the total "
 "conversation time."
 msgstr ""
 "Abrirase unha nova xanela. Cando a conexión se estabeleza verá <placeholder-"
 "2/> na parte inferior da xanela, ao carón do tempo de conversa total."
 
-#: ../C/video-call.page:56(gui) ../C/audio-call.page:58(gui)
-msgid "Hang up"
-msgstr "Colgar"
-
-#: ../C/video-call.page:55(p) ../C/audio-call.page:57(p)
-msgid "To end the conversation, click on <placeholder-1/>."
+#: C/video-call.page:55(p) C/audio-call.page:57(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:62(gui) ../C/audio-video.page:130(p)
-#: ../C/audio-call.page:64(gui)
-msgid "Video"
-msgstr "Vídeo"
-
-#: ../C/video-call.page:62(gui)
-msgid "Video Off"
-msgstr "Vídeo desactivado"
-
-#: ../C/video-call.page:61(p)
+#: C/video-call.page:61(p)
 msgid ""
-"To turn a video conversation into an audio conversation, choose "
-"<guiseq><placeholder-1/><placeholder-2/></guiseq>, or click the <placeholder-"
-"3/> toolbar button to deselect it."
+"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=\"figures/camera-"
+"web.png\">video call</media> toolbar button to deselect it."
 msgstr ""
 "Para trocar unha conversa de vídeo nunha conversa de son, seleccione "
 "<guiseq><placeholder-1/><placeholder-2/></guiseq>, ou prema o botón da barra "
 "de ferramentas <placeholder-3/> para deseleccionalo.."
 
-#: ../C/status-icons.page:7(desc)
+#. 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/available.png'; md5=1952a8952efbe87e84b21e09e0587e71"
+msgstr "@@image: 'figures/available.png'; md5=1952a8952efbe87e84b21e09e0587e71"
+
+#. 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/busy.png'; md5=6cab57171fb6d732a85ace48f11cf207"
+msgstr "@@image: 'figures/busy.png'; md5=6cab57171fb6d732a85ace48f11cf207"
+
+#. 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:53(None)
+msgid "@@image: 'figures/away.png'; md5=9a93ccca527af39cbe11db5c9d915ca0"
+msgstr "@@image: 'figures/away.png'; md5=9a93ccca527af39cbe11db5c9d915ca0"
+
+#. 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/offline.png'; md5=565ba82fbedd22e4eb5b810750199527"
+msgstr "@@image: 'figures/offline.png'; md5=565ba82fbedd22e4eb5b810750199527"
+
+#: C/status-icons.page:7(desc)
 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/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)
 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/account-jabber.page:15(email) ../C/account-irc.page:17(email)
+#: 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/account-jabber.page:15(email) C/account-irc.page:17(email)
 msgid "shaunm@gnome.org"
 msgstr "shaunm@gnome.org"
 
-#: ../C/status-icons.page:35(title)
+#: C/status-icons.page:35(title)
 msgid "Status Types and Icons"
 msgstr "Tipos de estados e iconas"
 
-#: ../C/status-icons.page:39(media)
+#: C/status-icons.page:39(media)
 msgid "Available icon"
 msgstr "Icona de dispoñíbel"
 
-#: ../C/status-icons.page:40(gui) ../C/status-icons.page:41(em)
+#: C/status-icons.page:40(gui)
 msgid "Available"
 msgstr "Dispoñíbel"
 
-#: ../C/status-icons.page:41(p)
+#: C/status-icons.page:41(p)
 msgid ""
-"Use the <placeholder-1/> status when you are at your computer and able to "
+"Use the <em>Available</em> status when you are at your computer and able to "
 "chat with your contacts. You can set a custom message for this status."
 msgstr ""
-"Use o estado <placeholder-1/> cando está no seu computador e pode falar cos "
-"seus contactos. Vostede pode estabelecer unha mensaxe personalizada para "
+"Use o estado <em>Dispoñíbel</em> cando está no seu computador e pode falar "
+"cos seus contactos. Vostede pode estabelecer unha mensaxe personalizada para "
 "este estado."
 
-#: ../C/status-icons.page:45(media)
+#: C/status-icons.page:45(media)
 msgid "Busy icon"
 msgstr "Icona de ocupado"
 
-#: ../C/status-icons.page:46(gui) ../C/status-icons.page:47(em)
+#: C/status-icons.page:46(gui)
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../C/status-icons.page:49(app) ../C/status-icons.page:56(app)
-#: ../C/status-icons.page:58(app) ../C/share-desktop.page:85(app)
-#: ../C/set-custom-status.page:71(app) ../C/remove-account.page:8(app)
-#: ../C/remove-account.page:35(app) ../C/remove-account.page:37(app)
-#: ../C/remove-account.page:59(app) ../C/prob-conn-neterror.page:42(app)
-#: ../C/prob-conn-neterror.page:92(app) ../C/prev-conv.page:47(app)
-#: ../C/prev-conv.page:82(app) ../C/irc-start-conversation.page:46(app)
-#: ../C/irc-send-file.page:9(app) ../C/irc-nick-password.page:40(app)
-#: ../C/irc-nick-password.page:42(app) ../C/irc-nick-password.page:71(app)
-#: ../C/irc-manage.page:9(app) ../C/irc-manage.page:38(app)
-#: ../C/introduction.page:10(app) ../C/introduction.page:24(app)
-#: ../C/introduction.page:29(app) ../C/introduction.page:33(app)
-#: ../C/introduction.page:40(app) ../C/introduction.page:42(app)
-#: ../C/import-account.page:44(app) ../C/import-account.page:50(app)
-#: ../C/hide-contacts.page:22(app) ../C/group-conversations.page:141(app)
-#: ../C/geolocation-what-is.page:38(app) ../C/geolocation-turn.page:10(app)
-#: ../C/geolocation-supported.page:50(app)
-#: ../C/geolocation-privacy.page:73(app) ../C/geolocation.page:9(app)
-#: ../C/geolocation-not-showing.page:9(app)
-#: ../C/geolocation-not-showing.page:35(app) ../C/disable-account.page:9(app)
-#: ../C/disable-account.page:41(app) ../C/disable-account.page:44(app)
-#: ../C/create-account.page:36(app) ../C/create-account.page:37(app)
-#: ../C/create-account.page:43(app) ../C/create-account.page:72(app)
-#: ../C/create-account.page:102(app) ../C/create-account.page:113(app)
-#: ../C/create-account.page:128(app) ../C/change-status.page:37(app)
-#: ../C/add-account.page:9(app) ../C/add-account.page:42(app)
-#: ../C/account-jabber.page:47(app) ../C/account-jabber.page:50(app)
-#: ../C/account-jabber.page:63(app) ../C/account-jabber.page:71(app)
-#: ../C/account-irc.page:40(app) ../C/account-irc.page:48(app)
-#: ../C/account-irc.page:67(app) ../C/account-irc.page:99(app)
-#: ../C/account-irc.page:135(app)
-msgid "Empathy"
-msgstr "Empathy"
-
-#: ../C/status-icons.page:47(p)
-msgid ""
-"Use the <placeholder-1/> status to let your contacts know that you don’t "
-"want to chat right now. They can still contact you, for instance if they "
-"have something urgent they need to discuss. By default, <placeholder-2/> "
-"will not use notification bubbles and sounds when you are busy. You can set "
-"a custom message for this status."
-msgstr ""
-
-#: ../C/status-icons.page:53(media)
+#: C/status-icons.page:47(p)
+msgid ""
+"Use the <em>Busy</em> status to let your contacts know that you don’t want "
+"to chat right now. They can still contact you, for instance if they have "
+"something urgent they need to discuss. By default, <app>Empathy</app> will "
+"not use notification bubbles and sounds when you are busy. You can set a "
+"custom message for this status."
+msgstr ""
+
+#: C/status-icons.page:53(media)
 msgid "Away icon"
 msgstr "Icona de ausente"
 
-#: ../C/status-icons.page:54(gui) ../C/status-icons.page:55(em)
+#: C/status-icons.page:54(gui)
 msgid "Away"
 msgstr "Ausente"
 
-#: ../C/status-icons.page:55(p)
+#: C/status-icons.page:55(p)
 msgid ""
-"Use the <placeholder-1/> status when you are going away from your computer. "
-"<placeholder-2/> automatically sets your status to Away if you do not use "
+"Use the <em>Away</em> status when you are going away from your computer. "
+"<app>Empathy</app> automatically sets your status to Away if you do not use "
 "your computer for a while, or if your screensaver is on. By default, "
-"<placeholder-3/> will not use notification bubbles and sounds when you are "
+"<app>Empathy</app> will not use notification bubbles and sounds when you are "
 "away. You can set a custom message for this status."
 msgstr ""
 
-#: ../C/status-icons.page:62(media) ../C/status-icons.page:69(media)
+#: C/status-icons.page:62(media) C/status-icons.page:69(media)
 msgid "Offline icon"
 msgstr "Icona de desconectado"
 
-#: ../C/status-icons.page:63(gui) ../C/status-icons.page:64(em)
+#: C/status-icons.page:63(gui)
 msgid "Invisible"
 msgstr "Invisíbel"
 
-#: ../C/status-icons.page:64(p)
+#: C/status-icons.page:64(p)
 msgid ""
-"When you set your status to <placeholder-1/>, you will appear as offline to "
-"your contacts. You will still be connected to your accounts, and you still "
-"see your contacts’ statuses and start conversations with them."
+"When you set your status to <em>Invisible</em>, you will appear as offline "
+"to your contacts. You will still be connected to your accounts, and you "
+"still see your contacts’ statuses and start conversations with them."
 msgstr ""
-"Ao estabelecer o seu estado a <placeholder-1/>, aparecerá como desconectado "
+"Ao estabelecer o seu estado <em>Invisíbel</em>, aparecerá como desconectado "
 "para os seus contactos. Aínda así vostede estará conectado aos seus "
 "contactos e poderá ver os estados dos seus contactos e iniciar unha conversa "
 "con eles."
 
-#: ../C/status-icons.page:70(gui) ../C/status-icons.page:71(em)
+#: C/status-icons.page:70(gui)
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../C/status-icons.page:71(p)
+#: C/status-icons.page:71(p)
 msgid ""
-"Setting your status to <placeholder-1/> disconnects you from all of your "
+"Setting your status to <em>Offline</em> disconnects you from all of your "
 "accounts."
 msgstr ""
-"Estabelecer o seu estado a <placeholder-1/> desconectaralle de todas as súas "
-"contas."
+"Estabelecer o seu estado a <em>Desconectado</em> desconectaralle de todas as "
+"súas contas."
 
-#: ../C/share-desktop.page:7(desc)
+#: C/share-desktop.page:7(desc)
 msgid "Share the desktop with your contacts."
 msgstr "Compartir o escritorio cos seus contactos."
 
-#: ../C/share-desktop.page:28(title)
+#: C/share-desktop.page:28(title)
 msgid "Share your desktop"
 msgstr "Compartir o seu escritorio"
 
-#: ../C/share-desktop.page:30(p)
+#: 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 "
@@ -339,7 +293,7 @@ msgstr ""
 "mostrar o seu escritorio aos seus contactos, para pedirlle axuda ou axudar "
 "aos seus contactos a solucionar un problema."
 
-#: ../C/share-desktop.page:38(p)
+#: 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 "
@@ -349,42 +303,29 @@ msgstr ""
 "seus contactos é necesario ter un aplicativo de visión remota de escritorios "
 "instalada no seu sistema."
 
-#: ../C/share-desktop.page:46(p) ../C/send-message.page:35(p)
-#: ../C/send-file.page:40(p) ../C/favorite-rooms.page:66(p)
-msgid "From the <placeholder-1/> window, perform one of the following:"
+#: C/share-desktop.page:46(p) C/send-message.page:35(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:"
 msgstr ""
-"Desde a xanela <placeholder-1/> leve a cabo unha das seguintes opcións:"
-
-#: ../C/share-desktop.page:53(gui) ../C/send-file.page:51(gui)
-#: ../C/remove-account.page:42(gui) ../C/prob-conn-acctdisabled.page:49(gui)
-#: ../C/irc-nick-password.page:50(gui) ../C/group-conversations.page:103(gui)
-#: ../C/geolocation-turn.page:38(gui) ../C/disable-account.page:48(gui)
-#: ../C/add-account.page:48(gui) ../C/account-irc.page:109(media)
-msgid "Edit"
-msgstr "Editar"
-
-#: ../C/share-desktop.page:53(gui) ../C/send-file.page:52(gui)
-#: ../C/group-conversations.page:103(gui)
-msgid "Contact"
-msgstr "Contacto"
-
-#: ../C/share-desktop.page:53(gui) ../C/share-desktop.page:59(gui)
-msgid "Share my desktop"
-msgstr "Compartir o meu escritorio"
+"Desde a xanela <gui>Lista de contactos</gui> leve a cabo unha das seguintes "
+"opcións:"
 
-#: ../C/share-desktop.page:51(p)
+#: C/share-desktop.page:51(p)
 msgid ""
 "Select the contact you want to share your desktop with, and choose "
-"<guiseq><placeholder-1/><placeholder-2/><placeholder-3/></guiseq>."
+"<guiseq><gui>Edit</gui><gui>Contact</gui><gui>Share my desktop</gui></"
+"guiseq>."
 msgstr ""
 
-#: ../C/share-desktop.page:57(p)
+#: C/share-desktop.page:57(p)
 msgid ""
 "Right-click on the name of the contact you want to share your desktop with, "
-"and select <placeholder-1/>."
+"and select <gui>Share my desktop</gui>."
 msgstr ""
+"Prema co botón dereito sobre o nome do contacto co que quere manter unha "
+"conversa e seleccione <gui>Compartir o meu escritorio</gui>."
 
-#: ../C/share-desktop.page:65(p)
+#: 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 "
@@ -392,654 +333,563 @@ msgid ""
 "your desktop."
 msgstr ""
 
-#: ../C/share-desktop.page:70(p)
+#: C/share-desktop.page:70(p)
 msgid ""
 "For more information about how to use the remote desktop viewer application, "
 "refer to its help."
 msgstr ""
 
-#: ../C/share-desktop.page:77(p)
+#: C/share-desktop.page:77(p)
 msgid ""
 "When you share your desktop with someone else, it is possible to experience "
 "system performance slowdown and low Internet speed."
 msgstr ""
 
-#: ../C/share-desktop.page:83(p)
+#: 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 <placeholder-1/> and "
-"a remote desktop viewer application installed in their system."
+"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."
 msgstr ""
+"Para poder compartir o seu escritorio ou usar remotamente o escritorio dos "
+"seus contactos é necesario ter un aplicativo de visión remota de escritorios "
+"instalada no seu sistema."
 
-#: ../C/set-custom-status.page:9(desc)
+#: C/set-custom-status.page:9(desc)
 msgid "Add, edit or delete personal messages for your status."
 msgstr "Engadir, editar e borrar un mensaxe persoal para o seu estado."
 
-#: ../C/set-custom-status.page:15(name)
+#: C/set-custom-status.page:15(name)
 msgid "Jim Campbell"
 msgstr "Jim Campbell"
 
-#: ../C/set-custom-status.page:16(email)
+#: C/set-custom-status.page:16(email)
 msgid "jwcampbell@gmail.com"
 msgstr "jwcampbell@gmail.com"
 
-#: ../C/set-custom-status.page:34(title)
+#: C/set-custom-status.page:34(title)
 msgid "Set a custom message"
 msgstr "Estabelecer unha mensaxe personalizada"
 
-#: ../C/set-custom-status.page:36(p)
+#: C/set-custom-status.page:36(p)
 msgid ""
 "Sometimes you may want to set a custom message for your status, for example "
 "to let people know that you will be unavailable for a certain period of time."
 msgstr ""
 
-#: ../C/set-custom-status.page:40(p)
+#: C/set-custom-status.page:40(p)
 msgid ""
 "It is possible to set a custom message based on the different statuses "
 "available."
 msgstr ""
 
-#: ../C/set-custom-status.page:46(p) ../C/set-custom-status.page:82(p)
+#: C/set-custom-status.page:46(p) C/set-custom-status.page:82(p)
 msgid ""
-"From the <placeholder-1/> window, click on the drop-down list at the top."
+"From the <gui>Contact List</gui> window, click on the drop-down list at the "
+"top."
 msgstr ""
-"Desde a xanela <placeholder-1/>, prema na lista despregábel na parte "
-"superior."
-
-#: ../C/set-custom-status.page:54(gui)
-msgid "Custom Message"
-msgstr "Mensaxe personalizada"
+"Desde a xanela <gui>Lista de contactos</gui>, prema na lista despregábel na "
+"parte superior."
 
-#: ../C/set-custom-status.page:52(p)
+#: C/set-custom-status.page:52(p)
 msgid ""
 "Select the status you want to add a custom message to. You have to select "
-"the one identified with the label <placeholder-1/>."
+"the one identified with the label <gui>Custom Message</gui>."
 msgstr ""
 
-#: ../C/set-custom-status.page:60(key) ../C/set-custom-status.page:107(key)
-#: ../C/send-message.page:56(key) ../C/prev-conv.page:75(key)
-#: ../C/irc-commands.page:21(key) ../C/add-account.page:80(key)
-msgid "Enter"
-msgstr "Introducir"
-
-#: ../C/set-custom-status.page:58(p)
+#: C/set-custom-status.page:58(p)
 msgid ""
 "Enter your custom message in the text box at the top of the window, and "
-"press <placeholder-1/> to set the message."
+"press <key>Enter</key> to set the message."
 msgstr ""
 "Introduza a súa mensaxe personalizada na caixa de texto da parte superior da "
-"xanela e prema <placeholder-1/> para estabelecer a mensaxe."
+"xanela e prema <key>Intro</key> para estabelecer a mensaxe."
 
-#: ../C/set-custom-status.page:64(p)
+#: C/set-custom-status.page:64(p)
 msgid ""
 "If you want to set the custom message as a favorite, saving it in order to "
 "use it again, click on the little star on the right of the text box where "
 "you wrote your custom message."
 msgstr ""
 
-#: ../C/set-custom-status.page:69(p)
+#: C/set-custom-status.page:69(p)
 msgid ""
 "If you do not do it, the custom message will not be available the next time "
-"you use <placeholder-1/>. It will be saved only for the current session."
+"you use <app>Empathy</app>. It will be saved only for the current session."
 msgstr ""
 
-#: ../C/set-custom-status.page:78(title)
+#: C/set-custom-status.page:78(title)
 msgid "Edit, remove and add a custom message"
 msgstr ""
 
-#: ../C/set-custom-status.page:89(gui)
-msgid "Edit Custom Message"
+#: C/set-custom-status.page:88(p)
+msgid "Select <gui>Edit Custom Message</gui>."
 msgstr "Editar a mensaxe personalizada"
 
-#: ../C/set-custom-status.page:88(p)
-msgid "Select <placeholder-1/>."
-msgstr "Seleccione <placeholder-1/>."
-
-#: ../C/set-custom-status.page:95(p)
+#: C/set-custom-status.page:95(p)
 msgid "To edit a custom message:"
 msgstr "Para editar unha mensaxe personalizada:"
 
-#: ../C/set-custom-status.page:101(gui) ../C/set-custom-status.page:119(gui)
-msgid "Saved Presets"
-msgstr "Preferencias gardadas"
-
-#: ../C/set-custom-status.page:100(p)
+#: C/set-custom-status.page:100(p)
 msgid ""
-"From the <placeholder-1/> box, select the status message you want to edit "
-"and double-click on it."
+"From the <gui>Saved Presets</gui> box, select the status message you want to "
+"edit and double-click on it."
 msgstr ""
 
-#: ../C/set-custom-status.page:106(p)
-msgid "Type the new custom message and press <placeholder-1/> to modify it."
+#: C/set-custom-status.page:106(p)
+msgid "Type the new custom message and press <key>Enter</key> to modify it."
 msgstr ""
 
-#: ../C/set-custom-status.page:113(p)
+#: C/set-custom-status.page:113(p)
 msgid "To remove a custom message:"
 msgstr "Para eliminar unha mensaxe personalizada:"
 
-#: ../C/set-custom-status.page:118(p)
+#: C/set-custom-status.page:118(p)
 msgid ""
-"From the <placeholder-1/> box, select the status message you want to remove."
+"From the <gui>Saved Presets</gui> box, select the status message you want to "
+"remove."
 msgstr ""
 
-#: ../C/set-custom-status.page:125(gui) ../C/remove-account.page:50(gui)
-#: ../C/remove-account.page:53(gui) ../C/favorite-rooms.page:128(gui)
-#: ../C/account-irc.page:112(media) ../C/account-irc.page:146(gui)
-msgid "Remove"
-msgstr "Eliminar"
-
-#: ../C/set-custom-status.page:124(p)
-msgid "Click on the <placeholder-1/> button."
+#: C/set-custom-status.page:124(p)
+msgid "Click on the <gui>Remove</gui> button."
 msgstr "Prema sobre o botón <placeholder-1/>"
 
-#: ../C/set-custom-status.page:132(gui)
-msgid "Add New Preset"
-msgstr ""
-
-#: ../C/set-custom-status.page:131(p)
-msgid "To add a new custom message, from the <placeholder-1/> section:"
+#: C/set-custom-status.page:131(p)
+msgid ""
+"To add a new custom message, from the <gui>Add New Preset</gui> section:"
 msgstr ""
 
-#: ../C/set-custom-status.page:136(p)
+#: C/set-custom-status.page:136(p)
 msgid ""
 "Click on the drop-down list to select the status you want to set a custom "
 "message to."
 msgstr ""
 
-#: ../C/set-custom-status.page:142(p)
+#: C/set-custom-status.page:142(p)
 msgid "Click on the text box, and type the new custom message."
 msgstr "Prema sobre a caixa de texto e escriba a nova mensaxe personalizada."
 
-#: ../C/set-custom-status.page:148(gui) ../C/add-contact.page:54(gui)
-#: ../C/add-account.page:53(gui) ../C/account-irc.page:106(media)
-#: ../C/account-irc.page:146(gui)
-msgid "Add"
-msgstr "Engadir"
-
-#: ../C/set-custom-status.page:147(p)
-msgid "Click on <placeholder-1/> to add the new message to the presets ones."
+#: C/set-custom-status.page:147(p)
+msgid "Click on <gui>Add</gui> to add the new message to the presets ones."
 msgstr ""
 
-#: ../C/set-custom-status.page:157(gui) ../C/favorite-rooms.page:135(gui)
-msgid "Close"
-msgstr "Pechar"
-
-#: ../C/set-custom-status.page:156(p)
-msgid "When finished, click on <placeholder-1/>."
+#: C/set-custom-status.page:156(p)
+msgid "When finished, click on <gui>Close</gui>."
 msgstr "Ao rematar, prema en <placeholder-/>"
 
-#: ../C/set-custom-status.page:163(p)
+#: C/set-custom-status.page:163(p)
 msgid ""
 "When you edit or add a new custom message, it will not be set as the current "
-"status message. You will need to select it from the <placeholder-1/> window."
+"status message. You will need to select it from the <gui>Contact List</gui> "
+"window."
 msgstr ""
 
-#: ../C/send-message.page:8(desc)
+#: C/send-message.page:8(desc)
 msgid "Send a message to one of your contacts."
 msgstr "Enviar unha mensaxe a un dos seus contactos."
 
-#: ../C/send-message.page:16(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/send-message.page:16(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)
 msgid "Phil Bull"
 msgstr "Phil Bull"
 
-#: ../C/send-message.page:17(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)
+#: C/send-message.page:17(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 "philbull@gmail.com"
 msgstr "philbull@gmail.com"
 
-#: ../C/send-message.page:31(title)
+#: C/send-message.page:31(title)
 msgid "Send a message to someone"
 msgstr "Enviar unha mensaxe a alguén"
 
-#: ../C/send-message.page:40(p)
+#: C/send-message.page:40(p)
 msgid ""
 "Double click the name of the contact that you want to have a conversation "
 "with."
 msgstr ""
 
-#: ../C/send-message.page:48(gui) ../C/irc-start-conversation.page:39(gui)
-#: ../C/add-contact.page:37(gui)
-msgid "Chat"
-msgstr "Conversa"
-
-#: ../C/send-message.page:46(p)
+#: C/send-message.page:46(p)
 msgid ""
 "Right-click on the name of the contact you want to have a conversation with, "
-"and choose <placeholder-1/>."
+"and choose <gui>Chat</gui>."
 msgstr ""
 "Prema co botón dereito sobre o nome do contacto co que quere manter unha "
 "conversa e seleccione <placeholder-1/>."
 
-#: ../C/send-message.page:54(p)
+#: C/send-message.page:54(p)
 msgid ""
 "A new window will open. Type a message into the box at the bottom of the "
-"window and press <placeholder-1/> to send it."
+"window and press <key>Enter</key> to send it."
 msgstr ""
 "Abrirase unha nova xanela. Escriba a mensaxe na caixa na parte inferior da "
 "xanela e prema <placeholder-1/> para enviala."
 
-#: ../C/send-file.page:8(desc)
+#: C/send-file.page:8(desc)
 msgid "Send a file from your computer to one of your contacts."
 msgstr "Enviar un ficheiro desde o seu computador a un dos seus contactos."
 
-#: ../C/send-file.page:36(title)
+#: C/send-file.page:36(title)
 msgid "Send files"
 msgstr "Enviar ficheiros"
 
-#: ../C/send-file.page:46(gui) ../C/send-file.page:52(gui)
-msgid "Send file"
-msgstr "Enviar ficheiro"
-
-#: ../C/send-file.page:45(p)
+#: C/send-file.page:45(p)
 msgid ""
-"Right click on the contact you want to send a file to, and choose "
-"<placeholder-1/>."
+"Right click on the contact you want to send a file to, and choose <gui>Send "
+"file</gui>."
 msgstr ""
+"Prema co botón dereito sobre o nome do contacto co que quere manter unha "
+"conversa e seleccione <placeholder-1/>."
 
-#: ../C/send-file.page:50(p)
+#: C/send-file.page:50(p)
 msgid ""
-"Click on the contact you want to send a file, and choose "
-"<guiseq><placeholder-1/><placeholder-2/><placeholder-3/></guiseq>."
+"Click on the contact you want to send a file, and choose <guiseq><gui>Edit</"
+"gui><gui>Contact</gui><gui>Send file</gui></guiseq>."
 msgstr ""
 
-#: ../C/send-file.page:59(gui)
-msgid "Send"
-msgstr "Enviar"
-
-#: ../C/send-file.page:58(p)
-msgid "Select the file to send, and click on <placeholder-1/>."
+#: C/send-file.page:58(p)
+msgid "Select the file to send, and click on <gui>Send</gui>."
 msgstr ""
 
-#: ../C/send-file.page:64(gui) ../C/send-file.page:73(gui)
-msgid "File Transfers"
+#: C/send-file.page:63(p)
+msgid "The <gui>File Transfers</gui> window will appear."
 msgstr ""
 
-#: ../C/send-file.page:63(p)
-msgid "The <placeholder-1/> window will appear."
-msgstr ""
-
-#: ../C/send-file.page:68(gui)
-msgid "Stop"
-msgstr "Deter"
-
-#: ../C/send-file.page:66(p)
+#: C/send-file.page:66(p)
 msgid ""
-"Wait for your contact to accept the file transfer, or click <placeholder-1/> "
+"Wait for your contact to accept the file transfer, or click <gui>Stop</gui> "
 "to halt the transfer."
 msgstr ""
 
-#: ../C/send-file.page:72(p)
+#: C/send-file.page:72(p)
 msgid ""
-"Once the transfer is finished, it is possible to close the <placeholder-1/> "
-"window."
+"Once the transfer is finished, it is possible to close the <gui>File "
+"Transfers</gui> window."
 msgstr ""
 
-#: ../C/send-file.page:82(gui)
-msgid "Clear"
-msgstr "Limpar"
-
-#: ../C/send-file.page:80(p)
+#: C/send-file.page:80(p)
 msgid ""
 "If you have multiple finished transfers listed in the window, click on "
-"<placeholder-1/> to empty the list. This will only remove the files from the "
+"<gui>Clear</gui> to empty the list. This will only remove the files from the "
 "list and will not delete them from your computer."
 msgstr ""
 
-#: ../C/send-file.page:88(em) ../C/create-account.page:59(title)
-#: ../C/audio-video.page:170(p)
-msgid "Jabber"
-msgstr "Jabber"
-
-#: ../C/send-file.page:89(em) ../C/audio-video.page:150(p)
-msgid "Google Talk"
-msgstr "Google Talk"
-
-#: ../C/send-file.page:89(em) ../C/create-account.page:77(title)
-#: ../C/audio-video.page:190(p)
-msgid "People Nearby"
-msgstr "Persoas próximas"
-
-#: ../C/send-file.page:87(p)
+#: C/send-file.page:87(p)
 msgid ""
-"It is possible to send files only using the following services: <placeholder-"
-"1/>, <placeholder-2/> and <placeholder-3/>."
+"It is possible to send files only using the following services: <em>Jabber</"
+"em>, <em>Google Talk</em> and <em>People Nearby</em>."
 msgstr ""
 
-#: ../C/send-file.page:93(p)
+#: C/send-file.page:93(p)
 msgid ""
 "In order to send a file to someone, you need to be connected to the "
 "Internet, or to a local area network."
 msgstr ""
 
-#: ../C/salut-protocol.page:8(desc)
+#: C/salut-protocol.page:8(desc)
 msgid "Understanding the People Nearby feature."
 msgstr ""
 
-#: ../C/salut-protocol.page:33(title)
+#: C/salut-protocol.page:33(title)
 msgid "What is People Nearby?"
 msgstr "Que é Persoas próximas"
 
-#: ../C/salut-protocol.page:37(p)
+#: C/salut-protocol.page:37(p)
 msgid "I'd like to see this played up a bit more."
 msgstr ""
 
-#: ../C/salut-protocol.page:40(p)
+#: 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."
 msgstr ""
 
-#: ../C/salut-protocol.page:45(p)
+#: C/salut-protocol.page:45(p)
 msgid ""
 "This kind of serverless messaging system is restricted to a local area "
 "network and an active Internet connection is not necessary."
 msgstr ""
 
-#: ../C/salut-protocol.page:49(p)
+#: C/salut-protocol.page:49(p)
 msgid ""
 "The people that use this service inside the same local area network will be "
 "auto-discovered, and it will be possible to send them messages and files as "
 "with other services."
 msgstr ""
 
-#: ../C/salut-protocol.page:54(p)
+#: C/salut-protocol.page:54(p)
 msgid ""
 "All the modern local area networks should be able to support this kind of "
 "service."
 msgstr ""
 
-#: ../C/remove-account.page:8(desc)
-msgid "Completely remove an account from <placeholder-1/>."
+#: C/remove-account.page:8(desc)
+msgid "Completely remove an account from <app>Empathy</app>."
 msgstr ""
 
-#: ../C/remove-account.page:33(title)
+#: C/remove-account.page:33(title)
 msgid "Remove an account"
 msgstr "Eliminar unha conta"
 
-#: ../C/remove-account.page:35(p)
+#: C/remove-account.page:35(p)
 msgid ""
-"You can completely remove an account from <placeholder-1/> if you no longer "
-"wish to use the account. If you wish to use the account in <placeholder-2/> "
-"again in the future, you will have to add your account details again."
+"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 ""
 
-#: ../C/remove-account.page:43(gui) ../C/prob-conn-acctdisabled.page:49(gui)
-#: ../C/irc-nick-password.page:51(gui) ../C/disable-account.page:49(gui)
-#: ../C/add-account.page:49(gui) ../C/add-account.page:78(gui)
-#: ../C/accounts-window.page:35(gui)
-msgid "Accounts"
-msgstr "Contas"
-
-#: ../C/remove-account.page:43(key) ../C/irc-nick-password.page:51(key)
-#: ../C/disable-account.page:49(key) ../C/add-account.page:49(key)
-msgid "F4"
-msgstr "F4"
-
-#: ../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:42(p) C/irc-nick-password.page:50(p)
+#: C/disable-account.page:48(p) C/add-account.page:48(p)
 msgid ""
-"From the <placeholder-1/> window, choose <guiseq><placeholder-2/"
-"><placeholder-3/></guiseq>, or press <placeholder-4/>."
+"From the <gui>Contact List</gui> window, choose <guiseq><gui>Edit</"
+"gui><gui>Accounts</gui></guiseq>, or press <key>F4</key>."
 msgstr ""
 
-#: ../C/remove-account.page:46(p)
+#: C/remove-account.page:46(p)
 msgid ""
 "Select the account you wish to remove from the accounts list on the left "
 "side of the window."
 msgstr ""
 
-#: ../C/remove-account.page:50(p)
-msgid "Click on <placeholder-1/>."
-msgstr "Prema sobre <placeholder-1/>."
+#: C/remove-account.page:50(p)
+msgid "Click on <gui style=\"button\">Remove</gui>."
+msgstr ""
 
-#: ../C/remove-account.page:53(p)
+#: C/remove-account.page:53(p)
 msgid ""
-"A dialog will be shown asking for confirmation. Click the <placeholder-1/> "
+"A dialog will be shown asking for confirmation. Click the <gui>Remove</gui> "
 "button to permanently remove the account."
 msgstr ""
 
-#: ../C/remove-account.page:59(p)
+#: C/remove-account.page:59(p)
 msgid ""
-"Even after removing an account, <placeholder-1/> does not delete your "
+"Even after removing an account, <app>Empathy</app> does not delete your "
 "conversation history for that account."
 msgstr ""
 
-#: ../C/prob-conn.page:7(desc)
+#: C/prob-conn.page:7(desc)
 msgid "Diagnose common problems connecting to an instant messaging service."
 msgstr ""
 
-#: ../C/prob-conn.page:29(title)
+#: C/prob-conn.page:29(title)
 msgid "Problems connecting to an instant messaging service"
 msgstr ""
 
-#: ../C/prob-conn-neterror.page:8(gui)
-msgid "Network error"
-msgstr "Erro de rede"
+#. 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-auth.page:58(None) C/account-irc.page:109(None)
+msgid "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b"
+msgstr ""
 
-#: ../C/prob-conn-neterror.page:7(desc) ../C/prob-conn-name.page:10(desc)
-#: ../C/prob-conn-auth.page:8(desc)
+#: C/prob-conn-neterror.page:7(desc)
 msgid ""
-"An error message which says “<placeholder-1/>” appears in the main window."
+"An error message which says “<gui>Network error</gui>” appears in the main "
+"window."
 msgstr ""
 
-#: ../C/prob-conn-neterror.page:33(title)
+#: C/prob-conn-neterror.page:33(title)
 msgid "I get a message that says “Network error”"
 msgstr ""
 
-#: ../C/prob-conn-neterror.page:36(cite)
+#: C/prob-conn-neterror.page:36(cite)
 msgid "shaunm"
 msgstr "shaunm"
 
-#: ../C/prob-conn-neterror.page:37(p)
+#: C/prob-conn-neterror.page:37(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 ""
 
-#: ../C/prob-conn-neterror.page:41(p)
+#: C/prob-conn-neterror.page:41(p)
 msgid ""
-"This kind of error happens when <placeholder-1/> cannot communicate with the "
-"instant messaging service for some reason."
+"This kind of error happens when <app>Empathy</app> cannot communicate with "
+"the instant messaging service for some reason."
 msgstr ""
 
-#: ../C/prob-conn-neterror.page:45(p)
+#: C/prob-conn-neterror.page:45(p)
 msgid ""
 "Also, this kind of error happens when you try to use an IRC account without "
 "setting a nickname."
 msgstr ""
 
-#: ../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:52(p) C/prob-conn-auth.page:45(p)
+#: C/prob-conn-acctdisabled.page:43(p)
 msgid ""
 "Make sure that you are connected to the Internet, or to a local area network."
 msgstr ""
 
-#: ../C/prob-conn-neterror.page:58(media) ../C/prob-conn-name.page:43(media)
-#: ../C/prob-conn-auth.page:58(media)
-msgid "edit"
-msgstr "editar"
-
-#: ../C/prob-conn-neterror.page:57(p) ../C/prob-conn-name.page:42(p)
-#: ../C/prob-conn-auth.page:57(p)
-msgid "Click the <placeholder-1/> icon in the error message."
+#: C/prob-conn-neterror.page:57(p) C/prob-conn-name.page:42(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 ""
+"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png"
+"\">Logotipo da mensaxaría instantánea Empathy</media>Mensaxaría instantánea "
+"Empathy"
 
-#: ../C/prob-conn-neterror.page:66(gui)
-#: ../C/prob-conn-acctdisabled.page:60(gui) ../C/account-jabber.page:33(gui)
-msgid "Advanced"
-msgstr "Avanzado"
-
-#: ../C/prob-conn-neterror.page:65(p) ../C/prob-conn-acctdisabled.page:59(p)
+#: C/prob-conn-neterror.page:65(p) C/prob-conn-acctdisabled.page:59(p)
 msgid ""
-"Check in the <placeholder-1/> section that all the details are correct. You "
-"should be able to find these details from the website of the messaging "
+"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 ""
 "Comprobe na sección <placeholder-1/> que todos os detalles son correctos. "
 "Vostede poderá encontrar estes detalles no sitio web do seu servizo de "
 "mensaxería."
 
-#: ../C/prob-conn-neterror.page:83(gui) ../C/prob-conn-name.page:65(gui)
-#: ../C/prob-conn-auth.page:69(gui) ../C/prob-conn-acctdisabled.page:66(gui)
-#: ../C/disable-account.page:56(gui) ../C/disable-account.page:63(gui)
-msgid "Enabled"
-msgstr "Activar"
-
-#: ../C/prob-conn-neterror.page:82(p) ../C/prob-conn-auth.page:68(p)
+#: C/prob-conn-neterror.page:82(p) C/prob-conn-auth.page:68(p)
 msgid ""
-"Deselect the <placeholder-1/>, and then select it again to try to reconnect "
-"to the service."
+"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-neterror.page:90(title)
+#: C/prob-conn-neterror.page:90(title)
 msgid "Proxy support"
 msgstr "Compatibilidade de proxy"
 
-#: ../C/prob-conn-neterror.page:91(p)
+#: C/prob-conn-neterror.page:91(p)
 msgid ""
-"At the moment <placeholder-1/> can not be configured to work with a proxy."
+"At the moment <app>Empathy</app> can not be configured to work with a proxy."
 msgstr ""
 
-#: ../C/prob-conn-name.page:9(title)
+#: C/prob-conn-name.page:9(title)
 msgid "“Name in use”"
 msgstr "\"Nome en uso\""
 
-#: ../C/prob-conn-name.page:11(gui)
-msgid "Name in use"
-msgstr "Nome en uso"
+#: C/prob-conn-name.page:10(desc)
+msgid ""
+"An error message which says “<gui>Name in use</gui>” appears in the main "
+"window."
+msgstr ""
 
-#: ../C/prob-conn-name.page:32(title)
+#: C/prob-conn-name.page:32(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:34(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 ""
 
-#: ../C/prob-conn-name.page:51(gui) ../C/account-irc.page:53(gui)
-msgid "Nickname"
-msgstr "Alcume"
-
-#: ../C/prob-conn-name.page:50(p)
-msgid "In the <placeholder-1/> text box, type a new nickname."
+#: C/prob-conn-name.page:50(p)
+msgid "In the <gui>Nickname</gui> text box, type a new nickname."
 msgstr ""
 
-#: ../C/prob-conn-name.page:55(p)
+#: C/prob-conn-name.page:55(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 ""
 
-#: ../C/prob-conn-name.page:64(p)
+#: C/prob-conn-name.page:64(p)
 msgid ""
-"Deselect the <placeholder-1/> check-box next to the name of your account, "
+"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:9(gui)
-msgid "Authentication failed"
-msgstr "Fallou a autenticación"
+#: C/prob-conn-auth.page:8(desc)
+msgid ""
+"An error message which says “<gui>Authentication failed</gui>” appears in "
+"the main window."
+msgstr ""
 
-#: ../C/prob-conn-auth.page:36(title)
+#: C/prob-conn-auth.page:36(title)
 msgid "I get a message that says “Authentication failed”"
-msgstr ""
+msgstr "Obteño unha mensaxe que di «Produciuse un fallo na autenticación»"
 
-#: ../C/prob-conn-auth.page:38(p)
+#: C/prob-conn-auth.page:38(p)
 msgid ""
 "This kind of error happens when your instant messaging service is not "
 "allowing you to connect because it does not recognize your username or "
 "password for some reason."
 msgstr ""
 
-#: ../C/prob-conn-auth.page:50(p)
+#: C/prob-conn-auth.page:50(p)
 msgid ""
 "Make sure that you have registered an account with the service you are "
 "trying to connect to. If you do not have an account, most services will not "
 "allow you to connect."
 msgstr ""
+"Asegúrese de que rexistrou unha conta co servizo ao que está tentando "
+"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:54(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-acctdisabled.page:7(desc)
+#: 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 ""
 
-#: ../C/prob-conn-acctdisabled.page:33(title)
+#: C/prob-conn-acctdisabled.page:33(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:35(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 ""
 
-#: ../C/prob-conn-acctdisabled.page:48(p)
+#: C/prob-conn-acctdisabled.page:48(p)
 msgid ""
-"Choose <guiseq><placeholder-1/><placeholder-2/></guiseq> and select the "
+"Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq> and select the "
 "account that is not working."
 msgstr ""
 
-#: ../C/prob-conn-acctdisabled.page:65(p)
+#: C/prob-conn-acctdisabled.page:65(p)
 msgid ""
-"Check that the <placeholder-1/> check-box is selected. If it is not, select "
-"the check-box to enable the account."
+"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 ""
 
-#: ../C/prev-conv.page:8(desc)
+#: 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:35(title)
 msgid "View previous conversations"
-msgstr ""
-
-#: ../C/prev-conv.page:40(link)
-msgid "#593733"
-msgstr "#593733"
+msgstr "Ver as conversas anteriores"
 
-#: ../C/prev-conv.page:39(p)
+#: C/prev-conv.page:39(p)
 msgid ""
-"Highlighting text is quirky: <placeholder-1/>. 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."
+"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 ""
 
-#: ../C/prev-conv.page:48(link)
-msgid "search through all of your previous conversations"
-msgstr "buscar a través de todas as súas conversas anteriores"
-
-#: ../C/prev-conv.page:49(link)
-msgid "browse previous conversations"
-msgstr "explorar as conversas anteriores"
-
-#: ../C/prev-conv.page:46(p)
+#: C/prev-conv.page:46(p)
 msgid ""
-"<placeholder-1/> automatically saves all your text conversations you have "
-"with your contacts. You can <placeholder-2/> or <placeholder-3/> by contact "
-"and date."
+"<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 ""
 
-#: ../C/prev-conv.page:54(p)
+#: C/prev-conv.page:54(p)
 msgid ""
 "You do not need to be connected to the Internet to view and search your "
 "previous conversations."
@@ -1047,11 +897,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:61(title)
 msgid "Search previous conversations"
 msgstr "Buscar conversas anteriores"
 
-#: ../C/prev-conv.page:63(p)
+#: C/prev-conv.page:63(p)
 msgid ""
 "You can perform a full-text search through all of your previous "
 "conversations."
@@ -1059,88 +909,62 @@ msgstr ""
 "Pode realizar unha busca de texto completo sobre todas as súas conversas "
 "anteriores."
 
-#: ../C/prev-conv.page:67(gui) ../C/prev-conv.page:96(gui)
-#: ../C/hide-contacts.page:31(gui)
-msgid "View"
-msgstr "Ver"
-
-#: ../C/prev-conv.page:68(gui) ../C/prev-conv.page:97(gui)
-#: ../C/prev-conv.page:123(gui)
-msgid "Previous Conversations"
-msgstr "Conversas previas"
-
-#: ../C/prev-conv.page:68(key) ../C/prev-conv.page:97(key)
-msgid "F3"
-msgstr "F3"
-
-#: ../C/prev-conv.page:67(p) ../C/prev-conv.page:96(p)
+#: C/prev-conv.page:67(p) C/prev-conv.page:96(p)
 msgid ""
-"From the <placeholder-1/> window, choose <guiseq><placeholder-2/"
-"><placeholder-3/></guiseq>. Alternatively, press <placeholder-4/>."
-msgstr ""
-
-#: ../C/prev-conv.page:71(gui)
-msgid "Search"
-msgstr "Buscar"
-
-#: ../C/prev-conv.page:71(p) ../C/prev-conv.page:100(p)
-#: ../C/geolocation-turn.page:42(p)
-msgid "Select the <placeholder-1/> tab."
+"From the <gui>Contact List</gui> window, choose <guiseq><gui>View</"
+"gui><gui>Previous Conversations</gui></guiseq>. Alternatively, press "
+"<key>F3</key>."
 msgstr ""
 
-#: ../C/prev-conv.page:74(gui)
-msgid "For"
-msgstr "Por"
+#: C/prev-conv.page:71(p)
+msgid "Select the <gui>Search</gui> tab."
+msgstr "Seleccione o separador <gui>Buscar</gui>."
 
-#: ../C/prev-conv.page:75(gui)
-msgid "Find"
-msgstr "Buscar"
-
-#: ../C/prev-conv.page:74(p)
+#: C/prev-conv.page:74(p)
 msgid ""
-"In the <placeholder-1/> field, type the text you want to search for. Click "
-"<placeholder-2/> or press <placeholder-3/>."
+"In the <gui>For</gui> field, type the text you want to search for. Click "
+"<gui>Find</gui> or press <key>Enter</key>."
 msgstr ""
 
-#: ../C/prev-conv.page:78(p)
+#: 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."
 msgstr ""
 
-#: ../C/prev-conv.page:82(p)
+#: C/prev-conv.page:82(p)
 msgid ""
-"Click on a conversation to view it. <placeholder-1/> will select the text in "
-"the conversation that matched your search terms."
+"Click on a conversation to view it. <app>Empathy</app> will select the text "
+"in the conversation that matched your search terms."
 msgstr ""
 
-#: ../C/prev-conv.page:89(title)
+#: C/prev-conv.page:89(title)
 msgid "Browse previous conversations"
 msgstr "Explorar as conversas anteriores"
 
-#: ../C/prev-conv.page:91(p)
+#: C/prev-conv.page:91(p)
 msgid ""
 "You can browse your previous conversations with your contacts or in chat "
 "rooms by date."
 msgstr ""
 
-#: ../C/prev-conv.page:100(gui)
-msgid "Conversations"
-msgstr "Conversas"
+#: 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:103(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 ""
 
-#: ../C/prev-conv.page:107(p)
+#: C/prev-conv.page:107(p)
 msgid ""
 "Select a contact or chat room to view your previous conversations from. By "
 "default the most recent conversation will be shown."
 msgstr ""
 
-#: ../C/prev-conv.page:111(p)
+#: C/prev-conv.page:111(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 "
@@ -1148,33 +972,29 @@ msgid ""
 "earlier dates."
 msgstr ""
 
-#: ../C/prev-conv.page:117(p)
+#: 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."
 msgstr ""
 
-#: ../C/prev-conv.page:123(gui)
-msgid "View Previous Conversations"
-msgstr "Ver as conversas anteriores"
-
-#: ../C/prev-conv.page:121(p)
+#: C/prev-conv.page:121(p)
 msgid ""
 "You can quickly view the previous conversations with one of your contacts "
-"from the <placeholder-1/> window. Simply right click the contact and choose "
-"<placeholder-2/>. The <placeholder-3/> window will open with that contact "
-"already selected."
+"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 ""
 
-#: ../C/license.page:8(desc)
+#: C/license.page:8(desc)
 msgid "Legal information."
 msgstr "Información legal."
 
-#: ../C/license.page:11(title)
+#: C/license.page:11(title)
 msgid "License"
 msgstr "Licenza"
 
-#: ../C/license.page:12(p)
+#: C/license.page:12(p)
 msgid ""
 "This work is distributed under a CreativeCommons Attribution-Share Alike 3.0 "
 "Unported license."
@@ -1182,35 +1002,35 @@ msgstr ""
 "Este traballo está licenciado baixo una Licenza Creative Commons Atribución "
 "- Compartir igual 3.0 sen asistencia."
 
-#: ../C/license.page:20(p)
+#: C/license.page:20(p)
 msgid "You are free:"
 msgstr "É libre de:"
 
-#: ../C/license.page:25(em)
+#: C/license.page:25(em)
 msgid "To share"
 msgstr "Compartir"
 
-#: ../C/license.page:26(p)
+#: C/license.page:26(p)
 msgid "To copy, distribute and transmit the work."
 msgstr "Copiar, distribuír e comunicar publicamente a obra"
 
-#: ../C/license.page:29(em)
+#: C/license.page:29(em)
 msgid "To remix"
 msgstr "Facer obras derivadas"
 
-#: ../C/license.page:30(p)
+#: C/license.page:30(p)
 msgid "To adapt the work."
 msgstr "Adaptar o traballo."
 
-#: ../C/license.page:33(p)
+#: C/license.page:33(p)
 msgid "Under the following conditions:"
 msgstr "Baixo as seguintes condicións:"
 
-#: ../C/license.page:38(em)
+#: C/license.page:38(em)
 msgid "Attribution"
 msgstr "Atribución"
 
-#: ../C/license.page:39(p)
+#: C/license.page:39(p)
 msgid ""
 "You must attribute the work in the manner specified by the author or "
 "licensor (but not in any way that suggests that they endorse you or your use "
@@ -1220,94 +1040,80 @@ msgstr ""
 "licenciatario (pero non dunha maneira que suxira que ten o seu apoio ou "
 "apoian o uso que fai da súa obra)."
 
-#: ../C/license.page:46(em)
+#: C/license.page:46(em)
 msgid "Share Alike"
 msgstr "Compartir igual"
 
-#: ../C/license.page:47(p)
+#: C/license.page:47(p)
 msgid ""
 "If you alter, transform, or build upon this work, you may distribute the "
 "resulting work only under the same, similar or a compatible license."
 msgstr ""
 
-#: ../C/license.page:56(link)
-msgid "CreativeCommons website"
-msgstr "Sitio web de Creative Commons"
-
-#: ../C/license.page:57(link)
-msgid "Commons Deed"
-msgstr ""
-
-#: ../C/license.page:53(p)
+#: C/license.page:53(p)
 msgid ""
-"For the full text of the license, see the <placeholder-1/>, or read the full "
-"<placeholder-2/>."
+"For the full text of the license, see the <link href=\"http://"
+"creativecommons.org/licenses/by-sa/3.0/legalcode\">CreativeCommons website</"
+"link>, or read the full <link href=\"http://creativecommons.org/licenses/by-"
+"sa/3.0/\">Commons Deed</link>."
 msgstr ""
 
-#: ../C/irc-start-conversation.page:8(desc)
+#: C/irc-start-conversation.page:8(desc)
 msgid "Start a conversation witn an IRC contact."
 msgstr ""
 
-#: ../C/irc-start-conversation.page:30(title)
+#: C/irc-start-conversation.page:30(title)
 msgid "Chat with somebody on IRC"
 msgstr "Conversar con alguén no IRC"
 
-#: ../C/irc-start-conversation.page:32(p)
+#: C/irc-start-conversation.page:32(p)
 msgid ""
 "You can hold private conversations with other IRC users, outside of the "
 "public IRC chat rooms. To start a conversation with another IRC user:"
 msgstr ""
 
-#: ../C/irc-start-conversation.page:37(p)
+#: C/irc-start-conversation.page:37(p)
 msgid ""
 "In the contact list for an IRC chat room, double click the name of the user "
 "you want to chat with. Alternatively, right click the name of the user and "
-"choose <placeholder-1/>."
+"choose <gui>Chat</gui>."
 msgstr ""
 
-#: ../C/irc-start-conversation.page:45(p)
+#: C/irc-start-conversation.page:45(p)
 msgid ""
-"The IRC room contact list is not the same as <placeholder-1/> contact list. "
-"It contains a list of users in the IRC chat room you joined. Different rooms "
-"can have different contacts listed."
+"The IRC room contact list is not the same as <app>Empathy</app> contact "
+"list. It contains a list of users in the IRC chat room you joined. Different "
+"rooms can have different contacts listed."
 msgstr ""
 
-#: ../C/irc-start-conversation.page:55(gui) ../C/favorite-rooms.page:56(gui)
-msgid "Conversation"
-msgstr "Conversa"
-
-#: ../C/irc-start-conversation.page:55(gui)
-msgid "Show Contact List"
-msgstr "Mostrar a lista de contactos"
-
-#: ../C/irc-start-conversation.page:52(p)
+#: C/irc-start-conversation.page:52(p)
 msgid ""
 "The IRC room contact list is usually on the right side of the IRC room "
-"window. If you do not see it, choose <guiseq><placeholder-1/><placeholder-2/"
-"></guiseq>."
+"window. If you do not see it, choose <guiseq><gui>Conversation</"
+"gui><gui>Show Contact List</gui></guiseq>."
 msgstr ""
 
-#: ../C/irc-send-file.page:9(desc)
-msgid "<placeholder-1/> does not currently support sending files using IRC."
-msgstr ""
+#: C/irc-send-file.page:9(desc)
+msgid "<app>Empathy</app> does not currently support sending files using IRC."
+msgstr "Actualmente non é posíbel enviar ficheiros mediante o IRC."
 
-#: ../C/irc-send-file.page:31(title)
+#: C/irc-send-file.page:31(title)
 msgid "Send files over IRC"
 msgstr "Enviar ficheiros mediante o IRC"
 
-#: ../C/irc-send-file.page:33(p)
+#: C/irc-send-file.page:33(p)
 msgid "It is not currently possible to send files using IRC."
 msgstr "Actualmente non é posíbel enviar ficheiros mediante o IRC."
 
-#: ../C/irc-nick-password.page:10(desc)
+#: C/irc-nick-password.page:10(desc)
 msgid "Protect your nickname to prevent other IRC users from using it."
-msgstr ""
+msgstr "Protexa o seu alcume para previr que outros usuarios do IRC o usen."
 
-#: ../C/irc-nick-password.page:33(title)
+#: C/irc-nick-password.page:33(title)
 msgid "Use a nickname password on IRC"
 msgstr "Usar un contrasinal para un alcume no IRC"
 
-#: ../C/irc-nick-password.page:35(p)
+#: C/irc-nick-password.page:35(p)
 msgid ""
 "On some IRC networks, you can register your nickname with a service called "
 "NickServ. By sending special messages to NickServ, you can set your password "
@@ -1315,253 +1121,222 @@ msgid ""
 "a registered nickname."
 msgstr ""
 
-#: ../C/irc-nick-password.page:41(em)
-msgid "server password"
-msgstr "contrasinal do servidor"
-
-#: ../C/irc-nick-password.page:40(p)
+#: C/irc-nick-password.page:40(p)
 msgid ""
-"<placeholder-1/> does not currently support nickname registration. Some IRC "
-"networks, however, will automatically forward a <placeholder-2/> to "
-"NickServ. On these networks, you can use the IRC password in <placeholder-3/"
-"> to identify yourself to NickServ. The popular freenode network is known to "
-"have this feature."
+"<app>Empathy</app> does not currently support nickname registration. Some "
+"IRC networks, however, will automatically forward a <em>server password</em> "
+"to NickServ. On these networks, you can use the IRC password in "
+"<app>Empathy</app> to identify yourself to NickServ. The popular freenode "
+"network is known to have this feature."
 msgstr ""
 
-#: ../C/irc-nick-password.page:46(p)
+#: C/irc-nick-password.page:46(p)
 msgid "To set an IRC server password:"
 msgstr "Para estabelecer un contrasinal de servidor de IRC:"
 
-#: ../C/irc-nick-password.page:54(p)
+#: C/irc-nick-password.page:54(p)
 msgid "Select the IRC account from the list on the left of the dialog."
 msgstr "Seleccione a conta de IRC da lista na parte esquerda do diálogo."
 
-#: ../C/irc-nick-password.page:58(gui) ../C/account-irc.page:60(gui)
-msgid "Password"
-msgstr "Contrasinal"
-
-#: ../C/irc-nick-password.page:57(p)
+#: C/irc-nick-password.page:57(p)
 msgid ""
-"In the <placeholder-1/> field, type the password you used to register your "
-"nikcname."
+"In the <gui>Password</gui> field, type the password you used to register "
+"your nikcname."
 msgstr ""
 
-#: ../C/irc-nick-password.page:63(gui) ../C/import-account.page:61(gui)
-msgid "Apply"
-msgstr "Aplicar"
-
-#: ../C/irc-nick-password.page:63(p) ../C/import-account.page:61(p)
-#: ../C/add-account.page:52(p) ../C/add-account.page:71(p)
-msgid "Click <placeholder-1/>."
+#: C/irc-nick-password.page:63(p) C/import-account.page:61(p)
+msgid "Click <gui style=\"button\">Apply</gui>."
 msgstr ""
 
-#: ../C/irc-nick-password.page:69(p)
+#: C/irc-nick-password.page:69(p)
 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 <placeholder-1/>."
+"nickname or change your nickname password using <app>Empathy</app>."
 msgstr ""
 "Estas instrucións só lle permiten usar un alcume protexido por contrasinal "
 "en certas redes IRC. Actualmente non é posíbel rexistrar un alcume IRC ou "
 "cambiar o seu contrasinal de alcume usando <placeholder-1/>."
 
-#: ../C/irc-manage.page:9(desc)
-msgid "How to use IRC with <placeholder-1/>."
+#: C/irc-manage.page:9(desc)
+msgid "How to use IRC with <app>Empathy</app>."
 msgstr "Como usar IRC con <placeholder-1/>."
 
-#: ../C/irc-manage.page:34(title)
+#: C/irc-manage.page:34(title)
 msgid "Internet Relay Chat (IRC)"
 msgstr "Internet Relay Chat (IRC)"
 
-#: ../C/irc-manage.page:37(sys) ../C/account-irc.page:39(sys)
-msgid "telepathy-idle"
-msgstr "telepathy-idle"
-
-#: ../C/irc-manage.page:37(p) ../C/account-irc.page:39(p)
+#: C/irc-manage.page:37(p) C/account-irc.page:39(p)
 msgid ""
-"You must have the <placeholder-1/> package installed to use IRC in "
-"<placeholder-2/>."
+"You must have the <sys>telepathy-idle</sys> package installed to use IRC in "
+"<app>Empathy</app>."
 msgstr ""
 "Vostede debe ter instalado o paquete <placeholder-1/> para usar o IRC en "
 "<placeholder-2/>."
 
-#: ../C/irc-manage.page:43(title)
+#: C/irc-manage.page:43(title)
 msgid "IRC Chat Rooms and Conversations"
 msgstr "Salas de chat e conversa no IRC."
 
-#: ../C/irc-manage.page:45(title)
+#: C/irc-manage.page:45(title)
 msgid "Chat Rooms and Conversations"
 msgstr "Salas de char e conversas"
 
-#: ../C/irc-manage.page:50(title)
+#: C/irc-manage.page:50(title)
 msgid "Common IRC Problems"
 msgstr "Problemas comúns no IRC"
 
-#: ../C/irc-manage.page:52(title) ../C/index.page:52(title)
+#: C/irc-manage.page:52(title) C/index.page:52(title)
 msgid "Common Problems"
 msgstr "Problemas comúns"
 
-#: ../C/irc-join-room.page:8(desc)
+#: C/irc-join-room.page:8(desc)
 msgid "Join an IRC channel."
 msgstr "Entrar nunha canle IRC."
 
-#: ../C/irc-join-room.page:31(title)
+#: C/irc-join-room.page:31(title)
 msgid "Join an IRC chat room"
 msgstr "Unirse a unha sala de conversa IRC"
 
-#: ../C/irc-join-room.page:33(p)
+#: C/irc-join-room.page:33(p)
 msgid ""
 "You can join IRC chat rooms (also known as IRC channels) on any IRC network "
 "you’re connected to. To connect to an IRC network, see <link xref=\"add-"
 "account\"/> and <link xref=\"account-irc\"/>."
 msgstr ""
 
-#: ../C/irc-join-room.page:41(gui) ../C/irc-join-room.page:52(gui)
-#: ../C/group-conversations.page:59(gui) ../C/group-conversations.page:79(gui)
-#: ../C/group-conversations.page:124(gui) ../C/favorite-rooms.page:77(gui)
-#: ../C/favorite-rooms.page:83(gui) ../C/favorite-rooms.page:103(gui)
-msgid "Room"
-msgstr "Sala"
-
-#: ../C/irc-join-room.page:41(gui) ../C/irc-join-room.page:58(gui)
-#: ../C/irc-join-pwd.page:40(gui) ../C/group-conversations.page:59(gui)
-#: ../C/group-conversations.page:124(gui)
-msgid "Join"
-msgstr "Unirse"
-
-#: ../C/irc-join-room.page:39(p) ../C/group-conversations.page:58(p)
-#: ../C/group-conversations.page:122(p) ../C/favorite-rooms.page:101(p)
+#: C/irc-join-room.page:39(p) C/group-conversations.page:58(p)
+#: C/group-conversations.page:122(p)
 msgid ""
-"From the <placeholder-1/> window, choose <guiseq><placeholder-2/"
-"><placeholder-3/></guiseq>."
+"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</"
+"gui><gui>Join</gui></guiseq>."
 msgstr ""
 
-#: ../C/irc-join-room.page:46(gui) ../C/group-conversations.page:64(gui)
-#: ../C/favorite-rooms.page:108(gui) ../C/add-contact.page:40(gui)
-msgid "Account"
-msgstr "Conta"
-
-#: ../C/irc-join-room.page:45(p)
+#: C/irc-join-room.page:45(p)
 msgid ""
-"From the <placeholder-1/> drop-down list, select the IRC account that "
+"From the <gui>Account</gui> drop-down list, select the IRC account that "
 "corresponds to the network you want to use."
 msgstr ""
 
-#: ../C/irc-join-room.page:53(sys)
-msgid "#"
-msgstr "#"
-
-#: ../C/irc-join-room.page:51(p)
+#: C/irc-join-room.page:51(p)
 msgid ""
-"In the <placeholder-1/> text box, type the name of the channel you want to "
-"join. IRC channel names start with the hash character (<placeholder-2/>)."
+"In the <gui>Room</gui> text box, type the name of the channel you want to "
+"join. IRC channel names start with the hash character (<sys>#</sys>)."
 msgstr ""
 
-#: ../C/irc-join-room.page:57(p)
-msgid "Click <placeholder-1/> to enter the room."
+#: C/irc-join-room.page:57(p)
+msgid "Click <gui>Join</gui> to enter the room."
 msgstr ""
 
-#: ../C/irc-join-room.page:64(p)
+#: C/irc-join-room.page:64(p)
 msgid ""
 "To join multiple rooms, you need to repeat the steps above for each room."
 msgstr ""
 
-#: ../C/irc-join-pwd.page:9(desc)
+#: C/irc-join-pwd.page:9(desc)
 msgid "Enter password-protected IRC chat rooms."
 msgstr "Introduza o contrasinal para as salas de char IRC protexidas."
 
-#: ../C/irc-join-pwd.page:25(title)
+#: C/irc-join-pwd.page:25(title)
 msgid "Join a protected IRC chat room"
 msgstr "Unirse a unha sala de chat IRC protexida"
 
-#: ../C/irc-join-pwd.page:27(p)
+#: C/irc-join-pwd.page:27(p)
 msgid ""
 "On some IRC networks, private IRC rooms may be protected with a password. If "
 "you know the password, use the following steps to join:"
 msgstr ""
 
-#: ../C/irc-join-pwd.page:34(link)
-msgid "Join the room"
-msgstr "Unirse á sala"
-
-#: ../C/irc-join-pwd.page:33(p)
-msgid "<placeholder-1/> as normal."
-msgstr "<placeholder-1/> é normal."
+#: C/irc-join-pwd.page:33(p)
+msgid "<link xref=\"irc-join-room\">Join the room</link> as normal."
+msgstr ""
 
-#: ../C/irc-join-pwd.page:38(p)
+#: C/irc-join-pwd.page:38(p)
 msgid ""
 "Empathy will prompt you for a password. Enter the password for the IRC chat "
-"room and click <placeholder-1/>."
+"room and click <gui style=\"button\">Join</gui>."
 msgstr ""
 
-#: ../C/irc-commands.page:7(desc)
+#: C/irc-commands.page:7(desc)
 msgid "The supported IRC commands."
-msgstr ""
+msgstr "As ordes de IRC admitidas."
 
-#: ../C/irc-commands.page:18(title)
+#: C/irc-commands.page:18(title)
 msgid "Supported IRC commands"
 msgstr "Ordes IRC admitidas"
 
-#: ../C/irc-commands.page:20(input)
-msgid "/help"
-msgstr "/help"
-
-#: ../C/irc-commands.page:19(p)
+#: C/irc-commands.page:19(p)
 msgid ""
-"To see the list of the supported IRC commands, in a chat room type "
-"<placeholder-1/> and press <placeholder-2/>."
+"To see the list of the supported IRC commands, in a chat room type <input>/"
+"help</input> and press <key>Enter</key>."
 msgstr ""
 
-#: ../C/irc-commands.page:24(p)
+#: C/irc-commands.page:24(p)
 msgid "All commands available have a small description on their usage."
 msgstr ""
 
-#: ../C/introduction.page:9(desc)
-msgid "Introduction to the <placeholder-1/> instant messenger."
+#. 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/empathy-main-window.png'; "
+"md5=489ba00b0fc377aba4c691210b6e0650"
+msgstr ""
+
+#: C/introduction.page:9(desc)
+msgid "Introduction to the <app>Empathy</app> instant messenger."
 msgstr ""
 
-#: ../C/introduction.page:21(title)
+#: C/introduction.page:21(title)
 msgid "Introduction"
 msgstr "Introdución"
 
-#: ../C/introduction.page:23(p)
+#: C/introduction.page:23(p)
 msgid ""
-"<placeholder-1/> is an instant messaging application for the GNOME Desktop. "
-"It supports text messaging, voice &amp; video calls, file transfers, and all "
-"the most used messaging systems such as MSN and Google Talk."
+"<app>Empathy</app> is an instant messaging application for the GNOME "
+"Desktop. It supports text messaging, voice &amp; video calls, file "
+"transfers, and all the most used messaging systems such as MSN and Google "
+"Talk."
 msgstr ""
 
-#: ../C/introduction.page:28(p)
+#: C/introduction.page:28(p)
 msgid ""
-"<placeholder-1/> includes features that help you better collaborate while at "
-"work, and that let you easily keep in touch with your friends."
+"<app>Empathy</app> includes features that help you better collaborate while "
+"at work, and that let you easily keep in touch with your friends."
 msgstr ""
 
-#: ../C/introduction.page:32(p)
+#: C/introduction.page:32(p)
 msgid ""
-"Using <placeholder-1/>, you can group all the conversations in a single "
+"Using <app>Empathy</app>, you can group all the conversations in a single "
 "window, have multiple windows for different kind of conversations, easily "
 "search through your previous conversations, and share your desktop in just "
 "two clicks."
 msgstr ""
 
-#: ../C/introduction.page:39(title)
+#: C/introduction.page:39(title)
 msgid "<gui>Contact List</gui> window"
 msgstr "Xanela de <gui>Lista de contactos</gui>"
 
-#: ../C/introduction.page:40(desc)
-msgid "<placeholder-1/> main window"
+#: C/introduction.page:40(desc)
+msgid "<app>Empathy</app> main window"
 msgstr "Xanela principal de <placeholder-1/>"
 
-#: ../C/introduction.page:42(p)
-msgid "<placeholder-1/> main window."
+#: C/introduction.page:42(p)
+msgid "<app>Empathy</app> main window."
 msgstr "Xanela principal de <placeholder-1/>."
 
-#: ../C/index.page:7(title) ../C/index.page:8(title)
+#. 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:27(None)
+msgid ""
+"@@image: 'figures/empathy-logo.png'; md5=14568248b11d2cfe7992c5edd7e157e8"
+msgstr ""
+
+#: C/index.page:7(title) C/index.page:8(title)
 msgid "Empathy Instant Messenger"
 msgstr "Cliente de mensaxaría instantánea Empathy"
 
-#: ../C/index.page:26(title)
+#: C/index.page:26(title)
 msgid ""
 "<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png"
 "\">Empathy Instant Messenger logo</media> Empathy Instant Messenger"
@@ -1570,264 +1345,233 @@ msgstr ""
 "\">Logotipo da mensaxaría instantánea Empathy</media>Mensaxaría instantánea "
 "Empathy"
 
-#: ../C/index.page:32(title)
+#: C/index.page:32(title)
 msgid "Account Management"
 msgstr "Xestión de contas"
 
-#: ../C/index.page:36(title)
+#: C/index.page:36(title)
 msgid "Contact Management"
 msgstr "Xestión de contactos"
 
-#: ../C/index.page:40(title)
+#: C/index.page:40(title)
 msgid "Text Conversations"
 msgstr "Conversas de texto"
 
-#: ../C/index.page:44(title)
+#: C/index.page:44(title)
 msgid "Audio and Video Conversations"
 msgstr "Conversas de son e vídeo"
 
-#: ../C/index.page:48(title)
+#: C/index.page:48(title)
 msgid "Advanced Actions"
 msgstr "Accións avanzadas"
 
-#: ../C/import-account.page:10(desc)
+#: C/import-account.page:10(desc)
 msgid "Import an account from another instant messaging application."
 msgstr "Importar unha conta de outro aplicativo de mensaxaría instantánea."
 
-#: ../C/import-account.page:19(name)
+#: C/import-account.page:19(name)
 msgid "Peter Haslam"
 msgstr "Peter Haslam"
 
-#: ../C/import-account.page:20(email)
+#: C/import-account.page:20(email)
 msgid "peter.haslam@freenet.de"
 msgstr "peter.haslam@freenet.de"
 
-#: ../C/import-account.page:42(title)
+#: C/import-account.page:42(title)
 msgid "Import an existing account"
 msgstr "Importar unha conta existente"
 
-#: ../C/import-account.page:46(app)
-msgid "Pidgin"
-msgstr "Pidgin"
-
-#: ../C/import-account.page:44(p)
+#: C/import-account.page:44(p)
 msgid ""
-"The first time you run <placeholder-1/>, it will offer to import your "
+"The first time you run <app>Empathy</app>, it will offer to import your "
 "accounts from other instant messaging applications. Currently, the only "
-"supported application is <placeholder-2/>."
+"supported application is <app>Pidgin</app>."
 msgstr ""
 
-#: ../C/import-account.page:50(p)
+#: C/import-account.page:50(p)
 msgid ""
-"Run <placeholder-1/> for the first time. An assistant will offer you a "
+"Run <app>Empathy</app> for the first time. An assistant will offer you a "
 "number of options to create new accounts."
 msgstr ""
 
-#: ../C/import-account.page:54(gui)
-msgid "Yes, import my account details from"
-msgstr "Si, importar os detalles da miña conta desde"
-
-#: ../C/import-account.page:55(gui)
-msgid "Forward"
-msgstr "Adiante"
-
-#: ../C/import-account.page:54(p)
-msgid "Select <placeholder-1/> and click <placeholder-2/>."
+#: C/import-account.page:54(p)
+msgid ""
+"Select <gui>Yes, import my account details from</gui> and click "
+"<gui>Forward</gui>."
 msgstr ""
 
-#: ../C/import-account.page:58(p)
+#: C/import-account.page:58(p)
 msgid "Select the check box next to each account you wish to import."
-msgstr ""
+msgstr "Marque a caixa de verificación xunto a cada conta que queira importar"
 
-#: ../C/import-account.page:66(p)
+#: C/import-account.page:66(p)
 msgid ""
 "It is not currently possible to import accounts after you have completed the "
 "first-run assistant."
 msgstr ""
 
-#: ../C/hide-contacts.page:8(desc)
-msgid "Hide the offline contacts from your <placeholder-1/>."
+#: C/hide-contacts.page:8(desc)
+msgid "Hide the offline contacts from your <gui>Contact List</gui>."
 msgstr ""
+"Ocultar os contactos desconectados da súa <gui>Lista de contactos</gui>."
 
-#: ../C/hide-contacts.page:19(title)
+#: C/hide-contacts.page:19(title)
 msgid "Hide offline contacts"
-msgstr ""
+msgstr "Ocultar os contactos desconectados"
 
-#: ../C/hide-contacts.page:21(p)
+#: C/hide-contacts.page:21(p)
 msgid ""
-"Normally, <placeholder-1/> shows all your contacts: those that are online, "
+"Normally, <app>Empathy</app> shows all your contacts: those that are online, "
 "with which you can have a conversation, and also those that are offline."
 msgstr ""
 
-#: ../C/hide-contacts.page:25(p)
+#: C/hide-contacts.page:25(p)
 msgid "To hide the contacts that are offline:"
 msgstr ""
 
-#: ../C/hide-contacts.page:32(gui)
-msgid "Offline Contacts"
-msgstr "Contactos desconectados"
-
-#: ../C/hide-contacts.page:32(key)
-msgid "Ctrl"
-msgstr "Ctrl"
-
-#: ../C/hide-contacts.page:33(key)
-msgid "H"
-msgstr "H"
-
-#: ../C/hide-contacts.page:31(p)
+#: C/hide-contacts.page:31(p)
 msgid ""
-"From the <placeholder-1/> window, choose <guiseq><placeholder-2/"
-"><placeholder-3/></guiseq>, or press <keyseq><placeholder-4/><placeholder-5/"
-"></keyseq>."
+"From the <gui>Contact List</gui> window, choose <guiseq><gui>View</"
+"gui><gui>Offline Contacts</gui></guiseq>, or press <keyseq><key>Ctrl</"
+"key><key>H</key></keyseq>."
 msgstr ""
 
-#: ../C/hide-contacts.page:36(p)
+#: C/hide-contacts.page:36(p)
 msgid "To show the offline contacts again, repeat the same procedure above."
 msgstr ""
 
-#: ../C/group-conversations.page:8(desc)
+#: C/group-conversations.page:8(desc)
 msgid "Start or join a group conversation with your contacts."
 msgstr ""
 
-#: ../C/group-conversations.page:34(title)
+#: C/group-conversations.page:34(title)
 msgid "Group conversations"
 msgstr "Conversas en grupo"
 
-#: ../C/group-conversations.page:36(p)
+#: C/group-conversations.page:36(p)
 msgid ""
 "Group conversations permits you to have text conversations with more than "
 "one contact at the same time."
 msgstr ""
+"As conversas en grupo permítenlle manter conversas de texto con máis dun "
+"contacto ao mesmo tempo."
 
-#: ../C/group-conversations.page:40(p)
+#: C/group-conversations.page:40(p)
 msgid ""
 "To have a group conversation you need to have a registered account with "
 "either Jabber or Google Talk, or a People Nearby account."
 msgstr ""
 
-#: ../C/group-conversations.page:46(p)
+#: C/group-conversations.page:46(p)
 msgid ""
 "You can have a group conversation only with the contacts that are using the "
 "same service as yours."
 msgstr ""
 
-#: ../C/group-conversations.page:54(title)
+#: C/group-conversations.page:54(title)
 msgid "Start a group conversation"
 msgstr "Iniciar unha conversa en grupo"
 
-#: ../C/group-conversations.page:63(p)
+#: C/group-conversations.page:63(p)
 msgid ""
-"From the <placeholder-1/> drop-down list, select the account you want to use "
-"for the group conversation."
+"From the <gui>Account</gui> drop-down list, select the account you want to "
+"use for the group conversation."
 msgstr ""
 
-#: ../C/group-conversations.page:70(gui) ../C/account-irc.page:147(gui)
-msgid "Server"
-msgstr "Servidor"
-
-#: ../C/group-conversations.page:69(p)
+#: C/group-conversations.page:69(p)
 msgid ""
-"In the <placeholder-1/> text box, type the name of server in which the "
+"In the <gui>Server</gui> text box, type the name of server in which the "
 "conversation will be hosted."
 msgstr ""
 
-#: ../C/group-conversations.page:73(p)
+#: C/group-conversations.page:73(p)
 msgid "Leave it empty if it will be on the current server."
 msgstr ""
 
-#: ../C/group-conversations.page:78(p)
+#: C/group-conversations.page:78(p)
 msgid ""
-"In the <placeholder-1/> text box, type the name you want to give to the "
+"In the <gui>Room</gui> text box, type the name you want to give to the "
 "conversation."
 msgstr ""
 
-#: ../C/group-conversations.page:82(p)
+#: C/group-conversations.page:82(p)
 msgid ""
 "This will be the name of the room you are going to have a conversation. This "
 "name will be publicly available for other people to join. It is not possible "
 "to create a private room."
 msgstr ""
 
-#: ../C/group-conversations.page:90(p)
+#: C/group-conversations.page:90(p)
 msgid ""
 "To invite other contacts to join the group conversation, from the "
-"<placeholder-1/> window, select the contact you want to invite, and perform "
-"one of the following:"
+"<gui>Contact List</gui> window, select the contact you want to invite, and "
+"perform one of the following:"
 msgstr ""
 
-#: ../C/group-conversations.page:98(gui)
-#: ../C/group-conversations.page:103(gui)
-msgid "Invite to chatroom"
-msgstr "Invitar a unha sala de conversa"
-
-#: ../C/group-conversations.page:97(p)
-msgid "Right-click on the contact and choose <placeholder-1/>."
+#: C/group-conversations.page:97(p)
+msgid "Right-click on the contact and choose <gui>Invite to chatroom</gui>."
 msgstr ""
 
-#: ../C/group-conversations.page:102(p)
+#: C/group-conversations.page:102(p)
 msgid ""
-"Choose <guiseq><placeholder-1/><placeholder-2/><placeholder-3/></guiseq>."
+"Choose <guiseq><gui>Edit</gui><gui>Contact</gui><gui>Invite to chatroom</"
+"gui></guiseq>."
 msgstr ""
 
-#: ../C/group-conversations.page:107(p)
+#: C/group-conversations.page:107(p)
 msgid ""
 "If you have more than one group conversation open, select the one you want "
 "to invite your contacts."
 msgstr ""
 
-#: ../C/group-conversations.page:118(title)
+#: C/group-conversations.page:118(title)
 msgid "Join a group conversation"
-msgstr ""
-
-#: ../C/group-conversations.page:129(gui)
-msgid "Room List"
-msgstr "Lista de salas"
+msgstr "Unirse a unha conversa en grupo"
 
-#: ../C/group-conversations.page:128(p)
-msgid "Expand the <placeholder-1/> section to see all the existing rooms."
+#: C/group-conversations.page:128(p)
+msgid "Expand the <gui>Room List</gui> section to see all the existing rooms."
 msgstr ""
 
-#: ../C/group-conversations.page:133(p)
+#: C/group-conversations.page:133(p)
 msgid "Double-click on the name of a room to join it."
-msgstr ""
+msgstr "Prema dúas veces sobre o nome dunha sala á que queira unirse."
 
-#: ../C/group-conversations.page:139(p)
+#: C/group-conversations.page:139(p)
 msgid ""
 "It is not possible to join all existing rooms. Some of the rooms might "
-"require a password, or might be invitation only. <placeholder-1/> does not "
+"require a password, or might be invitation only. <app>Empathy</app> does not "
 "support these kind of rooms."
 msgstr ""
 
-#: ../C/geolocation-what-is.page:9(desc)
+#: C/geolocation-what-is.page:9(desc)
 msgid "Understanding geolocation."
-msgstr ""
+msgstr "Entender a xeolocalización."
 
-#: ../C/geolocation-what-is.page:33(title)
+#: C/geolocation-what-is.page:33(title)
 msgid "What is geolocation"
 msgstr "Que é a xeolocalización"
 
-#: ../C/geolocation-what-is.page:35(p)
+#: C/geolocation-what-is.page:35(p)
 msgid ""
 "Geolocation allows you to identify the real geographical location of a "
 "computer or a device connected to the Internet."
 msgstr ""
 
-#: ../C/geolocation-what-is.page:37(p)
-msgid "With geolocation in <placeholder-1/> you can:"
+#: C/geolocation-what-is.page:37(p)
+msgid "With geolocation in <app>Empathy</app> you can:"
 msgstr "Coa xeolocalización en <placeholder-1> vostede pode:"
 
-#: ../C/geolocation-what-is.page:42(p)
+#: C/geolocation-what-is.page:42(p)
 msgid "Publish your geographical location to your contacts."
 msgstr "Publicar a súa información xeográfica aos seus contactos."
 
-#: ../C/geolocation-what-is.page:47(p)
+#: C/geolocation-what-is.page:47(p)
 msgid "See your contacts’ geographical location and quickly contact them."
 msgstr ""
 "Vexa a localización xeográfica dos seus contactos e contacte con eles "
 "rapidamente."
 
-#: ../C/geolocation-what-is.page:52(p)
+#: C/geolocation-what-is.page:52(p)
 msgid ""
 "Set the accuracy of your location and the device used to discover your "
 "location."
@@ -1835,7 +1579,7 @@ msgstr ""
 "Estabeleza a precisión da súa localización e o dispositivo que usar para "
 "descubrir a súa localización."
 
-#: ../C/geolocation-what-is.page:60(p)
+#: C/geolocation-what-is.page:60(p)
 msgid ""
 "In order to see your contacts’ geographical locations, they need to use a "
 "service and an application that supports geolocation."
@@ -1843,153 +1587,129 @@ msgstr ""
 "Para poder ver as localizacións xeográficas dos seus contactos, estes deben "
 "usan un servizo e un aplicativo que admita a xeolocalización."
 
-#: ../C/geolocation-turn.page:9(desc)
-msgid "How to activate and deactivate geolocation in <placeholder-1/>."
+#: C/geolocation-turn.page:9(desc)
+msgid "How to activate and deactivate geolocation in <app>Empathy</app>."
 msgstr "Como activar e desactivar a xeolocalización en <placeholder-1/>."
 
-#: ../C/geolocation-turn.page:33(title)
+#: C/geolocation-turn.page:33(title)
 msgid "Activate/Deactivate geolocation"
 msgstr "Activar e desactivar a xeolocalización"
 
-#: ../C/geolocation-turn.page:38(gui)
-msgid "Preferences"
-msgstr "Preferencias"
-
-#: ../C/geolocation-turn.page:37(p) ../C/add-contact.page:37(p)
-msgid "Choose <guiseq><placeholder-1/><placeholder-2/></guiseq>."
-msgstr "Seleccione <guiseq><placeholder-1/><placeholder-2/></guiseq>."
-
-#: ../C/geolocation-turn.page:43(gui)
-msgid "Location"
-msgstr "Localización"
+#: C/geolocation-turn.page:37(p)
+msgid "Choose <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq>."
+msgstr ""
 
-#: ../C/geolocation-turn.page:48(gui)
-msgid "Publish location to my contacts"
-msgstr "Publicar a localización aos meus contactos"
+#: C/geolocation-turn.page:42(p)
+msgid "Select the <gui>Location</gui> tab."
+msgstr ""
 
-#: ../C/geolocation-turn.page:47(p)
-msgid "Select <placeholder-1/> to activate geolocation."
+#: C/geolocation-turn.page:47(p)
+msgid ""
+"Select <gui>Publish location to my contacts</gui> to activate geolocation."
 msgstr ""
 
-#: ../C/geolocation-turn.page:50(p)
+#: C/geolocation-turn.page:50(p)
 msgid "To deactivate geolocation, deselect it."
 msgstr "Para desactivar a xeolocalización, deselecciónea."
 
-#: ../C/geolocation-turn.page:57(gui)
-msgid "Reduce location accuracy"
-msgstr "Reducir a exactitude da localización"
-
-#: ../C/geolocation-turn.page:55(p)
-msgid "To increase the accuracy of your position, deselect <placeholder-1/>."
+#: C/geolocation-turn.page:55(p)
+msgid ""
+"To increase the accuracy of your position, deselect <gui>Reduce location "
+"accuracy</gui>."
 msgstr ""
 
-#: ../C/geolocation-turn.page:63(gui)
-msgid "Geoclue Settings"
-msgstr "Configuración de Geoclue"
-
-#: ../C/geolocation-turn.page:61(p)
+#: C/geolocation-turn.page:61(p)
 msgid ""
 "If you have an external device like a GPS or want to send a more accurate "
-"position, select the appropriate option in the <placeholder-1/> section."
+"position, select the appropriate option in the <gui>Geoclue Settings</gui> "
+"section."
 msgstr ""
 
-#: ../C/geolocation-supported.page:7(desc)
+#: C/geolocation-supported.page:7(desc)
 msgid "Services that supports geolocation and compatibility."
 msgstr ""
 
-#: ../C/geolocation-supported.page:31(title)
+#: C/geolocation-supported.page:31(title)
 msgid "Supported services"
 msgstr "Servizos admitidos"
 
-#: ../C/geolocation-supported.page:33(p)
+#: C/geolocation-supported.page:33(p)
 msgid ""
 "The geolocation feature at the moment is compatible only with the Jabber "
 "service. In order to use it, you and your contacts need to have a Jabber "
 "account."
 msgstr ""
 
-#: ../C/geolocation-supported.page:39(p)
+#: C/geolocation-supported.page:39(p)
 msgid ""
 "It is necessary that also the server you are using supports the geolocation "
 "feature. Most of the Jabber servers support it. See your service website "
 "documentation for more information."
 msgstr ""
 
-#: ../C/geolocation-supported.page:47(title)
+#: C/geolocation-supported.page:47(title)
 msgid "Compatibility"
 msgstr "Compatibilidade"
 
-#: ../C/geolocation-supported.page:51(em)
-msgid "Google Latitude"
-msgstr "Google Latitude"
-
-#: ../C/geolocation-supported.page:51(em)
-msgid "Yahoo Fire Eagle"
-msgstr "Yahoo Fire Eagle"
-
-#: ../C/geolocation-supported.page:52(em)
-msgid "Brightkite"
-msgstr "Brightkite"
-
-#: ../C/geolocation-supported.page:49(p)
+#: C/geolocation-supported.page:49(p)
 msgid ""
-"<placeholder-1/> geolocation feature is not compatible with other "
-"geographical position services such as <placeholder-2/>, <placeholder-3/> or "
-"<placeholder-4/>."
+"<app>Empathy</app> geolocation feature is not compatible with other "
+"geographical position services such as <em>Google Latitude</em>, <em>Yahoo "
+"Fire Eagle</em> or <em>Brightkite</em>."
 msgstr ""
 
-#: ../C/geolocation-privacy.page:8(desc)
+#: C/geolocation-privacy.page:8(desc)
 msgid "What information are sent and to who."
 msgstr ""
 
-#: ../C/geolocation-privacy.page:32(title)
+#: C/geolocation-privacy.page:32(title)
 msgid "Geolocation Privacy"
 msgstr "Privacidade na xeolocalización"
 
-#: ../C/geolocation-privacy.page:35(title)
+#: C/geolocation-privacy.page:35(title)
 msgid "What information is sent"
 msgstr "Que información se envía"
 
-#: ../C/geolocation-privacy.page:36(p)
+#: C/geolocation-privacy.page:36(p)
 msgid ""
 "What is possible to send is: your country, region, locality, area, street, "
 "building, floor, room, and postal code, longitude, latitude and altitude, "
 "speed and bearing."
 msgstr ""
 
-#: ../C/geolocation-privacy.page:40(p)
+#: C/geolocation-privacy.page:40(p)
 msgid ""
 "The accuracy and the quantity of information about your geographical "
 "position are based on the software or on the infrastructure used to discover "
 "your position."
 msgstr ""
 
-#: ../C/geolocation-privacy.page:44(p)
+#: C/geolocation-privacy.page:44(p)
 msgid ""
 "Different kind of networks may have different accuracy settings, and may "
 "send different information. The use of external devices such as GPS or "
 "mobile phone will increase the accuracy of the information sent."
 msgstr ""
 
-#: ../C/geolocation-privacy.page:49(p)
+#: C/geolocation-privacy.page:49(p)
 msgid ""
 "When the privacy mode is enabled, nothing more precise than your city will "
 "be sent, even if you are using an external device."
 msgstr ""
 
-#: ../C/geolocation-privacy.page:56(title)
+#: C/geolocation-privacy.page:56(title)
 msgid "Who can see the information sent"
 msgstr ""
 
-#: ../C/geolocation-privacy.page:57(p)
+#: C/geolocation-privacy.page:57(p)
 msgid "Only your contacts can see your geographical position."
 msgstr ""
 
-#: ../C/geolocation-privacy.page:63(title)
+#: C/geolocation-privacy.page:63(title)
 msgid "What is the privacy mode"
 msgstr "Que é o modo de privacidade"
 
-#: ../C/geolocation-privacy.page:64(p)
+#: C/geolocation-privacy.page:64(p)
 msgid ""
 "The privacy mode, enabled by default, is a reduced accuracy mode that will "
 "decrease the accuracy of the geographical position sent to your contacts."
@@ -1997,265 +1717,245 @@ msgstr ""
 "O modo de privacidade, activado por omisión, é un modo de precisión reducida "
 "da información de posición xeográfica enviada aos seus contactos."
 
-#: ../C/geolocation-privacy.page:71(title)
+#: C/geolocation-privacy.page:71(title)
 msgid "Privacy overview"
 msgstr "Vista previa da privacidade"
 
-#: ../C/geolocation-privacy.page:72(p)
+#: C/geolocation-privacy.page:72(p)
 msgid ""
-"Overview of the various geolocation privacy settings in <placeholder-1/>."
+"Overview of the various geolocation privacy settings in <app>Empathy</app>."
 msgstr ""
 
-#: ../C/geolocation-privacy.page:77(p)
+#: C/geolocation-privacy.page:77(p)
 msgid "Geolocation is not enabled by default."
 msgstr "De forma predefinida a xeolocalización non está activada."
 
-#: ../C/geolocation-privacy.page:82(p)
+#: C/geolocation-privacy.page:82(p)
 msgid "Privacy mode is enabled by default."
 msgstr "De forma predefinida o modo de privacidade está activado."
 
-#: ../C/geolocation-privacy.page:87(p)
+#: C/geolocation-privacy.page:87(p)
 msgid ""
 "Privacy mode prevails even when using external and more precise devices."
 msgstr ""
 "O modo de privacidade prevalece incluso cando se está usando dispositivos "
 "externos máis precisos."
 
-#: ../C/geolocation-privacy.page:92(p)
+#: C/geolocation-privacy.page:92(p)
 msgid "Only your contacts can see your position."
 msgstr ""
 
-#: ../C/geolocation.page:8(desc)
-msgid "Use and understand geolocation in <placeholder-1/>."
-msgstr "Usar e entender a xeolocalizacón en <placeholder-1/>."
+#: C/geolocation.page:8(desc)
+msgid "Use and understand geolocation in <app>Empathy</app>."
+msgstr "Usar e entender a xeolocalizacón en <app>Empathy</app>."
 
-#: ../C/geolocation.page:32(title)
+#: C/geolocation.page:32(title)
 msgid "Geographical position"
 msgstr "Posición xeográfica"
 
-#: ../C/geolocation.page:35(title)
+#: C/geolocation.page:35(title)
 msgid "Geolocation"
 msgstr "Xeolocalización"
 
-#: ../C/geolocation.page:39(title)
+#: C/geolocation.page:39(title)
 msgid "Fix common problems"
 msgstr "Solucionar problemas comúns"
 
-#: ../C/geolocation-not-showing.page:8(desc)
-msgid "<placeholder-1/> does not publish my geographical position."
-msgstr "<placeholder-1/> non publica a miña posición xeográfica."
+#: C/geolocation-not-showing.page:8(desc)
+msgid "<app>Empathy</app> does not publish my geographical position."
+msgstr "<app>Empathy</app> non publica a miña posición xeográfica."
 
-#: ../C/geolocation-not-showing.page:32(title)
+#: C/geolocation-not-showing.page:32(title)
 msgid "Geographical position not published"
 msgstr "Posición xeográfica non publicada"
 
-#: ../C/geolocation-not-showing.page:34(p)
+#: C/geolocation-not-showing.page:34(p)
 msgid ""
-"If your contacts cannot see your location, <placeholder-1/> might not be "
+"If your contacts cannot see your location, <app>Empathy</app> might not be "
 "able to discover with a good margin of precision your geographical position."
 msgstr ""
 
-#: ../C/geolocation-not-showing.page:38(p)
+#: C/geolocation-not-showing.page:38(p)
 msgid ""
 "In this case, your position will not be published, but you are still able to "
 "see the location of your contacts."
 msgstr ""
 
-#: ../C/geolocation-not-showing.page:42(p)
+#: C/geolocation-not-showing.page:42(p)
 msgid ""
 "If you want to publish your geographical position, you can try to use an "
 "external device such as a GPS."
 msgstr ""
 
-#: ../C/geolocation-not-showing.page:50(link)
-msgid "servers which support PEP"
-msgstr ""
-
-#: ../C/geolocation-not-showing.page:48(p)
+#: C/geolocation-not-showing.page:48(p)
 msgid ""
 "In order to publish your geographical location, your Jabber server needs to "
-"support the Personal Eventing Protocal (PEP). A list of <placeholder-1/> is "
-"maintained online. Google Talk does not support this feature at this time."
+"support the Personal Eventing Protocal (PEP). A list of <link href=\"http://"
+"coccinella.im/servers/servers_by_pubsub_pep.html\">servers which support "
+"PEP</link> is maintained online. Google Talk does not support this feature "
+"at this time."
 msgstr ""
 
-#: ../C/favorite-rooms.page:10(desc)
+#: C/favorite-rooms.page:10(desc)
 msgid "Set, join and manage favorite rooms."
 msgstr "Configurar, unirse e xestionar salas favoritas."
 
-#: ../C/favorite-rooms.page:29(title)
+#: C/favorite-rooms.page:29(title)
 msgid "Favorite rooms"
 msgstr "Salas favoritas"
 
-#: ../C/favorite-rooms.page:32(title)
+#: C/favorite-rooms.page:32(title)
 msgid "Set a room as a favorite"
 msgstr "Estabelecer unha sala como favorita"
 
-#: ../C/favorite-rooms.page:35(p)
+#: C/favorite-rooms.page:35(p)
 msgid "Join a room."
 msgstr "Unirse a unha sala."
 
-#: ../C/favorite-rooms.page:40(p)
+#: C/favorite-rooms.page:40(p)
 msgid ""
 "See <link xref=\"irc-join-room\"/> for more information on how to join an "
 "IRC room."
 msgstr ""
 
-#: ../C/favorite-rooms.page:46(p)
+#: C/favorite-rooms.page:46(p)
 msgid ""
 "See <link xref=\"group-conversations\"/> for more information on how to "
 "start or join a group conversation."
 msgstr ""
 
-#: ../C/favorite-rooms.page:56(gui)
-msgid "Favorite Chat Room"
-msgstr "Sala de conversa favorita"
-
-#: ../C/favorite-rooms.page:54(p)
+#: C/favorite-rooms.page:54(p)
 msgid ""
-"From the conversation window, choose <guiseq><placeholder-1/><placeholder-2/"
-"></guiseq>."
+"From the conversation window, choose <guiseq><gui>Conversation</"
+"gui><gui>Favorite Chat Room</gui></guiseq>."
 msgstr ""
 
-#: ../C/favorite-rooms.page:63(title)
+#: C/favorite-rooms.page:63(title)
 msgid "Join favorite rooms"
 msgstr "Unirse ás salas favoritas"
 
-#: ../C/favorite-rooms.page:72(key)
-msgid "F5"
-msgstr "F5"
-
-#: ../C/favorite-rooms.page:71(p)
-msgid "Press <placeholder-1/>."
-msgstr "Prema <placeholder-1/>."
-
-#: ../C/favorite-rooms.page:77(gui)
-msgid "Join Favorites"
-msgstr "Unirse ás favoritas"
+#: C/favorite-rooms.page:71(p)
+msgid "Press <key>F5</key>."
+msgstr ""
 
-#: ../C/favorite-rooms.page:76(p)
+#: C/favorite-rooms.page:76(p)
 msgid ""
-"Choose <guiseq><placeholder-1/><placeholder-2/></guiseq>, to join all your "
-"favorite rooms."
+"Choose <guiseq><gui>Room</gui><gui>Join Favorites</gui></guiseq>, to join "
+"all your favorite rooms."
 msgstr ""
 
-#: ../C/favorite-rooms.page:82(p)
-msgid "Choose <placeholder-1/>, and select the favorite room you want to join."
-msgstr ""
+#: C/favorite-rooms.page:82(p)
+msgid "Choose <gui>Room</gui>, and select the favorite room you want to join."
+msgstr "Seleccione a sala favorita que quere xestionar:"
 
-#: ../C/favorite-rooms.page:90(p)
+#: C/favorite-rooms.page:90(p)
 msgid ""
 "To join a favorite room, you need to be connected to the Internet and to "
 "your account."
 msgstr ""
 
-#: ../C/favorite-rooms.page:98(title)
+#: C/favorite-rooms.page:98(title)
 msgid "Manage favorite rooms"
 msgstr "Xestionar as salas favoritas"
 
-#: ../C/favorite-rooms.page:103(gui)
-msgid "Manage Favorites"
-msgstr "Xestionar favoritas"
+#: C/favorite-rooms.page:101(p)
+msgid ""
+"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</"
+"gui><gui>Manage Favorites</gui></guiseq>."
+msgstr ""
 
-#: ../C/favorite-rooms.page:107(p)
+#: C/favorite-rooms.page:107(p)
 msgid ""
-"From the <placeholder-1/> drop-down list, select the account you want to "
+"From the <gui>Account</gui> drop-down list, select the account you want to "
 "manage the favorite rooms of."
 msgstr ""
 
-#: ../C/favorite-rooms.page:112(gui)
-msgid "All"
-msgstr "Todas"
-
-#: ../C/favorite-rooms.page:111(p)
-msgid "Select <placeholder-1/> to see all you favorite rooms."
+#: C/favorite-rooms.page:111(p)
+msgid "Select <gui>All</gui> to see all you favorite rooms."
 msgstr "Seleccione <placeholder-1/> para ver todas as súas salas favoritas."
 
-#: ../C/favorite-rooms.page:116(p)
+#: C/favorite-rooms.page:116(p)
 msgid "Select the favorite room you want to manage:"
 msgstr "Seleccione a sala favorita que quere xestionar:"
 
-#: ../C/favorite-rooms.page:122(gui)
-msgid "Auto-Connect"
-msgstr "Conectarse automaticamente"
-
-#: ../C/favorite-rooms.page:121(p)
+#: C/favorite-rooms.page:121(p)
 msgid ""
-"Select the <placeholder-1/> check-box in order to automatically join that "
-"room when you connect to your account."
+"Select the <gui>Auto-Connect</gui> check-box in order to automatically join "
+"that room when you connect to your account."
 msgstr ""
 
-#: ../C/favorite-rooms.page:127(p)
-msgid "Click on <placeholder-1/> to remove the room from your favorites."
+#: C/favorite-rooms.page:127(p)
+msgid "Click on <gui>Remove</gui> to remove the room from your favorites."
 msgstr ""
 
-#: ../C/favorite-rooms.page:134(p)
-msgid "When done, click <placeholder-1/>."
+#: C/favorite-rooms.page:134(p)
+msgid "When done, click <gui>Close</gui>."
 msgstr "Cando remate prema <placeholder-1/>."
 
-#: ../C/disable-account.page:9(desc)
-msgid "Prevent <placeholder-1/> from automatically logging in to an account."
+#: C/disable-account.page:9(desc)
+msgid "Prevent <app>Empathy</app> from automatically logging in to an account."
 msgstr ""
 
-#: ../C/disable-account.page:39(title)
+#: C/disable-account.page:39(title)
 msgid "Disable an account"
 msgstr "Desactivar unha conta"
 
-#: ../C/disable-account.page:41(p)
+#: C/disable-account.page:41(p)
 msgid ""
-"You can disable an account to prevent <placeholder-1/> 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 <placeholder-2/> for other accounts."
+"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 ""
 
-#: ../C/disable-account.page:52(p)
+#: C/disable-account.page:52(p)
 msgid ""
 "Select the account you wish to disable from the accounts list on the left "
 "side of the window."
 msgstr ""
 
-#: ../C/disable-account.page:56(p)
-msgid "Deselect <placeholder-1/> on the right side of the window."
+#: C/disable-account.page:56(p)
+msgid ""
+"Deselect <gui style=\"checkbox\">Enabled</gui> on the right side of the "
+"window."
 msgstr ""
 
-#: ../C/disable-account.page:62(p)
-msgid "To re-enable the account, simply select <placeholder-1/>."
+#: 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/>."
 
-#: ../C/create-account.page:9(desc)
+#: C/create-account.page:9(desc)
 msgid "Register for an account with one of the supported messaging services."
 msgstr ""
 
-#: ../C/create-account.page:33(title)
+#: C/create-account.page:33(title)
 msgid "Register for a new account"
 msgstr "Rexistrar unha nova conta"
 
-#: ../C/create-account.page:38(link)
-msgid "add an account"
-msgstr "engadir unha conta"
-
-#: ../C/create-account.page:35(p)
+#: C/create-account.page:35(p)
 msgid ""
 "Most account types require you to create an account with a account provider "
 "before you can connect using instant messaging applications like "
-"<placeholder-1/>. With some account providers, you can use <placeholder-2/> "
-"to register for a new account, using the same steps as you would to "
-"<placeholder-3/>."
+"<app>Empathy</app>. With some account providers, you can use <app>Empathy</"
+"app> to register for a new account, using the same steps as you would to "
+"<link xref=\"add-account\">add an account</link>."
 msgstr ""
 
-#: ../C/create-account.page:41(p)
+#: C/create-account.page:41(p)
 msgid ""
 "This page provides information on creating a new account for various types "
 "of accounts. Your account provider should give you a login ID and a "
 "password, as well as any additional information you need to connect using "
-"<placeholder-1/>."
+"<app>Empathy</app>."
 msgstr ""
 
-#: ../C/create-account.page:46(title)
+#: C/create-account.page:46(title)
 msgid "Facebook"
 msgstr "Facebook"
 
-#: ../C/create-account.page:47(p)
+#: C/create-account.page:47(p)
 msgid ""
 "Facebook is one of the most-used social networks. It allows users to create "
 "their own profile and to communicate with their friends."
@@ -2263,41 +1963,43 @@ msgstr ""
 "Facebook é unha das redes sociais máis usadas. Permite aos usuarios crear o "
 "seu propio perfil e comunicarse cos seus amigos."
 
-#: ../C/create-account.page:54(link)
-msgid "www.facebook.com"
-msgstr "www.facebook.com"
-
-#: ../C/create-account.page:51(p)
+#: C/create-account.page:51(p)
 msgid ""
 "To use Facebook to communicate with your friends, you will need to create a "
-"new account from the website: <placeholder-1/>."
+"new account from the website: <link href=\"http://www.facebook.com\">www."
+"facebook.com</link>."
 msgstr ""
 
-#: ../C/create-account.page:61(p)
+#: C/create-account.page:59(title) C/audio-video.page:170(p)
+msgid "Jabber"
+msgstr "Jabber"
+
+#: C/create-account.page:61(p)
 msgid ""
 "Jabber is an open instant messaging system. Like email, Jabber allows you to "
 "choose your account provider and communicate with all other Jabber users, "
 "regardless of their account provider."
 msgstr ""
 
-#: ../C/create-account.page:67(link)
-msgid "Jabber.org"
-msgstr "Jabber.org"
-
-#: ../C/create-account.page:65(p)
+#: C/create-account.page:65(p)
 msgid ""
 "You will need to create a new account with a Jabber provider. There are many "
-"free providers; one popular provider is <placeholder-1/>."
+"free providers; one popular provider is <link href=\"http://register.jabber."
+"org/\">Jabber.org</link>."
 msgstr ""
 
-#: ../C/create-account.page:70(p)
+#: C/create-account.page:70(p)
 msgid ""
 "If you use Google Mail or Google Talk, you already have a Jabber account. "
 "Google Talk is a Jabber service. Simply use your Google Mail address and "
-"password in <placeholder-1/> to connect."
+"password in <app>Empathy</app> to connect."
 msgstr ""
 
-#: ../C/create-account.page:79(p)
+#: C/create-account.page:77(title) C/audio-video.page:190(p)
+msgid "People Nearby"
+msgstr "Persoas próximas"
+
+#: C/create-account.page:79(p)
 msgid ""
 "You do not need to create an account with a service provider to use this "
 "feature. This service works whenever you are connected to a local network, "
@@ -2305,15 +2007,15 @@ msgid ""
 "network who are also using this service."
 msgstr ""
 
-#: ../C/create-account.page:84(p)
+#: C/create-account.page:84(p)
 msgid "For more information, see <link xref=\"salut-protocol\"/>."
 msgstr ""
 
-#: ../C/create-account.page:88(title) ../C/audio-video.page:205(p)
+#: C/create-account.page:88(title) C/audio-video.page:205(p)
 msgid "SIP"
 msgstr "SIP"
 
-#: ../C/create-account.page:90(p)
+#: C/create-account.page:90(p)
 msgid ""
 "SIP is an open system which allows users to have audio and video "
 "conversations over the Internet. You need to create an account with a SIP "
@@ -2321,134 +2023,134 @@ msgid ""
 "SIP provider they use."
 msgstr ""
 
-#: ../C/create-account.page:97(link)
-msgid "Sipphone"
-msgstr "Sipphone"
-
-#: ../C/create-account.page:95(p)
+#: C/create-account.page:95(p)
 msgid ""
 "There are a number of popular free SIP account providers; one popular "
-"provider is <placeholder-1/>."
+"provider is <link href=\"https://signup.sipphone.com/new-users/app?"
+"class=NewUser;proc=start\">Sipphone</link>."
 msgstr ""
 
-#: ../C/create-account.page:101(link)
-msgid "Ekiga.net"
-msgstr "Ekiga.net"
-
-#: ../C/create-account.page:100(p)
+#: C/create-account.page:100(p)
 msgid ""
-"Due to technical differences, the free <placeholder-1/> service does not "
-"currently work with <placeholder-2/>."
+"Due to technical differences, the free <link href=\"https://www.ekiga.net/"
+"index.php?page=register\">Ekiga.net</link> service does not currently work "
+"with <app>Empathy</app>."
 msgstr ""
 
-#: ../C/create-account.page:105(p)
+#: C/create-account.page:105(p)
 msgid ""
 "Some SIP providers allow you to call normal phones from your computer. "
 "Generally, you will need to subscribe to a paid service for this feature."
 msgstr ""
 
-#: ../C/create-account.page:110(title) ../C/audio-video.page:165(p)
+#: C/create-account.page:110(title) C/audio-video.page:165(p)
 msgid "IRC"
 msgstr "IRC"
 
-#: ../C/create-account.page:112(p)
+#: C/create-account.page:112(p)
 msgid ""
 "You do not need to register for an account to use IRC. Although you specify "
-"a nickname when you add an IRC account to <placeholder-1/>, this nickname is "
-"only established each time you connect. If another user is using the "
+"a nickname when you add an IRC account to <app>Empathy</app>, this nickname "
+"is only established each time you connect. If another user is using the "
 "nickname, you will need to choose a new nickname."
 msgstr ""
 
-#: ../C/create-account.page:117(p)
+#: C/create-account.page:117(p)
 msgid ""
 "Some IRC networks use a service called NickServ to allow users to protect "
 "their nicknames. See <link xref=\"irc-nick-password\"/> for more information."
 msgstr ""
 
-#: ../C/create-account.page:120(p)
+#: C/create-account.page:120(p)
 msgid ""
 "Some IRC servers are password protected. You will need to know the password "
 "to connect to these servers. Generally, these are private IRC networks."
 msgstr ""
 
-#: ../C/create-account.page:125(title)
+#: C/create-account.page:125(title)
 msgid "Proprietary Services"
 msgstr ""
 
-#: ../C/create-account.page:127(p)
+#: C/create-account.page:127(p)
 msgid ""
 "There are many proprietary instant messaging services that have been "
-"developed by different companies or organizations. <placeholder-1/> allows "
+"developed by different companies or organizations. <app>Empathy</app> allows "
 "you to connect to an existing account for most popular services. To create a "
 "new account with one of these services, you will need to visit the service’s "
 "web site and agree to its terms of use."
 msgstr ""
 
-#: ../C/create-account.page:136(link) ../C/audio-video.page:135(p)
+#: C/create-account.page:136(link) C/audio-video.page:135(p)
 msgid "AIM"
 msgstr "AIM"
 
-#: ../C/create-account.page:141(link) ../C/audio-video.page:160(p)
+#: C/create-account.page:141(link) C/audio-video.page:160(p)
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../C/create-account.page:146(link) ../C/audio-video.page:175(p)
+#: C/create-account.page:146(link) C/audio-video.page:175(p)
 msgid "MSN"
 msgstr "MSN"
 
-#: ../C/create-account.page:151(link) ../C/audio-video.page:210(p)
+#: C/create-account.page:151(link) C/audio-video.page:210(p)
 msgid "Yahoo!"
 msgstr "Yahoo!"
 
-#: ../C/change-status.page:9(desc)
+#: C/change-status.page:9(desc)
 msgid "Change your status to advertise your availability to your contacts."
 msgstr ""
 
-#: ../C/change-status.page:34(title)
+#: C/change-status.page:34(title)
 msgid "Change your status"
 msgstr ""
 
-#: ../C/change-status.page:36(p)
+#: C/change-status.page:36(p)
 msgid ""
 "You can set your status to indicate your availability to your contacts. "
-"<placeholder-1/> allows you to select from a list of defined statuses."
+"<app>Empathy</app> allows you to select from a list of defined statuses."
 msgstr ""
 
-#: ../C/change-status.page:41(p)
-msgid "Click on the drop-down list at the top of the <placeholder-1/> window."
+#: C/change-status.page:41(p)
+msgid ""
+"Click on the drop-down list at the top of the <gui>Contact List</gui> window."
 msgstr ""
 
-#: ../C/change-status.page:46(p)
+#: C/change-status.page:46(p)
 msgid "Select a status from the list."
 msgstr ""
 
-#: ../C/change-status.page:53(link)
-msgid "add custom status messages"
-msgstr ""
-
-#: ../C/change-status.page:52(p)
+#: 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 <placeholder-1/> to provide more information "
-"about your availability to your contacts."
+"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 ""
 
-#: ../C/change-status.page:58(p)
+#: C/change-status.page:58(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 ""
 
-#: ../C/audio-video.page:8(desc)
+#. 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/audio-video.page:58(None) C/audio-call.page:47(None)
+msgid ""
+"@@image: 'figures/audio-input-microphone.png'; "
+"md5=8d89026b66a263a3bc5b1f0665948567"
+msgstr ""
+
+#: C/audio-video.page:8(desc)
 msgid ""
 "Information on when it is possible to have an audio or video conversation."
 msgstr ""
 
-#: ../C/audio-video.page:32(title)
+#: C/audio-video.page:32(title)
 msgid "Audio and video support"
 msgstr ""
 
-#: ../C/audio-video.page:34(p)
+#: C/audio-video.page:34(p)
 msgid ""
 "You can only have audio and video conversation with contacts who are using "
 "an application which also supports this feature. When your contacts support "
@@ -2456,54 +2158,54 @@ msgid ""
 "names in the contact list:"
 msgstr ""
 
-#: ../C/audio-video.page:43(p)
+#: C/audio-video.page:43(p)
 msgid "Icon"
 msgstr "Icona"
 
-#: ../C/audio-video.page:48(p)
+#: C/audio-video.page:48(p)
 msgid "Description"
 msgstr "Descrición"
 
-#: ../C/audio-video.page:58(media)
+#: C/audio-video.page:58(media)
 msgid "Icon for audio conversation"
 msgstr ""
 
-#: ../C/audio-video.page:64(p)
+#: C/audio-video.page:64(p)
 msgid "The contact is able to have an audio conversation."
 msgstr ""
 
-#: ../C/audio-video.page:70(media)
+#: C/audio-video.page:70(media)
 msgid "Icon for video conversation"
-msgstr ""
+msgstr "Icona para a conversa de vídeo"
 
-#: ../C/audio-video.page:76(p)
+#: C/audio-video.page:76(p)
 msgid "The contact is able to have a video conversation."
 msgstr ""
 
-#: ../C/audio-video.page:83(p)
+#: C/audio-video.page:83(p)
 msgid ""
 "In order to have an audio conversation, you need to have a sound card that "
 "is supported by your operating system, and a working microphone."
 msgstr ""
 
-#: ../C/audio-video.page:87(p)
+#: C/audio-video.page:87(p)
 msgid ""
 "In order to have a video conversation, you need to have a webcam that is "
 "supported by your operating system, and a working microphone."
 msgstr ""
 
-#: ../C/audio-video.page:95(title)
+#: C/audio-video.page:95(title)
 msgid "Supported Account Types"
 msgstr ""
 
-#: ../C/audio-video.page:97(p)
+#: C/audio-video.page:97(p)
 msgid ""
 "You can only have audio and video conversations using accounts on certain "
 "supported services. The following table lists whether audio and video is "
 "supported for each type of account."
 msgstr ""
 
-#: ../C/audio-video.page:102(p)
+#: C/audio-video.page:102(p)
 msgid ""
 "Account types are provided by plugins. Your system may not have all of the "
 "following types available, or it may have types not listed here. Updated "
@@ -2511,17 +2213,15 @@ msgid ""
 "are listed as unsupported here."
 msgstr ""
 
-#: ../C/audio-video.page:112(link)
-msgid "asked the accessibility team"
-msgstr ""
-
-#: ../C/audio-video.page:110(p)
+#: C/audio-video.page:110(p)
 msgid ""
 "I'd like to do tables like this using nothing for No and ✔ for Yes, but we "
-"need to look at the accessibility impact. I've <placeholder-1/> for input."
+"need to look at the accessibility impact. I've <link href=\"http://mail."
+"gnome.org/archives/gnome-doc-list/2009-September/msg00006.html\">asked the "
+"accessibility team</link> for input."
 msgstr ""
 
-#: ../C/audio-video.page:118(p)
+#: C/audio-video.page:118(p)
 msgid ""
 "There's recent work on telepathy-butterfly and papyon to support audio and "
 "video for MSN. It might be released in time for 2.28, but since it doesn't "
@@ -2529,332 +2229,342 @@ msgid ""
 "going to ship, let's mark it Yes."
 msgstr ""
 
-#: ../C/audio-video.page:128(p)
+#: C/audio-video.page:128(p)
 msgid "Service"
-msgstr ""
+msgstr "Servizo"
 
-#: ../C/audio-video.page:129(p)
+#: C/audio-video.page:129(p)
 msgid "Audio"
 msgstr "Son"
 
-#: ../C/audio-video.page:136(p) ../C/audio-video.page:137(p)
-#: ../C/audio-video.page:141(p) ../C/audio-video.page:142(p)
-#: ../C/audio-video.page:146(p) ../C/audio-video.page:147(p)
-#: ../C/audio-video.page:156(p) ../C/audio-video.page:157(p)
-#: ../C/audio-video.page:161(p) ../C/audio-video.page:162(p)
-#: ../C/audio-video.page:166(p) ../C/audio-video.page:167(p)
-#: ../C/audio-video.page:181(p) ../C/audio-video.page:182(p)
-#: ../C/audio-video.page:186(p) ../C/audio-video.page:187(p)
-#: ../C/audio-video.page:191(p) ../C/audio-video.page:192(p)
-#: ../C/audio-video.page:196(p) ../C/audio-video.page:197(p)
-#: ../C/audio-video.page:201(p) ../C/audio-video.page:202(p)
-#: ../C/audio-video.page:211(p) ../C/audio-video.page:212(p)
-#: ../C/audio-video.page:216(p) ../C/audio-video.page:217(p)
+#: C/audio-video.page:130(p)
+msgid "Video"
+msgstr "Vídeo"
+
+#: C/audio-video.page:136(p) C/audio-video.page:137(p)
+#: C/audio-video.page:141(p) C/audio-video.page:142(p)
+#: C/audio-video.page:146(p) C/audio-video.page:147(p)
+#: C/audio-video.page:156(p) C/audio-video.page:157(p)
+#: C/audio-video.page:161(p) C/audio-video.page:162(p)
+#: C/audio-video.page:166(p) C/audio-video.page:167(p)
+#: C/audio-video.page:181(p) C/audio-video.page:182(p)
+#: C/audio-video.page:186(p) C/audio-video.page:187(p)
+#: C/audio-video.page:191(p) C/audio-video.page:192(p)
+#: C/audio-video.page:196(p) C/audio-video.page:197(p)
+#: C/audio-video.page:201(p) C/audio-video.page:202(p)
+#: C/audio-video.page:211(p) C/audio-video.page:212(p)
+#: C/audio-video.page:216(p) C/audio-video.page:217(p)
 msgid "No"
 msgstr "Non"
 
-#: ../C/audio-video.page:140(p)
+#: C/audio-video.page:140(p)
 msgid "Facebook Chat"
 msgstr "Chat de Facebook"
 
-#: ../C/audio-video.page:145(p)
+#: C/audio-video.page:145(p)
 msgid "gadugadu"
 msgstr "gadugadu"
 
-#: ../C/audio-video.page:151(p) ../C/audio-video.page:152(p)
-#: ../C/audio-video.page:171(p) ../C/audio-video.page:172(p)
-#: ../C/audio-video.page:176(p) ../C/audio-video.page:177(p)
-#: ../C/audio-video.page:206(p) ../C/audio-video.page:207(p)
+#: C/audio-video.page:150(p)
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: C/audio-video.page:151(p) C/audio-video.page:152(p)
+#: C/audio-video.page:171(p) C/audio-video.page:172(p)
+#: C/audio-video.page:176(p) C/audio-video.page:177(p)
+#: C/audio-video.page:206(p) C/audio-video.page:207(p)
 msgid "Yes"
 msgstr "Si"
 
-#: ../C/audio-video.page:155(p)
+#: C/audio-video.page:155(p)
 msgid "Groupwise"
 msgstr "Groupwise"
 
-#: ../C/audio-video.page:180(p)
+#: C/audio-video.page:180(p)
 msgid "myspace"
 msgstr "myspace"
 
-#: ../C/audio-video.page:185(p)
+#: C/audio-video.page:185(p)
 msgid "qq"
 msgstr "qq"
 
-#: ../C/audio-video.page:195(p)
+#: C/audio-video.page:195(p)
 msgid "sametime"
 msgstr "sametime"
 
-#: ../C/audio-video.page:200(p)
+#: C/audio-video.page:200(p)
 msgid "silc"
 msgstr "silc"
 
-#: ../C/audio-video.page:215(p)
+#: C/audio-video.page:215(p)
 msgid "zephyr"
 msgstr "zephyr"
 
-#: ../C/audio-call.page:9(desc)
+#: C/audio-call.page:9(desc)
 msgid "Call your contacts over the Internet."
 msgstr ""
 
-#: ../C/audio-call.page:33(title)
+#: C/audio-call.page:33(title)
 msgid "Start an audio conversation"
 msgstr ""
 
-#: ../C/audio-call.page:35(p)
+#: C/audio-call.page:35(p)
 msgid ""
 "You can call your contacts and have an audio conversation with them. This "
 "features only works with certain types of accounts, and it requires the "
 "other person to have an application that supports audio calls."
 msgstr ""
 
-#: ../C/audio-call.page:47(media)
-msgid "audio call"
-msgstr "chamada de son"
-
-#: ../C/audio-call.page:48(gui) ../C/audio-call.page:49(gui)
-msgid "Audio Call"
-msgstr "chamada de vídeo"
-
-#: ../C/audio-call.page:64(gui)
-msgid "Video On"
+#: C/audio-call.page:46(p)
+msgid ""
+"From the <gui>Contact List</gui> window, click the <media type=\"image\" "
+"mime=\"image/png\" src=\"figures/audio-input-microphone.png\">audio call</"
+"media> icon next to the name of the contact you wish to call and choose <gui "
+"style=\"menuitem\">Audio Call</gui>. Alternatively, right click the contact "
+"and choose <gui style=\"menuitem\">Audio Call</gui>."
 msgstr ""
+"Desde a xanela <gui>Lista de contactos</gui>, prema a icona <media type="
+"\"image\" mime=\"image/png\" src=\"figures/audio-input-microphone.png"
+"\">Audiochamada</media> ao lado do nome do contacto ao que quere chamar e "
+"seleccione <gui style=\"menuitem\">Audiochamada</gui>. De forma alternativa, "
+"prema co botón dereito e seleccione <gui style=\"menuitem\">Audiochamada</"
+"gui>."
 
-#: ../C/audio-call.page:63(p)
+#: C/audio-call.page:63(p)
 msgid ""
-"To turn an audio conversation into a video conversation, choose "
-"<guiseq><placeholder-1/><placeholder-2/></guiseq>, or click the <placeholder-"
-"3/> toolbar button to select it."
+"To turn an audio conversation into a video conversation, choose <guiseq><gui "
+"style=\"menu\">Video</gui><gui style=\"menuitem\">Video On</gui></guiseq>, "
+"or click the <media type=\"image\" mime=\"image/png\" src=\"figures/camera-"
+"web.png\">video call</media> toolbar button to select it."
 msgstr ""
+"Para trocar unha conversa de vídeo nunha conversa de son, seleccione "
+"<guiseq><placeholder-1/><placeholder-2/></guiseq>, ou prema o botón da barra "
+"de ferramentas <placeholder-3/> para deseleccionalo.."
 
-#: ../C/add-contact.page:9(desc)
+#: C/add-contact.page:9(desc)
 msgid "Add someone to the contact list."
-msgstr ""
+msgstr "Engadir a alguén á lista de contactos."
 
-#: ../C/add-contact.page:33(title)
+#: C/add-contact.page:33(title)
 msgid "Add someone to your list of contacts"
-msgstr ""
+msgstr "Engadir a alguén á súa lista de contactos."
 
-#: ../C/add-contact.page:37(gui)
-msgid "Add Contact"
-msgstr "Engadir contacto"
+#: C/add-contact.page:37(p)
+msgid "Choose <guiseq><gui>Chat</gui><gui>Add Contact</gui></guiseq>."
+msgstr ""
+"Seleccione<guiseq><gui>Conversa</gui><gui>Engadir contacto</gui></guiseq>."
 
-#: ../C/add-contact.page:40(p)
+#: C/add-contact.page:40(p)
 msgid ""
-"From the <placeholder-1/> drop-down list, select the account you wish to use "
-"to connect to your contact. Your contact will need to be using the same "
+"From the <gui>Account</gui> drop-down list, select the account you wish to "
+"use to connect to your contact. Your contact will need to be using the same "
 "service as the account you select."
 msgstr ""
 
-#: ../C/add-contact.page:45(gui)
-msgid "Identifier"
-msgstr "Identificador"
-
-#: ../C/add-contact.page:45(p)
+#: C/add-contact.page:45(p)
 msgid ""
-"In the <placeholder-1/> field, enter your contact’s login ID, username, "
+"In the <gui>Identifier</gui> field, enter your contact’s login ID, username, "
 "screen name, or other appropriate identifier for the service type."
 msgstr ""
 
-#: ../C/add-contact.page:49(gui)
-msgid "Alias"
-msgstr "Alias"
-
-#: ../C/add-contact.page:49(p)
+#: C/add-contact.page:49(p)
 msgid ""
-"In the <placeholder-1/> field, type your contact’s name as you would like it "
+"In the <gui>Alias</gui> field, type your contact’s name as you would like it "
 "to appear in your contact list."
 msgstr ""
 
-#: ../C/add-contact.page:53(p)
-msgid "Click <placeholder-1/> to add the person to your list of contacts."
+#: C/add-contact.page:53(p)
+msgid "Click <gui>Add</gui> to add the person to your list of contacts."
 msgstr ""
 
-#: ../C/add-contact.page:61(p)
+#: C/add-contact.page:61(p)
 msgid ""
 "To add a new person to your list of contacts, you need to be connected to "
 "the Internet and to your account."
 msgstr ""
 
-#: ../C/add-account.page:9(desc)
-msgid "Add a new account to <placeholder-1/>."
+#: C/add-account.page:9(desc)
+msgid "Add a new account to <app>Empathy</app>."
 msgstr ""
 
-#: ../C/add-account.page:39(title)
+#: C/add-account.page:39(title)
 msgid "Add a new account"
 msgstr "Engadir unha nova conta"
 
-#: ../C/add-account.page:41(p)
+#: C/add-account.page:41(p)
 msgid ""
 "You can add instant messaging accounts from any supported service to "
-"communicate with all of your contacts in <placeholder-1/>. For some account "
-"providers, these steps will also allow you to register for a new account. "
-"For more details, see <link xref=\"create-account\"/>."
+"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 ""
 
-#: ../C/add-account.page:57(gui)
-msgid "Protocol"
+#: C/add-account.page:52(p)
+msgid "Click <gui style=\"button\">Add</gui>."
 msgstr ""
 
-#: ../C/add-account.page:57(p)
+#: C/add-account.page:57(p)
 msgid ""
-"From the <placeholder-1/> drop-down list, select the type of account you "
+"From the <gui>Protocol</gui> drop-down list, select the type of account you "
 "wish to add."
 msgstr ""
 
-#: ../C/add-account.page:61(gui)
-msgid "Create a new account on the server"
-msgstr ""
-
-#: ../C/add-account.page:61(p)
+#: C/add-account.page:61(p)
 msgid ""
-"If you do not already have a registered account, select <placeholder-1/>. "
-"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."
+"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 ""
 
-#: ../C/add-account.page:66(p)
+#: 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."
 msgstr ""
 
-#: ../C/add-account.page:72(gui)
-msgid "Log in"
-msgstr "Iniciar a sesión"
+#: C/add-account.page:71(p)
+msgid "Click <gui style=\"button\">Log in</gui>."
+msgstr ""
 
-#: ../C/add-account.page:78(p)
+#: C/add-account.page:78(p)
 msgid ""
-"To change the name that identifies the account in the <placeholder-1/> "
+"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 <placeholder-2/"
-"> when you’re finished."
+"name or press the space bar. Edit the account name and press <key>Enter</"
+"key> when you’re finished."
 msgstr ""
 
-#: ../C/accounts-window.page:11(desc)
+#: C/accounts-window.page:11(desc)
 msgid "Add, modify, and delete accounts."
 msgstr ""
 
-#: ../C/accounts-window.page:33(title)
+#: C/accounts-window.page:33(title)
 msgid "Accounts Window"
 msgstr "Xanela de contas"
 
-#: ../C/accounts-window.page:35(p)
+#: C/accounts-window.page:35(p)
 msgid ""
-"The <placeholder-1/> window allows you to add, modify, and delete accounts."
+"The <gui>Accounts</gui> window allows you to add, modify, and delete "
+"accounts."
 msgstr ""
 
-#: ../C/accounts-window.page:43(title)
+#: C/accounts-window.page:43(title)
 msgid "Account Details"
 msgstr "Detalles da conta"
 
-#: ../C/accounts-window.page:44(p)
+#: C/accounts-window.page:44(p)
 msgid ""
 "For most types of accounts, you can simply enter a login ID and a password. "
 "Certain accounts or account types, however, may require additional "
 "information."
 msgstr ""
 
-#: ../C/account-jabber.page:7(desc)
+#: C/account-jabber.page:7(desc)
 msgid "Advanced options for Jabber and Google Talk accounts."
 msgstr ""
 
-#: ../C/account-jabber.page:29(title)
+#: C/account-jabber.page:29(title)
 msgid "Jabber account details"
-msgstr ""
+msgstr "Detalles da conta Jabber"
 
-#: ../C/account-jabber.page:31(p)
+#: C/account-jabber.page:31(p)
 msgid ""
 "Most Jabber accounts will require only a login ID and a password to connect. "
 "For some accounts or on certain types of networks, you may need to enter "
-"additional information in the <placeholder-1/> section. Normally, you will "
-"not need to use the advanced options below. For general instructions on "
+"additional information in the <gui>Advanced</gui> section. Normally, you "
+"will not need to use the advanced options below. For general instructions on "
 "adding an account, see <link xref=\"add-account\"/>."
 msgstr ""
 
-#: ../C/account-jabber.page:39(p)
+#: C/account-jabber.page:39(p)
 msgid ""
 "Google Talk is a type of Jabber account. These instructions hold for Google "
 "Talk accounts as well."
 msgstr ""
 
-#: ../C/account-jabber.page:45(gui)
+#: C/account-jabber.page:45(gui)
 msgid "Encryption required (TLS/SSL)"
-msgstr ""
+msgstr "Requírese cifrado (TLS/SSL)"
 
-#: ../C/account-jabber.page:46(gui) ../C/account-jabber.page:54(gui)
+#: C/account-jabber.page:46(gui)
 msgid "Ignore SSL certificate errors"
 msgstr ""
 
-#: ../C/account-jabber.page:49(gui)
-msgid "Encryption required"
-msgstr ""
-
-#: ../C/account-jabber.page:47(p)
+#: C/account-jabber.page:47(p)
 msgid ""
-"Whenever possible, communication between <placeholder-1/> and the Jabber "
+"Whenever possible, communication between <app>Empathy</app> and the Jabber "
 "server is encrypted. If encrypted communication is not possible, messages "
-"may be sent unencrypted. Select <placeholder-2/> to prevent <placeholder-3/> "
-"from communicating with the Jabber server when encryption is not possible."
+"may be sent unencrypted. Select <gui>Encryption required</gui> to prevent "
+"<app>Empathy</app> from communicating with the Jabber server when encryption "
+"is not possible."
 msgstr ""
 
-#: ../C/account-jabber.page:52(p)
+#: C/account-jabber.page:52(p)
 msgid ""
 "Some Jabber servers may encrypt data using invalid certificates, or using "
 "certificates from unknown authorities. If you trust the server you are "
-"connecting to, you can select <placeholder-1/> to allow encrypted "
-"communication with invalid certificates."
+"connecting to, you can select <gui>Ignore SSL certificate errors</gui> to "
+"allow encrypted communication with invalid certificates."
 msgstr ""
 
-#: ../C/account-jabber.page:59(gui)
+#: C/account-jabber.page:59(gui)
 msgid "Resource"
 msgstr "Recurso"
 
-#: ../C/account-jabber.page:60(gui)
+#: C/account-jabber.page:60(gui)
 msgid "Priority"
 msgstr "Prioridade"
 
-#: ../C/account-jabber.page:64(input)
-msgid "Telepathy"
-msgstr "Telepathy"
-
-#: ../C/account-jabber.page:61(p)
+#: C/account-jabber.page:61(p)
 msgid ""
 "If you have multiple applications (for instance, on separate computers) "
 "connected to your account at the same time, you can set a resource to "
-"uniquely identify each one. By default, <placeholder-1/> will use "
-"<placeholder-2/> as the resource."
+"uniquely identify each one. By default, <app>Empathy</app> will use "
+"<input>Telepathy</input> as the resource."
 msgstr ""
 
-#: ../C/account-jabber.page:65(p)
+#: C/account-jabber.page:65(p)
 msgid ""
 "You can set the priority to specify which application should receive "
 "incoming messages from your contacts. New messages will be sent to the "
 "application with the highest priority."
 msgstr ""
 
-#: ../C/account-jabber.page:70(gui)
+#: C/account-jabber.page:70(gui)
 msgid "Override server settings"
 msgstr ""
 
-#: ../C/account-jabber.page:71(p)
+#: C/account-jabber.page:71(p)
 msgid ""
-"<placeholder-1/> will use default settings to connect to the Jabber server "
+"<app>Empathy</app> will use default settings to connect to the Jabber server "
 "based on your login ID. For some Jabber servers, you will need to enter "
 "custom server settings manually. These settings should be provided for you "
 "by your Jabber provider."
 msgstr ""
 
-#: ../C/account-irc.page:8(desc)
+#. 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/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d"
+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:112(None)
+msgid "@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6"
+msgstr ""
+
+#: C/account-irc.page:8(desc)
 msgid "Additional information necessary for connecting to IRC networks."
 msgstr ""
 
-#: ../C/account-irc.page:31(title)
+#: C/account-irc.page:31(title)
 msgid "IRC account details"
 msgstr ""
 
-#: ../C/account-irc.page:33(p)
+#: C/account-irc.page:33(p)
 msgid ""
 "IRC accounts require different information than many other types of "
 "accounts. To create an IRC account, you must specify at least an IRC network "
@@ -2862,20 +2572,23 @@ msgid ""
 "account."
 msgstr ""
 
-#: ../C/account-irc.page:45(gui) ../C/account-irc.page:49(gui)
-#: ../C/account-irc.page:120(gui)
+#: C/account-irc.page:45(gui) C/account-irc.page:120(gui)
 msgid "Network"
 msgstr "Rede"
 
-#: ../C/account-irc.page:46(p)
+#: C/account-irc.page:46(p)
 msgid ""
 "IRC is an open system that allows people to run separate IRC networks. Each "
-"network is distinct and has its own users and chat rooms. <placeholder-1/> "
-"lists the most popular networks in the <placeholder-2/> drop-down list. You "
-"can add additional networks. See <link xref=\"#networks\"/> below."
+"network is distinct and has its own users and chat rooms. <app>Empathy</app> "
+"lists the most popular networks in the <gui>Network</gui> drop-down list. "
+"You can add additional networks. See <link xref=\"#networks\"/> below."
 msgstr ""
 
-#: ../C/account-irc.page:54(p)
+#: C/account-irc.page:53(gui)
+msgid "Nickname"
+msgstr "Alcume"
+
+#: C/account-irc.page:54(p)
 msgid ""
 "Your nickname is your unique name on the IRC network. Only one person on a "
 "network may use a given nickname. If you get an error message that says "
@@ -2883,95 +2596,103 @@ msgid ""
 "your nickname."
 msgstr ""
 
-#: ../C/account-irc.page:61(p)
+#: C/account-irc.page:60(gui)
+msgid "Password"
+msgstr "Contrasinal"
+
+#: C/account-irc.page:61(p)
 msgid ""
 "Some servers, particularly those on private networks, require a password to "
 "connect. If you are authorized to use the network, the network "
 "administrators should provide you with a password."
 msgstr ""
 
-#: ../C/account-irc.page:65(title)
+#: C/account-irc.page:65(title)
 msgid "NickServ Passwords"
 msgstr ""
 
-#: ../C/account-irc.page:66(p)
+#: C/account-irc.page:66(p)
 msgid ""
 "On some networks, nicknames can be registered using a service known as "
-"NickServ. <placeholder-1/> does not directly support nickname passwords. On "
-"some networks, including the popular freenode network, server passwords are "
-"automatically forwarded to NickServ, allowing you to set this field to "
+"NickServ. <app>Empathy</app> does not directly support nickname passwords. "
+"On some networks, including the popular freenode network, server passwords "
+"are automatically forwarded to NickServ, allowing you to set this field to "
 "identify yourself with NickServ. See <link xref=\"irc-nick-password\"/> for "
 "more details."
 msgstr ""
 
-#: ../C/account-irc.page:76(gui)
+#: C/account-irc.page:76(gui)
 msgid "Real name"
 msgstr "Nome real"
 
-#: ../C/account-irc.page:77(p)
+#: C/account-irc.page:77(p)
 msgid ""
 "You can provide your real name in addition to your nickname. Other users "
 "will be able to see this when they view your information."
 msgstr ""
 
-#: ../C/account-irc.page:81(gui)
+#: C/account-irc.page:81(gui)
 msgid "Quit message"
 msgstr "Mensaxe de saída"
 
-#: ../C/account-irc.page:82(p)
+#: C/account-irc.page:82(p)
 msgid ""
 "When you go offline, a quit message is sent to all the chat rooms you’re in "
 "and to all the users you’re having a private conversation with. Use this "
 "field to provide a custom quit message."
 msgstr ""
 
-#: ../C/account-irc.page:94(title)
+#: C/account-irc.page:94(title)
 msgid "IRC Networks"
 msgstr "Redes IRC"
 
-#: ../C/account-irc.page:97(title)
+#: C/account-irc.page:97(title)
 msgid "Networks"
 msgstr "Redes"
 
-#: ../C/account-irc.page:99(p)
+#: C/account-irc.page:99(p)
 msgid ""
-"<placeholder-1/> includes a list of popular IRC networks. If you wish to "
+"<app>Empathy</app> includes a list of popular IRC networks. If you wish to "
 "another IRC network, you can add it to the list. You can also modify "
 "networks and remove them from the list."
 msgstr ""
 
-#: ../C/account-irc.page:104(p)
-msgid "To add a network to the list, click <placeholder-1/>."
+#: C/account-irc.page:104(p)
+msgid ""
+"To add a network to the list, click <media type=\"image\" mime=\"image/png\" "
+"src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Add</media>."
 msgstr ""
 
-#: ../C/account-irc.page:107(p)
+#: C/account-irc.page:107(p)
 msgid ""
-"To modify a network in the list, select the network and click <placeholder-1/"
-">."
+"To modify a network in the list, select the network and click <media type="
+"\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" "
+"height=\"16\">Edit</media>."
 msgstr ""
 
-#: ../C/account-irc.page:110(p)
+#: C/account-irc.page:110(p)
 msgid ""
-"To remove a network from the list, select the network and click <placeholder-"
-"1/>."
+"To remove a network from the list, select the network and click <media type="
+"\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" "
+"height=\"16\">Remove</media>."
 msgstr ""
 
-#: ../C/account-irc.page:115(p)
+#: C/account-irc.page:115(p)
 msgid ""
 "When adding or modifying a network, you can enter the following information:"
 msgstr ""
 
-#: ../C/account-irc.page:121(p)
+#: C/account-irc.page:121(p)
 msgid ""
 "This is the name of the network as you want it to appear in the list of "
 "networks."
 msgstr ""
 
-#: ../C/account-irc.page:125(gui)
+#: C/account-irc.page:125(gui)
 msgid "Charset"
 msgstr "Conxunto de caracteres"
 
-#: ../C/account-irc.page:126(p)
+#: C/account-irc.page:126(p)
 msgid ""
 "This specifies the character encoding that is typically used on this "
 "network. A character encoding is a specific way of recording characters "
@@ -2982,48 +2703,322 @@ msgstr ""
 
 #. Translators: Recommend character encodings that are common
 #.             for your language.
-#: ../C/account-irc.page:135(p)
+#: C/account-irc.page:135(p)
 msgid ""
-"By default, <placeholder-1/> uses UTF-8, a modern character encoding that "
+"By default, <app>Empathy</app> uses UTF-8, a modern character encoding that "
 "can handle text from most of the world's languages. Another common encoding "
 "for English and some other Western languages is ISO-8859-1."
 msgstr ""
 
-#: ../C/account-irc.page:141(gui)
+#: C/account-irc.page:141(gui)
 msgid "Servers"
 msgstr "Servidores"
 
-#: ../C/account-irc.page:142(p)
+#: C/account-irc.page:142(p)
 msgid ""
 "An IRC network may have many servers you can connect to. When you are "
 "connected to a server on a particular network, you can communicate with all "
 "users on all other servers on that network. You can add and remove servers "
-"for this network using the <placeholder-1/> and <placeholder-2/> buttons."
+"for this network using the <gui>Add</gui> and <gui>Remove</gui> buttons."
 msgstr ""
 
-#: ../C/account-irc.page:148(gui)
-msgid "Port"
-msgstr "Porto"
-
-#: ../C/account-irc.page:147(p)
+#: C/account-irc.page:147(p)
 msgid ""
-"When a server is selected, click the field under <placeholder-1/> or "
-"<placeholder-2/> to edit it. Alternatively, use the left and right arrow "
-"keys to focus the field, and press the space bar to begin editing."
+"When a server is selected, click the field under <gui>Server</gui> or "
+"<gui>Port</gui> to edit it. Alternatively, use the left and right arrow keys "
+"to focus the field, and press the space bar to begin editing."
 msgstr ""
 
-#: ../C/account-irc.page:151(gui)
-msgid "SSL"
-msgstr "SSL"
-
-#: ../C/account-irc.page:151(p)
+#: C/account-irc.page:151(p)
 msgid ""
-"Select the check box in the <placeholder-1/> column to encrypt all "
+"Select the check box in the <gui>SSL</gui> column to encrypt all "
 "communication with a server. Note that this does not prevent other users on "
 "the network from seeing what you write on public chat rooms."
 msgstr ""
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
-#: ../C/account-irc.page:0(None)
+#: C/account-irc.page:0(None)
 msgid "translator-credits"
 msgstr "Fran Diéguez <frandieguez@ubuntu.com>, 2010"
+
+#~ msgid "Contact List"
+#~ msgstr "Lista de contactos"
+
+#~ msgid "video call"
+#~ msgstr "vídeochamada"
+
+#~ msgid "Video Call"
+#~ msgstr "Vídeochamada"
+
+#~ msgid "Connected"
+#~ msgstr "Conectado"
+
+#~ msgid "Hang up"
+#~ msgstr "Colgar"
+
+#~ msgid "Video Off"
+#~ msgstr "Vídeo desactivado"
+
+#~ msgid "Empathy"
+#~ msgstr "Empathy"
+
+#~ msgid "Edit"
+#~ msgstr "Editar"
+
+#~ msgid "Contact"
+#~ msgstr "Contacto"
+
+#~ msgid "Share my desktop"
+#~ msgstr "Compartir o meu escritorio"
+
+#~ msgid "Custom Message"
+#~ msgstr "Mensaxe personalizada"
+
+#~ msgid "Enter"
+#~ msgstr "Introducir"
+
+#~ msgid "Select <placeholder-1/>."
+#~ msgstr "Seleccione <placeholder-1/>."
+
+#~ msgid "Saved Presets"
+#~ msgstr "Preferencias gardadas"
+
+#~ msgid "Remove"
+#~ msgstr "Eliminar"
+
+#~ msgid "Add"
+#~ msgstr "Engadir"
+
+#~ msgid "Close"
+#~ msgstr "Pechar"
+
+#~ msgid "Chat"
+#~ msgstr "Conversa"
+
+#~ msgid "Send file"
+#~ msgstr "Enviar ficheiro"
+
+#~ msgid "Send"
+#~ msgstr "Enviar"
+
+#~ msgid "Stop"
+#~ msgstr "Deter"
+
+#~ msgid "Clear"
+#~ msgstr "Limpar"
+
+#~ msgid "Accounts"
+#~ msgstr "Contas"
+
+#~ msgid "F4"
+#~ msgstr "F4"
+
+#~ msgid "Click on <placeholder-1/>."
+#~ msgstr "Prema sobre <placeholder-1/>."
+
+#~ msgid "Network error"
+#~ msgstr "Erro de rede"
+
+#~ msgid "edit"
+#~ msgstr "editar"
+
+#~ msgid "Advanced"
+#~ msgstr "Avanzado"
+
+#~ msgid "Enabled"
+#~ msgstr "Activar"
+
+#~ msgid "Name in use"
+#~ msgstr "Nome en uso"
+
+#~ msgid "Authentication failed"
+#~ msgstr "Fallou a autenticación"
+
+#~ msgid "#593733"
+#~ msgstr "#593733"
+
+#~ msgid "search through all of your previous conversations"
+#~ msgstr "buscar a través de todas as súas conversas anteriores"
+
+#~ msgid "browse previous conversations"
+#~ msgstr "explorar as conversas anteriores"
+
+#~ msgid "View"
+#~ msgstr "Ver"
+
+#~ msgid "Previous Conversations"
+#~ msgstr "Conversas previas"
+
+#~ msgid "F3"
+#~ msgstr "F3"
+
+#~ msgid "Search"
+#~ msgstr "Buscar"
+
+#~ msgid "For"
+#~ msgstr "Por"
+
+#~ msgid "Find"
+#~ msgstr "Buscar"
+
+#~ msgid "Conversations"
+#~ msgstr "Conversas"
+
+#~ msgid "View Previous Conversations"
+#~ msgstr "Ver as conversas anteriores"
+
+#~ msgid "CreativeCommons website"
+#~ msgstr "Sitio web de Creative Commons"
+
+#~ msgid "Conversation"
+#~ msgstr "Conversa"
+
+#~ msgid "Show Contact List"
+#~ msgstr "Mostrar a lista de contactos"
+
+#~ msgid "server password"
+#~ msgstr "contrasinal do servidor"
+
+#~ msgid "Apply"
+#~ msgstr "Aplicar"
+
+#~ msgid "telepathy-idle"
+#~ msgstr "telepathy-idle"
+
+#~ msgid "Room"
+#~ msgstr "Sala"
+
+#~ msgid "Join"
+#~ msgstr "Unirse"
+
+#~ msgid "Account"
+#~ msgstr "Conta"
+
+#~ msgid "#"
+#~ msgstr "#"
+
+#~ msgid "Join the room"
+#~ msgstr "Unirse á sala"
+
+#~ msgid "<placeholder-1/> as normal."
+#~ msgstr "<placeholder-1/> é normal."
+
+#~ msgid "/help"
+#~ msgstr "/help"
+
+#~ msgid "Pidgin"
+#~ msgstr "Pidgin"
+
+#~ msgid "Yes, import my account details from"
+#~ msgstr "Si, importar os detalles da miña conta desde"
+
+#~ msgid "Forward"
+#~ msgstr "Adiante"
+
+#~ msgid "Offline Contacts"
+#~ msgstr "Contactos desconectados"
+
+#~ msgid "Ctrl"
+#~ msgstr "Ctrl"
+
+#~ msgid "H"
+#~ msgstr "H"
+
+#~ msgid "Server"
+#~ msgstr "Servidor"
+
+#~ msgid "Invite to chatroom"
+#~ msgstr "Invitar a unha sala de conversa"
+
+#~ msgid "Room List"
+#~ msgstr "Lista de salas"
+
+#~ msgid "Preferences"
+#~ msgstr "Preferencias"
+
+#~ msgid "Choose <guiseq><placeholder-1/><placeholder-2/></guiseq>."
+#~ msgstr "Seleccione <guiseq><placeholder-1/><placeholder-2/></guiseq>."
+
+#~ msgid "Location"
+#~ msgstr "Localización"
+
+#~ msgid "Publish location to my contacts"
+#~ msgstr "Publicar a localización aos meus contactos"
+
+#~ msgid "Reduce location accuracy"
+#~ msgstr "Reducir a exactitude da localización"
+
+#~ msgid "Geoclue Settings"
+#~ msgstr "Configuración de Geoclue"
+
+#~ msgid "Google Latitude"
+#~ msgstr "Google Latitude"
+
+#~ msgid "Yahoo Fire Eagle"
+#~ msgstr "Yahoo Fire Eagle"
+
+#~ msgid "Brightkite"
+#~ msgstr "Brightkite"
+
+#~ msgid "Favorite Chat Room"
+#~ msgstr "Sala de conversa favorita"
+
+#~ msgid "F5"
+#~ msgstr "F5"
+
+#~ msgid "Press <placeholder-1/>."
+#~ msgstr "Prema <placeholder-1/>."
+
+#~ msgid "Join Favorites"
+#~ msgstr "Unirse ás favoritas"
+
+#~ msgid "Manage Favorites"
+#~ msgstr "Xestionar favoritas"
+
+#~ msgid "All"
+#~ msgstr "Todas"
+
+#~ msgid "Auto-Connect"
+#~ msgstr "Conectarse automaticamente"
+
+#~ msgid "add an account"
+#~ msgstr "engadir unha conta"
+
+#~ msgid "www.facebook.com"
+#~ msgstr "www.facebook.com"
+
+#~ msgid "Jabber.org"
+#~ msgstr "Jabber.org"
+
+#~ msgid "Sipphone"
+#~ msgstr "Sipphone"
+
+#~ msgid "Ekiga.net"
+#~ msgstr "Ekiga.net"
+
+#~ msgid "audio call"
+#~ msgstr "chamada de son"
+
+#~ msgid "Audio Call"
+#~ msgstr "chamada de vídeo"
+
+#~ msgid "Add Contact"
+#~ msgstr "Engadir contacto"
+
+#~ msgid "Identifier"
+#~ msgstr "Identificador"
+
+#~ msgid "Alias"
+#~ msgstr "Alias"
+
+#~ msgid "Log in"
+#~ msgstr "Iniciar a sesión"
+
+#~ msgid "Telepathy"
+#~ msgstr "Telepathy"
+
+#~ msgid "Port"
+#~ msgstr "Porto"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"