GNOME.org
 

[gnome-control-center] Updated Spanish translation

commit 10a569855a29282990aac85bef67f4180d93e10f
Author: Daniel Mustieles <daniel mustieles gmail com>
Date:   Tue Aug 27 19:43:11 2013 +0200

    Updated Spanish translation

 po/es.po |  437 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 390 insertions(+), 47 deletions(-)
---
diff --git a/po/es.po b/po/es.po
index 6b2ba91..836105b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -20,16 +20,26 @@ msgstr ""
 "Project-Id-Version: gnome-control-center.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
 "control-center&keywords=I18N+L10N&component=general\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2013-08-20 14:26+0000\n"
 "PO-Revision-Date: 2013-08-20 17:43+0200\n"
+=======
+"POT-Creation-Date: 2013-08-23 14:35+0000\n"
+"PO-Revision-Date: 2013-08-27 18:22+0200\n"
+>>>>>>> Updated Spanish translation
 "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"
+"X-Generator: Gtranslator 2.91.6\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../panels/background/background.ui.h:1
+#: ../panels/background/gnome-background-panel.desktop.in.in.h:1
+msgid "Background"
+msgstr "Fondo"
 
 #: ../panels/background/background.ui.h:1
 #: ../panels/background/gnome-background-panel.desktop.in.in.h:1
@@ -42,7 +52,10 @@ msgid "Changes throughout the day"
 msgstr "Cambia a lo largo del día"
 
 #: ../panels/background/background.ui.h:4
+<<<<<<< HEAD
 #| msgid "Lock screen"
+=======
+>>>>>>> Updated Spanish translation
 msgid "Lock Screen"
 msgstr "Bloquear la pantalla"
 
@@ -112,11 +125,20 @@ msgstr "Puede añadir imágenes a su carpeta %s y se mostrarán aquí"
 #: ../panels/background/cc-background-chooser-dialog.c:443
 #: ../panels/bluetooth/cc-bluetooth-panel.c:631
 #: ../panels/color/cc-color-panel.c:220 ../panels/color/cc-color-panel.c:967
+<<<<<<< HEAD
+=======
+#: ../panels/display/cc-display-panel.c:1348
+#: ../panels/display/cc-display-panel.c:1746
+>>>>>>> Updated Spanish translation
 #: ../panels/network/connection-editor/vpn-helpers.c:245
 #: ../panels/network/connection-editor/vpn-helpers.c:374
 #: ../panels/network/net-device-wifi.c:1201
 #: ../panels/network/net-device-wifi.c:1407
+<<<<<<< HEAD
 #: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:355
+=======
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:379
+>>>>>>> Updated Spanish translation
 #: ../panels/printers/cc-printers-panel.c:1946
 #: ../panels/printers/new-printer-dialog.ui.h:2
 #: ../panels/privacy/cc-privacy-panel.c:467
@@ -266,7 +288,11 @@ msgstr ""
 "nuevamente."
 
 #: ../panels/bluetooth/cc-bluetooth-panel.c:632
+<<<<<<< HEAD
 #: ../panels/online-accounts/cc-online-accounts-panel.c:826
+=======
+#: ../panels/online-accounts/cc-online-accounts-panel.c:844
+>>>>>>> Updated Spanish translation
 msgid "_Remove"
 msgstr "_Quitar"
 
@@ -982,13 +1008,20 @@ msgid "Language"
 msgstr "Idioma"
 
 #: ../panels/common/language-chooser.ui.h:2
+<<<<<<< HEAD
 #: ../panels/mouse/cc-mouse-panel.c:119 ../panels/region/format-chooser.ui.h:2
+=======
+#: ../panels/mouse/cc-mouse-panel.c:120 ../panels/region/format-chooser.ui.h:2
+>>>>>>> Updated Spanish translation
 msgid "_Done"
 msgstr "_Hecho"
 
 #. Translators: This is the full date and time format used in 12-hour mode.
 #: ../panels/datetime/cc-datetime-panel.c:322
+<<<<<<< HEAD
 #| msgid "%b %d %l:%M %p"
+=======
+>>>>>>> Updated Spanish translation
 msgid "%e %B %Y, %l:%M %p"
 msgstr "%d/%b/%Y, %I:%M"
 
@@ -1076,8 +1109,11 @@ msgid "∶"
 msgstr "∶"
 
 #: ../panels/datetime/datetime.ui.h:17
