Updated Spanish Translation

po/es.po

@@ -20,26 +20,13 @@ 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; 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.6\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
+"PO-Revision-Date: 2013-08-27 19:44+0200\n"
-#: ../panels/background/background.ui.h:1
+"X-Generator: Gtranslator 2.91.6\n"
-#: ../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
@@ -52,10 +39,6 @@ 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"
 
@@ -125,20 +108,14 @@ 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
@@ -288,11 +265,8 @@ 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"
 
@@ -1008,20 +982,13 @@ 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/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"
 
@@ -1109,11 +1076,6 @@ msgid "∶"
 msgstr "∶"
 
 #: ../panels/datetime/datetime.ui.h:17
-<<<<<<< HEAD
-#| msgid "minute"
-#| msgid_plural "minutes"
-=======
->>>>>>> Updated Spanish translation
 msgid "Minute"
 msgstr "Minuto"
 
@@ -1134,66 +1096,34 @@ 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"
 
@@ -1223,7 +1153,6 @@ 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"
@@ -1262,7 +1191,6 @@ 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"
@@ -1276,7 +1204,6 @@ 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 "Primary _button"
 msgid "Primary"
@@ -1294,7 +1221,6 @@ msgstr "Primaria"
 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."
@@ -1323,9 +1249,10 @@ msgid "Could not detect displays"
 msgstr "No se pudieron detectar las pantallas"
 
 #: ../panels/display/cc-display-panel.c:2574
+#: ../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:431
 #| msgid "Secondary color"
 msgid "Secondary"
@@ -1363,7 +1290,6 @@ msgstr "Proporción de aspecto"
 #: ../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
@@ -1402,10 +1328,6 @@ msgstr "Espejo"
 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"
@@ -2074,11 +1996,7 @@ 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
-#: ../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"
 
@@ -3829,20 +3747,6 @@ 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
-#: ../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"
-
-=======
->>>>>>> Updated Spanish translation
 #: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1
 msgid "Notifications"
 msgstr "Notificaciones"
@@ -3864,40 +3768,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"
-
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:345
-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:345
 #: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:363
 msgid "Contacts"
 msgstr "Contactos"
@@ -3907,7 +3797,6 @@ msgid "Chat"
 msgstr "Chat"
 
 #: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:375
->>>>>>> Updated Spanish translation
 msgid "Resources"
 msgstr "Recursos"
 
@@ -3915,59 +3804,38 @@ 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."
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:501
-msgid "Sign in to enable this account."
-msgstr "Firme para activar esta cuenta."
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:506
-msgid "_Sign In"
-msgstr "Iniciar _sesión"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:747
-msgid "Error creating account"
-msgstr "Error al crear la cuenta"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:787
-msgid "Error removing account"
-msgstr "Error al quitar la cuenta"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:823
-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:501
 #: ../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:506
 #: ../panels/online-accounts/cc-online-accounts-panel.c:504
 msgid "_Sign In"
 msgstr "Iniciar _sesión"
 
+#: ../panels/online-accounts/cc-online-accounts-panel.c:747
 #: ../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:787
 #: ../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:823
 #: ../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."
 
@@ -3981,13 +3849,12 @@ 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;"
@@ -3997,7 +3864,6 @@ msgid ""
 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"
@@ -4956,10 +4822,6 @@ 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?"
 
@@ -5747,10 +5609,6 @@ 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"
 
@@ -6500,7 +6358,6 @@ 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"
@@ -6535,42 +6392,6 @@ 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"
@@ -7070,14 +6891,6 @@ 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 ""
@@ -7444,11 +7257,8 @@ 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/cc-window.c:1574 ../shell/gnome-control-center.desktop.in.in.h:1
->>>>>>> Updated Spanish translation
 msgid "Settings"
 msgstr "Configuración"
 
@@ -7456,46 +7266,9 @@ 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"
 
@@ -7511,7 +7284,6 @@ msgstr "Preferencias;Configuración;"
 #~ msgid "_Detect Displays"
 #~ msgstr "_Detectar pantallas"
 
->>>>>>> Updated Spanish translation
 #~ msgid "_Region:"
 #~ msgstr "_Región:"