Updated Spanish translation

svn path=/trunk/; revision=35198

1 files changed, 314 insertions, 244 deletions

diff --git a/help/es/es.po b/help/es/es.po
index fcc83070d3..17f9d634e9 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.help.HEAD\n"
-"POT-Creation-Date: 2008-03-03 18:48+0000\n"
-"PO-Revision-Date: 2008-03-04 00:52+0100\n"
+"POT-Creation-Date: 2008-03-14 18:27+0000\n"
+"PO-Revision-Date: 2008-03-16 13:13+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"
@@ -713,9 +713,10 @@ msgstr ""
 "Una guía de usuario para Evolution que explica como usar sus características "
 "de correo, calendario, libreta de direcciones y listas de tareas."
 
-#: C/evolution.xml:76(productname)
-msgid "Evolution™"
-msgstr "Evolution™"
+#: C/evolution.xml:76(productname) C/evolution.xml:5566(para)
+#: C/evolution.xml:7262(glossterm)
+msgid "Evolution"
+msgstr "Evolution"
 
 #: C/evolution.xml:78(invpartnumber)
 msgid "February 2008"
@@ -731,11 +732,12 @@ msgstr "Acerca de esta guía"
 
 #: C/evolution.xml:85(para)
 msgid ""
-"This guide describes how to use and manage Evolution™ 2.22 client software. "
-"This guide is intended for users and is divided into the following sections:"
+"This guide describes how to use and manage <trademark>Evolution</trademark> "
+"2.22 client software. This guide is intended for users and is divided into "
+"the following sections:"
 msgstr ""
-"Esta guía describe cómo usar y gestionar el cliente de Evolution™2.22. Esta "
-"guía está dirigida a los usuarios y se divide en las siguientes secciones:"
+"Esta guía describe cómo usar y gestionar el cliente de <trademark>Evolution</trademark> "
+"2.22. Esta guía está dirigida a los usuarios y se divide en las siguientes secciones:"
 
 #: C/evolution.xml:88(link) C/evolution.xml:155(title)
 msgid "Getting Started"
@@ -817,13 +819,13 @@ msgstr ""
 
 #: C/evolution.xml:142(para)
 msgid ""
-"For support, late-breaking news, and errata, visit the Novell® support "
-"center at <ulink url=\"http://support.novell.com\">support.novell.com</"
-"ulink>."
+"For support, late-breaking news, and errata, visit the <trademark class="
+"\"registered\">Novell</trademark> support center at <ulink url=\"http://"
+"support.novell.com\">support.novell.com</ulink>."
 msgstr ""
 "Para asistencia, noticias de última hora y erratas, visite la web del centro "
-"asistencia técnica de Novell® en <ulink url=\"http://support.novell.com"
-"\">support.novell.com</ulink>."
+"asistencia técnica de <trademark class=\"registered\">Novell</trademark> "
+"en <ulink url=\"http://support.novell.com\">support.novell.com</ulink>."
 
 #: C/evolution.xml:145(para)
 msgid "In the Evolution interface, click Help &gt; Contents."
@@ -834,11 +836,12 @@ msgid "Documentation Conventions:"
 msgstr "Convenciones del documento:"
 
 #: C/evolution.xml:150(para)
+#, fuzzy
 msgid ""
 "In Novell documentation, a greater-than symbol (&gt;) is used to separate "
 "actions within a step and items in a cross-reference path. A trademark "
-"symbol (®, TM, etc.) denotes a Novell trademark. An asterisk (*) denotes a "
-"third-party trademark."
+"symbol (<trademark class=\"registered\"/>, <trademark/>, etc.) denotes a "
+"Novell trademark. An asterisk (*) denotes a third-party trademark."
 msgstr ""
 "En la documentación de Novell, se usa un símbolo «mayor que» (&gt;) para "
 "separar acciones dentro de un paso y elementos en una referencia cruzada. Un "
@@ -846,11 +849,13 @@ msgstr ""
 "Novell. Un asterisco (*) denota una marca registrada de terceras partes."
 
 #: C/evolution.xml:156(para)
+#, fuzzy
 msgid ""
-"Evolution™ makes the tasks of storing, organizing, and retrieving your "
-"personal information easy, so you can work and communicate more effectively "
-"with others. It is a highly evolved <link linkend=\"groupware\">groupware</"
-"link> program, an integral part of the Internet-connected desktop."
+"<trademark>Evolution</trademark> makes the tasks of storing, organizing, and "
+"retrieving your personal information easy, so you can work and communicate "
+"more effectively with others. It is a highly evolved <link linkend="
+"\"groupware\">groupware</link> program, an integral part of the Internet-"
+"connected desktop."
 msgstr ""
 "Evolution™ facilita las tareas de almacenar, organizar y obtener su "
 "información personal, con el fin de poder trabajar y comunicarse con otras "
@@ -1093,11 +1098,12 @@ msgid "Novell GroupWise:"
 msgstr "Novell GroupWise:"
 
 #: C/evolution.xml:276(para)
+#, fuzzy
 msgid ""
-"Select this option if you connect to Novell GroupWise®. Novell GroupWise "
-"keeps e-mail, calendar, and contact information on the server. For "
-"configuration instructions, see <link linkend=\"bstfw13\">Remote "
-"Configuration Options</link>."
+"Select this option if you connect to Novell <trademark class=\"registered"
+"\">GroupWise</trademark>. Novell GroupWise keeps e-mail, calendar, and "
+"contact information on the server. For configuration instructions, see <link "
+"linkend=\"bstfw13\">Remote Configuration Options</link>."
 msgstr ""
 "Seleccione esta opción si se conecta a Novell GroupWise®. Novell GroupWise "
 "conserva la información de correo-e, calendario, y contactos en el servidor. "
@@ -1156,11 +1162,12 @@ msgid "Hula:"
 msgstr "Hula:"
 
 #: C/evolution.xml:292(para)
+#, fuzzy
 msgid ""
 "Select this option if you want Hula account. Evolution provide you "
-"connectivity to Hula® servers through IMAP and calendaring support through "
-"CalDAV. For more information refer <link linkend=\"b1012tkg\">Connecting to "
-"Hula</link>"
+"connectivity to <trademark class=\"registered\">Hula</trademark> servers "
+"through IMAP and calendaring support through CalDAV. For more information "
+"refer <link linkend=\"b1012tkg\">Connecting to Hula</link>"
 msgstr ""
 "Seleccione esta opción si quiere una cuenta Hula. Evolution le proporciona "
 "conectividad con servidores Hula® a través de IMAP y a través de soporte "
@@ -1534,11 +1541,11 @@ msgstr ""
 "tiempo y uso de la red. Esto es útil cuando no lee todos los mensajes que "
 "recibe."
 
-#: C/evolution.xml:421(para)
+#: C/evolution.xml:421(para) C/evolution.xml:512(para)
 msgid ""
 "If you check this option, evolution fetches the headers as well as the body "
 "of the message simultaneously. In this case, the time taken to open a "
-"message is comparitevely less. In addition to that, you can download the "
+"message is comparatively less. In addition to that, you can download the "
 "mails for reading them offline, when you have checked this option."
 msgstr ""
 "Si selecciona esta opción, Evolution obtendrá las cabeceras así como el "
@@ -1729,19 +1736,6 @@ msgstr ""
 "Marque si quiere comprobar si el los mensajes de la Bandeja de entrada son "
 "spam."
 
-#: C/evolution.xml:512(para)
-msgid ""
-"If you check this option, evolution fetches the headers as well as the body "
-"of the message simultaneously. In this case, the time taken to open a "
-"message is comparatively less. In addition to that, you can download the "
-"mails for reading them offline, when you have checked this option."
-msgstr ""
-"Si selecciona esta opción, Evolution obtendrá las cabeceras así como el "
-"cuerpo del mensaje de forma simultánea. En este caso, el tiempo que lleva "
-"abrir un mensaje es comparativamente inferior. Además de esto, puede "
-"descargar los correos para leerlos cuando esté desconectado, siempre que "
-"haya seleccionado esta opción."
-
 #: C/evolution.xml:524(para)
 msgid ""
 "If you select POP as your receiving server type, you need to specify the "
