Updated Spanish translation

diff --git a/help/es/es.po b/help/es/es.po
index 27fa77c9796a26349d1606532e89cb05868b7913..6913e6a64290f4c1790dd198ceefcab45d92d6ad 100644 (file)
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy-help.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-15 22:03+0000\n"
-"PO-Revision-Date: 2013-04-24 12:19+0200\n"
+"POT-Creation-Date: 2013-04-30 11:54+0000\n"
+"PO-Revision-Date: 2013-05-02 18:09+0200\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
-"Language-Team: Español <gnome-es-list@gnome.org>\n"
+"Language-Team: Español; Castellano <gnome-es-list@gnome.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Gtranslator 2.91.5\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -80,7 +80,7 @@ msgstr "Milo Casagrande"
 #: C/irc-join-room.page:20(license/p) C/irc-manage.page:28(license/p)
 #: C/irc-nick-password.page:22(license/p) C/irc-send-file.page:20(license/p)
 #: C/irc-start-conversation.page:19(license/p)
-#: C/link-contacts.page:19(license/p) C/overview.page:20(license/p)
+#: C/link-contacts.page:23(license/p) C/overview.page:20(license/p)
 #: C/prev-conv.page:25(license/p) C/prob-conn-acctdisabled.page:23(license/p)
 #: C/prob-conn-auth.page:25(license/p) C/prob-conn-name.page:22(license/p)
 #: C/prob-conn-neterror.page:23(license/p) C/prob-conn.page:18(license/p)
@@ -344,8 +344,8 @@ msgid ""
 "height=\"16\">Remove</media>."
 msgstr ""
 "Para quitar una red de la lista seleccione y pulse <media type=\"image\" "
-"mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" height=\"16"
-"\">Quitar</media>."
+"mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" height="
+"\"16\">Quitar</media>."
 
 #: C/account-irc.page:115(section/p)
 msgid ""
@@ -725,10 +725,6 @@ msgid "Start an audio conversation"
 msgstr "Iniciar una conversación de sonido"
 
 #: C/audio-call.page:37(page/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."
 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 "
@@ -739,9 +735,6 @@ msgstr ""
 "otra persona tenga una aplicación que soporte llamadas de voz."
 
 #: C/audio-call.page:43(item/p)
-#| msgid ""
-#| "Select the contact you want to have the conversation, and from the menu "
-#| "select <gui style=\"menuitem\">Audio Call</gui>."
 msgid ""
 "Right-click on the contact that you want to call and select <gui style="
 "\"menuitem\">Audio Call</gui>."
@@ -750,10 +743,6 @@ msgstr ""
 "seleccione <gui style=\"menuitem\">Llamada de voz</gui>."
 
 #: C/audio-call.page:49(item/p) C/video-call.page:50(item/p)
-#| msgid ""
-#| "A new window will open. When the connection is established, you will see "
-#| "<gui>Connected</gui> at the bottom of the window, along with the total "
-#| "conversation time."
 msgid ""
 "A new window will open. When the connection is established, you will see the "
 "total conversation time at the bottom of the window."
@@ -762,8 +751,6 @@ msgstr ""
 "tiempo total de conversación en la parte inferior de la ventana."
 
 #: C/audio-call.page:55(item/p)
-#| msgid ""
-#| "To end the conversation, click on <gui style=\"button\">Hang up</gui>."
 msgid ""
 "To end the conversation, click the <gui style=\"button\">hand up</gui> "
 "button."
@@ -818,10 +805,6 @@ msgstr ""
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
 #: C/audio-video.page:58(media)
-#| msgctxt "_"
-#| msgid ""
-#| "external ref='figures/audio-input-microphone.png' "
-#| "md5='8d89026b66a263a3bc5b1f0665948567'"
 msgctxt "_"
 msgid "external ref='figures/audio-input-microphone.png' md5='__failed__'"
 msgstr "external ref='figures/audio-input-microphone.png' md5='__failed__'"
@@ -831,10 +814,6 @@ msgstr "external ref='figures/audio-input-microphone.png' md5='__failed__'"
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
 #: C/audio-video.page:70(media)
-#| msgctxt "_"
-#| msgid ""
-#| "external ref='figures/camera-web.png' "
-#| "md5='8166b4372f25b78cbf5a64fe2eac2ce5'"
 msgctxt "_"
 msgid "external ref='figures/camera-web.png' md5='__failed__'"
 msgstr "external ref='figures/camera-web.png' md5='__failed__'"
