6 files changed, 236 insertions, 157 deletions
diff --git a/help/C/irc-join-pwd.page b/help/C/irc-join-pwd.page
index befbaf05a..b8fd52afb 100644
--- a/help/C/irc-join-pwd.page
+++ b/help/C/irc-join-pwd.page
@@ -6,12 +6,13 @@
   <info>
     <link type="guide" xref="irc-manage#manage"/>
     <link type="seealso" xref="irc-join-room"/>
-    <desc><app>Empathy</app> does not currently support password-protected IRC chat rooms.</desc>
+    <desc>Enter password-protected IRC chat rooms.</desc>
     <revision pkgversion="2.28" version="0.1" date="2009-08-07" status="review">
       <!--
       <e:review by="shaunm@gnome.org" date="2009-08-31" status="done"/>
       -->
     </revision>
+    <revision pkgversion="2.30" version="0.2" date="2010-03-12" status="review"/>
     <credit type="author">
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
@@ -19,17 +20,28 @@
     <license>
       <p>Creative Commons Share Alike 3.0</p>
     </license>    
-<!--
-    <copyright>
-      <year>2009</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
-    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
--->
   </info>
 
   <title>Join a protected IRC chat room</title>
 
-  <p>It is not currently possible to join a password-protected IRC chat room.</p>
+  <p>
+    On some IRC networks, private IRC rooms may be protected with a password.
+  </p>
+  <p>
+    To join such a room, if you know the password:
+  </p>
+  <steps>
+    <item>
+      <p>
+        <link xref="irc-join-room">Join the room</link>.
+      </p>
+    </item>
+    <item>
+      <p>
+        In the <gui>This room is protected by a password</gui> text box, type the
+        IRC room password, and click on <gui style="button">Join</gui>.
+      </p>
+    </item>
+  </steps>
 
 </page>
diff --git a/help/de/de.po b/help/de/de.po
index cb4b6199e..45edb108a 100644
--- a/help/de/de.po
+++ b/help/de/de.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-11 17:25+0000\n"
-"PO-Revision-Date: 2010-03-11 23:46+0100\n"
+"POT-Creation-Date: 2010-03-12 21:03+0000\n"
+"PO-Revision-Date: 2010-03-12 23:01+0100\n"
 "Last-Translator: Mario Blättermann <mariobl@gnome.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -40,7 +40,7 @@ msgstr "Beginnen Sie eine Videounterhaltung mit einem Ihrer Kontakte."
 #: 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:18(name)
-#: C/irc-join-room.page:16(name) C/irc-join-pwd.page:16(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)
@@ -61,7 +61,7 @@ msgstr "Milo Casagrande"
 #: 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:19(email)
-#: C/irc-join-room.page:17(email) C/irc-join-pwd.page:17(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)
@@ -82,7 +82,7 @@ msgstr "milo@ubuntu.com"
 #: 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:22(p) C/irc-join-room.page:20(p) C/irc-join-pwd.page:20(p)
+#: C/irc-manage.page:22(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)
@@ -1476,21 +1476,38 @@ msgstr ""
 "jeden Raum wiederholen."
 
 #: C/irc-join-pwd.page:9(desc)
-msgid ""
-"<app>Empathy</app> does not currently support password-protected IRC chat "
-"rooms."
-msgstr ""
-"Derzeit ist es nicht möglich, mit <app>Empathy</app> einen "
-"passwortgeschützten Raum im IRC zu betreten."
+#| msgid "Join a protected IRC chat room"
+msgid "Enter password-protected IRC chat rooms."
+msgstr "Betreten von passwortgeschützten Räumen im IRC"
 
-#: C/irc-join-pwd.page:31(title)
+#: C/irc-join-pwd.page:25(title)
 msgid "Join a protected IRC chat room"
 msgstr "Betreten eines passwortgeschützten Raumes im IRC"
 
-#: C/irc-join-pwd.page:33(p)
-msgid "It is not currently possible to join a password-protected IRC chat room."
+#: C/irc-join-pwd.page:27(p)
+msgid ""
+"On some IRC networks, private IRC rooms may be protected with a password."
+msgstr ""
+"In einigen IRC-Netzwerken können private IRC-Räume durch ein Passwort "
+"geschützt sein."
+
+#: C/irc-join-pwd.page:30(p)
+msgid "To join such a room, if you know the password:"
 msgstr ""