+<<<<<<< HEAD
 #| msgid "minute"
 #| msgid_plural "minutes"
+=======
+>>>>>>> Updated Spanish translation
 msgid "Minute"
 msgstr "Minuto"
 
@@ -1098,42 +1134,66 @@ msgid "Year"
 msgstr "Año"
 
 #: ../panels/datetime/datetime.ui.h:22
+<<<<<<< HEAD
 #| msgid "Time"
+=======
+>>>>>>> Updated Spanish translation
 msgid "Time Zone"
 msgstr "Zona horaria"
 
 #: ../panels/datetime/datetime.ui.h:23
+<<<<<<< HEAD
 #| msgid "Search for the string"
+=======
+>>>>>>> Updated Spanish translation
 msgid "Search for a city"
 msgstr "Buscar una ciudad"
 
 #: ../panels/datetime/datetime.ui.h:24
+<<<<<<< HEAD
 #| msgid "Date & Time"
+=======
+>>>>>>> Updated Spanish translation
 msgid "Automatic _Date & Time"
 msgstr "Fecha y _hora automáticas"
 
 #: ../panels/datetime/datetime.ui.h:25
+<<<<<<< HEAD
 #| msgid "Requires Internet connection"
+=======
+>>>>>>> Updated Spanish translation
 msgid "Requires internet access"
 msgstr "Requiere conexión a Internet"
 
 #: ../panels/datetime/datetime.ui.h:26
+<<<<<<< HEAD
 #| msgid "Automatic _Connect"
+=======
+>>>>>>> Updated Spanish translation
 msgid "Automatic Time _Zone"
 msgstr "_Zona horaria automática"
 
 #: ../panels/datetime/datetime.ui.h:27
+<<<<<<< HEAD
 #| msgid "Date & Time"
+=======
+>>>>>>> Updated Spanish translation
 msgid "Date & _Time"
 msgstr "Fecha y _hora"
 
 #: ../panels/datetime/datetime.ui.h:28
+<<<<<<< HEAD
 #| msgid "Firewall _Zone"
+=======
+>>>>>>> Updated Spanish translation
 msgid "Time _Zone"
 msgstr "_Zona horaria"
 
 #: ../panels/datetime/datetime.ui.h:29
+<<<<<<< HEAD
 #| msgid "Formats"
+=======
+>>>>>>> Updated Spanish translation
 msgid "Time _Format"
 msgstr "Formato de _fecha"
 
@@ -1163,6 +1223,7 @@ msgid "To change time or date settings, you need to authenticate."
 msgstr ""
 "Para cambiar la configuración de la fecha o de la hora, debe autenticarse."
 
+<<<<<<< HEAD
 #: ../panels/display/cc-display-panel.c:487
 msgctxt "display panel, rotation"
 msgid "Normal"
@@ -1201,10 +1262,39 @@ msgid "Mirrored Displays"
 msgstr "Pantallas en espejo"
 
 #: ../panels/display/cc-display-panel.c:653
+=======
+#: ../panels/display/cc-display-panel.c:421
+#| msgid "Close"
+msgid "Lid Closed"
+msgstr "Tapa cerrada"
+
+#. translators: "Mirrored" describes when both displays show the same view
+#: ../panels/display/cc-display-panel.c:424
+#| msgid "Mirrored Displays"
+msgid "Mirrored"
+msgstr "En espejo"
+
+#: ../panels/display/cc-display-panel.c:426
+#: ../panels/display/cc-display-panel.c:1877
+>>>>>>> Updated Spanish translation
 #: ../panels/display/display-capplet.ui.h:1
-msgid "Monitor"
-msgstr "Monitor"
+#| msgid "Primary _button"
+msgid "Primary"
+msgstr "Primaria"
+
+#: ../panels/display/cc-display-panel.c:428
+#: ../panels/notifications/cc-notifications-panel.c:205
+#: ../panels/power/cc-power-panel.c:1745 ../panels/power/cc-power-panel.c:1756
+#: ../panels/privacy/cc-privacy-panel.c:77
+#: ../panels/privacy/cc-privacy-panel.c:117
+#: ../panels/universal-access/cc-ua-panel.c:253
+#: ../panels/universal-access/cc-ua-panel.c:573
+#: ../panels/universal-access/cc-ua-panel.c:699
+#: ../panels/universal-access/uap.ui.h:6
+msgid "Off"
+msgstr "Apagado"
 