@@ -3012,8 +3006,8 @@ msgid "Forces every part of Evolution to shut down immediately."
 msgstr "Fuerza cada componente de Evolution a terminar inmediatamente."
 
 #: C/evolution.xml:1104(para)
-msgid "evolution ‘%s’"
-msgstr "evolution «%s»"
+msgid "evolution <quote>%s</quote>"
+msgstr "evolution <quote>%s</quote>"
 
 #: C/evolution.xml:1107(para)
 msgid ""
@@ -3024,12 +3018,13 @@ msgstr ""
 "navegador web y en el centro de control de GNOME."
 
 #: C/evolution.xml:1118(para)
+#, fuzzy
 msgid ""
 "This section, and <link linkend=\"usage-mail-organize\">Organizing Your E-"
 "Mail</link>, provide you with an in-depth guide to the capabilities of "
-"Evolution™ as a mail client. For information about how to customize your "
-"mail account, see <link linkend=\"config-prefs-mail\">Mail Preferences</"
-"link>."
+"<trademark>Evolution</trademark> as a mail client. For information about how "
+"to customize your mail account, see <link linkend=\"config-prefs-mail\">Mail "
+"Preferences</link>."
 msgstr ""
 "Esta sección, así como<link linkend=\"usage-mail-organize\">Organización de "
 "su correo-e, le ofrece una guía en profundidad de </link>las posibilidades "
@@ -3184,7 +3179,10 @@ msgstr ""
 "mainwindow-starting\">Iniciar Evolution por primera vez</link>."
 
 #: C/evolution.xml:1172(para)
-msgid "‘Get Mail' in the Evolution toolbar replaced with Send/Receive tool in SLED."
+#, fuzzy
+msgid ""
+"<guilabel>Get Mail</guilabel> in the Evolution toolbar replaced with Send/"
+"Receive tool in SLED."
 msgstr ""
 "Se ha sustituido «Obtener correo» en la barra de herramientas de Evolution "
 "por «Enviar/Recibir»."
@@ -3321,7 +3319,10 @@ msgid "Select Mail Preferences"
 msgstr "Seleccione Opciones de correo"
 
 #: C/evolution.xml:1223(para)
-msgid "Check ‘Shrink To/CC/Bcc headers to column’ to limit the address"
+#, fuzzy
+msgid ""
+"Check <guilabel>Shrink To/CC/Bcc headers to column</guilabel> to limit the "
+"address"
 msgstr ""
 "Marque la columna «Reducir las cabeceras Para / Cc / Cco a» para limitar las "
 "direcciones"
@@ -3331,11 +3332,12 @@ msgid "Enter the limit in the field."
 msgstr "Introduzca el límite en el campo."
 
 #: C/evolution.xml:1229(para)
+#, fuzzy
 msgid ""
 "You can expand the message headers by click the <inlinegraphic format=\"PNG"
-"\" fileref=\"figures/plus.png\"/> icon or the ‘…’ in the message preview "
-"pane. To collapse click <inlinegraphic format=\"PNG\" fileref=\"figures/"
-"minus.png\"/> icon in the preview pane."
+"\" fileref=\"figures/plus.png\"/> icon or the <guilabel>...</guilabel> in "
+"the message preview pane. To collapse click <inlinegraphic format=\"PNG\" "
+"fileref=\"figures/minus.png\"/> icon in the preview pane."
 msgstr ""
 "Puede expandir las cabeceras del mensaje pulsando el icono <inlinegraphic "
 "format=\"PNG\" fileref=\"figures/plus.png\"/> o el «...» en el panel de "
@@ -3804,6 +3806,7 @@ msgid "Tips for E-Mail Courtesy"
 msgstr "Consejos para correo electrónico de cortesía"
 
 #: C/evolution.xml:1426(para)
+#, fuzzy
 msgid ""
 "If you want to write in a non-Latin alphabet while using a Latin keyboard, "
 "try selecting a different input method in the message composer. Right-click "
@@ -3811,8 +3814,9 @@ msgid ""
 "Methods menu, then begin typing. The actual keys vary by language and input "
 "style. For example, the Cyrillic input method uses transliterated Latin "
 "keyboard combinations to get the Cyrillic alphabet, combining letters where "
-"necessary. “Zh” and “ya” produce the appropriate single Cyrillic letters, "
-"and the single-quote (‘) produces a soft sign character."
+"necessary. <quote>Zh</quote> and <quote>ya</quote> produce the appropriate "
+"single Cyrillic letters, and the single-quote (') produces a soft sign "
+"character."
 msgstr ""
 "Si quiere usar un alfabeto no latino mientras usa un teclado latino, pruebe "
 "seleccionando un método de entrada diferente en el editor de mensajes. Pulse "
@@ -3926,12 +3930,13 @@ msgstr ""
 "Guardar como, y después especifique un nombre de archivo."
 
 #: C/evolution.xml:1454(para)
+#, fuzzy
 msgid ""
 "Offline mode help you communicate with remote mail storage systems like "
-"GroupWise®, IMAP or Exchange, in situations where you are not connected to "
-"the network at all times. Evolution keeps a local copy of one or more "
-"folders to allow you to compose messages, storing them in your Outbox to be "
-"sent the next time you connect."
+"<trademark class=\"registered\">GroupWise</trademark>, IMAP or Exchange, in "
+"situations where you are not connected to the network at all times. "
+"Evolution keeps a local copy of one or more folders to allow you to compose "
+"messages, storing them in your Outbox to be sent the next time you connect."
 msgstr ""
 "El modo desconectado le permite comunicarse con sistemas de almacenamiento "
 "de correo remoto tales como GroupWise®;, IMAP o Exchange en situaciones en "
@@ -4144,15 +4149,17 @@ msgid "Click Configure to add the keywords."
 msgstr "Pulse Configurar para añadir las palabras clave."
 
 #: C/evolution.xml:1542(para)
+#, fuzzy
 msgid ""
-"Click Add to add keywords such as &ldquo;Attach&rdquo; or &ldquo;"
-"Attachment&rdquo;."
+"Click Add to add keywords such as <quote>Attach</quote> or <quote>Attachment."
+"</quote>"
 msgstr "Pulse Añadir para añadir palabras clave tales como «Adjuntar» o «Adjunto»."
 
 #: C/evolution.xml:1543(para)
+#, fuzzy
 msgid ""
 "Based on the keywords you have added here, it searches every email you are "
-"sending. If it finds the keywords such as &ldquo;attach&rdquo; in your e-"
+"sending. If it finds the keywords such as <quote>attach</quote> in your e-"
 "mail and no actual attached file, you are reminded of missing attachments."
 msgstr ""
 "Busca cada correo electrónico que esté enviando basándose en las palabras "
@@ -4421,11 +4428,12 @@ msgid "Find Regex:"
 msgstr "Buscar expresión regular:"
 
 #: C/evolution.xml:1660(para)
+#, fuzzy
 msgid ""
 "You can search for a complex pattern of characters, called a <link linkend="
-"\"regular-expression\">regular expression</link> or “regex” in your composer "
-"window. If you're not sure what a regular expression is, you should ignore "
-"this feature."
+"\"regular-expression\">regular expression</link> or <quote>regex</quote> in "
+"your composer window. If you're not sure what a regular expression is, you "
+"should ignore this feature."
 msgstr ""
 "Puede buscar un complejo patrón de caracteres llamado <link linkend="
 "\"regular-expression\">expresión regular</link> o «regex» en la ventana de "