-"Derzeit ist es nicht möglich, einen passwortgeschützten Raum zu betreten."
+"So betreten Sie einen solchen Raum, falls Ihnen das Passwort bekannt ist:"
+
+#: C/irc-join-pwd.page:35(p)
+msgid "<link xref=\"irc-join-room\">Join the room</link>."
+msgstr "<link xref=\"irc-join-room\">Betreten Sie den Raum</link>."
+
+#: C/irc-join-pwd.page:40(p)
+msgid ""
+"In the <gui>This room is protected by a password</gui> text box, type the IRC "
+"room password, and click on <gui style=\"button\">Join</gui>."
+msgstr ""
+"Geben Sie im Textfeld <gui>Dieser Raum ist durch ein Kennwort geschützt</gui> "
+"das Passwort für den IRC-Raum ein und klicken Sie auf <gui style=\"button"
+"\">Beitreten</gui>."
 
 #: C/irc-commands.page:7(desc)
 msgid "The supported IRC commands."
@@ -1672,15 +1689,10 @@ msgid "Hide the offline contacts from your <gui>Contact List</gui>."
 msgstr "Verbergen von abgemeldeten Kontakten in Ihrer <gui>Kontaktliste</gui>."
 
 #: C/hide-contacts.page:19(title)
-#| msgid "Show offline contacts"
 msgid "Hide offline contacts"
 msgstr "Abgemeldete Kontakte verbergen"
 
 #: C/hide-contacts.page:21(p)
-#| msgid ""
-#| "Normally, <app>Empathy</app> only shows your contacts that are currently "
-#| "online. You can show all of your contacts instead, including those that "
-#| "are offline."
 msgid ""
 "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."
@@ -1704,7 +1716,6 @@ msgstr ""
 "<keyseq><key>Strg</key><key>H</key></keyseq>."
 
 #: C/hide-contacts.page:36(p)
-#| msgid "To hide the offline contacts again, repeat the same procedure above."
 msgid "To show the offline contacts again, repeat the same procedure above."
 msgstr ""
 "Um die abgemeldeten Kontakte wieder anzuzeigen, wiederholen Sie den oben "
@@ -3338,6 +3349,18 @@ msgstr ""
 "Mario Blättermann <mariobl@gnome.org>, 2008, 2009, 2010\n"
 "Philipp Kerling <k.philipp@gmail.com>, 2008"
 
+#~ msgid ""
+#~ "<app>Empathy</app> does not currently support password-protected IRC chat "
+#~ "rooms."
+#~ msgstr ""
+#~ "Derzeit ist es nicht möglich, mit <app>Empathy</app> einen "
+#~ "passwortgeschützten Raum im IRC zu betreten."
+
+#~ msgid ""
+#~ "It is not currently possible to join a password-protected IRC chat room."
+#~ msgstr ""
+#~ "Derzeit ist es nicht möglich, einen passwortgeschützten Raum zu betreten."
+
 #~ msgid "See all of your contacts, even those that are not online."
 #~ msgstr "Sehen Sie alle Ihre Kontakte, auch wenn diese abgemeldet sind."
 
diff --git a/help/es/es.po b/help/es/es.po
index 745ea5222..b77d83565 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -4,8 +4,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy-help.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-11 17:25+0000\n"
-"PO-Revision-Date: 2010-03-11 18:41+0100\n"
+"POT-Creation-Date: 2010-03-12 21:03+0000\n"
+"PO-Revision-Date: 2010-03-14 23:17+0100\n"
 "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -34,7 +34,7 @@ msgstr "Iniciar una conversación de vídeo con uno de sus contactos."
 #: 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:18(name)
-#: C/irc-join-room.page:16(name) C/irc-join-pwd.page:16(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)
@@ -55,7 +55,7 @@ msgstr "Milo Casagrande"
 #: 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:19(email)
-#: C/irc-join-room.page:17(email) C/irc-join-pwd.page:17(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)
@@ -77,7 +77,7 @@ msgstr "milo@ubuntu.com"
 #: 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:22(p)