+<<<<<<< HEAD
 #: ../panels/display/cc-display-panel.c:1698
 msgid "Drag to change primary display."
 msgstr "Arrastrar para cambiar la pantalla principal."
@@ -1235,27 +1325,123 @@ msgstr "No se pudieron detectar las pantallas"
 #: ../panels/display/cc-display-panel.c:2574
 msgid "Could not get screen information"
 msgstr "No se pudo obtener la información de la pantalla"
+=======
+#: ../panels/display/cc-display-panel.c:431
+#| msgid "Secondary color"
+msgid "Secondary"
+msgstr "Secundaria"
+
+#: ../panels/display/cc-display-panel.c:1345
+#| msgid "Mirrored Displays"
+msgid "Arrange Combined Displays"
+msgstr "Ordenar las pantallas combinadas"
+
+#: ../panels/display/cc-display-panel.c:1349
+#: ../panels/display/cc-display-panel.c:1747
+#: ../panels/network/connection-editor/connection-editor.ui.h:1
+msgid "_Apply"
+msgstr "_Aplicar"
+
+#: ../panels/display/cc-display-panel.c:1369
+msgid "Drag displays to rearrange them"
+msgstr "Arrastrar las pantallas para reordenarlas"
+
+#. size
+#: ../panels/display/cc-display-panel.c:1811
+#| msgid "Size:"
+msgid "Size"
+msgstr "Tamaño"
 
+#. aspect ratio
+#: ../panels/display/cc-display-panel.c:1826
+#: ../panels/display/display-capplet.ui.h:12
+msgid "Aspect Ratio"
+msgstr "Proporción de aspecto"
+
+#: ../panels/display/cc-display-panel.c:1847
+#: ../panels/display/display-capplet.ui.h:13
+#: ../panels/printers/pp-options-dialog.c:86
+msgid "Resolution"
+msgstr "Resolución"
+>>>>>>> Updated Spanish translation
+
+#: ../panels/display/cc-display-panel.c:1878
 #: ../panels/display/display-capplet.ui.h:2
-msgid "_Resolution"
-msgstr "_Resolución"
+msgid "Show the top bar and Activities Overview on this display"
+msgstr "Mostrar la barra superior y la vista de actividades en esta pantalla"
+
+#: ../panels/display/cc-display-panel.c:1884
+#| msgid "Secondary click delay"
+msgid "Secondary Display"
+msgstr "Pantalla secundaria"
 
+#: ../panels/display/cc-display-panel.c:1885
+msgid "Join this display with another to create an extra workspace"
+msgstr "Unir esta pantalla a otra para crear un área de trabajo adicional"
+
+#: ../panels/display/cc-display-panel.c:1892
 #: ../panels/display/display-capplet.ui.h:3
-msgid "R_otation"
-msgstr "R_otación"
+#| msgid "Orientation"
+msgid "Presentation"
+msgstr "Presentación"
+
+#: ../panels/display/cc-display-panel.c:1893
+#: ../panels/display/display-capplet.ui.h:4
+msgid "Show slideshows and media only"
+msgstr "Mostrar sólo diapositivas y multimedia"
 
-#. Note that mirror is a verb in this string
+#. translators: "Mirror" describes when both displays show the same view
+#: ../panels/display/cc-display-panel.c:1898
 #: ../panels/display/display-capplet.ui.h:5
-msgid "_Mirror displays"
-msgstr "_Espejar pantallas"
+#| msgctxt "Sound event"
+#| msgid "Error"
+msgid "Mirror"
+msgstr "Espejo"
+
+#: ../panels/display/cc-display-panel.c:1899
+msgid "Show your existing view on both displays"
+msgstr "Mostrar la vista existente en ambas pantallas"
+
+#: ../panels/display/cc-display-panel.c:2092
+msgid "Could not get screen information"
+msgstr "No se pudo obtener la información de la pantalla"
+
+#: ../panels/display/cc-display-panel.c:2123
+#| msgid "Mirrored Displays"
+msgid "_Arrange Combined Displays"
+msgstr "_Ordenar las pantallas combinadas"
 
 #: ../panels/display/display-capplet.ui.h:6