@@ -4985,10 +4993,11 @@ msgstr ""
 "descuidados."
 
 #: C/evolution.xml:1952(para)
+#, fuzzy
 msgid ""
-"Always begin and close with a salutation. Say “please” and “thank you,” just "
-"like you do in real life. You can keep your pleasantries short, but be "
-"polite."
+"Always begin and close with a salutation. Say <quote>please</quote> and "
+"<quote>thank you,</quote> just like you do in real life. You can keep your "
+"pleasantries short, but be polite."
 msgstr ""
 "Siempre empiece y acabe con un saludo. Diga «por favor» y «gracias» de la "
 "misma manera que haría en la vida real. Puede ser breve en sus cumplidos "
@@ -5243,12 +5252,14 @@ msgstr ""
 "remitente."
 
 #: C/evolution.xml:2044(para)
+#, fuzzy
 msgid ""
 "For example, suppose that Kevin wants to send an encrypted message to his "
 "friend Rachel. He looks up her public key on a general key server, and then "
-"tells Evolution to encrypt the message. The message now reads “@#"
-"$23ui7yr87#@!48970fsd.” When the information gets to Rachel, she decrypts it "
-"using her private key, and it appears as plain text for her to read."
+"tells Evolution to encrypt the message. The message now reads <quote>@#"
+"$23ui7yr87#@!48970fsd.</quote> When the information gets to Rachel, she "
+"decrypts it using her private key, and it appears as plain text for her to "
+"read."
 msgstr ""
 "Por ejemplo, suponga que Antonio quiere enviar un mensaje cifrado a su amigo "
 "Jorge. Él busca su clave pública en un servidor público y entonces le pide a "
@@ -5437,11 +5448,12 @@ msgstr ""
 "su identificador se añadirá automáticamente a su llavero."
 
 #: C/evolution.xml:2105(para)
+#, fuzzy
 msgid ""
-"The domain &rsquo;<emphasis>wwwkeys.pgp.net</emphasis>&rsquo; is assigned to "
-"multiple hosts in various networks. The gpg utility tries to connect to one "
-"in the current network; and if that particular host is down, it fails with a "
-"time-out."
+"The domain <quote><emphasis>wwwkeys.pgp.net</emphasis></quote> is assigned "
+"to multiple hosts in various networks. The gpg utility tries to connect to "
+"one in the current network; and if that particular host is down, it fails "
+"with a time-out."
 msgstr ""
 "El dominio «<emphasis>wwwkeys.pgp.net</emphasis>» está asignado en múltiples "
 "servidores en varias redes. La utilidad gpg trata de conectarse a una en la "
@@ -5702,10 +5714,11 @@ msgid "Select the appropriate options."
 msgstr "Seleccione las opciones apropiadas."
 
 #: C/evolution.xml:2243(para)
+#, fuzzy
 msgid ""
 "Whether you only get a few e-mail messages a day, or you receive hundreds, "
-"you probably want to sort and organize them. Evolution™ has the tools to "
-"help you do it."
+"you probably want to sort and organize them. <trademark>Evolution</"
+"trademark> has the tools to help you do it."
 msgstr ""
 "Independientemente de que reciba unos pocos correos-e al día, o unos "
 "cientos, probablemente querrá organizarlos. Evolution™ tiene las "
@@ -6343,10 +6356,11 @@ msgstr ""
 "eligiendo Marcar como terminado o Quitar marca."
 
 #: C/evolution.xml:2519(para)
+#, fuzzy
 msgid ""
 "When you read a flagged message, its flag status is displayed at the top, "
-"before the message headers. An overdue message might tell you “Overdue: Call "
-"by April 07, 2003, 5:00 PM.”"
+"before the message headers. An overdue message might tell you "
+"<quote>Overdue: Call by April 07, 2003, 5:00 PM.</quote>"
 msgstr ""
 "Cuando lea un mensaje marcado en la parte superior derecha del mismo, "
 "aparecerá una nota con el estado de la bandera, antes de la cabecera del "
@@ -6888,13 +6902,15 @@ msgid "Any header including custom ones."
 msgstr "Cualquier cabecera, incluyendo las personalizadas."
 
 #: C/evolution.xml:2784(para)
+#, fuzzy
 msgid ""
 "If a message uses a header more than once, Evolution pays attention only to "
 "the first instance, even if the message defines the header differently the "
 "second time. For example, if a message declares the Resent-From: header as "
-"“engineering@example.com” and then restates it as “marketing@example.com,” "
-"Evolution filters as though the second declaration did not occur. To filter "
-"on messages that use headers multiple times, use a regular expression."
+"<quote>engineering@example.com</quote> and then restates it as "
+"<quote>marketing@example.com,</quote> Evolution filters as though the second "
+"declaration did not occur. To filter on messages that use headers multiple "
+"times, use a regular expression."
 msgstr ""
 "Si en un mensaje aparece más de una vez la misma cabecera, Evolution sólo se "
 "fija en la primera, aunque en la segunda el contenido sea diferente. Por "
@@ -7386,6 +7402,7 @@ msgstr ""
 "remotos, la carpeta de búsqueda no coincidente tampoco los buscará."
 
 #: C/evolution.xml:2993(para)
+#, fuzzy
 msgid ""
 "As an example of using folders, searches, and search folders, consider the "
 "following: To organize his mailbox, Jim sets up a search folder for e-mail "
@@ -7393,9 +7410,10 @@ msgid ""
 "messages that have novell.com in the address and Evolution in the subject "
 "line, so he can keep a record of what people from work send him about "
 "Evolution. If Anna sends him a message about anything other than Evolution, "
-"it only shows up in the “Anna” search folder. When Anna sends him mail about "
-"the user interface for Evolution, he can see the message both in the “Anna” "
-"search folder and in the “Internal Evolution Discussion” search folder."
+"it only shows up in the <quote>Anna</quote> search folder. When Anna sends "
+"him mail about the user interface for Evolution, he can see the message both "
+"in the <quote>Anna</quote> search folder and in the <quote>Internal "
+"Evolution Discussion</quote> search folder."
 msgstr ""
 "Como ejemplo de uso de las carpetas, búsquedas y carpetas de búsqueda "
 "considere lo siguiente: Para organizar su buzón de correo, Juan define una "
@@ -7673,10 +7691,11 @@ msgstr ""
 "Bogofilter</ulink>."
 
 #: C/evolution.xml:3135(para)
+#, fuzzy
 msgid ""
-"This section shows you how to use the Evolution™ contacts tool to organize "
-"any amount of contact information, share addresses over a network, and save "
-"time with everyday tasks."
+"This section shows you how to use the <trademark>Evolution</trademark> "
+"contacts tool to organize any amount of contact information, share addresses "
+"over a network, and save time with everyday tasks."
 msgstr ""
 "Esta sección le muestra cómo usar la herramienta de contactos de Evolution™ "
 "para organizar cualquier cantidad de información sobre contactos, compartir "
@@ -7809,19 +7828,21 @@ msgid "Full Name:"
 msgstr "Nombre completo:"
 
 #: C/evolution.xml:3180(para)
+#, fuzzy
 msgid ""
 "Specify the name of your contact here. You can type a name into the Full "
 "Name field, but you can also click the Full Name button to bring up a small "