@@ -2371,19 +2350,27 @@ msgstr ""
 msgid "Merge and separate different contacts into a single one."
 msgstr "Unir y separar diferentes contactos en uno solo."
 
-#: C/link-contacts.page:25(page/title)
-msgid "Combine and separate contacts"
-msgstr "Combinar y separar contactos"
+#: C/link-contacts.page:19(credit/name)
+msgid "Shobha Tyagi"
+msgstr "Shobha Tyagi"
 
-#: C/link-contacts.page:26(page/p)
+#: C/link-contacts.page:29(page/title)
+#| msgid "Hide offline contacts"
+msgid "Link and unlink contacts"
+msgstr "Enlazar y desenlazar contactos"
+
+#: C/link-contacts.page:30(page/p)
+#| msgid ""
+#| "If one, or more, of your contacts has multiple accounts with different "
+#| "messaging services, you can combine these contacts into a single one."
 msgid ""
-"If one, or more, of your contacts has multiple accounts with different "
-"messaging services, you can combine these contacts into a single one."
+"If one or more of your contacts has multiple accounts with different "
+"messaging services, you can combine these accounts into a single contact."
 msgstr ""
-"Si uno o más de sus contactos tiene múltiples cuentas con diferentes "
-"servicios de mensajería, puede combinar esos contactos en uno solo."
+"Si uno o más de sus contactos tienen varias cuentas con diferentes servicios "
+"de mensajería, puede combinar esas cuentas en uno sola."
 
-#: C/link-contacts.page:30(page/p)
+#: C/link-contacts.page:34(page/p)
 msgid ""
 "The resulting contact is called a <em>meta-contact</em>: a contact composed "
 "from different single contacts."
@@ -2391,82 +2378,117 @@ msgstr ""
 "Al contacto resultante se le llama <em>metacontacto</em>: un contacto "
 "compuesto de diferentes contactos simples."
 
-#: C/link-contacts.page:34(page/p)
+#: C/link-contacts.page:38(page/p)
+#| msgid ""
+#| "If you have a Jane Smith contact that is using three different messaging "
+#| "services like:"
 msgid ""
-"If you have a Jane Smith contact that is using three different messaging "
-"services like:"
+"Suppose you have a contact called Jane Smith who is using three different "
+"messaging services like:"
 msgstr ""
-"Si tiene un contacto Juan Pérez que usa tres servicios de mensajería de "
-"contactos como:"
+"Suponga que tiene un contacto llamado Juan Pérez que usa tres servicios de "
+"mensajería de contactos como:"
 
-#: C/link-contacts.page:40(item/p)
+#: C/link-contacts.page:44(item/p)
 msgid "janes@facebook"
 msgstr "juan@facebook"
 
-#: C/link-contacts.page:45(item/p)
+#: C/link-contacts.page:49(item/p)
 msgid "jane.smith@gmail"
 msgstr "juan.perez@gmail"
 
-#: C/link-contacts.page:50(item/p)
+#: C/link-contacts.page:54(item/p)
 msgid "jane_smith@hotmail"
 msgstr "juan_perez@hotmail"
 
-#: C/link-contacts.page:55(page/p)
+#: C/link-contacts.page:59(page/p)
 msgid "You can combine these contacts into a single Jane Smith one."
 msgstr "Puede combinar estos contactos en un solo Juan Pérez."
 
-#: C/link-contacts.page:60(section/title)
-msgid "Combining contacts"
-msgstr "Combinar contactos"
+#: C/link-contacts.page:63(section/title)
+#| msgid "Combining contacts"
+msgid "Link contacts"
+msgstr "Enlazar contactos"
+
+#: C/link-contacts.page:64(section/p)
+msgid "The way you can link your contacts is as follows:"
+msgstr "Puede enlazar sus contactos de la siguiente manera:"
 
-#: C/link-contacts.page:63(item/p)
+#: C/link-contacts.page:69(item/p)
 msgid ""
-"From the <gui>Contact List</gui> window, right-click one of the contact that "
-"has different accounts, and select <gui style=\"menuitem\">Link Contacts...</"
-"gui>."
+"Press the tick button to select entries you want to link. This will enable "
+"<em>selection mode</em> and you can see a checkbox for each entry."
 msgstr ""
-"Desde la ventana <gui>Lista de contactos</gui> pulse con el botón derecho "
-"uno de los contactos que tiene diferentes cuentas y seleccione <gui style="
-"\"menuitem\">Enlazar contactos...</gui>."
+"Pulse el botón para seleccionar las entradas que quiere enlazar. Esto "
+"activará el <em>modo de selección</em> y verá una casilla por cada entrada."
 