-#: C/irc-join-room.page:20(p) C/irc-join-pwd.page:20(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)
@@ -1445,22 +1445,37 @@ msgstr ""
 "sala."
 
 #: C/irc-join-pwd.page:9(desc)
-msgid ""
-"<app>Empathy</app> does not currently support password-protected IRC chat "
-"rooms."
-msgstr ""
-"Actualmente <app>Empathy</app> no soporta salas de chat de IRC protegidas "
-"por contraseña."
+#| msgid "Join a protected IRC chat room"
+msgid "Enter password-protected IRC chat rooms."
+msgstr "Introduzca la contraseña para salas de chat IRC protegidas."
 
-#: C/irc-join-pwd.page:31(title)
+#: C/irc-join-pwd.page:25(title)
 msgid "Join a protected IRC chat room"
 msgstr "Unirse a una sala de chat protegida en el IRC"
 
-#: C/irc-join-pwd.page:33(p)
+#: C/irc-join-pwd.page:27(p)
+msgid ""
+"On some IRC networks, private IRC rooms may be protected with a password."
+msgstr ""
+"En algunas redes IRC las salas privadas de IRC pueden estar protegidas por "
+"contraseña."
+
+#: C/irc-join-pwd.page:30(p)
+msgid "To join such a room, if you know the password:"
+msgstr "Para unirse a una sala así, si sabe la contraseña:"
+
+#: C/irc-join-pwd.page:35(p)
+msgid "<link xref=\"irc-join-room\">Join the room</link>."
+msgstr "<link xref=\"irc-join-room\">Unirse a la sala</link>."
+
+#: C/irc-join-pwd.page:40(p)
 msgid ""
-"It is not currently possible to join a password-protected IRC chat room."
+"In the <gui>This room is protected by a password</gui> text box, type the "
+"IRC room password, and click on <gui style=\"button\">Join</gui>."
 msgstr ""
-"Actualmente no es posible unirse a salas protegidas por contraseña en el IRC."
+"Escriba la contraseña para la sala de chat IRC en la caja de texto <gui>Esta "
+"sala está protegida por contraseña</gui> y pulse <gui style=\"button"
+"\">Unirse</gui>."
 
 #: C/irc-commands.page:7(desc)
 msgid "The supported IRC commands."
@@ -1647,15 +1662,10 @@ msgstr ""
 "Ocultar los contactos desconectados de su <gui>Lista de contactos</gui>."
 
 #: C/hide-contacts.page:19(title)
-#| msgid "Show offline contacts"
 msgid "Hide offline contacts"
 msgstr "Ocultar contactos desconectados"
 
 #: C/hide-contacts.page:21(p)
-#| msgid ""
-#| "Normally, <app>Empathy</app> only shows your contacts that are currently "
-#| "online. You can show all of your contacts instead, including those that "
-#| "are offline."
 msgid ""
 "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."
@@ -1679,7 +1689,6 @@ msgstr ""
 "key><key>H</key></keyseq>."
 
 #: C/hide-contacts.page:36(p)
-#| msgid "To hide the offline contacts again, repeat the same procedure above."
 msgid "To show the offline contacts again, repeat the same procedure above."
 msgstr ""
 "Para mostrar los contactos desconectados de nuevo, repita el mismo "
@@ -3290,6 +3299,19 @@ msgstr ""
 msgid "translator-credits"
 msgstr "Jorge González <jorgegonz@svn.gnome.org>, 2008-2010"
 
+#~ msgid ""
+#~ "<app>Empathy</app> does not currently support password-protected IRC chat "
+#~ "rooms."
+#~ msgstr ""
+#~ "Actualmente <app>Empathy</app> no soporta salas de chat de IRC protegidas "
+#~ "por contraseña."
+
+#~ msgid ""
+#~ "It is not currently possible to join a password-protected IRC chat room."
+#~ msgstr ""
+#~ "Actualmente no es posible unirse a salas protegidas por contraseña en el "
+#~ "IRC."
+
 #~ msgid "See all of your contacts, even those that are not online."
 #~ msgstr "Vea todos sus contactos, incluso aquellos que no están conectados."
 