-"dialog box with text boxes for first and last names, titles like “Mr.” or "
-"“Her Excellency,” and suffixes like “Jr.” The Full Name field also interacts "
-"with the File Under box to help you organize your contacts and to handle "
-"multi-word surnames.To see how it works, type a name in the Full Name field. "
-"As an example, we'll use Miguel de Icaza. You'll notice that the File Under "
-"field also fills in, but in reverse: Icaza, Miguel de. If you had entered "
-"John Q. Doe, the contacts editor would have correctly guessed that the entry "
-"should be filed under “Doe, John Q.” However, Miguel's surname, “de Icaza”, "
-"has two words, and to sort it correctly you must enter de Icaza, Miguel in "
-"the File As entry."
+"dialog box with text boxes for first and last names, titles like <quote>Mr.</"
+"quote> or <quote>Her Excellency,</quote> and suffixes like <quote>Jr.</"
+"quote> The Full Name field also interacts with the File Under box to help "
+"you organize your contacts and to handle multi-word surnames.To see how it "
+"works, type a name in the Full Name field. As an example, we'll use Miguel "
+"de Icaza. You'll notice that the File Under field also fills in, but in "
+"reverse: Icaza, Miguel de. If you had entered John Q. Doe, the contacts "
+"editor would have correctly guessed that the entry should be filed under "
+"<quote>Doe, John Q.</quote> However, Miguel's surname, <quote>de Icaza,</"
+"quote> has two words, and to sort it correctly you must enter de Icaza, "
+"Miguel in the File As entry."
 msgstr ""
 "Especifique aquí el nombre de su contacto. Puede escribir un nombre dentro "
 "del campo Nombre completo, pero también puede pulsar el botón Nombre "
@@ -8275,11 +8296,12 @@ msgstr ""
 "gestionada por una aplicación para listas de correo en un servidor."
 
 #: C/evolution.xml:3443(para)
+#, fuzzy
 msgid ""
 "For example, you could create one card for each family member, then add "
-"those cards to a contact list called “Family.” Then, instead of entering "
-"each person's e-mail address individually, you can send e-mail to “Family” "
-"and the message would go to all of them."
+"those cards to a contact list called <quote>Family.</quote> Then, instead of "
+"entering each person's e-mail address individually, you can send e-mail to "
+"<quote>Family</quote> and the message would go to all of them."
 msgstr ""
 "Por ejemplo, puede crear una tarjeta para cada miembro de su familia, "
 "después añadir esas tarjetas a una lista de contactos llamada «Familia». "
@@ -8322,11 +8344,12 @@ msgstr ""
 "mensaje a la lista."
 
 #: C/evolution.xml:3461(para)
+#, fuzzy
 msgid ""
 "Unless it is a very small list, it is recommended that you leave the "
-"addresses hidden. This is the same thing as using the “Bcc:” feature "
-"discussed in <link linkend=\"usage-mail-getnsend-send-to-types\">Specifying "
-"Additional Recipients for E-Mail</link>."
+"addresses hidden. This is the same thing as using the <quote>Bcc:</quote> "
+"feature discussed in <link linkend=\"usage-mail-getnsend-send-to-types"
+"\">Specifying Additional Recipients for E-Mail</link>."
 msgstr ""
 "A no ser que sea una lista muy pequeña, es recomendable que oculte las "
 "direcciones. Este funcionamiento es similar al de la característica «Cco:», "
@@ -8365,12 +8388,14 @@ msgid "Evolution cannot store contact lists on Microsoft Exchange servers."
 msgstr "Evolution no puede almacenar listas de contactos en servidores Exchange."
 
 #: C/evolution.xml:3474(para)
+#, fuzzy
 msgid ""
 "Another way to group cards is to mark them as belonging to different "
 "categories. You can mark a card as being in several categories or no "
-"category at all. For example, you put a friend's card in the “Business” "
-"category because he works with you, the “Friends” category because he's a "
-"friend, and the “Frequent” category because you call him often."
+"category at all. For example, you put a friend's card in the "
+"<guilabel>Business</guilabel> category because he works with you, the "
+"<guilabel>Friends</guilabel> category because he's a friend, and the "
+"<guilabel>Frequent</guilabel> category because you call him often."
 msgstr ""
 "Otro método para agrupar tarjetas consiste en marcarlas como pertenecientes "
 "a diferentes categorías. Por tanto, puede asociar una tarjeta con numerosas "
@@ -8544,11 +8569,12 @@ msgstr ""
 "Evolution con dispositivos portátiles</link>."
 
 #: C/evolution.xml:3547(para)
+#, fuzzy
 msgid ""
-"This section shows you how to use the Evolution™ Calendar to manage your "
-"schedule alone or in conjunction with peers. To learn about importing "
-"calendar data, see <link linkend=\"importing-mail\">Importing Single Files</"
-"link>, which covers the Import tool."
+"This section shows you how to use the <trademark>Evolution</trademark> "
+"Calendar to manage your schedule alone or in conjunction with peers. To "
+"learn about importing calendar data, see <link linkend=\"importing-mail"
+"\">Importing Single Files</link>, which covers the Import tool."
 msgstr ""
 "Este capítulo explica cómo usar el calendario de Evolution™ para planificar "
 "su horario individual o en función de sus compañeros. Para saber cómo "
@@ -9219,14 +9245,16 @@ msgstr ""
 "próximas."
 
 #: C/evolution.xml:3911(para)
+#, fuzzy
 msgid ""
-"If you are using a calendar on a Novell GroupWise® or Microsoft Exchange "
-"server, select a classification for the appointment to determine who can "
-"view it. Public is the default category, and a public appointment can be "
-"viewed by anyone on the calendar-sharing network. Private denotes one level "
-"of security, and Confidential an even higher level. The different levels "
-"vary depending on your server settings; check with your system administrator "
-"or adjust your delegation settings."
+"If you are using a calendar on a Novell <trademark class=\"registered"
+"\">GroupWise</trademark> or Microsoft Exchange server, select a "
+"classification for the appointment to determine who can view it. Public is "
+"the default category, and a public appointment can be viewed by anyone on "
+"the calendar-sharing network. Private denotes one level of security, and "
+"Confidential an even higher level. The different levels vary depending on "
+"your server settings; check with your system administrator or adjust your "
+"delegation settings."
 msgstr ""
 "Si está usando un calendario en servidor Novell GroupWise®; o Microsoft "
 "Exchange, seleccione una clasificación para la cita para determinar quién "
@@ -9304,14 +9332,15 @@ msgstr ""
 "búsqueda en la parte superior del calendario y seleccione una categoría."
 
 #: C/evolution.xml:3934(para)
+#, fuzzy
 msgid ""
 "The Recurrence tool button lets you describe repetition in appointments "
 "ranging from once every day up to once every 100 years. You can then choose "
 "a time and date when the appointment stops recurring, and, under Exceptions, "
 "pick individual days when the appointment does not recur. Make your "
-"selections from left to right, and you form a sentence: “Every two weeks on "
-"Monday and Friday until January 3, 2008” or “Every month on the first Friday "
-"for 12 occurrences.”"
+"selections from left to right, and you form a sentence: <quote>Every two "
+"weeks on Monday and Friday until January 3, 2008</quote> or <quote>Every "
+"month on the first Friday for 12 occurrences.</quote>"
 msgstr ""
 "El botón de la herramienta de Repetición le permite describir la "
 "periodicidad de las citas que puede variar desde diaria hasta cada 100 años. "
@@ -9347,11 +9376,13 @@ msgstr ""
 "las respuestas a las solicitudes de reunión."
 
 #: C/evolution.xml:3942(para)
+#, fuzzy
 msgid ""
 "When you create a meeting or group appointment, you can specify the "
-"attendees in several categories, such as “chair” or “required.” When you "
-"save the meeting listing, each attendee is sent an e-mail with the meeting "
-"information, which also gives them the option to respond."
+"attendees in several categories, such as <quote>chair</quote> or "
+"<quote>required.</quote> When you save the meeting listing, each attendee is "
+"sent an e-mail with the meeting information, which also gives them the "
+"option to respond."
 msgstr ""
 "Al crear una reunión o una cita en grupo puede especificar a los asistentes "
 "en varias categorías como «presidencia» o «participante requerido». Cuando "
@@ -9942,13 +9973,14 @@ msgstr ""
 "acontecimientos locales y regionales."
 
 #: C/evolution.xml:4298(para)