-msgid "Note: may limit resolution options"
-msgstr "Nota: puede limitar las opciones de resolución"
+msgid "Show your primary display on this screen also"
+msgstr "Mostrar su pantalla primaria también en este monitor"
 
 #: ../panels/display/display-capplet.ui.h:7
-msgid "_Detect Displays"
-msgstr "_Detectar pantallas"
+msgid "Combine"
+msgstr "Combinar"
+
+#: ../panels/display/display-capplet.ui.h:8
+msgid "Join with the primary display to create an extra space"
+msgstr "Unir a la pantalla primaria para crear un espacio adicional"
+
+#: ../panels/display/display-capplet.ui.h:9
+#| msgid "_Turn On"
+msgid "Turn Off"
+msgstr "Apagar"
+
+#: ../panels/display/display-capplet.ui.h:10
+#| msgid "Could not detect displays"
+msgid "Don't use the display"
+msgstr "No usar la pantalla"
+
+#: ../panels/display/display-capplet.ui.h:11
+#: ../panels/printers/printers.ui.h:12
+msgid "Model"
+msgstr "Modelo"
+
+#: ../panels/display/display-capplet.ui.h:14
+#| msgid "Re_fresh rate:"
+msgid "Refresh Rate"
+msgstr "Tasa de refresco"
 
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:1
 msgid "Displays"
@@ -1888,7 +2074,11 @@ msgstr "_Reasignar"
 msgid "Test Your _Settings"
 msgstr "_Probar su configuración"
 
+<<<<<<< HEAD
 #: ../panels/mouse/cc-mouse-panel.c:116
+=======
+#: ../panels/mouse/cc-mouse-panel.c:117
+>>>>>>> Updated Spanish translation
 msgid "Test Your Settings"
 msgstr "Probar su configuración"
 
@@ -2310,10 +2500,6 @@ msgstr "WPA y WPA2 personal"
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA y WPA2 enterprise"
 
-#: ../panels/network/connection-editor/connection-editor.ui.h:1
-msgid "_Apply"
-msgstr "_Aplicar"
-
 #: ../panels/network/connection-editor/details-page.ui.h:1
 #: ../panels/network/network-wifi.ui.h:2
 msgid "Signal Strength"
@@ -2576,8 +2762,8 @@ msgid ""
 "\n"
 "Error: %s."
 msgstr ""
-"No se pudo leer el archivo «%s» o no contiene información de conexión VPN que "
-"se pueda reconocer\n"
+"No se pudo leer el archivo «%s» o no contiene información de conexión VPN "
+"que se pueda reconocer\n"
 "\n"
 "Error: %s."
 
@@ -3643,6 +3829,7 @@ msgstr "Mostrar detalles en la pantalla de bloqueo"
 msgid "On"
 msgstr "Encendido"
 
+<<<<<<< HEAD
 #: ../panels/notifications/cc-notifications-panel.c:205
 #: ../panels/power/cc-power-panel.c:1745 ../panels/power/cc-power-panel.c:1756
 #: ../panels/privacy/cc-privacy-panel.c:77
@@ -3654,6 +3841,8 @@ msgstr "Encendido"
 msgid "Off"
 msgstr "Apagado"
 
+=======
+>>>>>>> Updated Spanish translation
 #: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1
 msgid "Notifications"
 msgstr "Notificaciones"
@@ -3675,17 +3864,26 @@ msgstr "Mostrar los banners emergentes"
 msgid "Show in Lock Screen"
 msgstr "Mostrar en la pantalla de bloqueo"
 
+<<<<<<< HEAD
 #: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:197
+=======
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:200
+>>>>>>> Updated Spanish translation
 msgctxt "Online Account"
 msgid "Other"
 msgstr "Otra"
 
 #. translators: This is the title of the "Add Account" dialog.
+<<<<<<< HEAD
 #: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:300
+=======
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:318
+>>>>>>> Updated Spanish translation
 #: ../panels/online-accounts/online-accounts.ui.h:2
 msgid "Add Account"
 msgstr "Añadir cuenta"
 
+<<<<<<< HEAD
 #: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:339
 msgid "Mail"
 msgstr "Correo"
@@ -3695,6 +3893,21 @@ msgid "Contacts"
 msgstr "Contactos"
 
 #: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:351
+=======
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:357
+msgid "Mail"
+msgstr "Correo"
+
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:363
+msgid "Contacts"
+msgstr "Contactos"
+
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:369
+msgid "Chat"
+msgstr "Chat"
+
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:375
+>>>>>>> Updated Spanish translation
 msgid "Resources"
 msgstr "Recursos"
 