-#: C/link-contacts.page:70(item/p)
+#: C/link-contacts.page:75(item/p)
 msgid ""
-"From the left pane in the <gui>Link Contacts</gui> window, select the "
-"contacts you want to combine."
+"Tick the checkboxes that correspond to the <app>Contacts</app> entries which "
+"belong to the same contact."
 msgstr ""
-"Desde el panel izquierdo, en la ventana <gui>Enlazar contatos</gui>, "
-"seleccione los contactos que quiere combinar."
+"Marque las casillas que corresponden a las entradas de <app>Contactos</app> "
+"que pertenecen al mismo contacto."
 
-#: C/link-contacts.page:76(item/p)
-msgid "Click <gui style=\"button\">Link</gui>."
+#: C/link-contacts.page:81(item/p)
+#| msgid "Click <gui style=\"button\">Link</gui>."
+msgid "Press <gui style=\"button\">Link</gui>."
 msgstr "Pulse <gui style=\"button\">Enlazar</gui>."
 
-#: C/link-contacts.page:82(note/p)
+#: C/link-contacts.page:86(section/p)
+msgid "Repeat steps 3 and 4 in order to link other contacts."
+msgstr "Repita los pasos 3 y 4 para enlazar otros contactos."
+
+#: C/link-contacts.page:92(section/title)
+#| msgid "Combining contacts"
+msgid "Unlink contacts"
+msgstr "Desenlazar contactos"
+
+#: C/link-contacts.page:93(section/p)
+msgid "To unlink a linked contact:"
+msgstr "Para desenlazar un contacto enlazado:"
+
+#: C/link-contacts.page:98(item/p)
+#| msgid "Select a status from the list."
+msgid "Select the contact from your list."
+msgstr "Seleccione el contacto de su lista."
+
+#: C/link-contacts.page:103(item/p)
 msgid ""
-"When a meta-contact has been created, the default contact that will be used "
-"to have a conversation with when you double-click on it, is the contact with "
-"the highest presence on-line."
+"Press <gui style=\"button\">Edit</gui> in the top-right corner of "
+"<app>Contacts</app>."
 msgstr ""
-"Cuando se ha creado un metacontacto, el contacto predeterminado que se usará "
-"para tener una conversación al pulsar dos veces sobre él, es el último "
-"contacto con presencia en línea."
+"Pulse <gui style=\"button\">Editar</gui> en la esquina superior derecha de "
+"<app>Contactos</app>."
 
-#: C/link-contacts.page:91(section/title)
-msgid "Separating contacts"
-msgstr "Separar contactos"
+#: C/link-contacts.page:108(item/p)
+#| msgid "Click <gui style=\"button\">Link</gui>."
+msgid "Press <gui style=\"button\">Linked Contacts</gui>."
+msgstr "Pulse <gui style=\"button\">Contactos enlazados</gui>."
 
-#: C/link-contacts.page:94(item/p)
+#: C/link-contacts.page:113(item/p)
+#| msgid "Click <gui style=\"button\">Connect</gui> to enable the new account."
 msgid ""
-"From the <gui>Contact List</gui>, right-click the contact to separate, and "
-"select <gui style=\"menuitem\">Link Contacts...</gui>."
+"Press <gui style=\"button\">Remove</gui> to unlink an entry from the linked "
+"contact."
 msgstr ""
-"Desde la ventana <gui>Lista de contactos</gui> pulse con el botón derecho "
-"del ratón para separar, y seleccione <gui style=\"menuitem\">Enlazar "
-"contactos...</gui>."
+"Pulse <gui style=\"button\">Quitar</gui> para desenlazar una entrada de un "
+"contacto enlazado."
 
-#: C/link-contacts.page:100(item/p)
-msgid "Click <gui style=\"button\">Unlink</gui>."
-msgstr "Pulse <gui style=\"button\">Desenlazar</gui>."
+#: C/link-contacts.page:118(item/p)
+#| msgid "Click <gui style=\"button\">Connect</gui> to enable the new account."
+msgid ""
+"Press <gui style=\"button\">Close</gui> if you do not want to unlink any "
+"more contacts."
+msgstr ""
+"Pulse <gui style=\"button\">Cerrar</gui> si no quiere desenlazar más "
+"contactos."
+
+#: C/link-contacts.page:123(item/p)
+#| msgid "Click <gui style=\"button\">Connect</gui> to enable the new account."
+msgid "Finally, press <gui style=\"button\">Done</gui> to finish editing."
+msgstr ""
+"Finalmente, pulse <gui style=\"button\">Hecho</gui> para terminar la edición."
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
@@ -2820,8 +2842,8 @@ msgid ""
 "An error message which says “<gui>Name in use</gui>” appears in the main "
 "window."
 msgstr ""