+#, fuzzy
 msgid ""
 "Evolution lets you view and manage calendars on remote CalDAV servers such "
-"as Hula®. For more information about Hula, see the <ulink url=\"http://www."
-"hula-project.org\">Hula Project Web site</ulink>. The procedure to create a "
-"CalDAV calendar source is similar to that of a remote Web calendar source. "
-"You can view and create calendar events on CalDav accounts just like other "
-"calendars on Evolution."
+"as <trademark class=\"registered\">Hula</trademark>. For more information "
+"about Hula, see the <ulink url=\"http://www.hula-project.org\">Hula Project "
+"Web site</ulink>. The procedure to create a CalDAV calendar source is "
+"similar to that of a remote Web calendar source. You can view and create "
+"calendar events on CalDav accounts just like other calendars on Evolution."
 msgstr ""
 "Evolution le permite ver y gestionar calendarios en servidores remotos "
 "CalDAV tales como Hula. Par®a obtener más información acerca de Hula, vea la "
@@ -10103,11 +10135,12 @@ msgid "Evolution can be used to assign a task to multiple people."
 msgstr "Evolution se puede usar para asignar una tarea a varias personas."
 
 #: C/evolution.xml:4384(para)
+#, fuzzy
 msgid ""
 "When you assign a task, you can specify the attendees in several categories, "
-"such as “chair” or “required.” When you save the task, each attendee is sent "
-"an e-mail with the task information, which also gives them the option to "
-"respond."
+"such as <quote>chair</quote> or <quote>required.</quote> When you save the "
+"task, each attendee is sent an e-mail with the task information, which also "
+"gives them the option to respond."
 msgstr ""
 "Al asignar una tarea puede especificar los asistentes en varias categorías, "
 "tales como «presidencia» o «participante requerido». Cuando guarde la tarea, "
@@ -10465,10 +10498,11 @@ msgstr ""
 "Esta característica ahora está disponible en el calendario de Evolution."
 
 #: C/evolution.xml:4837(para)
+#, fuzzy
 msgid ""
-"Evolution™ Exchange for Microsoft Exchange allows Evolution clients to "
-"access accounts on Microsoft Exchange 2000 and 2003 servers. Like Evolution, "
-"it is free software and is licensed under the GPL."
+"<trademark>Evolution</trademark> Exchange for Microsoft Exchange allows "
+"Evolution clients to access accounts on Microsoft Exchange 2000 and 2003 "
+"servers. Like Evolution, it is free software and is licensed under the GPL."
 msgstr ""
 "Evolution™ Exchange para Microsoft Exchange permite a los clientes de "
 "Evolution acceder a cuentas en servidores Microsoft Exchange 2000 y 2003. Al "
@@ -10571,11 +10605,13 @@ msgid "Sending E-mail via Exchange Protocols:"
 msgstr "Envío de correo mediante protocolos Exchange:"
 
 #: C/evolution.xml:4898(para)
+#, fuzzy
 msgid ""
 "If you use the Microsoft Exchange mail transport protocol to send e-mail, "
 "make sure that the address you have entered as your e-mail address is "
 "exactly the one that the Exchange server has on file. This might be "
-"“yourname@exchange-server.example.com” rather than “yourname@example.com”."
+"<quote>yourname@exchange-server.example.com</quote> rather than "
+"<quote>yourname@example.com.</quote>"
 msgstr ""
 "Si utiliza el protocolo de transporte de correo de Microsoft Exchange para "
 "enviar correo, asegúrese de que la dirección de correo electrónico que ha "
@@ -10588,9 +10624,10 @@ msgid "Out of Office Message:"
 msgstr "Mensaje de Estoy fuera de la oficina:"
 
 #: C/evolution.xml:4904(para)
+#, fuzzy
 msgid ""
-"You can set ‘out of Office’ message that will automatically be sent to "
-"people who send mails to you while you are away from office."
+"You can set <quote>out of Office</quote> message that will automatically be "
+"sent to people who send mails to you while you are away from office."
 msgstr ""
 "Puede establecer su mensaje «Estoy fuera de la oficina» que se enviará "
 "automáticamente a las personas que le envíen correos mientras está fuera de "
@@ -10744,10 +10781,12 @@ msgstr ""
 "a menos que su administrador de sistema lo haya deshabilitado."
 
 #: C/evolution.xml:4993(para)
+#, fuzzy
 msgid ""
-"The <ulink url=\"http://support.novell.com\">Novell® Web site Knowledgebase</"
-"ulink> has additional information about checking to make sure that your "
-"Exchange server accepts connections from Evolution."
+"The <ulink url=\"http://support.novell.com\"><trademark class=\"registered"
+"\">Novell</trademark> Web site Knowledgebase</ulink> has additional "
+"information about checking to make sure that your Exchange server accepts "
+"connections from Evolution."
 msgstr ""
 "La <ulink url=\"http://support.novell.com\">base de conocimiento de Novell®</"
 "ulink> contiene información adicional para asegurar que su servidor Exchange "
@@ -10952,10 +10991,11 @@ msgstr ""
 "globales (GAL) aparece vacía hasta que busque algo en ella."
 
 #: C/evolution.xml:5138(para)
+#, fuzzy
 msgid ""
 "There are some settings in Evolution that are available only with Evolution "
-"Exchange, like delegation and permission handling, creating “Out of Office” "
-"messages, changing password and viewing folder size."
+"Exchange, like delegation and permission handling, creating <quote>Out of "
+"Office</quote> messages, changing password and viewing folder size."
 msgstr ""
 "Existen algunos ajustes en Evolution que están sólo disponibles con "
 "Evolution Exchange, tales como delegación y manejo de permisos, crear "
@@ -11096,11 +11136,12 @@ msgstr ""
 "vez."
 
 #: C/evolution.xml:5207(para)
+#, fuzzy
 msgid ""
 "When the recipient opens the mail, he or she can also read a message that "
-"‘The message was sent by &lt;<emphasis>Delegator's name</emphasis>&gt; on "
-"behalf of &lt;<emphasis>Delegate's name</emphasis>&gt; on the preview pane "
-"header bar."
+"<guilabel>The message was sent by &lt;<emphasis>Delegator's name</"
+"emphasis>&gt; on behalf of &lt;<emphasis>Delegate's name</emphasis>&gt;</"
+"guilabel> on the preview pane header bar."
 msgstr ""
 "Cuando el destinatario abre el correo puede leer el mensaje «El mensaje lo "
 "envió &lt;<emphasis>Nombre del delegado</emphasis>&gt; en nombre de &lt;"
@@ -11354,14 +11395,16 @@ msgid "To view contents of a folder, click it."
 msgstr "Para ver el contenido de una carpeta, pulse sobre ella."
 
 #: C/evolution.xml:5348(para)
+#, fuzzy
 msgid ""
 "Reminders for meetings in your Exchange calendar do not work until you have "
 "run Evolution at least once after logging in. This is different from locally "
 "stored reminders, which work from the moment you log in, regardless of "
 "whether you have run Evolution in the session.so that you can fix a "
 "convenient time for a meeting.To enable Reminder setting in your Exchange "
-"account, select ‘Remember the password’ checkbox. To find more information "
-"about Reminders see<link linkend=\"bshly4v\">Reminders</link>"
+"account, select <guilabel>Remember the password</guilabel> checkbox. To find "
+"more information about Reminders see<link linkend=\"bshly4v\">Reminders</"
+"link>"
 msgstr ""
 "Los recordatorios de reuniones en su calendario de Exchange no funcionarán "
 "hasta que ejecute Evolution al menos una vez después de iniciar la sesión. "
@@ -11513,14 +11556,15 @@ msgstr ""
 "de cada uno de los asistentes"
 
 #: C/evolution.xml:5433(para)