diff --git a/help/it/it.po b/help/it/it.po
index 7975a0a60..3f2af4351 100644
--- a/help/it/it.po
+++ b/help/it/it.po
@@ -1,14 +1,14 @@
-# Italian translation of empathy documentation.
-# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+# Italian translation of empathy help.
+# Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 # This package is distributed under the same license as the empathy package.
 #
 # Milo Casagrande <milo@ubuntu.com>, 2008, 2009, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy manual\n"
+"Project-Id-Version: empathy help\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-17 21:06+0000\n"
-"PO-Revision-Date: 2010-02-17 21:51+0100\n"
+"POT-Creation-Date: 2010-03-12 21:03+0000\n"
+"PO-Revision-Date: 2010-03-14 20:56+0100\n"
 "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
@@ -32,12 +32,12 @@ msgstr "Avviare una conversazione video con i propri contatti."
 #: C/remove-account.page:17(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/offline-contacts.page:17(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:18(name) C/irc-join-room.page:16(name)
-#: C/irc-join-pwd.page:16(name) C/irc-commands.page:10(name)
-#: C/introduction.page:13(name) C/index.page:18(name)
-#: C/import-account.page:23(name) C/group-conversations.page:19(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:18(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-not-showing.page:17(name) C/geolocation.page:17(name)
@@ -53,12 +53,12 @@ msgstr "Milo Casagrande"
 #: C/remove-account.page:18(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/offline-contacts.page:18(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:19(email) C/irc-join-room.page:17(email)
-#: C/irc-join-pwd.page:17(email) C/irc-commands.page:11(email)
-#: C/introduction.page:14(email) C/index.page:19(email)
-#: C/import-account.page:24(email) C/group-conversations.page:20(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:19(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-not-showing.page:18(email) C/geolocation.page:18(email)
@@ -75,11 +75,11 @@ msgstr "milo@ubuntu.com"
 #: 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/offline-contacts.page:21(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:22(p) C/irc-join-room.page:20(p)
-#: C/irc-join-pwd.page:20(p) C/irc-commands.page:14(p)
-#: C/introduction.page:17(p) C/index.page:22(p) C/import-account.page:31(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:22(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-not-showing.page:21(p)
@@ -1168,40 +1168,6 @@ msgstr ""
 "precedenti</gui>. La finestra <gui>Conversazioni precedenti</gui> viene "
 "aperta con quel contatto già selezionato."
 
-#: C/offline-contacts.page:8(desc)
-msgid "See all of your contacts, even those that are not online."
-msgstr "Visualizzare tutti i propri contatti, anche quelli non in rete"
-
-#: C/offline-contacts.page:32(title)
-msgid "Show offline contacts"
-msgstr "Mostrare i contatti fuori rete"
-
-#: C/offline-contacts.page:34(p)
-msgid ""
-"Normally, <app>Empathy</app> only shows your contacts that are currently "
-"online. You can show all of your contacts instead, including those that are "
-"offline."
-msgstr ""
-"Normalmente <app>Empathy</app> mostra solo i contatti che sono collegati in "
-"rete. È comunque possibile visualizzare tutti i contatti, anche quelli fuori "
-"rete."
-
-#: C/offline-contacts.page:40(p)
-msgid ""
-"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 ""
-"Dalla finestra <gui>Elenco contatti</gui>, scegliere "
-"<guiseq><gui>Visualizza</gui><gui>Contatti fuori rete</gui></guiseq> o "
-"premere <keyseq><key>Ctrl</key><key>H</key></keyseq>."
-
-#: C/offline-contacts.page:45(p)
-msgid "To hide the offline contacts again, repeat the same procedure above."
-msgstr ""
-"Per nascondere nuovamente i contatti fuori rete, ripetere la procedura "
-"precedente."
-
 #: C/license.page:8(desc)
 msgid "Legal information."
 msgstr "Informazioni legali."
@@ -1493,23 +1459,37 @@ msgstr ""
 "passi precedenti per ciascuna stanza."
 
 #: C/irc-join-pwd.page:9(desc)
-msgid ""
-"<app>Empathy</app> does not currently support password-protected IRC chat "
-"rooms."
-msgstr ""
-"Attualmente <app>Empathy</app> non supporta stanze di conversazione protette "
-"da password."
+#| msgid "Join a protected IRC chat room"
+msgid "Enter password-protected IRC chat rooms."
+msgstr "Entrare in stanze di conversazione IRC protette da password."
 