@@ -3702,6 +3915,7 @@ msgstr "Recursos"
 msgid "Error logging into the account"
 msgstr "Error al iniciar sesión en la cuenta"
 
+<<<<<<< HEAD
 #: ../panels/online-accounts/cc-online-accounts-panel.c:497
 msgid "Credentials have expired."
 msgstr "Las credenciales han caducado."
@@ -3727,6 +3941,33 @@ msgid "Are you sure you want to remove the account?"
 msgstr "¿Está seguro de que quiere quitar la cuenta?"
 
 #: ../panels/online-accounts/cc-online-accounts-panel.c:825
+=======
+#: ../panels/online-accounts/cc-online-accounts-panel.c:495
+msgid "Credentials have expired."
+msgstr "Las credenciales han caducado."
+
+#: ../panels/online-accounts/cc-online-accounts-panel.c:499
+msgid "Sign in to enable this account."
+msgstr "Firme para activar esta cuenta."
+
+#: ../panels/online-accounts/cc-online-accounts-panel.c:504
+msgid "_Sign In"
+msgstr "Iniciar _sesión"
+
+#: ../panels/online-accounts/cc-online-accounts-panel.c:745
+msgid "Error creating account"
+msgstr "Error al crear la cuenta"
+
+#: ../panels/online-accounts/cc-online-accounts-panel.c:805
+msgid "Error removing account"
+msgstr "Error al quitar la cuenta"
+
+#: ../panels/online-accounts/cc-online-accounts-panel.c:841
+msgid "Are you sure you want to remove the account?"
+msgstr "¿Está seguro de que quiere quitar la cuenta?"
+
+#: ../panels/online-accounts/cc-online-accounts-panel.c:843
+>>>>>>> Updated Spanish translation
 msgid "This will not remove the account on the server."
 msgstr "Esto no quitará la cuenta en el servidor."
 
@@ -3740,11 +3981,23 @@ msgstr "Conectarse a sus cuentas en línea y decidir para qué usarlas"
 
 #. Translators: those are keywords for the online-accounts control-center panel
 #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4
+<<<<<<< HEAD
 msgid ""
 "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
 msgstr ""
 "Google;Facebook;Twitter;Yahoo;Web;En línea;Chat;Calendario;Correo-e;Contacto;"
 "ownCloud;"
+=======
+#| msgid ""
+#| "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;"
+#| "ownCloud;"
+msgid ""
+"Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
+"Kerberos;IMAP;SMTP;"
+msgstr ""
+"Google;Facebook;Twitter;Yahoo;Web;en línea;Chat;Calendario;Correo;Contacto;"
+"ownCloud;Kerberos;IMAP;SMTP;"
+>>>>>>> Updated Spanish translation
 
 #: ../panels/online-accounts/online-accounts.ui.h:1
 msgid "No online accounts configured"
@@ -4493,10 +4746,6 @@ msgstr "Fuente de papel"
 msgid "Output Tray"
 msgstr "Bandeja de salida"
 
-#: ../panels/printers/pp-options-dialog.c:86
-msgid "Resolution"
-msgstr "Resolución"
-
 #: ../panels/printers/pp-options-dialog.c:87
 msgid "GhostScript pre-filtering"
 msgstr "Prefiltrado GhostScript"
@@ -4650,10 +4899,6 @@ msgstr "Trabajos"
 msgid "Show _Jobs"
 msgstr "Mostrar _tareas"
 
-#: ../panels/printers/printers.ui.h:12
-msgid "Model"
-msgstr "Modelo"
-
 #: ../panels/printers/printers.ui.h:15
 msgid "label"
 msgstr "etiqueta"
@@ -4711,7 +4956,10 @@ msgid "_Empty Trash"
 msgstr "_Vaciar papelera"
 
 #: ../panels/privacy/cc-privacy-panel.c:511
+<<<<<<< HEAD
 #| msgid "Purge Trash & Temporary Files"
+=======
+>>>>>>> Updated Spanish translation
 msgid "Delete all the temporary files?"
 msgstr "¿Quiere eliminar todos los archivos temporales?"
 
@@ -5206,7 +5454,8 @@ msgid ""
 "your current network using: <a href=\"dav://%s\">dav://%s</a>"
 msgstr ""
 "La compartición de archivos personales le permite compartir su carpeta "