+#, fuzzy
 msgid ""
 "If meeting attendees are not available during the times you have scheduled a "
-"meeting, you can “nudge” the meeting forward or backward to the nearest "
-"available time. To do so, just click the arrows to the left or right of the "
-"Autopick button. The Autopick tool lets you move the meeting to the nearest "
-"time during which all attendees are available. If you are not satisfied with "
-"those results, you can also drag the edges of the area marked as meeting "
-"time to the hours that you want to select."
+"meeting, you can <quote>nudge</quote> the meeting forward or backward to the "
+"nearest available time. To do so, just click the arrows to the left or right "
+"of the Autopick button. The Autopick tool lets you move the meeting to the "
+"nearest time during which all attendees are available. If you are not "
+"satisfied with those results, you can also drag the edges of the area marked "
+"as meeting time to the hours that you want to select."
 msgstr ""
 "Si los asistentes no están disponibles para las horas previstas de reunión, "
 "es posible «empujar» la reunión hacia adelante o hacia atrás, hasta el "
@@ -11531,8 +11575,14 @@ msgstr ""
 "reunión hacia las horas que desea seleccionar."
 
 #: C/evolution.xml:5439(para)
-msgid "Evolution™ can access accounts on Novell® GroupWise® 7 system."
-msgstr "Evolution™ puede acceder a cuentas en el sistema Novell® GroupWise 7®."
+msgid ""
+"<trademark>Evolution</trademark> can access accounts on <trademark class="
+"\"registered\">Novell</trademark><trademark class=\"registered\">GroupWise</"
+"trademark> 7 system."
+msgstr ""
+"<trademark>Evolution</trademark> puede acceder a cuentas del sistema "
+" <trademark class=\"registered\">Novell</trademark><trademark "
+"class=\"registered\">GroupWise</trademark> 7."
 
 #: C/evolution.xml:5442(link) C/evolution.xml:5465(title)
 msgid "GroupWise Features"
@@ -11712,10 +11762,6 @@ msgstr ""
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: C/evolution.xml:5566(para) C/evolution.xml:7262(glossterm)
-msgid "Evolution"
-msgstr "Evolution"
-
 #: C/evolution.xml:5573(para) C/evolution.xml:5584(para)
 msgid "Appointment"
 msgstr "Cita"
@@ -12004,12 +12050,12 @@ msgstr ""
 #: C/evolution.xml:5782(para)
 msgid ""
 "If meeting attendees are not available during the times you have scheduled a "
-"meeting, you can “nudge” the meeting forward or backward to the nearest "
-"available time. To do so, just click the arrows to the left or right of the "
-"Autopick button. The Autopick tool moves the meeting to the nearest time "
-"during which all attendees are available. If you aren't satisfied with those "
-"results, you can drag the edges of the meeting time to the hours that you "
-"want to select."
+"meeting, you can <quote>nudge</quote> the meeting forward or backward to the "
+"nearest available time. To do so, just click the arrows to the left or right "
+"of the Autopick button. The Autopick tool moves the meeting to the nearest "
+"time during which all attendees are available. If you aren't satisfied with "
+"those results, you can drag the edges of the meeting time to the hours that "
+"you want to select."
 msgstr ""
 "Si los asistentes no están disponibles para las horas previstas de reunión, "
 "es posible «empujar» la reunión hacia adelante o hacia atrás, hasta el "
@@ -12697,11 +12743,13 @@ msgstr "Seleccione la dirección de correo-e a quitar, después pulse Quitar."
 
 #: C/evolution.xml:6245(para)
 msgid ""
-"Evolution™ supports mail connectivity to Hula® servers through IMAP and "
-"calendaring support through CalDAV."
+"<trademark>Evolution</trademark> supports mail connectivity to <trademark "
+"class=\"registered\">Hula</trademark> servers through IMAP and calendaring "
+"support through CalDAV."
 msgstr ""
-"Evolution™ soporta conectividad de correo en servidores Hula a t®ravés de "
-"IMAP y soporta calendarios a través de CalDAV."
+"<trademark>Evolution</trademark> soporta conectividad de correo en servidores "
+"<trademark class=\"registered\">Hula</trademark> a través de IMAP y soporta "
+"calendarios a través de CalDAV."
 
 #: C/evolution.xml:6246(para)
 msgid ""
@@ -12731,11 +12779,11 @@ msgstr ""
 msgid ""
 "Perhaps your mail server has changed names. Or you have grown tired of a "
 "certain layout for your appointments. Whatever the reason, you can change "
-"your Evolution™ settings."
+"your <trademark>Evolution</trademark> settings."
 msgstr ""
 "Quizá su servidor de correo haya cambiado de nombre. Quizá se cansó de "
 "utilizar siempre la misma disposición para sus citas. Sea cual sea la razón "
-"puede que quiera cambiar su configuración de Evolution™."
+"puede que quiera cambiar su configuración de <trademark>Evolution</trademark>."
 
 #: C/evolution.xml:6265(link) C/evolution.xml:6319(title)
 msgid "Working with Mail Accounts"
@@ -12842,12 +12890,13 @@ msgid "Composer Preferences:"
 msgstr "Preferencias del editor:"
 
 #: C/evolution.xml:6306(para)
+#, fuzzy
 msgid ""
 "These are settings for the way that you use the mail composer, such as "
 "shortcuts, signatures, and spelling. This includes the ability to substitute "
-"graphical emoticons for “emoticons” such as : ) that many people use in e-"
-"mail. This tool is covered in <link linkend=\"config-prefs-mail-composer"
-"\">Composer Preferences</link>."
+"graphical emoticons for <quote>emoticons</quote> such as : ) that many "
+"people use in e-mail. This tool is covered in <link linkend=\"config-prefs-"
+"mail-composer\">Composer Preferences</link>."
 msgstr ""
 "Estos son ajustes para definir la manera en la que quiere usar el editor de "
 "correo, tales como atajos, firmas, y corrección ortográfica. Ésto incluye la "
@@ -12955,19 +13004,22 @@ msgid "Receiving Email:"
 msgstr "Recibir correo electrónico:"
 
 #: C/evolution.xml:6330(para)
+#, fuzzy
 msgid ""
 "Select the way you receive e-mail. You can download e-mail from a <link "
 "linkend=\"pop\">POP server</link>, read and keep it on the server (Microsoft "
-"Exchange, Novell® GroupWise®, or IMAP<link linkend=\"imap\">IMAP</link>), or "
-"read it from files that already exist on your desktop computer. Your server "
-"requires you to use a Secure Socket Layer (SSL) connection. You can select "
-"from the given three options: No encryption, TLS encryption or SSL "
-"encryption."
+"Exchange, <trademark class=\"registered\">Novell</trademark><trademark class="
+"\"registered\">GroupWise</trademark>, or IMAP<link linkend=\"imap\">IMAP</"
+"link>), or read it from files that already exist on your desktop computer. "
+"Your server requires you to use a Secure Socket Layer (SSL) connection. You "
+"can select from the given three options: No encryption, TLS encryption or "
+"SSL encryption."
 msgstr ""
 "Seleccione de qué manera desea recibir su correo. Puede descargarlo desde un "
 "<link linkend=\"pop\">servidor POP</link>, leerlo y conservarlo en el mismo "
-"servidor (Microsoft Exchange, Novell® GroupWise® o <link linkend"
-"=\"imap\">IMAP</link>), o leerlo de archivos que ya están en su escritorio. Es posible que su servidor le permita utilizar conexiones cifradas (SSL, Secure "
+"servidor (Microsoft Exchange, Novell® GroupWise® o <link linkend=\"imap"
+"\">IMAP</link>), o leerlo de archivos que ya están en su escritorio. Es "
+"posible que su servidor le permita utilizar conexiones cifradas (SSL, Secure "
 "Socket Layer). Puede seleccionar una opción de las tres dadas: Sin cifrado, "
 "cifrado TLS o cifrado SSL."
 