-#: C/irc-join-pwd.page:31(title)
+#: C/irc-join-pwd.page:25(title)
 msgid "Join a protected IRC chat room"
 msgstr "Entrare in una stanza di conversazione IRC protetta"
 
-#: C/irc-join-pwd.page:33(p)
+#: C/irc-join-pwd.page:27(p)
 msgid ""
-"It is not currently possible to join a password-protected IRC chat room."
+"On some IRC networks, private IRC rooms may be protected with a password."
 msgstr ""
-"Al momento non è possibile entrare in una stanza di conversazione IRC "
-"protetta da password."
+"In alcune reti IRC, le stanze IRC private possono essere protette tramite "
+"una password."
+
+#: C/irc-join-pwd.page:30(p)
+msgid "To join such a room, if you know the password:"
+msgstr "Per entrare in tali stanze, se si conosce la password:"
+
+#: C/irc-join-pwd.page:35(p)
+msgid "<link xref=\"irc-join-room\">Join the room</link>."
+msgstr "<link xref=\"irc-join-room\">Entrare nella stanza</link>."
+
+#: C/irc-join-pwd.page:40(p)
+msgid ""
+"In the <gui>This room is protected by a password</gui> text box, type the "
+"IRC room password, and click on <gui style=\"button\">Join</gui>."
+msgstr ""
+"Nella casella di testo <gui>Questa stanza è protetta da una password</gui>, "
+"digitare la password della stanza e fare clic su <gui style=\"button"
+"\">Entra</gui>."
 
 #: C/irc-commands.page:7(desc)
 msgid "The supported IRC commands."
@@ -1686,6 +1666,50 @@ msgstr ""
 "Al momento non è possibile importare gli account una volta completati i "
 "passi dell'assistente dopo il primo avvio dell'applicazione."
 
+#: C/hide-contacts.page:8(desc)
+msgid "Hide the offline contacts from your <gui>Contact List</gui>."
+msgstr ""
+"Nascondere i contatti fuori rete dal proprio <gui>Elenco contatti</gui>."
+
+#: C/hide-contacts.page:19(title)
+#| msgid "Show offline contacts"
+msgid "Hide offline contacts"
+msgstr "Nascondere i contatti fuori rete"
+
+#: C/hide-contacts.page:21(p)
+#| msgid ""
+#| "Normally, <app>Empathy</app> only shows your contacts that are currently "
+#| "online. You can show all of your contacts instead, including those that "
+#| "are offline."
+msgid ""
+"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 ""
+"Normalmente <app>Empathy</app> mostra tutti i contatti: quelli che sono "
+"collegati in rete, con cui è possibile avere conversazioni, e anche quelli "
+"che risultano fuori rete"
+
+#: C/hide-contacts.page:25(p)
+msgid "To hide the contacts that are offline:"
+msgstr "Per nascondere i contatti fuori rete:"
+
+#: C/hide-contacts.page:31(p)
+msgid ""
+"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 ""
+"Dalla finestra <gui>Elenco contatti</gui>, scegliere "
+"<guiseq><gui>Visualizza</gui><gui>Contatti fuori rete</gui></guiseq> o "
+"premere <keyseq><key>Ctrl</key><key>H</key></keyseq>."
+
+#: C/hide-contacts.page:36(p)
+#| msgid "To hide the offline contacts again, repeat the same procedure above."
+msgid "To show the offline contacts again, repeat the same procedure above."
+msgstr ""
+"Per mostrare nuovamente i contatti fuori rete, ripetere la procedura "
+"precedente."
+
 #: C/group-conversations.page:8(desc)
 msgid "Start or join a group conversation with your contacts."
 msgstr ""
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index 807b6afaf..b33760629 100644
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -1631,6 +1631,9 @@ empathy_send_file_with_file_chooser (EmpathyContact *contact)
 
 	gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (widget), FALSE);
 
+	gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (widget),
+		g_get_home_dir ());
+
 	g_signal_connect (widget, "response",
 			  G_CALLBACK (file_manager_send_file_response_cb),
 			  contact);