-"Aparecen en la ventana principal un mensaje de error que dice «<gui>Nombre en "
-"uso</gui>»."
+"Aparecen en la ventana principal un mensaje de error que dice «<gui>Nombre "
+"en uso</gui>»."
 
 #: C/prob-conn-name.page:33(page/title)
 msgid "I get a message that says “Name in use”"
@@ -3501,9 +3523,6 @@ msgstr ""
 "llamadas de vídeo."
 
 #: C/video-call.page:46(item/p)
-#| msgid ""
-#| "Select the contact you want to have the conversation, and from the menu "
-#| "select <gui style=\"menuitem\">Video Call</gui>."
 msgid ""
 "Right-click on the contact that you want to call and select <gui style="
 "\"menuitem\">Video Call</gui>."
@@ -3512,8 +3531,6 @@ msgstr ""
 "seleccione <gui style=\"menuitem\">Llamada de vídeo</gui>."
 
 #: C/video-call.page:54(item/p)
-#| msgid ""
-#| "To end the conversation, click on <gui style=\"button\">Hang up</gui>."
 msgid ""
 "To end the conversation, click on the <gui style=\"button\">hang up</gui> "
 "button."
@@ -3542,6 +3559,48 @@ msgstr ""
 "Seleccione el contacto con el que quiere tener la conversación y, del menú, "
 "seleccione <gui style=\"menuitem\">Llamada de vídeo</gui>."
 
+#~ msgid "Combine and separate contacts"
+#~ msgstr "Combinar y separar contactos"
+
+#~ msgid ""
+#~ "From the <gui>Contact List</gui> window, right-click one of the contact "
+#~ "that has different accounts, and select <gui style=\"menuitem\">Link "
+#~ "Contacts...</gui>."
+#~ msgstr ""
+#~ "Desde la ventana <gui>Lista de contactos</gui> pulse con el botón derecho "
+#~ "uno de los contactos que tiene diferentes cuentas y seleccione <gui style="
+#~ "\"menuitem\">Enlazar contactos...</gui>."
+
+#~ msgid ""
+#~ "From the left pane in the <gui>Link Contacts</gui> window, select the "
+#~ "contacts you want to combine."
+#~ msgstr ""
+#~ "Desde el panel izquierdo, en la ventana <gui>Enlazar contatos</gui>, "
+#~ "seleccione los contactos que quiere combinar."
+
+#~ msgid ""
+#~ "When a meta-contact has been created, the default contact that will be "
+#~ "used to have a conversation with when you double-click on it, is the "
+#~ "contact with the highest presence on-line."
+#~ msgstr ""
+#~ "Cuando se ha creado un metacontacto, el contacto predeterminado que se "
+#~ "usará para tener una conversación al pulsar dos veces sobre él, es el "
+#~ "último contacto con presencia en línea."
+
+#~ msgid "Separating contacts"
+#~ msgstr "Separar contactos"
+
+#~ msgid ""
+#~ "From the <gui>Contact List</gui>, right-click the contact to separate, "
+#~ "and select <gui style=\"menuitem\">Link Contacts...</gui>."
+#~ msgstr ""
+#~ "Desde la ventana <gui>Lista de contactos</gui> pulse con el botón derecho "
+#~ "del ratón para separar, y seleccione <gui style=\"menuitem\">Enlazar "
+#~ "contactos...</gui>."
+
+#~ msgid "Click <gui style=\"button\">Unlink</gui>."
+#~ msgstr "Pulse <gui style=\"button\">Desenlazar</gui>."
+
 #~ 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 "
@@ -3881,10 +3940,6 @@ msgstr ""
 #~ msgid "Click the <gui style=\"button\">Add</gui> button."
 #~ msgstr "Pulse el botón <gui style=\"button\">Añadir</gui>."
 
-#~ msgid "Click <gui style=\"button\">Connect</gui> to enable the new account."
-#~ msgstr ""
-#~ "Pulse <gui style=\"button\">Conectar</gui> para activar la nueva cuenta."
-
 #~ msgid ""
 #~ "If you select another account without clicking <gui>Connect</gui>, any "
 #~ "information you have entered will be lost."