@@ -13364,17 +13416,18 @@ msgid "Message Display:"
 msgstr "Vista de los mensajes:"
 
 #: C/evolution.xml:6460(para)
+#, fuzzy
 msgid ""
 "Choose how long you want to wait before marking a message read, how to "
-"highlight quotations, and the default encoding. Enable ‘Fall back to "
-"threading message by subject’ to group the messages as message threads. You "
-"can also set the limit to the number of addresses displayed in the message "
-"header by enabling ‘Shrink To/CC/BCC header to’ option.You can also set the "
-"limit for rendering text content in the message you recive.By default, when "
-"you receive a message with text content more than 4096 Kilo Bytes, Evolution "
-"will not render the message in the preview pane. You can view unformatted "
-"text either inline or using an external application. You can also enable "
-"Magic spacebar and search folders."
+"highlight quotations, and the default encoding. Enable <guilabel>Fall back "
+"to threading message by subject</guilabel> to group the messages as message "
+"threads. You can also set the limit to the number of addresses displayed in "
+"the message header by enabling <guilabel>Shrink To/CC/BCC header to</"
+"guilabel> option.You can also set the limit for rendering text content in "
+"the message you recive.By default, when you receive a message with text "
+"content more than 4096 Kilo Bytes, Evolution will not render the message in "
+"the preview pane. You can view unformatted text either inline or using an "
+"external application. You can also enable Magic spacebar and search folders."
 msgstr ""
 "Elija cuánto tiempo quiere esperar antes de marcar un mensaje como leído, "
 "cómo resaltar las citas de otros mensajes y la codificación predeterminada. "
@@ -13462,12 +13515,13 @@ msgid "Loading Images:"
 msgstr "Cargar imágenes:"
 
 #: C/evolution.xml:6486(para)
+#, fuzzy
 msgid ""
 "You can embed a image in an e-mail and have it load only when the message "
-"arrives. However, spammers can use image loading patterns to confirm “live” "
-"addresses and invade your privacy. You can elect to never load images "
-"automatically, to load images only if the sender is in your contacts, or "
-"always load images."
+"arrives. However, spammers can use image loading patterns to confirm "
+"<quote>live</quote> addresses and invade your privacy. You can elect to "
+"never load images automatically, to load images only if the sender is in "
+"your contacts, or always load images."
 msgstr ""
 "Al crear un mensaje puede incluir una imagen que sólo se descargue cuando el "
 "destinatario lea el mensaje. Sin embargo los «spammers» pueden usar los "
@@ -13575,14 +13629,16 @@ msgstr ""
 "característica."
 
 #: C/evolution.xml:6535(para)
+#, fuzzy
 msgid ""
 "By default it searches only in the local addressbooks enabled for "
-"autocompletion. If you deselect the option ‘Search for sender photograph "
-"only in the local addressbook’, it searches in all the addressbooks enabled "
-"for autocompletion. If there are multiple matches for the same contact, it "
-"always takes the first one. Consider a contact that has multiple matches - "
-"the first one with a photograph and the second without a photo. Here, "
-"Evolution takes the first contact regardless of it not having a photograph."
+"autocompletion. If you deselect the option <guilabel>Search for sender "
+"photograph only in the local addressbook</guilabel>, it searches in all the "
+"addressbooks enabled for autocompletion. If there are multiple matches for "
+"the same contact, it always takes the first one. Consider a contact that has "
+"multiple matches - the first one with a photograph and the second without a "
+"photo. Here, Evolution takes the first contact regardless of it not having a "
+"photograph."
 msgstr ""
 "De forma predeterminada sólo se busca en las libretas de direcciones locales "
 "activadas para autocompletado. Si deselecciona la opción «Buscar la foto del "
@@ -13881,15 +13937,17 @@ msgstr ""
 "alternativa, o no utilizar ninguna, desde el propio editor de correo."
 
 #: C/evolution.xml:6648(para)
+#, fuzzy
 msgid ""
 "To choose a spell-checking language, select it here. You must install the "
-"gnome-spell package, available through ZENworks® Linux Management, for spell-"
-"checking to be available in Evolution. Additional dictionaries are also "
-"available through Red Carpet® and are detected automatically if you have "
-"installed them. You must also install the aspell package. If this is the "
-"case, please contact your packager. To have the composer automatically check "
-"your spelling while you type, select Check Spelling While I Type. You can "
-"set the color for misspelled words."
+"gnome-spell package, available through <trademark class=\"registered"
+"\">ZENworks</trademark> Linux Management, for spell-checking to be available "
+"in Evolution. Additional dictionaries are also available through <trademark "
+"class=\"registered\">Red Carpet</trademark> and are detected automatically "
+"if you have installed them. You must also install the aspell package. If "
+"this is the case, please contact your packager. To have the composer "
+"automatically check your spelling while you type, select Check Spelling "
+"While I Type. You can set the color for misspelled words."
 msgstr ""
 "Seleccione aquí un idioma al que aplicar la corrección ortográfica. Debe "
 "instalar el paquete gnome-spell, disponible a través de ZENworks Linu®x "
@@ -14445,11 +14503,12 @@ msgid "The messages remain in the statusbar for this specified time."
 msgstr "El mensaje permanece en la barra de estado durante el tiempo especificado."
 
 #: C/evolution.xml:6918(para)
+#, fuzzy
 msgid ""
 "The <inlinegraphic format=\"PNG\" fileref=\"figures/evo_dialog-warning.png\"/"
 "> icon indicates that the error message displayed is a warning. The "
 "<inlinegraphic format=\"PNG\" fileref=\"figures/evo_dialog-info.png\"/> icon "
-"is displayed with a &ldquo;for-your-information&rdquo; message."
+"is displayed with a <quote>for-your-information</quote> message."
 msgstr ""
 "El icono <inlinegraphic format=\"PNG\" fileref=\"figures/evo_dialog-warning."
 "png\"/> indica que el mensaje de error mostrado es una advertencia. El "
@@ -14460,13 +14519,13 @@ msgstr ""
 msgid ""
 "Synchronization presents you with three issues you need to address. First, "
 "you need to enable synchronization. Second, your computer needs to recognize "
-"and access your handheld. At this time, Evolution™ only supports Palm OS "
-"devices like the PalmPilot* and the Handspring Visor. Third, you should "
-"decide what sort of synchronization behavior you want."
+"and access your handheld. At this time, <trademark>Evolution</trademark> "
+"only supports Palm OS devices like the PalmPilot* and the Handspring Visor. "
+"Third, you should decide what sort of synchronization behavior you want."
 msgstr ""
 "La sincronización se le presenta con tres temas que debe tratar. Primero, "
 "debe activar la sincronización. Segundo, su equipo debe reconocer y acceder "
-"a su dispositivo portátil. En este momento, Evolution™ sólo soporta "
+"a su dispositivo portátil. En este momento, <trademark>Evolution</trademark> sólo soporta "
 "dispositivos Palm OS como PalmPilot* y Handspring Visor. Tercero, debe "
 "decidir que tipo de sincronización quiere."
 
@@ -14624,10 +14683,10 @@ msgstr ""
 #: C/evolution.xml:6982(para)
 msgid ""
 "If you are using Microsoft Outlook, but not Microsoft Exchange, this section "
-"helps you switch to Evolution™."
+"helps you switch to <trademark>Evolution</trademark>."
 msgstr ""
 "Si está usando Microsoft Outlook pero no Microsoft Exchange, esta sección le "
-"ayuda a cambiarse a Evolution™."
+"ayuda a cambiarse a <trademark>Evolution</trademark>."
 
 #: C/evolution.xml:6985(title)
 msgid "Migrating Local Outlook Mail Folders"