-"«Público» con otros en su red actual usando: <a href=\"dav://%s\">dav://%s</a>"
+"«Público» con otros en su red actual usando: <a href=\"dav://%s\">dav://%s</"
+"a>"
 
 #: ../panels/sharing/sharing.ui.h:21
 msgid "Share Public Folder On This Network"
@@ -5498,7 +5747,10 @@ msgstr ""
 "teclas;Teclas del ratón"
 
 #: ../panels/universal-access/uap.ui.h:1
+<<<<<<< HEAD
 #| msgid "Show Universal Access status"
+=======
+>>>>>>> Updated Spanish translation
 msgid "_Always Show Universal Access Menu"
 msgstr "_Mostrar siempre el menú de acceso universal"
 
@@ -6248,6 +6500,7 @@ msgstr "Pruebe a usar una mezcla de letras, números y signos de puntuación."
 msgctxt "Password hint"
 msgid "Try to avoid repeating the same character."
 msgstr "Evite repetir el mismo carácter."
+<<<<<<< HEAD
 
 #: ../panels/user-accounts/pw-utils.c:112
 msgctxt "Password hint"
@@ -6282,6 +6535,42 @@ msgstr ""
 "Buena contraseña. Pruebe a añadir más letras, números y signos de puntuación "
 "para hacerla más robusta."
 
+=======
+
+#: ../panels/user-accounts/pw-utils.c:112
+msgctxt "Password hint"
+msgid ""
+"Try to avoid repeating the same type of character: you need to mix up "
+"letters, numbers and punctuation."
+msgstr ""
+"Evite repetir el mismo tipo de carácter: debe mezclar letras, números y "
+"signos de puntuación."
+
+#: ../panels/user-accounts/pw-utils.c:114
+msgctxt "Password hint"
+msgid "Try to avoid sequences like 1234 or abcd."
+msgstr "Evite secuencias como 1234 o abcd."
+
+#: ../panels/user-accounts/pw-utils.c:116
+msgctxt "Password hint"
+msgid "Try to add more letters, numbers and symbols."
+msgstr "Pruebe a añadir más letras, números y signos de puntuación."
+
+#: ../panels/user-accounts/pw-utils.c:118
+msgctxt "Password hint"
+msgid "Mix uppercase and lowercase and use a number or two."
+msgstr "Mezcle letras mayúsculas y minúsculas y use uno o dos números."
+
+#: ../panels/user-accounts/pw-utils.c:120
+msgctxt "Password hint"
+msgid ""
+"Good password! Adding more letters, numbers and punctuation will make it "
+"stronger."
+msgstr ""
+"Buena contraseña. Pruebe a añadir más letras, números y signos de puntuación "
+"para hacerla más robusta."
+
+>>>>>>> Updated Spanish translation
 #: ../panels/user-accounts/pw-utils.c:142
 #: ../panels/user-accounts/pw-utils.c:172
 msgctxt "Password strength"
@@ -6660,8 +6949,8 @@ msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
 msgstr ""
-"Es posible mantener la carpeta personal, el «spool» del correo y los archivos "
-"temporales al eliminar una cuenta de usuario."
+"Es posible mantener la carpeta personal, el «spool» del correo y los "
+"archivos temporales al eliminar una cuenta de usuario."
 
 #: ../panels/user-accounts/um-user-panel.c:506
 msgid "_Delete Files"
@@ -6781,8 +7070,14 @@ msgid ""
 "To edit a shortcut, choose the \"Send Keystroke\" action, press the keyboard "
 "shortcut button and hold down the new keys or press Backspace to clear."
 msgstr ""
+<<<<<<< HEAD
 "Para editar un atajo, elija la acción «Enviar pulsación de teclas», pulse las "
 "teclas que forman el atajo del teclado, o pulse Retroceso para eliminarla."
+=======
+"Para editar un atajo, elija la acción «Enviar pulsación de teclas», pulse "
+"las teclas que forman el atajo del teclado, o pulse Retroceso para "
+"eliminarla."
+>>>>>>> Updated Spanish translation
 
 #: ../panels/wacom/calibrator/calibrator-gui.c:82
 msgid ""
@@ -7149,7 +7444,11 @@ msgctxt "category"
 msgid "System"
 msgstr "Sistema"
 