@@ -1669,6 +1672,7 @@ void
 empathy_receive_file_with_file_chooser (EmpathyFTHandler *handler)
 {
 	GtkWidget *widget;
+	const gchar *dir;
 
 	widget = gtk_file_chooser_dialog_new (_("Select a destination"),
 					      NULL,
@@ -1683,6 +1687,13 @@ empathy_receive_file_with_file_chooser (EmpathyFTHandler *handler)
 	gtk_file_chooser_set_do_overwrite_confirmation
 		(GTK_FILE_CHOOSER (widget), TRUE);
 
+	dir = g_get_user_special_dir (G_USER_DIRECTORY_DOWNLOAD);
+	if (dir == NULL)
+		/* Fallback to $HOME if $XDG_DOWNLOAD_DIR is not set */
+		dir = g_get_home_dir ();
+
+	gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (widget), dir);
+
 	g_signal_connect (widget, "response",
 		G_CALLBACK (file_manager_receive_file_response_cb), handler);
 
diff --git a/po/gl.po b/po/gl.po
index 5c46e01cb..5eb13b877 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,22 +1,22 @@
-# translation of empathy-master-po-gl-57278_.merged.po to Galego
+# translation of empathy to Galego
 # This file is distributed under the same license as the EMPATHY package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 #
 # Mancomún - Centro de Referencia e Servizos de Software Libre <g11n@mancomun.org>, 2009.
 # Antón Méixome <meixome@mancomun.org>, 2009.
 # Fran Dieguez <fran.dieguez@glug.es>, 2009.
-# Francisco Diéguez <frandieguez@ubuntu.com>, 2010.
 # Fran Diéguez <frandieguez@ubuntu.com>,2009, 2010.
 # Antón Méixome <meixome@certima.net>, 2010.
+# Francisco Diéguez <frandieguez@ubuntu.com>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy-master-po-gl-57278_.merged\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=empathy&component=general\n"
-"POT-Creation-Date: 2010-03-04 18:12+0000\n"
-"PO-Revision-Date: 2010-03-02 15:32+0100\n"
-"Last-Translator: Antón Méixome <meixome@certima.net>\n"
-"Language-Team: Galego <gnome@g11n.net>\n"
+"POT-Creation-Date: 2010-03-12 13:32+0000\n"
+"PO-Revision-Date: 2010-03-06 22:40+0100\n"
+"Last-Translator: Francisco Diéguez <frandieguez@ubuntu.com>\n"
+"Language-Team: Galician <proxecto@trasno.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,7 +30,7 @@ msgstr "Empathy"
 
 #: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy IM Client"
-msgstr "Cliente de mensaxaría Empathy"
+msgstr "Cliente de mensaxería Empathy"
 
 #: ../data/empathy.desktop.in.in.h:3
 msgid "IM Client"
@@ -181,7 +181,7 @@ msgstr "Carácter de completado de alcume"
 # rever
 #: ../data/empathy.schemas.in.h:28
 msgid "Open new chats in separate windows"
-msgstr "Abrir as conversas novas en xanelas separadas"
+msgstr "Abrir as novas conversas en xanelas separadas"
 
 #: ../data/empathy.schemas.in.h:29
 msgid "Path of the Adium theme to use"
@@ -537,12 +537,14 @@ msgstr ""
 
 #: ../data/empathy-accounts.desktop.in.in.h:1
 msgid "Manage Messaging and VoIP accounts"
-msgstr "Xestionar as contas de mensaxaría e VoIP"
+msgstr "Xestionar as contas de mensaxería e VoIP"
 
+#. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/cc-empathy-accounts-page.c:229 ../src/cc-empathy-accounts-panel.c:70
+#: ../src/empathy-accounts-dialog.c:2066 ../src/cc-empathy-accounts-page.c:243
+#: ../src/cc-empathy-accounts-panel.c:91
 msgid "Messaging and VoIP Accounts"
-msgstr "Contas de mensaxaría e VoIP"
+msgstr "Contas de mensaxería e VoIP"
 
 #: ../libempathy/empathy-ft-handler.c:842
 msgid "The hash of the received file and the sent one do not match"
@@ -753,7 +755,7 @@ msgstr "no futuro"
 
 #: ../libempathy-gtk/empathy-account-chooser.c:462
 msgid "All"
-msgstr "Todo"
+msgstr "Todas"
 
 #: ../libempathy-gtk/empathy-account-widget.c:538
 #: ../libempathy-gtk/empathy-account-widget.c:594
@@ -1554,30 +1556,30 @@ msgid "Subscription Request"
 msgstr "Solicitude de subscrición"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-list-view.c:1516
+#: ../libempathy-gtk/empathy-contact-list-view.c:1529
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Está seguro de que quere eliminar o grupo '%s'?"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-list-view.c:1518
+#: ../libempathy-gtk/empathy-contact-list-view.c:1531
 msgid "Removing group"
 msgstr "Eliminando o grupo"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1565
-#: ../libempathy-gtk/empathy-contact-list-view.c:1642
+#: ../libempathy-gtk/empathy-contact-list-view.c:1578
+#: ../libempathy-gtk/empathy-contact-list-view.c:1655
 #: ../src/empathy-accounts-dialog.ui.h:6
 msgid "_Remove"
 msgstr "_Eliminar"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-list-view.c:1595
+#: ../libempathy-gtk/empathy-contact-list-view.c:1608
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Está seguro de quere eliminar o contacto '%s'?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1597
+#: ../libempathy-gtk/empathy-contact-list-view.c:1610
 msgid "Removing contact"
 msgstr "Eliminando o contacto"
 
@@ -2057,7 +2059,7 @@ msgid "Select a file"
 msgstr "Seleccione un ficheiro"
 
 # rever
-#: ../libempathy-gtk/empathy-ui-utils.c:1673
+#: ../libempathy-gtk/empathy-ui-utils.c:1677
 msgid "Select a destination"
 msgstr "Seleccione un destinatario"
 
@@ -2259,7 +2261,7 @@ msgstr "Non mostrar a lista de contactos nin outros diálogos no inicio"
 # rever
 #: ../src/empathy.c:612
 msgid "- Empathy IM Client"
-msgstr "- Cliente de mensaxaría instantánea Empathy"
+msgstr "- Cliente de mensaxería instantánea Empathy"
 
 # rever
 #: ../src/empathy-about-dialog.c:85
@@ -2553,11 +2555,6 @@ msgstr ""
 "Vai cerrar a xanela, e descartaranse os cambios que realizou.\n"
 "Está seguro de que quere proceder?"
 
-#. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2066
-msgid "Accounts"
-msgstr "Contas"
-
 # rever
 #: ../src/empathy-accounts-dialog.ui.h:1
 msgid "No protocol installed"
@@ -3198,7 +3195,7 @@ msgstr "Unirse a pre_feridos"
 
 #: ../src/empathy-main-window.ui.h:5
 msgid "Manage Favorites"
-msgstr "Xestionar os preferidos"
+msgstr "Xestionar as preferidas"
 
 #: ../src/empathy-main-window.ui.h:6
 msgid "N_ormal Size"
@@ -3481,8 +3478,8 @@ msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
-"A lista de idiomas reflicte só aqueles idiomas para os que ten un dicionario "
-"instalado."
+"A lista de idiomas reflicte só naqueles idiomas para os que ten un "
+"dicionario instalado."
 
 #: ../src/empathy-preferences.ui.h:24
 msgid "Themes"
@@ -3562,7 +3559,7 @@ msgstr "Depuración"
 
 #: ../src/empathy-debug-window.c:1337
 msgid "Info"
-msgstr "Info"
+msgstr "Información"
 
 #: ../src/empathy-debug-window.c:1343 ../src/empathy-debug-window.c:1392
 msgid "Message"
@@ -3640,13 +3637,3 @@ msgstr "- Contas de Empathy"
 msgid " Accounts"
 msgstr " Contas"
 
-# rever
-#~ msgid "Salut account is created"
-#~ msgstr "A conta Salut foi creada"
-
-# rever
-#~ msgid "Whether the Salut account has been created on the first Empathy run."
-#~ msgstr ""
-#~ "Indica se a conta Salut debería ser creada na primeira execución do "
-#~ "Empathy ou non."
-