@@ -14776,11 +14835,11 @@ msgstr "Repita los pasos de importación hasta que haya importado todo su correo
 #: C/evolution.xml:7044(para)
 msgid ""
 "You can print this section to use it as a quick reference for most of the "
-"things you want to do with Evolution™. You can also find this information by "
-"selecting Help &gt; Quick Reference in the Menubar."
+"things you want to do with <trademark>Evolution</trademark>. You can also "
+"find this information by selecting Help &gt; Quick Reference in the Menubar."
 msgstr ""
 "Puede imprimir esta sección para usarla como una referencia rápida para la "
-"mayoría de operaciones que quiera hacer con Evolution™. También puede "
+"mayoría de operaciones que quiera hacer con <trademark>Evolution</trademark>. También puede "
 "encontrar esta información seleccionando Ayuda &gt; Referencia rápida en la "
 "barra de menú."
 
@@ -15020,13 +15079,13 @@ msgstr ""
 
 #: C/evolution.xml:7158(para)
 msgid ""
-"Evolution™ bug tracking is done at the <ulink url=\"http://bugzilla.gnome.org"
-"\">GNOME bug tracking System</ulink>. You can use that, or the GNOME Bug "
-"Report Tool (known as bug-buddy at the command line) if you find bugs or "
-"want to request new features."
+"<trademark>Evolution</trademark> bug tracking is done at the <ulink url="
+"\"http://bugzilla.gnome.org\">GNOME bug tracking System</ulink>. You can use "
+"that, or the GNOME Bug Report Tool (known as bug-buddy at the command line) "
+"if you find bugs or want to request new features."
 msgstr ""
-"El control de calidad de Evolution™ se realiza desde el <ulink url=\"http://"
-"bugzilla.gnome.org\">sistema de seguimiento de errores de GNOME</ulink>. Si "
+"El control de calidad de <trademark>Evolution</trademark> se realiza desde "
+"el <ulink url=\"http://bugzilla.gnome.org\">sistema de seguimiento de errores de GNOME</ulink>. Si "
 "encuentra errores o quiere pedir nuevas características, puede utilizarlo o "
 "bien optar por la herramienta de información de errores de GNOME (conocida "
 "como bug-buddy en la línea de comandos)."
@@ -15047,18 +15106,19 @@ msgstr ""
 #: C/evolution.xml:7160(para)
 msgid ""
 "If you need additional help with Evolution, visit the <ulink url=\"http://"
-"support.novell.com\">Novell® support site at</ulink>."
+"support.novell.com\"><trademark class=\"registered\">Novell</trademark> "
+"support site at</ulink>."
 msgstr ""
 "Si necesita ayuda adicional sobre Evolution, visite la <ulink url=\"http://"
-"support.novell.com\">web de asistencia de Novell®</ulink>."
+"support.novell.com\">web de asistencia de <trademark class=\"registered\">Novell</trademark></ulink>."
 
 #: C/evolution.xml:7165(para)
 msgid ""
-"Evolution was written by the Evolution™ team and numerous other dedicated "
-"GNOME programmers. You can see their names by clicking Help &gt; About from "
-"any Evolution window."
+"Evolution was written by the <trademark>Evolution</trademark> team and "
+"numerous other dedicated GNOME programmers. You can see their names by "
+"clicking Help &gt; About from any Evolution window."
 msgstr ""
-"Evolution ha sido creado por el equipo de Evolution™ y otros muchos "
+"Evolution ha sido creado por el equipo de <trademark>Evolution</trademark> y otros muchos "
 "programadores dedicados a GNOME. Para ver sus nombres, seleccione Ayuda &gt; "
 "Acerca de en cualquiera de las ventanas de Evolution."
 
@@ -15186,10 +15246,10 @@ msgstr "Sergey V. Mironov al ruso (.ru)"
 #: C/evolution.xml:7224(para)
 msgid ""
 "This glossary contains terms that are frequently used in this guide as well "
-"as in Evolution™."
+"as in <trademark>Evolution</trademark>."
 msgstr ""
 "Este glosario contiene términos que se usan frecuentemente en esta guía así "
-"como en Evolution™."
+"como en <trademark>Evolution</trademark>."
 
 #: C/evolution.xml:7226(glossterm)
 msgid "Assistant"
@@ -15221,9 +15281,11 @@ msgid "automatic indexing"
 msgstr "indexado automático"
 
 #: C/evolution.xml:7240(para)
+#, fuzzy
 msgid ""
-"A pre-downloading procedure that allows Novell® Evolution™ to quickly refer "
-"to data. It enables faster searches and decreases memory usage for data "
+"A pre-downloading procedure that allows <trademark class=\"registered"
+"\">Novell</trademark><trademark>Evolution</trademark> to quickly refer to "
+"data. It enables faster searches and decreases memory usage for data "
 "displays."
 msgstr ""
 "Un procedimiento de predescarga que permite a Novell; Ev®olution™ acceder "
@@ -15510,13 +15572,15 @@ msgid "regular expression"
 msgstr "expresión regular"
 
 #: C/evolution.xml:7360(para)
+#, fuzzy
 msgid ""
 "A regular expression (regex) is a way of describing a string of text using "
 "metacharacters or wildcard symbols. For example, the statement fly.*so[au]p "
-"means any phrase beginning with ‘fly’ and ending in ‘soup’ or ‘soap’. If you "
-"searched for that expression, you'd find both ‘fly in my soup’ and ‘fly in "
-"my soap.’ For more information, enter <command>man grep</command> from the "
-"command line."
+"means any phrase beginning with <quote>fly</quote> and ending in "
+"<quote>soup</quote> or <quote>soap.</quote> If you searched for that "
+"expression, you'd find both <quote>fly in my soup</quote> and <quote>fly in "
+"my soap.</quote> For more information, enter <command>man grep</command> "
+"from the command line."
 msgstr ""
 "Una expresión regular (regex) es una manera de describir una cadena de texto "
 "mediante meta-caracteres o símbolos comodín. Por ejemplo la sentencia fly.*so"
@@ -15720,11 +15784,21 @@ msgstr ""
 "regulaciones aplicables incluyendo, sin limitación, las regulaciones de "
 "exportación de los EE.UU. o las leyes del país en el que resida."
 
+#: C/evolution.xml:7441(year)
+#, fuzzy
+msgid "2007"
+msgstr "Julio de 2007"
+
+#: C/evolution.xml:7441(holder) C/evolution.xml:7447(member)
+msgid "Novell, Inc."
+msgstr "Novell, Inc."
+
 #: C/evolution.xml:7441(member)
+#, fuzzy
 msgid ""
-"Copyright © 2007 Novell, Inc. All rights reserved. Permission is granted to "
-"copy, distribute, and/or modify this document under the terms of the GNU "
-"Free Documentation License (GFDL), Version 1.2 or any later version, "
+"<copyright><placeholder-1/><placeholder-2/></copyright> Permission is "
+"granted to copy, distribute, and/or modify this document under the terms of "
+"the GNU Free Documentation License (GFDL), Version 1.2 or any later version, "
 "published by the Free Software Foundation with no Invariant Sections, no "
 "Front-Cover Texts, and no Back-Cover Texts. A copy of the GFDL can be found "
 "at http://www.fsf.org/licenses/fdl.html."
@@ -15798,10 +15872,6 @@ msgstr ""
 "MODIFICADAS, AUNQUE DICHA PARTE HAYA SIDO INFORMADA DE LA POSIBILIDAD DE QUE "
 "SE PRODUJESEN DICHOS DAÑOS."
 
-#: C/evolution.xml:7447(member)
-msgid "Novell, Inc."
-msgstr "Novell, Inc."
-
 #: C/evolution.xml:7448(member)
 msgid "404 Wyman Street, Suite 500"
 msgstr "404 Wyman Street, Suite 500"