+<<<<<<< HEAD
 #: ../shell/cc-window.c:1573 ../shell/gnome-control-center.desktop.in.in.h:1
+=======
+#: ../shell/cc-window.c:1574 ../shell/gnome-control-center.desktop.in.in.h:1
+>>>>>>> Updated Spanish translation
 msgid "Settings"
 msgstr "Configuración"
 
@@ -7157,6 +7456,62 @@ msgstr "Configuración"
 msgid "Preferences;Settings;"
 msgstr "Preferencias;Configuración;"
 
+<<<<<<< HEAD
+=======
+#~ msgctxt "display panel, rotation"
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
+#~ msgctxt "display panel, rotation"
+#~ msgid "Counterclockwise"
+#~ msgstr "Antihorario"
+
+#~ msgctxt "display panel, rotation"
+#~ msgid "Clockwise"
+#~ msgstr "Horario"
+
+#~ msgctxt "display panel, rotation"
+#~ msgid "180 Degrees"
+#~ msgstr "180 grados"
+
+#~ msgid "Monitor"
+#~ msgstr "Monitor"
+
+#~ msgid "Drag to change primary display."
+#~ msgstr "Arrastrar para cambiar la pantalla principal."
+
+#~ msgid ""
+#~ "Select a monitor to change its properties; drag it to rearrange its "
+#~ "placement."
+#~ msgstr ""
+#~ "Seleccionar un monitor para cambiar sus propiedades; arrastrarlo lo "
+#~ "reubica."
+
+#~ msgid "%a %R"
+#~ msgstr "%a %R"
+
+#~ msgid "%a %l:%M %p"
+#~ msgstr "%a %H:%M"
+
+#~ msgid "Failed to apply configuration"
+#~ msgstr "Falló al aplicar la configuración"
+
+#~ msgid "_Resolution"
+#~ msgstr "_Resolución"
+
+#~ msgid "R_otation"
+#~ msgstr "R_otación"
+
+#~ msgid "_Mirror displays"
+#~ msgstr "_Espejar pantallas"
+
+#~ msgid "Note: may limit resolution options"
+#~ msgstr "Nota: puede limitar las opciones de resolución"
+
+#~ msgid "_Detect Displays"
+#~ msgstr "_Detectar pantallas"
+
+>>>>>>> Updated Spanish translation
 #~ msgid "_Region:"
 #~ msgstr "_Región:"
 
@@ -8181,9 +8536,6 @@ msgstr "Preferencias;Configuración;"
 #~ msgid "Swap colors"
 #~ msgstr "Intercambiar colores"
 
-#~ msgid "Secondary color"
-#~ msgstr "Color secundario"
-
 #~ msgid "Horizontal Gradient"
 #~ msgstr "Gradiente horizontal"
 
@@ -9350,9 +9702,6 @@ msgstr "Preferencias;Configuración;"
 #~ msgid "Thunderbird"
 #~ msgstr "Thunderbird"
 
-#~ msgid "Re_fresh rate:"
-#~ msgstr "Tasa de re_fresco:"
-
 #~ msgid "_Include Top Menu Bar"
 #~ msgstr "_Incluir barra de menú superior"
 
@@ -9441,10 +9790,6 @@ msgstr "Preferencias;Configuración;"
 #~ msgid "Warning"
 #~ msgstr "Advertencia"
 
-#~ msgctxt "Sound event"
-#~ msgid "Error"
-#~ msgstr "Error"
-
 #~ msgid "Custom…"
 #~ msgstr "Personalizado…"
 
@@ -9871,9 +10216,6 @@ msgstr "Preferencias;Configuración;"
 #~ msgid "Whether to thumbnail Type1 fonts"
 #~ msgstr "Indica si debe miniaturizar las tipografías Type1"
 
-#~ msgid "Size:"
-#~ msgstr "Tamaño:"
-
 #~ msgid "Copyright:"
 #~ msgstr "Copyright:"
 
@@ -11132,4 +11474,5 @@ msgstr "Preferencias;Configuración;"
 #~ msgstr "No hay establecido ningún grupo para el URI «%s»"
 
 #~ msgid "No application with name '%s' registered a bookmark for '%s'"
-#~ msgstr "Ninguna aplicación con el nombre «%s» registró un marcador para «%s»"
+#~ msgstr ""
+#~ "Ninguna aplicación con el nombre «%s» registró un marcador para «%s»"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]