diff options
| author | Anish Mangal <anish@sugarlabs.org> | 2011-02-12 00:33:01 (GMT) |
|---|---|---|
| committer | Anish Mangal <anish@sugarlabs.org> | 2011-02-12 00:33:01 (GMT) |
| commit | 6e031895ecef7c8f2296678d23a176ab079e4149 (patch) | |
| tree | 688c864753e38ced75b77bda5cb7736b0f75b76c | |
| parent | d043875385bd11271ac1a81d058fb00f738edd23 (diff) | |
Changes and fixes to sugar
* Update spanish translations patch
* Disable automatic feedback
* More robust completed activity downloads
* Notify if personalized feedback not sent
* Bump sugar version to 0.88.1-5.52dxo.fc11.noarch
6 files changed, 1342 insertions, 787 deletions
diff --git a/rpms/sugar/Add-spanish-translations-and-update-POTFILES.patch b/rpms/sugar/Add-spanish-translations-and-update-POTFILES.patch index 91b84b3..d7e71d1 100644 --- a/rpms/sugar/Add-spanish-translations-and-update-POTFILES.patch +++ b/rpms/sugar/Add-spanish-translations-and-update-POTFILES.patch @@ -1,19 +1,18 @@ -From 25da7bc0d1c20f208342bdaa0c64022aacb80958 Mon Sep 17 00:00:00 2001 +From 5fccc8bd2db4e69000c3ab18d1e5b506d96177c5 Mon Sep 17 00:00:00 2001 From: Anish Mangal <anish@sugarlabs.org> Date: Thu, 27 Jan 2011 17:39:29 -0300 Subject: [PATCH] Add spanish translations and update POTFILES Organization: Sugar Labs Foundation - Signed-off-by: Anish Mangal <anish@sugarlabs.org> --- - po/POTFILES.in | 23 +- + po/POTFILES.in | 25 +- po/POTFILES.skip | 1 + - po/es.po | 1685 +++++++++++++++++++++++++++++++++--------------------- - 3 files changed, 1062 insertions(+), 647 deletions(-) + po/es.po | 2110 +++++++++++++++++++++++++++++++++++------------------- + 3 files changed, 1404 insertions(+), 732 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in -index e9a7f1c..eef2c33 100644 +index e9a7f1c..888141d 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,9 +1,12 @@ @@ -32,7 +31,15 @@ index e9a7f1c..eef2c33 100644 extensions/cpsection/datetime/__init__.py extensions/cpsection/datetime/model.py extensions/cpsection/datetime/view.py -@@ -26,11 +29,15 @@ extensions/cpsection/power/view.py +@@ -16,6 +19,7 @@ extensions/cpsection/language/__init__.py + extensions/cpsection/language/model.py + extensions/cpsection/language/view.py + extensions/cpsection/modemconfiguration/__init__.py ++extensions/cpsection/modemconfiguration/model.py + extensions/cpsection/modemconfiguration/view.py + extensions/cpsection/network/__init__.py + extensions/cpsection/network/model.py +@@ -26,11 +30,15 @@ extensions/cpsection/power/view.py extensions/cpsection/updater/__init__.py extensions/cpsection/updater/view.py extensions/deviceicon/battery.py @@ -49,7 +56,7 @@ index e9a7f1c..eef2c33 100644 src/jarabe/controlpanel/cmd.py src/jarabe/controlpanel/gui.py src/jarabe/controlpanel/sectionview.py -@@ -39,6 +46,7 @@ src/jarabe/desktop/activitieslist.py +@@ -39,6 +47,7 @@ src/jarabe/desktop/activitieslist.py src/jarabe/desktop/favoriteslayout.py src/jarabe/desktop/favoritesview.py src/jarabe/desktop/homebox.py @@ -57,7 +64,7 @@ index e9a7f1c..eef2c33 100644 src/jarabe/desktop/keydialog.py src/jarabe/desktop/meshbox.py src/jarabe/desktop/schoolserver.py -@@ -46,21 +54,26 @@ src/jarabe/frame/activitiestray.py +@@ -46,21 +55,27 @@ src/jarabe/frame/activitiestray.py src/jarabe/frame/clipboardmenu.py src/jarabe/frame/clipboardobject.py src/jarabe/frame/devicestray.py @@ -77,6 +84,7 @@ index e9a7f1c..eef2c33 100644 src/jarabe/journal/palettes.py +src/jarabe/journal/processdialog.py src/jarabe/journal/volumestoolbar.py ++src/jarabe/model/feedback_collector.py +src/jarabe/model/network.py +src/jarabe/model/processmanagement.py src/jarabe/view/buddymenu.py @@ -93,15 +101,15 @@ index f199f9c..0889e57 100644 data/sugar.xml.in +data/em.py diff --git a/po/es.po b/po/es.po -index 16a132f..da3a3f4 100644 +index 16a132f..e212337 100644 --- a/po/es.po +++ b/po/es.po -@@ -6,64 +6,20 @@ msgid "" +@@ -6,20 +6,444 @@ msgid "" msgstr "" "Project-Id-Version: olpc-sugar\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-05 00:31-0400\n" -+"POT-Creation-Date: 2011-01-27 13:13-0300\n" ++"POT-Creation-Date: 2011-02-10 22:34-0300\n" "PO-Revision-Date: 2010-01-18 19:18+0200\n" "Last-Translator: Chris <cjl@laptop.org>\n" "Language-Team: Fedora Spanish <fedora-trans-es@redhat.com>\n" @@ -116,132 +124,503 @@ index 16a132f..da3a3f4 100644 "X-Poedit-SourceCharset: utf-8\n" "X-Poedit-Basepath: .\n" --#: ../extensions/cpsection/aboutme/__init__.py:24 --msgid "About Me" --msgstr "Acerca de mí" -- --#: ../extensions/cpsection/aboutme/model.py:43 --msgid "You must enter a name." --msgstr "Debe ingresar un nombre." -- --#: ../extensions/cpsection/aboutme/model.py:68 --#, python-format --msgid "stroke: color=%s hue=%s" --msgstr "borde: color=%s tonalidad=%s" -- --#: ../extensions/cpsection/aboutme/model.py:71 --#, python-format --msgid "stroke: %s" --msgstr "borde: %s" -- --#: ../extensions/cpsection/aboutme/model.py:73 --#, python-format --msgid "fill: color=%s hue=%s" --msgstr "relleno: color=%s tonalidad=%s" -- --#: ../extensions/cpsection/aboutme/model.py:75 --#, python-format --msgid "fill: %s" --msgstr "relleno: %s" -- --#: ../extensions/cpsection/aboutme/model.py:86 --msgid "Error in specified color modifiers." --msgstr "Error en modificadores de color especificados." -- --#: ../extensions/cpsection/aboutme/model.py:89 --msgid "Error in specified colors." --msgstr "Error en colores especificados." -- --#: ../extensions/cpsection/aboutme/view.py:94 ../src/jarabe/intro/window.py:92 --msgid "Name:" --msgstr "Nombre:" -- --#: ../extensions/cpsection/aboutme/view.py:128 --msgid "Click to change your color:" --msgstr "Clic para cambiar su color:" -- - #: ../extensions/cpsection/aboutcomputer/__init__.py:21 - msgid "About my Computer" - msgstr "Acerca de mi computadora" -@@ -121,6 +77,137 @@ msgstr "" - msgid "Full license:" - msgstr "Licencia completa:" - -+#: ../extensions/cpsection/aboutme/__init__.py:24 -+msgid "About Me" -+msgstr "Acerca de mí" -+ -+#: ../extensions/cpsection/aboutme/model.py:43 -+msgid "You must enter a name." -+msgstr "Debe ingresar un nombre." -+ -+#: ../extensions/cpsection/aboutme/model.py:68 -+#, python-format -+msgid "stroke: color=%s hue=%s" -+msgstr "borde: color=%s tonalidad=%s" ++#: ../data/sugar.schemas.in.h:1 ++msgid "" ++"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account " ++"long name." ++msgstr "" + -+#: ../extensions/cpsection/aboutme/model.py:71 -+#, python-format -+msgid "stroke: %s" -+msgstr "borde: %s" ++#: ../data/sugar.schemas.in.h:2 ++#, fuzzy ++msgid "Activity updater URL." ++msgstr "Fuente del paquete de la actividad" + -+#: ../extensions/cpsection/aboutme/model.py:73 -+#, python-format -+msgid "fill: color=%s hue=%s" -+msgstr "relleno: color=%s tonalidad=%s" ++#: ../data/sugar.schemas.in.h:3 ++msgid "Add XO serial numbers to anonymous submits" ++msgstr "" + -+#: ../extensions/cpsection/aboutme/model.py:75 -+#, python-format -+msgid "fill: %s" -+msgstr "relleno: %s" ++#: ../data/sugar.schemas.in.h:4 ++msgid "Add XO serial numbers to anonymous submits." ++msgstr "" + -+#: ../extensions/cpsection/aboutme/model.py:86 -+msgid "Error in specified color modifiers." -+msgstr "Error en modificadores de color especificados." ++#: ../data/sugar.schemas.in.h:5 ++msgid "Additional directories which can contain updated translations." ++msgstr "" + -+#: ../extensions/cpsection/aboutme/model.py:89 -+msgid "Error in specified colors." -+msgstr "Error en colores especificados." ++#: ../data/sugar.schemas.in.h:6 ++msgid "Backup URL" ++msgstr "URL de Respaldo" + -+#: ../extensions/cpsection/aboutme/view.py:94 ../src/jarabe/intro/window.py:94 -+msgid "Name:" -+msgstr "Nombre:" ++#: ../data/sugar.schemas.in.h:7 ++msgid "" ++"Color for the XO icon that is used throughout the desktop. The string is " ++"composed of the stroke color and fill color, format is that of rbg colors. " ++"Example: #AC32FF,#9A5200" ++msgstr "" ++"El color para el ícono del XO se utiliza en todo el escritorio. La cadena " ++"está compuesta por el trazo y color de relleno de color, el formato es el de " ++"colores RBG. Ejemplo: #AC32FF, #9A5200" ++ ++# es la mejor traduccion ? ++#: ../data/sugar.schemas.in.h:8 ++msgid "Corner Delay" ++msgstr "Retraso de las Esquinas" ++ ++#: ../data/sugar.schemas.in.h:9 ++msgid "Default font dpi" ++msgstr "" ++ ++#: ../data/sugar.schemas.in.h:10 ++msgid "Default font face" ++msgstr "" ++ ++#: ../data/sugar.schemas.in.h:11 ++msgid "Default font size" ++msgstr "" ++ ++#: ../data/sugar.schemas.in.h:12 ++msgid "Default nick" ++msgstr "" ++ ++#: ../data/sugar.schemas.in.h:13 ++msgid "Delay for the activation of the frame using the corners." ++msgstr "Retraso para la activación del cuadro utilizando las esquinas." ++ ++#: ../data/sugar.schemas.in.h:14 ++msgid "Delay for the activation of the frame using the edges." ++msgstr "Retraso para la activación del cuadro utilizando los bordes." ++ ++#: ../data/sugar.schemas.in.h:15 ++msgid "Delay in seconds to send anonymous reports automatically" ++msgstr "" ++ ++#: ../data/sugar.schemas.in.h:16 ++msgid "Directory to search for translations" ++msgstr "" ++ ++# es la mejor traduccion ? ++#: ../data/sugar.schemas.in.h:17 ++msgid "Edge Delay" ++msgstr "Retraso del Borde" ++ ++#: ../data/sugar.schemas.in.h:18 ++#, fuzzy ++msgid "Enable personalized submit" ++msgstr "Personalizar el envío..." ++ ++#: ../data/sugar.schemas.in.h:19 ++msgid "Favorites Layout" ++msgstr "Diseño de favoritos" ++ ++#: ../data/sugar.schemas.in.h:20 ++msgid "Favorites resume mode" ++msgstr "Modo de reanudar favoritos" ++ ++#: ../data/sugar.schemas.in.h:21 ++#, fuzzy ++msgid "Font dpi that is used throughout the desktop." ++msgstr "Nombre de usuario que se utiliza en todo el escritorio." ++ ++#: ../data/sugar.schemas.in.h:22 ++#, fuzzy ++msgid "Font face that is used throughout the desktop." ++msgstr "Nombre de usuario que se utiliza en todo el escritorio." ++ ++#: ../data/sugar.schemas.in.h:23 ++#, fuzzy ++msgid "Font size that is used throughout the desktop." ++msgstr "Nombre de usuario que se utiliza en todo el escritorio." ++ ++#: ../data/sugar.schemas.in.h:24 ++#, fuzzy ++msgid "GSM network APN" ++msgstr "%s's red %s" ++ ++#: ../data/sugar.schemas.in.h:25 ++#, fuzzy ++msgid "GSM network PIN" ++msgstr "%s's red %s" ++ ++#: ../data/sugar.schemas.in.h:26 ++#, fuzzy ++msgid "GSM network PUK" ++msgstr "%s's red %s" ++ ++#: ../data/sugar.schemas.in.h:27 ++#, fuzzy ++msgid "GSM network access point name configuration" ++msgstr "Sugerencia: Compruebe el Access Point Name (APN) de configuración" ++ ++#: ../data/sugar.schemas.in.h:28 ++#, fuzzy ++msgid "GSM network number" ++msgstr "%s's red %s" ++ ++#: ../data/sugar.schemas.in.h:29 ++#, fuzzy ++msgid "GSM network password" ++msgstr "%s's red %s" ++ ++#: ../data/sugar.schemas.in.h:30 ++#, fuzzy ++msgid "GSM network password configuration" ++msgstr "Configuración del módem" ++ ++#: ../data/sugar.schemas.in.h:31 ++msgid "GSM network personal identification number configuration" ++msgstr "" ++ ++#: ../data/sugar.schemas.in.h:32 ++msgid "GSM network personal unlock key configuration" ++msgstr "" ++ ++#: ../data/sugar.schemas.in.h:33 ++#, fuzzy ++msgid "GSM network telephone number configuration" ++msgstr "Sugerencia: Compruebe la configuración de Número." ++ ++#: ../data/sugar.schemas.in.h:34 ++#, fuzzy ++msgid "GSM network username" ++msgstr "%s's red %s" ++ ++#: ../data/sugar.schemas.in.h:35 ++#, fuzzy ++msgid "GSM network username configuration" ++msgstr "Configuración del módem" ++ ++#: ../data/sugar.schemas.in.h:36 ++msgid "If TRUE, NamingAlert will popup when the activity closes." ++msgstr "" ++ ++#: ../data/sugar.schemas.in.h:37 ++msgid "" ++"If TRUE, Sugar will make us searchable for the other users of the Jabber " ++"server." ++msgstr "" ++"Si es TRUE, Azúcar habilitará que otros usuarios nos busquen en el servidor " ++"Jabber." ++ ++#: ../data/sugar.schemas.in.h:38 ++msgid "If TRUE, Sugar will show a \"Log out\" option." ++msgstr "Si es TRUE, Azúcar mostrará una opción \"Terminar Sesión\"." ++ ++#: ../data/sugar.schemas.in.h:39 ++#, fuzzy ++msgid "If TRUE, Sugar will show a \"Register\" option." ++msgstr "Si es TRUE, Azúcar mostrará una opción \"Terminar Sesión\"." ++ ++#: ../data/sugar.schemas.in.h:40 ++#, fuzzy ++msgid "If TRUE, Sugar will show a \"Restart\" option." ++msgstr "Si es TRUE, Azúcar mostrará una opción \"Terminar Sesión\"." ++ ++#: ../data/sugar.schemas.in.h:41 ++msgid "" ++"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If " ++"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-" ++"hoc network." ++msgstr "" ++ ++#: ../data/sugar.schemas.in.h:42 ++msgid "Jabber Server" ++msgstr "Servidor Jabber" ++ ++#: ../data/sugar.schemas.in.h:43 ++msgid "Keyboard layouts" ++msgstr "Distribuciones del teclado" ++ ++#: ../data/sugar.schemas.in.h:44 ++msgid "Keyboard model" ++msgstr "Modelo del teclado" ++ ++#: ../data/sugar.schemas.in.h:45 ++msgid "Keyboard options" ++msgstr "Opciones del teclado" ++ ++#: ../data/sugar.schemas.in.h:46 ++msgid "Layout of the favorites view." ++msgstr "Distribución de las actividades favoritas." ++ ++#: ../data/sugar.schemas.in.h:47 ++msgid "" ++"List of keyboard layouts. Each entry should be in the form layout(variant)" ++msgstr "" ++"Lista de las distribuciones de teclado. Cada entrada debe ser en la forma " ++"distribución(variante)" ++ ++#: ../data/sugar.schemas.in.h:48 ++msgid "List of keyboard options." ++msgstr "Lista de las opciones del teclado." + -+#: ../extensions/cpsection/aboutme/view.py:128 -+msgid "Click to change your color:" -+msgstr "Clic para cambiar su color:" ++#: ../data/sugar.schemas.in.h:49 ++msgid "Power Automatic" ++msgstr "Manejo automática de energía" + ++#: ../data/sugar.schemas.in.h:50 ++msgid "Power Automatic." ++msgstr "Manejo automática de energía." ++ ++#: ../data/sugar.schemas.in.h:51 ++msgid "Power Extreme" ++msgstr "Manejo extremo de energía" ++ ++#: ../data/sugar.schemas.in.h:52 ++msgid "Power Extreme." ++msgstr "Manejo extremo de energía." ++ ++#: ../data/sugar.schemas.in.h:53 ++msgid "Publish to Gadget" ++msgstr "Publicar en Gadget" ++ ++#: ../data/sugar.schemas.in.h:54 ++msgid "Server host to send reports to" ++msgstr "" ++ ++#: ../data/sugar.schemas.in.h:55 ++msgid "Server port to send reports to" ++msgstr "" ++ ++#: ../data/sugar.schemas.in.h:56 ++msgid "Server that will handle reports sent via HTTPS POST requests." ++msgstr "" ++ ++#: ../data/sugar.schemas.in.h:57 ++msgid "Setting for muting the sound device." ++msgstr "Configuración para silenciar el dispositivo de sonido." ++ ++#: ../data/sugar.schemas.in.h:58 ++msgid "Show Log out" ++msgstr "Mostrar Terminar Sesión" ++ ++#: ../data/sugar.schemas.in.h:59 ++msgid "Show NamingAlert" ++msgstr "" ++ ++#: ../data/sugar.schemas.in.h:60 ++#, fuzzy ++msgid "Show Register" ++msgstr "Reiniciar" ++ ++#: ../data/sugar.schemas.in.h:61 ++#, fuzzy ++msgid "Show Restart" ++msgstr "Reiniciar" ++ ++#: ../data/sugar.schemas.in.h:62 ++#, fuzzy ++msgid "Show Sugar Ad-hoc networks" ++msgstr "Red Ad-hoc %d" ++ ++#: ../data/sugar.schemas.in.h:63 ++msgid "" ++"Show device icon to let pople submit text message with all collected data " ++"including detialed information about sumbitter." ++msgstr "" ++ ++#: ../data/sugar.schemas.in.h:64 ++msgid "Sound Muted" ++msgstr "Sonido silenciado" ++ ++#: ../data/sugar.schemas.in.h:65 ++msgid "" ++"Submit will not contain any information about submiter, only anonymous data " ++"(but see anonymous_with_sn). Setting value to 0 will disable automatic " ++"submiting." ++msgstr "" ++ ++#: ../data/sugar.schemas.in.h:66 ++msgid "TCP port that will used to send HTTPS POST requests." ++msgstr "" ++ ++#: ../data/sugar.schemas.in.h:67 ++msgid "The keyboard model to be used" ++msgstr "El modelo del teclado que se utilizará" ++ ++#: ../data/sugar.schemas.in.h:68 ++msgid "" ++"This key contains the url which the microformat compatible activity updater " ++"will search for activity updates." ++msgstr "" ++ ++#: ../data/sugar.schemas.in.h:69 ../extensions/cpsection/datetime/view.py:68 ++msgid "Timezone" ++msgstr "Zona horaria" ++ ++#: ../data/sugar.schemas.in.h:70 ++msgid "Timezone setting for the system." ++msgstr "Configuración de zona horaria para el sistema." ++ ++#: ../data/sugar.schemas.in.h:71 ++msgid "Url of the jabber server to use." ++msgstr "URL del servidor de Jabber para usar." ++ ++#: ../data/sugar.schemas.in.h:72 ++msgid "Url where the backup is saved to." ++msgstr "URL donde se guarda el backup." ++ ++#: ../data/sugar.schemas.in.h:73 ++msgid "User Color" ++msgstr "Color del usuario" ++ ++#: ../data/sugar.schemas.in.h:74 ++msgid "User Name" ++msgstr "Nombre de usuario" ++ ++#: ../data/sugar.schemas.in.h:75 ++msgid "User name that is used throughout the desktop." ++msgstr "Nombre de usuario que se utiliza en todo el escritorio." ++ ++#: ../data/sugar.schemas.in.h:76 ++msgid "Volume Level" ++msgstr "Nivel de volumen" ++ ++#: ../data/sugar.schemas.in.h:77 ++msgid "Volume level for the sound device." ++msgstr "Nivel de volumen para el dispositivo de sonido." ++ ++#: ../data/sugar.schemas.in.h:78 ++msgid "" ++"When in resume mode, clicking on a favorite icon will cause the last entry " ++"for that activity to be resumed." ++msgstr "" ++"Cuando en el modo de retomar, al hacer clic en un icono de favoritos causa " ++"que se retome la última entrada de esa actividad." ++ ++#: ../extensions/cpsection/aboutcomputer/__init__.py:21 ++msgid "About my Computer" ++msgstr "Acerca de mi computadora" ++ ++#: ../extensions/cpsection/aboutcomputer/model.py:29 ++msgid "Not available" ++msgstr "No disponible" ++ ++#: ../extensions/cpsection/aboutcomputer/view.py:60 ++msgid "Identity" ++msgstr "Identidad" ++ ++#: ../extensions/cpsection/aboutcomputer/view.py:69 ++msgid "Serial Number:" ++msgstr "Número de serie:" ++ ++#: ../extensions/cpsection/aboutcomputer/view.py:84 ++msgid "Lease: " ++msgstr "Activación: " ++ ++#: ../extensions/cpsection/aboutcomputer/view.py:106 ++msgid "Software" ++msgstr "Software" ++ ++# Por ahora.. ++#: ../extensions/cpsection/aboutcomputer/view.py:115 ++msgid "Build:" ++msgstr "Ensamble:" ++ ++#: ../extensions/cpsection/aboutcomputer/view.py:130 ++msgid "Sugar:" ++msgstr "Azúcar:" ++ ++#: ../extensions/cpsection/aboutcomputer/view.py:146 ++msgid "Firmware:" ++msgstr "Firmware:" ++ ++#: ../extensions/cpsection/aboutcomputer/view.py:161 ++msgid "Wireless Firmware:" ++msgstr "Firmware Wireless:" ++ ++#: ../extensions/cpsection/aboutcomputer/view.py:184 ++msgid "Copyright and License" ++msgstr "Licencia y Copyright" ++ ++#: ../extensions/cpsection/aboutcomputer/view.py:199 ++msgid "" ++"Sugar is the graphical user interface that you are looking at. Sugar is free " ++"software, covered by the GNU General Public License, and you are welcome to " ++"change it and/or distribute copies of it under certain conditions described " ++"therein." ++msgstr "" ++"Azucar es la interfaz gráfica de usuario que usted esta mirando. Azucar es " ++"software libre, cubierto bajo la licencia GNU Licencia Publica General, y " ++"esta invitado a cambiarla y/o distribuir copias bajo ciertas condiciones que " ++"se describen en ella." ++ ++#: ../extensions/cpsection/aboutcomputer/view.py:211 ++msgid "Full license:" ++msgstr "Licencia completa:" ++ + #: ../extensions/cpsection/aboutme/__init__.py:24 + msgid "About Me" + msgstr "Acerca de mí" +@@ -56,7 +480,7 @@ msgstr "Error en modificadores de color especificados." + msgid "Error in specified colors." + msgstr "Error en colores especificados." + +-#: ../extensions/cpsection/aboutme/view.py:94 ../src/jarabe/intro/window.py:92 ++#: ../extensions/cpsection/aboutme/view.py:94 ../src/jarabe/intro/window.py:94 + msgid "Name:" + msgstr "Nombre:" + +@@ -64,62 +488,93 @@ msgstr "Nombre:" + msgid "Click to change your color:" + msgstr "Clic para cambiar su color:" + +-#: ../extensions/cpsection/aboutcomputer/__init__.py:21 +-msgid "About my Computer" +-msgstr "Acerca de mi computadora" +#: ../extensions/cpsection/accessibility/__init__.py:24 +msgid "Accessibility" +msgstr "Accesibilidad" -+ + +-#: ../extensions/cpsection/aboutcomputer/model.py:28 +-msgid "Not available" +-msgstr "No disponible" +#: ../extensions/cpsection/accessibility/view.py:68 +#: ../extensions/cpsection/keyboard/__init__.py:21 +#: ../extensions/cpsection/keyboard/view.py:31 +msgid "Keyboard" +msgstr "Teclado" -+ + +-#: ../extensions/cpsection/aboutcomputer/view.py:60 +-msgid "Identity" +-msgstr "Identidad" +#: ../extensions/cpsection/accessibility/view.py:90 +msgid "Screen" +msgstr "Pantalla" -+ + +-#: ../extensions/cpsection/aboutcomputer/view.py:69 +-msgid "Serial Number:" +-msgstr "Número de serie:" +#: ../extensions/cpsection/accessibility/view.py:110 +msgid "Mouse" +msgstr "Ratón" -+ + +-#: ../extensions/cpsection/aboutcomputer/view.py:91 +-msgid "Software" +-msgstr "Software" +#: ../extensions/cpsection/accessibility/view.py:195 +msgid "Mouse Keys" +msgstr "Teclas del ratón" -+ + +-# Por ahora.. +-#: ../extensions/cpsection/aboutcomputer/view.py:100 +-msgid "Build:" +-msgstr "Ensamble:" +#: ../extensions/cpsection/accessibility/view.py:202 +msgid "Move the mouse pointer with keyboard number." -+msgstr "Mueva el puntero del ratón con el teclado numérico." -+"Mover el puntero del ratón con un teclado numérico o con las teclas de juego." -+ ++msgstr "" ++"Mueva el puntero del ratón con el teclado numérico.Mover el puntero del " ++"ratón con un teclado numérico o con las teclas de juego." + +-#: ../extensions/cpsection/aboutcomputer/view.py:115 +-msgid "Sugar:" +-msgstr "Azúcar:" +#: ../extensions/cpsection/accessibility/view.py:208 +msgid "Sticky Keys" +msgstr "Teclas pegajosas" -+ + +-#: ../extensions/cpsection/aboutcomputer/view.py:131 +-msgid "Firmware:" +-msgstr "Firmware:" +#: ../extensions/cpsection/accessibility/view.py:215 +msgid "" +"Instead of having to press two keys at once (such as CTRL + Q), you can " @@ -249,7 +628,10 @@ index 16a132f..da3a3f4 100644 +msgstr "" +"En lugar de tener que pulsar dos teclas a la vez (por ejemplo, CTRL + Q), " +"permite pulsar una tecla a la vez." -+ + +-#: ../extensions/cpsection/aboutcomputer/view.py:146 +-msgid "Wireless Firmware:" +-msgstr "Firmware Wireless:" +#: ../extensions/cpsection/accessibility/view.py:222 +msgid "Bounce Keys" +msgstr "Teclas de rebote" @@ -285,32 +667,50 @@ index 16a132f..da3a3f4 100644 +#: ../extensions/cpsection/accessibility/view.py:289 +msgid "White Mouse" +msgstr "Ratón blanco" -+ + +-#: ../extensions/cpsection/aboutcomputer/view.py:169 +-msgid "Copyright and License" +-msgstr "Licencia y Copyright" +#: ../extensions/cpsection/accessibility/view.py:301 +msgid "Show the mouse cursor white." +msgstr "Mostrar el puntero del ratón blanco." -+ + +-#: ../extensions/cpsection/aboutcomputer/view.py:184 +-msgid "" +-"Sugar is the graphical user interface that you are looking at. Sugar is free " +-"software, covered by the GNU General Public License, and you are welcome to " +-"change it and/or distribute copies of it under certain conditions described " +-"therein." +-msgstr "" +-"Azucar es la interfaz gráfica de usuario que usted esta mirando. Azucar es " +-"software libre, cubierto bajo la licencia GNU Licencia Publica General, y " +-"esta invitado a cambiarla y/o distribuir copias bajo ciertas condiciones que " +-"se describen en ella." +#: ../extensions/cpsection/accessibility/view.py:309 +msgid "Acceleration: " +msgstr "Aceleración: " -+ + +-#: ../extensions/cpsection/aboutcomputer/view.py:196 +-msgid "Full license:" +-msgstr "Licencia completa:" +#: ../extensions/cpsection/accessibility/view.py:325 +msgid "Controller acceleration mouse." +msgstr "Controla la aceleración del ratón." -+ + #: ../extensions/cpsection/datetime/__init__.py:21 msgid "Date & Time" - msgstr "Fecha y hora" -@@ -129,7 +216,7 @@ msgstr "Fecha y hora" +@@ -129,10 +584,6 @@ msgstr "Fecha y hora" msgid "Error timezone does not exist." msgstr "Error, zona horaria no existe." -#: ../extensions/cpsection/datetime/view.py:68 ../data/sugar.schemas.in.h:27 -+#: ../extensions/cpsection/datetime/view.py:68 - msgid "Timezone" - msgstr "Zona horaria" - -@@ -167,20 +254,15 @@ msgstr "Esquina" +-msgid "Timezone" +-msgstr "Zona horaria" +- + #: ../extensions/cpsection/frame/__init__.py:21 + msgid "Frame" + msgstr "Cuadro" +@@ -167,20 +618,15 @@ msgstr "Esquina" msgid "Edge" msgstr "Borde" @@ -334,16 +734,17 @@ index 16a132f..da3a3f4 100644 msgid "Keyboard Layout(s)" msgstr "Diseño(s) de teclado" -@@ -191,7 +273,7 @@ msgstr "Idioma" - +@@ -192,7 +638,8 @@ msgstr "Idioma" #: ../extensions/cpsection/language/model.py:28 msgid "Could not access ~/.i18n. Create standard settings." --msgstr "" -+msgstr "No se pudo acceder a ~/.i18n. Crear configuración estándar." - "No se puede acceder a ~/.i18n. Crear configuración internacional estándar." + msgstr "" +-"No se puede acceder a ~/.i18n. Crear configuración internacional estándar." ++"No se pudo acceder a ~/.i18n. Crear configuración estándar.No se puede " ++"acceder a ~/.i18n. Crear configuración internacional estándar." #: ../extensions/cpsection/language/model.py:124 -@@ -212,20 +294,56 @@ msgstr "" + #, python-format +@@ -212,20 +659,74 @@ msgstr "" "Añade idiomas en el orden que prefieres. Si una traducción no se encuentra " "disponible, se usará la siguiente en la lista." @@ -351,37 +752,55 @@ index 16a132f..da3a3f4 100644 +msgid "Modem Configuration" +msgstr "Configuración del módem" + ++#: ../extensions/cpsection/modemconfiguration/model.py:171 ++msgid "Default" ++msgstr "" ++ +#: ../extensions/cpsection/modemconfiguration/view.py:91 +msgid "Username:" +msgstr "Nombre de usuario:" + -+#: ../extensions/cpsection/modemconfiguration/view.py:102 ++#: ../extensions/cpsection/modemconfiguration/view.py:103 +msgid "Password:" +msgstr "Contraseña:" + -+#: ../extensions/cpsection/modemconfiguration/view.py:113 ++#: ../extensions/cpsection/modemconfiguration/view.py:115 +msgid "Number:" +msgstr "Número:" + -+#: ../extensions/cpsection/modemconfiguration/view.py:124 ++#: ../extensions/cpsection/modemconfiguration/view.py:127 +msgid "Access Point Name (APN):" +msgstr "Nombre del Punto de Acceso (APN):" + -+#: ../extensions/cpsection/modemconfiguration/view.py:135 ++#: ../extensions/cpsection/modemconfiguration/view.py:139 +msgid "Personal Identity Number (PIN):" +msgstr "Número de Identidad Personal (PIN):" + -+#: ../extensions/cpsection/modemconfiguration/view.py:146 ++#: ../extensions/cpsection/modemconfiguration/view.py:151 +msgid "Personal Unblocking Key (PUK):" +msgstr "Clave de desbloqueo personal (PUK):" + -+#: ../extensions/cpsection/modemconfiguration/view.py:167 ++#: ../extensions/cpsection/modemconfiguration/view.py:183 +msgid "" +"You will need to provide the following information to set up a mobile " +"broadband connection to a cellular (3G) network." +msgstr "" -+"Usted tendrá que proporcionar la siguiente información para configurar " -+"una conexión de banda ancha móvil a la red celular (3G)" ++"Usted tendrá que proporcionar la siguiente información para configurar una " ++"conexión de banda ancha móvil a la red celular (3G)" ++ ++#: ../extensions/cpsection/modemconfiguration/view.py:201 ++#, fuzzy ++msgid "Country:" ++msgstr "Contraste" ++ ++#: ../extensions/cpsection/modemconfiguration/view.py:220 ++#, fuzzy ++msgid "Provider:" ++msgstr "Servidor:" ++ ++#: ../extensions/cpsection/modemconfiguration/view.py:239 ++msgid "Plan:" ++msgstr "" + #: ../extensions/cpsection/network/__init__.py:21 #: ../extensions/cpsection/network/view.py:28 @@ -403,7 +822,7 @@ index 16a132f..da3a3f4 100644 msgid "Error in specified argument use 0/1." msgstr "Error en argumento especificado use 0/1." -@@ -249,11 +367,11 @@ msgstr "Descarte el historial de la red si tiene problemas de conexión" +@@ -249,11 +750,11 @@ msgstr "Descarte el historial de la red si tiene problemas de conexión" msgid "Discard network history" msgstr "Descarte historial de la red" @@ -417,7 +836,7 @@ index 16a132f..da3a3f4 100644 msgid "" "The server is the equivalent of what room you are in; people on the same " "server will be able to see each other, even when they aren't on the same " -@@ -262,7 +380,7 @@ msgstr "" +@@ -262,7 +763,7 @@ msgstr "" "El servidor es equivalente al cuarto en el cual se esta; la gente en el " "mismo servidor podrá verse entre ellos, aun cuando no esten en la misma red." @@ -426,7 +845,7 @@ index 16a132f..da3a3f4 100644 msgid "Server:" msgstr "Servidor:" -@@ -270,11 +388,11 @@ msgstr "Servidor:" +@@ -270,11 +771,11 @@ msgstr "Servidor:" msgid "Power" msgstr "Energía" @@ -440,7 +859,7 @@ index 16a132f..da3a3f4 100644 msgid "Error in extreme pm argument, use on/off." msgstr "Error en argumento extremo de pm, use on/off." -@@ -298,7 +416,7 @@ msgstr "" +@@ -298,7 +799,7 @@ msgstr "" msgid "Software update" msgstr "Actualización de Software" @@ -449,7 +868,7 @@ index 16a132f..da3a3f4 100644 msgid "" "Software updates correct errors, eliminate security vulnerabilities, and " "provide new features." -@@ -306,79 +424,80 @@ msgstr "" +@@ -306,79 +807,84 @@ msgstr "" "Las actualizaciones de software corrigen errores, eliminan vulnerabilidades " "de seguridad y proveen nuevas características." @@ -521,44 +940,44 @@ index 16a132f..da3a3f4 100644 msgid "From version %(current)d to %(new)s (Size: %(size)s)" msgstr "Desde la version %(current)d hacia %(new)s (Size: %(size)s)" --#. TRANS: download size is 0 --#: ../extensions/cpsection/updater/view.py:373 +#: ../extensions/cpsection/updater/view.py:369 +#, python-format +msgid "Install new activity version %(new)s (Size: %(size)s)" +msgstr "Instalar nueva versión de la actividad %(new)s (Tamaño: %(size)s)" + + #. TRANS: download size is 0 +-#: ../extensions/cpsection/updater/view.py:373 +#: ../extensions/cpsection/updater/view.py:388 msgid "None" msgstr "Ninguno" --#. TRANS: download size of very small updates + #. TRANS: download size of very small updates -#: ../extensions/cpsection/updater/view.py:376 +#: ../extensions/cpsection/updater/view.py:391 msgid "1 KB" msgstr "1 KB" --#. TRANS: download size of small updates, e.g. '250 KB' + #. TRANS: download size of small updates, e.g. '250 KB' -#: ../extensions/cpsection/updater/view.py:379 +#: ../extensions/cpsection/updater/view.py:394 #, python-format msgid "%.0f KB" msgstr "%.0f KB" --#. TRANS: download size of updates, e.g. '2.3 MB' + #. TRANS: download size of updates, e.g. '2.3 MB' -#: ../extensions/cpsection/updater/view.py:382 +#: ../extensions/cpsection/updater/view.py:397 #, python-format msgid "%.1f MB" msgstr "%.1f MB" -@@ -408,7 +527,37 @@ msgstr "Quedan %(hour)d:%(min).2d" +@@ -408,7 +914,37 @@ msgstr "Quedan %(hour)d:%(min).2d" msgid "Charged" msgstr "Cargada" -#: ../extensions/deviceicon/network.py:44 +#: ../extensions/deviceicon/feedback.py:48 +msgid "Feedback" -+msgstr "Comentarios" ++msgstr "Enviar reporte" + +#: ../extensions/deviceicon/feedback.py:62 +msgid "Personalized submit..." @@ -590,7 +1009,7 @@ index 16a132f..da3a3f4 100644 #, python-format msgid "IP address: %s" msgstr "Direccion IP: %s" -@@ -417,42 +566,130 @@ msgstr "Direccion IP: %s" +@@ -417,242 +953,201 @@ msgstr "Direccion IP: %s" # priority over the normal wireless device. NM doesn't have a "disconnect" # method for a device either (for various reasons) so this doesn't # have a good mapping @@ -640,186 +1059,81 @@ index 16a132f..da3a3f4 100644 msgstr "Velocidad" -#: ../extensions/deviceicon/network.py:415 +-#, python-format +-msgid "%s's network %s" +-msgstr "%s's red %s" +- +-#: ../extensions/deviceicon/speaker.py:59 +-msgid "My Speakers" +-msgstr "Mis parlantes" +- +-# la traducción la tome del AlsaMixer de Gnome. +-#: ../extensions/deviceicon/speaker.py:133 +-msgid "Unmute" +-msgstr "Dar voz" +- +-#: ../extensions/deviceicon/speaker.py:136 +-msgid "Mute" +-msgstr "Silenciar" +- +-#: ../extensions/globalkey/screenshot.py:56 +-msgid "Mesh" +-msgstr "Malla" +#: ../extensions/deviceicon/network.py:227 +msgid "Wireless modem" +msgstr "Módem Inalámbrico" -+ + +-#: ../extensions/globalkey/screenshot.py:58 +-#: ../src/jarabe/frame/zoomtoolbar.py:39 +-msgid "Group" +-msgstr "Grupo" +#: ../extensions/deviceicon/network.py:298 +#: ../extensions/deviceicon/network.py:399 +msgid "Please wait..." +msgstr "Por favor espere..." -+ + +-#: ../extensions/globalkey/screenshot.py:60 +-#: ../src/jarabe/frame/zoomtoolbar.py:41 +-msgid "Home" +-msgstr "Hogar" +#: ../extensions/deviceicon/network.py:301 +#: ../src/jarabe/desktop/meshbox.py:149 ../src/jarabe/desktop/meshbox.py:526 +#: ../src/jarabe/desktop/meshbox.py:656 +msgid "Connect" +msgstr "Conectar" -+ + +-#: ../extensions/globalkey/screenshot.py:66 +-#: ../src/jarabe/frame/zoomtoolbar.py:43 +-msgid "Activity" +-msgstr "Actividad" +#: ../extensions/deviceicon/network.py:303 +msgid "Disconnected" +msgstr "Desconectado" -+ + +-#: ../extensions/globalkey/screenshot.py:69 +-msgid "Screenshot" +-msgstr "Captura de pantalla" +#: ../extensions/deviceicon/network.py:316 +#: ../src/jarabe/desktop/meshbox.py:153 ../src/jarabe/desktop/meshbox.py:530 +msgid "Disconnect" +msgstr "Desconectar" -+ -+#: ../extensions/deviceicon/network.py:327 -+#, python-format -+msgid "Error: %s" -+msgstr "Error: %s" -+ -+#: ../extensions/deviceicon/network.py:337 -+#: ../extensions/deviceicon/network.py:863 -+msgid "Connection Error" -+msgstr "Error de Conexión" -+ -+# TODO: show the channel number -+#: ../extensions/deviceicon/network.py:355 -+#: ../extensions/deviceicon/network.py:358 -+msgid "Connected for " -+msgstr "Conectado para " -+ -+#: ../extensions/deviceicon/network.py:364 -+#: ../extensions/deviceicon/network.py:365 -+#, python-format -+msgid "%d KB" -+msgstr "%d KB" -+ -+#: ../extensions/deviceicon/network.py:369 -+msgid "Suggestion: Check your Pin/Puk configuration." -+msgstr "Sugerencia: Compruebe la configuración del Pin/Puk." -+ -+#: ../extensions/deviceicon/network.py:371 -+msgid "Suggestion: Check your Access Point Name (APN) configuration" -+msgstr "Sugerencia: Compruebe el Access Point Name (APN) de configuración" -+ -+#: ../extensions/deviceicon/network.py:373 -+msgid "Suggestion: Check the Number configuration." -+msgstr "Sugerencia: Compruebe la configuración de Número." -+ -+#: ../extensions/deviceicon/network.py:394 -+msgid "Private" -+msgstr "Privado" -+ -+#: ../extensions/deviceicon/network.py:402 -+msgid "My Neighborhood" -+msgstr "Mi Vecindario" -+ -+#: ../extensions/deviceicon/network.py:671 -+#: ../extensions/deviceicon/network.py:734 -+#: ../extensions/deviceicon/network.py:736 -+msgid "Mesh Network" -+msgstr "Red Malla" -+ -+#: ../extensions/deviceicon/network.py:864 -+msgid "There is no gsm connection available" -+msgstr "No hay conexión GSM disponible" -+ -+#: ../extensions/deviceicon/resources.py:48 -+msgid "System resources" -+msgstr "Recursos del sistema" -+ -+#: ../extensions/deviceicon/resources.py:170 - #, python-format --msgid "%s's network %s" --msgstr "%s's red %s" -+msgid "CPU in use: %d%%" -+msgstr "CPU en uso: %d%%" -+ -+#: ../extensions/deviceicon/resources.py:172 -+#, python-format -+msgid "Memory in use: %d%%" -+msgstr "Memoria en uso: %d%%" -+ -+#: ../extensions/deviceicon/resources.py:202 -+msgid "Cannot compute CPU and memory usage statistics!" -+msgstr "No se pueden calcular las estadísticas de CPU y uso de memoria!" - - #: ../extensions/deviceicon/speaker.py:59 - msgid "My Speakers" -@@ -467,217 +704,86 @@ msgstr "Dar voz" - msgid "Mute" - msgstr "Silenciar" - --#: ../extensions/globalkey/screenshot.py:56 -+# TRANS: label for the ring layout in the favorites view -+#: ../extensions/deviceicon/touchpad.py:32 -+msgid "finger" -+msgstr "dedo" -+ -+#: ../extensions/deviceicon/touchpad.py:32 -+msgid "stylus" -+msgstr "lápiz" -+ -+#: ../extensions/deviceicon/touchpad.py:60 -+msgid "My touchpad" -+msgstr "Mi touchpad" -+ -+#: ../extensions/deviceicon/virtualkeyboard.py:31 -+msgid "Teclado Virtual" -+msgstr "Teclado Virtual" -+ -+#: ../extensions/deviceicon/virtualkeyboard.py:45 -+#: ../src/jarabe/frame/clipboardmenu.py:58 -+#: ../src/jarabe/frame/clipboardmenu.py:81 -+msgid "Open" -+msgstr "Abrir" -+ -+#: ../extensions/deviceicon/virtualkeyboard.py:50 -+#: ../src/jarabe/journal/objectchooser.py:151 -+#: ../src/jarabe/journal/processdialog.py:129 -+#: ../src/jarabe/view/viewsource.py:310 -+msgid "Close" -+msgstr "Cerrar" -+ -+#: ../extensions/globalkey/screenshot.py:59 - msgid "Mesh" - msgstr "Malla" - --#: ../extensions/globalkey/screenshot.py:58 -+#: ../extensions/globalkey/screenshot.py:61 - #: ../src/jarabe/frame/zoomtoolbar.py:39 - msgid "Group" - msgstr "Grupo" - --#: ../extensions/globalkey/screenshot.py:60 -+#: ../extensions/globalkey/screenshot.py:63 - #: ../src/jarabe/frame/zoomtoolbar.py:41 - msgid "Home" - msgstr "Hogar" - --#: ../extensions/globalkey/screenshot.py:66 -+#: ../extensions/globalkey/screenshot.py:69 - #: ../src/jarabe/frame/zoomtoolbar.py:43 - msgid "Activity" - msgstr "Actividad" - --#: ../extensions/globalkey/screenshot.py:69 -+#: ../extensions/globalkey/screenshot.py:72 - msgid "Screenshot" - msgstr "Captura de pantalla" -#: ../extensions/globalkey/screenshot.py:71 -+#: ../extensions/globalkey/screenshot.py:74 ++#: ../extensions/deviceicon/network.py:327 #, python-format - msgid "Screenshot of \"%s\"" - msgstr "Captura pantalla de \"%s\"" - +-msgid "Screenshot of \"%s\"" +-msgstr "Captura pantalla de \"%s\"" +- -#: ../data/sugar.schemas.in.h:1 -msgid "Backup URL" -msgstr "URL de Respaldo" - -#: ../data/sugar.schemas.in.h:2 -+#: ../src/jarabe/controlpanel/cmd.py:28 -+#, python-format - msgid "" +-msgid "" -"Color for the XO icon that is used throughout the desktop. The string is " -"composed of the stroke color and fill color, format is that of rbg colors. " -"Example: #AC32FF,#9A5200" -+"sugar-control-panel: WARNING, found more than one option with the same name: " -+"%s module: %r" - msgstr "" +-msgstr "" -"El color para el ícono del XO se utiliza en todo el escritorio. La cadena " -"está compuesta por el trazo y color de relleno de color, el formato es el de " -"colores RBG. Ejemplo: #AC32FF, #9A5200" @@ -841,24 +1155,25 @@ index 16a132f..da3a3f4 100644 -#: ../data/sugar.schemas.in.h:6 -msgid "Edge Delay" -msgstr "Retraso del Borde" -+"sugar-control-panel: ADVERTENCIA, hay más de una opción con el mismo nombre: " -+"módulo %s: %r" ++msgid "Error: %s" ++msgstr "Error: %s" -#: ../data/sugar.schemas.in.h:7 -msgid "Favorites Layout" -msgstr "Diseño de favoritos" -+#: ../src/jarabe/controlpanel/cmd.py:30 -+#, python-format -+msgid "sugar-control-panel: key=%s not an available option" -+msgstr "sugar-control-panel: clave=%s no es una opción disponible" ++#: ../extensions/deviceicon/network.py:337 ++#: ../extensions/deviceicon/network.py:863 ++msgid "Connection Error" ++msgstr "Error de Conexión" -#: ../data/sugar.schemas.in.h:8 -msgid "Favorites resume mode" -msgstr "Modo de reanudar favoritos" -+#: ../src/jarabe/controlpanel/cmd.py:31 -+#, python-format -+msgid "sugar-control-panel: %s" -+msgstr "sugar-control-panel: %s" ++# TODO: show the channel number ++#: ../extensions/deviceicon/network.py:355 ++#: ../extensions/deviceicon/network.py:358 ++msgid "Connected for " ++msgstr "Conectado para " -#: ../data/sugar.schemas.in.h:9 -msgid "" @@ -867,110 +1182,204 @@ index 16a132f..da3a3f4 100644 -msgstr "" -"Si es TRUE, Azúcar habilitará que otros usuarios nos busquen en el servidor " -"Jabber." -- ++#: ../extensions/deviceicon/network.py:364 ++#: ../extensions/deviceicon/network.py:365 ++#, python-format ++msgid "%d KB" ++msgstr "%d KB" + -#: ../data/sugar.schemas.in.h:10 -msgid "If TRUE, Sugar will show a \"Log out\" option." -msgstr "Si es TRUE, Azúcar mostrará una opción \"Terminar Sesión\"." -- ++#: ../extensions/deviceicon/network.py:369 ++msgid "Suggestion: Check your Pin/Puk configuration." ++msgstr "Sugerencia: Compruebe la configuración del Pin/Puk." + -#: ../data/sugar.schemas.in.h:11 -msgid "Jabber Server" -msgstr "Servidor Jabber" -- ++#: ../extensions/deviceicon/network.py:371 ++msgid "Suggestion: Check your Access Point Name (APN) configuration" ++msgstr "Sugerencia: Compruebe el Access Point Name (APN) de configuración" + -#: ../data/sugar.schemas.in.h:12 -msgid "Keyboard layouts" -msgstr "Distribuciones del teclado" -- ++#: ../extensions/deviceicon/network.py:373 ++msgid "Suggestion: Check the Number configuration." ++msgstr "Sugerencia: Compruebe la configuración de Número." + -#: ../data/sugar.schemas.in.h:13 -msgid "Keyboard model" -msgstr "Modelo del teclado" -- ++#: ../extensions/deviceicon/network.py:394 ++msgid "Private" ++msgstr "Privado" + -#: ../data/sugar.schemas.in.h:14 -msgid "Keyboard options" -msgstr "Opciones del teclado" -- ++#: ../extensions/deviceicon/network.py:402 ++msgid "My Neighborhood" ++msgstr "Mi Vecindario" + -#: ../data/sugar.schemas.in.h:15 -msgid "Layout of the favorites view." -msgstr "Distribución de las actividades favoritas." -- ++#: ../extensions/deviceicon/network.py:671 ++#: ../extensions/deviceicon/network.py:734 ++#: ../extensions/deviceicon/network.py:736 ++msgid "Mesh Network" ++msgstr "Red Malla" + -#: ../data/sugar.schemas.in.h:16 -msgid "" -"List of keyboard layouts. Each entry should be in the form layout(variant)" -msgstr "" -"Lista de las distribuciones de teclado. Cada entrada debe ser en la forma " -"distribución(variante)" -- ++#: ../extensions/deviceicon/network.py:864 ++msgid "There is no gsm connection available" ++msgstr "No hay conexión GSM disponible" + -#: ../data/sugar.schemas.in.h:17 -msgid "List of keyboard options." -msgstr "Lista de las opciones del teclado." -- ++#: ../extensions/deviceicon/resources.py:48 ++msgid "System resources" ++msgstr "Recursos del sistema" + -#: ../data/sugar.schemas.in.h:18 -msgid "Power Automatic" -msgstr "Manejo automática de energía" -- ++#: ../extensions/deviceicon/resources.py:170 ++#, python-format ++msgid "CPU in use: %d%%" ++msgstr "CPU en uso: %d%%" + -#: ../data/sugar.schemas.in.h:19 -msgid "Power Automatic." -msgstr "Manejo automática de energía." -- ++#: ../extensions/deviceicon/resources.py:172 ++#, python-format ++msgid "Memory in use: %d%%" ++msgstr "Memoria en uso: %d%%" + -#: ../data/sugar.schemas.in.h:20 -msgid "Power Extreme" -msgstr "Manejo extremo de energía" -- ++#: ../extensions/deviceicon/resources.py:202 ++msgid "Cannot compute CPU and memory usage statistics!" ++msgstr "No se pueden calcular las estadísticas de CPU y uso de memoria!" + -#: ../data/sugar.schemas.in.h:21 -msgid "Power Extreme." -msgstr "Manejo extremo de energía." -- ++#: ../extensions/deviceicon/speaker.py:59 ++msgid "My Speakers" ++msgstr "Mis parlantes" + -#: ../data/sugar.schemas.in.h:22 -msgid "Publish to Gadget" -msgstr "Publicar en Gadget" -- ++# la traducción la tome del AlsaMixer de Gnome. ++#: ../extensions/deviceicon/speaker.py:133 ++msgid "Unmute" ++msgstr "Dar voz" + -#: ../data/sugar.schemas.in.h:23 -msgid "Setting for muting the sound device." -msgstr "Configuración para silenciar el dispositivo de sonido." -- ++#: ../extensions/deviceicon/speaker.py:136 ++msgid "Mute" ++msgstr "Silenciar" + -#: ../data/sugar.schemas.in.h:24 -msgid "Show Log out" -msgstr "Mostrar Terminar Sesión" -- ++# TRANS: label for the ring layout in the favorites view ++#: ../extensions/deviceicon/touchpad.py:32 ++msgid "finger" ++msgstr "dedo" + -#: ../data/sugar.schemas.in.h:25 -msgid "Sound Muted" -msgstr "Sonido silenciado" -- ++#: ../extensions/deviceicon/touchpad.py:32 ++msgid "stylus" ++msgstr "lápiz" + -#: ../data/sugar.schemas.in.h:26 -msgid "The keyboard model to be used" -msgstr "El modelo del teclado que se utilizará" -- ++#: ../extensions/deviceicon/touchpad.py:60 ++msgid "My touchpad" ++msgstr "Mi touchpad" + -#: ../data/sugar.schemas.in.h:28 -msgid "Timezone setting for the system." -msgstr "Configuración de zona horaria para el sistema." -- ++#: ../extensions/deviceicon/virtualkeyboard.py:31 ++msgid "Teclado Virtual" ++msgstr "Teclado Virtual" + -#: ../data/sugar.schemas.in.h:29 -msgid "Url of the jabber server to use." -msgstr "URL del servidor de Jabber para usar." -- ++#: ../extensions/deviceicon/virtualkeyboard.py:45 ++#: ../src/jarabe/frame/clipboardmenu.py:58 ++#: ../src/jarabe/frame/clipboardmenu.py:81 ++msgid "Open" ++msgstr "Abrir" + -#: ../data/sugar.schemas.in.h:30 -msgid "Url where the backup is saved to." -msgstr "URL donde se guarda el backup." -- ++#: ../extensions/deviceicon/virtualkeyboard.py:50 ++#: ../src/jarabe/journal/objectchooser.py:151 ++#: ../src/jarabe/journal/processdialog.py:129 ++#: ../src/jarabe/view/viewsource.py:310 ++msgid "Close" ++msgstr "Cerrar" + -#: ../data/sugar.schemas.in.h:31 -msgid "User Color" -msgstr "Color del usuario" -- ++#: ../extensions/globalkey/screenshot.py:59 ++msgid "Mesh" ++msgstr "Malla" + -#: ../data/sugar.schemas.in.h:32 -msgid "User Name" -msgstr "Nombre de usuario" -- ++#: ../extensions/globalkey/screenshot.py:61 ++#: ../src/jarabe/frame/zoomtoolbar.py:39 ++msgid "Group" ++msgstr "Grupo" + -#: ../data/sugar.schemas.in.h:33 -msgid "User name that is used throughout the desktop." -msgstr "Nombre de usuario que se utiliza en todo el escritorio." -- ++#: ../extensions/globalkey/screenshot.py:63 ++#: ../src/jarabe/frame/zoomtoolbar.py:41 ++msgid "Home" ++msgstr "Hogar" + -#: ../data/sugar.schemas.in.h:34 -msgid "Volume Level" -msgstr "Nivel de volumen" -- ++#: ../extensions/globalkey/screenshot.py:69 ++#: ../src/jarabe/frame/zoomtoolbar.py:43 ++msgid "Activity" ++msgstr "Actividad" + -#: ../data/sugar.schemas.in.h:35 -msgid "Volume level for the sound device." -msgstr "Nivel de volumen para el dispositivo de sonido." -- ++#: ../extensions/globalkey/screenshot.py:72 ++msgid "Screenshot" ++msgstr "Captura de pantalla" + -#: ../data/sugar.schemas.in.h:36 -msgid "" -"When in resume mode, clicking on a favorite icon will cause the last entry " @@ -978,66 +1387,42 @@ index 16a132f..da3a3f4 100644 -msgstr "" -"Cuando en el modo de retomar, al hacer clic en un icono de favoritos causa " -"que se retome la última entrada de esa actividad." -- --#: ../src/jarabe/controlpanel/cmd.py:28 --#, python-format --msgid "" --"sugar-control-panel: WARNING, found more than one option with the same name: " --"%s module: %r" --msgstr "" --"sugar-control-panel: ADVERTENCIA, hay más de una opción con el mismo nombre: " --"módulo %s: %r" -- --#: ../src/jarabe/controlpanel/cmd.py:30 --#, python-format --msgid "sugar-control-panel: key=%s not an available option" --msgstr "sugar-control-panel: clave=%s no es una opción disponible" -- --#: ../src/jarabe/controlpanel/cmd.py:31 --#, python-format --msgid "sugar-control-panel: %s" --msgstr "sugar-control-panel: %s" -- --# TRANS: Translators, there's a empty line at the end of this string,<br /><br /> --# which must appear in the translated string (msgstr) as well. --#. TRANS: Translators, there's a empty line at the end of this string, --#. which must appear in the translated string (msgstr) as well. --#: ../src/jarabe/controlpanel/cmd.py:37 -+# TRANS: Translators, there's a empty line at the end of this string,<br /><br /> -+# which must appear in the translated string (msgstr) as well. -+#: ../src/jarabe/controlpanel/cmd.py:37 - msgid "" - "Usage: sugar-control-panel [ option ] key [ args ... ] \n" - " Control for the sugar environment. \n" -@@ -705,68 +811,48 @@ msgstr "" ++#: ../extensions/globalkey/screenshot.py:74 ++#, python-format ++msgid "Screenshot of \"%s\"" ++msgstr "Captura pantalla de \"%s\"" + + #: ../src/jarabe/controlpanel/cmd.py:28 + #, python-format +@@ -705,68 +1200,48 @@ msgstr "" msgid "To apply your changes you have to restart sugar.\n" msgstr "Para aplicar sus cambios tiene que reiniciar Azúcar.\n" -#: ../src/jarabe/controlpanel/gui.py:280 -+#: ../src/jarabe/controlpanel/gui.py:292 ++#: ../src/jarabe/controlpanel/gui.py:297 +#: ../src/jarabe/journal/journaltoolbox.py:433 +#: ../src/jarabe/journal/volumestoolbar.py:183 msgid "Warning" msgstr "Advertencia" -#: ../src/jarabe/controlpanel/gui.py:281 -+#: ../src/jarabe/controlpanel/gui.py:293 ++#: ../src/jarabe/controlpanel/gui.py:298 #: ../src/jarabe/controlpanel/sectionview.py:42 msgid "Changes require restart" msgstr "Los cambios requieren reiniciar" -#: ../src/jarabe/controlpanel/gui.py:284 -+#: ../src/jarabe/controlpanel/gui.py:296 ++#: ../src/jarabe/controlpanel/gui.py:301 msgid "Cancel changes" msgstr "Cancelar cambios" -#: ../src/jarabe/controlpanel/gui.py:289 ../src/jarabe/desktop/homebox.py:70 -+#: ../src/jarabe/controlpanel/gui.py:301 ../src/jarabe/desktop/homebox.py:70 ++#: ../src/jarabe/controlpanel/gui.py:306 ../src/jarabe/desktop/homebox.py:70 msgid "Later" msgstr "Después" -#: ../src/jarabe/controlpanel/gui.py:293 -+#: ../src/jarabe/controlpanel/gui.py:305 ++#: ../src/jarabe/controlpanel/gui.py:310 msgid "Restart now" msgstr "Reiniciar ahora" @@ -1090,7 +1475,7 @@ index 16a132f..da3a3f4 100644 #, python-format msgid "Confirm erase: Do you want to permanently erase %s?" msgstr "Confirmar el borrado: ¿Quiere borrar %s de forma permanente?" -@@ -775,92 +861,92 @@ msgstr "Confirmar el borrado: ¿Quiere borrar %s de forma permanente?" +@@ -775,24 +1250,24 @@ msgstr "Confirmar el borrado: ¿Quiere borrar %s de forma permanente?" # TODO: Implement stopping downloads # self._stop_item.connect('activate', self._stop_item_activate_cb) # self.append_menu_item(self._stop_item) @@ -1123,33 +1508,7 @@ index 16a132f..da3a3f4 100644 msgid "Make favorite" msgstr "Hacer favorito" - # TRANS: label for the freeform layout in the favorites view --#. TRANS: label for the freeform layout in the favorites view - #: ../src/jarabe/desktop/favoriteslayout.py:116 - msgid "Freeform" - msgstr "Forma libre" - - # TRANS: label for the ring layout in the favorites view --#. TRANS: label for the ring layout in the favorites view - #: ../src/jarabe/desktop/favoriteslayout.py:198 - msgid "Ring" - msgstr "Anillo" - - # TRANS: label for the spiral layout in the favorites view --#. TRANS: label for the spiral layout in the favorites view - #: ../src/jarabe/desktop/favoriteslayout.py:337 - msgid "Spiral" - msgstr "Espiral" - - # TRANS: label for the box layout in the favorites view --#. TRANS: label for the box layout in the favorites view - #: ../src/jarabe/desktop/favoriteslayout.py:404 - msgid "Box" - msgstr "Caja" - - # TRANS: label for the box layout in the favorites view --#. TRANS: label for the box layout in the favorites view - #: ../src/jarabe/desktop/favoriteslayout.py:445 +@@ -826,27 +1301,32 @@ msgstr "Caja" msgid "Triangle" msgstr "Triángulo" @@ -1175,27 +1534,19 @@ index 16a132f..da3a3f4 100644 msgstr "Ahora estás registrado en el servidor de colegio." -#: ../src/jarabe/desktop/favoritesview.py:671 -+#: ../src/jarabe/desktop/favoritesview.py:636 ++#: ../src/jarabe/desktop/favoritesview.py:644 msgid "Register" msgstr "Registro" -+#: ../src/jarabe/desktop/favoritesview.py:638 -+#: ../src/jarabe/desktop/favoritesview.py:654 ++#: ../src/jarabe/desktop/favoritesview.py:646 ++#: ../src/jarabe/desktop/favoritesview.py:660 +msgid "Register Again" +msgstr "Registrar Nuevamente" + #: ../src/jarabe/desktop/homebox.py:63 msgid "Software Update" msgstr "Actualización de Software" - - #: ../src/jarabe/desktop/homebox.py:64 - msgid "Update your activities to ensure compatibility with your new software" --msgstr "" --"Actualice sus actividades para asegurar compatibilidad con su nuevo software" -+msgstr "Actualice sus actividades para asegurar compatibilidad con su nuevo software" - - #: ../src/jarabe/desktop/homebox.py:73 - msgid "Check now" +@@ -861,6 +1341,7 @@ msgid "Check now" msgstr "Pruebe ahora" #: ../src/jarabe/desktop/homebox.py:192 @@ -1203,7 +1554,7 @@ index 16a132f..da3a3f4 100644 msgid "List view" msgstr "Vista en lista" -@@ -876,113 +962,121 @@ msgstr "Vista de favoritos" +@@ -876,113 +1357,125 @@ msgstr "Vista de favoritos" msgid "<Ctrl>1" msgstr "<Ctrl>1" @@ -1213,11 +1564,14 @@ index 16a132f..da3a3f4 100644 + +#: ../src/jarabe/desktop/homewindow.py:101 +msgid "Please, reboot your computer to take into account new updates" -+msgstr "Por favor, reinicie su computadora para tomar en cuenta las nuevas actualizaciones." ++msgstr "" ++"Por favor, reinicie su computadora para tomar en cuenta las nuevas " ++"actualizaciones." + +#: ../src/jarabe/desktop/homewindow.py:106 +msgid "Please, restart Sugar to take into account new updates" -+msgstr "Por favor, reinicie Sugar para tener en cuenta las nuevas actualizaciones." ++msgstr "" ++"Por favor, reinicie Sugar para tener en cuenta las nuevas actualizaciones." + # This is an encryption key type, not a keyboard key -#: ../src/jarabe/desktop/keydialog.py:131 @@ -1257,7 +1611,7 @@ index 16a132f..da3a3f4 100644 +msgstr "Red Malla %d" # TRANS: Action label for resuming an activity. --#. TRANS: Action label for resuming an activity. + #. TRANS: Action label for resuming an activity. -#: ../src/jarabe/desktop/meshbox.py:466 -#: ../src/jarabe/frame/activitiestray.py:761 -#: ../src/jarabe/journal/journaltoolbox.py:428 @@ -1364,7 +1718,7 @@ index 16a132f..da3a3f4 100644 msgid "Open with" msgstr "Abrir con" -@@ -991,6 +1085,10 @@ msgstr "Abrir con" +@@ -991,6 +1484,10 @@ msgstr "Abrir con" msgid "%s clipping" msgstr "recorte de %s" @@ -1375,7 +1729,7 @@ index 16a132f..da3a3f4 100644 #: ../src/jarabe/frame/zoomtoolbar.py:37 msgid "Neighborhood" msgstr "Vecindario" -@@ -1011,150 +1109,206 @@ msgstr "F3" +@@ -1011,199 +1508,540 @@ msgstr "F3" msgid "F4" msgstr "F4" @@ -1431,104 +1785,88 @@ index 16a132f..da3a3f4 100644 msgstr "Tamaño: %s" -#: ../src/jarabe/journal/expandedentry.py:253 ../src/jarabe/journal/misc.py:92 +-msgid "No date" +-msgstr "Sin fecha" +#: ../src/jarabe/journal/expandedentry.py:291 +#: ../src/jarabe/journal/misc.py:108 - msgid "No date" - msgstr "Sin fecha" - --#: ../src/jarabe/journal/expandedentry.py:260 ++msgid "No date" ++msgstr "Sin fecha" ++ +#: ../src/jarabe/journal/expandedentry.py:298 - msgid "Participants:" - msgstr "Participantes:" - --#: ../src/jarabe/journal/expandedentry.py:283 ++msgid "Participants:" ++msgstr "Participantes:" ++ +#: ../src/jarabe/journal/expandedentry.py:321 - msgid "Description:" - msgstr "Descripción:" - --#: ../src/jarabe/journal/expandedentry.py:309 ++msgid "Description:" ++msgstr "Descripción:" ++ +#: ../src/jarabe/journal/expandedentry.py:346 - msgid "Tags:" - msgstr "Etiquetas:" - --#: ../src/jarabe/journal/journalactivity.py:108 --#: ../src/jarabe/journal/volumestoolbar.py:47 ++msgid "Tags:" ++msgstr "Etiquetas:" ++ +#: ../src/jarabe/journal/journalactivity.py:112 +#: ../src/jarabe/journal/journaltoolbox.py:452 +#: ../src/jarabe/journal/volumestoolbar.py:53 - msgid "Journal" - msgstr "Diario" - --#: ../src/jarabe/journal/journaltoolbox.py:67 ++msgid "Journal" ++msgstr "Diario" ++ +#: ../src/jarabe/journal/journaltoolbox.py:69 - msgid "Search" - msgstr "Buscar" - --#: ../src/jarabe/journal/journaltoolbox.py:126 ++msgid "Search" ++msgstr "Buscar" ++ +#: ../src/jarabe/journal/journaltoolbox.py:137 - msgid "Anytime" - msgstr "Cualquier momento" - --#: ../src/jarabe/journal/journaltoolbox.py:128 ++msgid "Anytime" ++msgstr "Cualquier momento" ++ +#: ../src/jarabe/journal/journaltoolbox.py:139 - msgid "Today" - msgstr "Hoy" - --#: ../src/jarabe/journal/journaltoolbox.py:130 ++msgid "Today" ++msgstr "Hoy" ++ +#: ../src/jarabe/journal/journaltoolbox.py:141 - msgid "Since yesterday" - msgstr "Desde ayer" - - # TRANS: Filter entries modified during the last 7 days. --#. TRANS: Filter entries modified during the last 7 days. --#: ../src/jarabe/journal/journaltoolbox.py:132 ++msgid "Since yesterday" ++msgstr "Desde ayer" ++ ++# TRANS: Filter entries modified during the last 7 days. ++#. TRANS: Filter entries modified during the last 7 days. +#: ../src/jarabe/journal/journaltoolbox.py:143 - msgid "Past week" - msgstr "Última semana" - - # TRANS: Filter entries modified during the last 30 days. --#. TRANS: Filter entries modified during the last 30 days. --#: ../src/jarabe/journal/journaltoolbox.py:134 ++msgid "Past week" ++msgstr "Última semana" ++ ++# TRANS: Filter entries modified during the last 30 days. ++#. TRANS: Filter entries modified during the last 30 days. +#: ../src/jarabe/journal/journaltoolbox.py:145 - msgid "Past month" - msgstr "Último mes" - - # TRANS: Filter entries modified during the last 356 days. --#. TRANS: Filter entries modified during the last 356 days. --#: ../src/jarabe/journal/journaltoolbox.py:136 ++msgid "Past month" ++msgstr "Último mes" ++ ++# TRANS: Filter entries modified during the last 356 days. ++#. TRANS: Filter entries modified during the last 356 days. +#: ../src/jarabe/journal/journaltoolbox.py:147 - msgid "Past year" - msgstr "Último año" - --#: ../src/jarabe/journal/journaltoolbox.py:143 ++msgid "Past year" ++msgstr "Último año" ++ +#: ../src/jarabe/journal/journaltoolbox.py:154 - msgid "Anyone" - msgstr "Cualquiera" - --#: ../src/jarabe/journal/journaltoolbox.py:145 ++msgid "Anyone" ++msgstr "Cualquiera" ++ +#: ../src/jarabe/journal/journaltoolbox.py:156 - msgid "My friends" - msgstr "Mis amigos" - --#: ../src/jarabe/journal/journaltoolbox.py:146 ++msgid "My friends" ++msgstr "Mis amigos" ++ +#: ../src/jarabe/journal/journaltoolbox.py:157 - msgid "My class" - msgstr "Mi clase" - - # TRANS: Item in a combo box that filters by entry type. --#: ../src/jarabe/journal/journaltoolbox.py:274 ++msgid "My class" ++msgstr "Mi clase" ++ ++# TRANS: Item in a combo box that filters by entry type. +#: ../src/jarabe/journal/journaltoolbox.py:296 - msgid "Anything" - msgstr "Cualquiera" - - # TODO: Add "Start with" menu item --#: ../src/jarabe/journal/journaltoolbox.py:350 --#: ../src/jarabe/journal/palettes.py:90 ++msgid "Anything" ++msgstr "Cualquiera" ++ ++# TODO: Add "Start with" menu item +#: ../src/jarabe/journal/journaltoolbox.py:377 +#: ../src/jarabe/journal/palettes.py:92 - msgid "Copy" - msgstr "Copiar" - ++msgid "Copy" ++msgstr "Copiar" ++ +#: ../src/jarabe/journal/journaltoolbox.py:432 +#: ../src/jarabe/journal/volumestoolbar.py:182 +msgid "Entries without a file cannot be copied." @@ -1545,17 +1883,14 @@ index 16a132f..da3a3f4 100644 +msgid "Error" +msgstr "Error" + - # TRANS: Action label for starting an entry. --#. TRANS: Action label for starting an entry. --#: ../src/jarabe/journal/journaltoolbox.py:431 --#: ../src/jarabe/journal/palettes.py:75 ++# TRANS: Action label for starting an entry. ++#. TRANS: Action label for starting an entry. +#: ../src/jarabe/journal/journaltoolbox.py:484 +#: ../src/jarabe/journal/palettes.py:70 +#: ../src/jarabe/journal/processdialog.py:121 - msgid "Start" - msgstr "Iniciar" - --#: ../src/jarabe/journal/listview.py:361 ++msgid "Start" ++msgstr "Iniciar" ++ +#: ../src/jarabe/journal/journaltoolbox.py:511 +msgid "View by last edit" +msgstr "Ver por última edición" @@ -1569,19 +1904,17 @@ index 16a132f..da3a3f4 100644 +msgstr "Ver por tamaño" + +#: ../src/jarabe/journal/listview.py:380 - msgid "Your Journal is empty" - msgstr "Su diario está vacío" - --#: ../src/jarabe/journal/listview.py:363 ++msgid "Your Journal is empty" ++msgstr "Su diario está vacío" ++ +#: ../src/jarabe/journal/listview.py:382 - msgid "No matching entries" - msgstr "No hay entradas coincidentes" - --#: ../src/jarabe/journal/listview.py:374 ++msgid "No matching entries" ++msgstr "No hay entradas coincidentes" ++ +#: ../src/jarabe/journal/listview.py:393 - msgid "Clear search" - msgstr "Limpiar búsqueda" - ++msgid "Clear search" ++msgstr "Limpiar búsqueda" ++ +#: ../src/jarabe/journal/listview.py:534 +msgid "Sorry, too soon to activate this icon again" +msgstr "Lo sentimos, demasiado pronto para activar este icono de nuevo" @@ -1610,70 +1943,59 @@ index 16a132f..da3a3f4 100644 +msgid "Do you want to downgrade to version %s" +msgstr "¿Quieres hacer un retroceso a la versión %s?" + - #: ../src/jarabe/journal/modalalert.py:63 - msgid "Your Journal is full" - msgstr "Su diario está vacío" - - #: ../src/jarabe/journal/modalalert.py:67 - msgid "Please delete some old Journal entries to make space for new ones." --msgstr "" -+msgstr "Por favor, elimine algunas de las viejas entradas del diario para hacer espacio para las nuevas." - "Por favor borre las entradas viejas del diario para hacer espacio a las " - "nuevas entradas." - -@@ -1166,44 +1320,314 @@ msgstr "Mostrar diario" - msgid "Choose an object" - msgstr "Escoja un objeto" - --#: ../src/jarabe/journal/objectchooser.py:151 --#: ../src/jarabe/view/viewsource.py:308 --msgid "Close" --msgstr "Cerrar" -- --#: ../src/jarabe/journal/palettes.py:73 ++#: ../src/jarabe/journal/modalalert.py:63 ++msgid "Your Journal is full" ++msgstr "Su diario está vacío" ++ ++#: ../src/jarabe/journal/modalalert.py:67 ++msgid "Please delete some old Journal entries to make space for new ones." ++msgstr "" ++"Por favor, elimine algunas de las viejas entradas del diario para hacer " ++"espacio para las nuevas.Por favor borre las entradas viejas del diario para " ++"hacer espacio a las nuevas entradas." ++ ++#: ../src/jarabe/journal/modalalert.py:79 ++msgid "Show Journal" ++msgstr "Mostrar diario" ++ ++#: ../src/jarabe/journal/objectchooser.py:146 ++msgid "Choose an object" ++msgstr "Escoja un objeto" ++ +#: ../src/jarabe/journal/palettes.py:68 - msgid "Resume with" - msgstr "Reiniciar con" - --#: ../src/jarabe/journal/palettes.py:76 ++msgid "Resume with" ++msgstr "Reiniciar con" ++ +#: ../src/jarabe/journal/palettes.py:71 - msgid "Start with" - msgstr "Empezar con" - --#: ../src/jarabe/journal/palettes.py:98 ++msgid "Start with" ++msgstr "Empezar con" ++ +#: ../src/jarabe/journal/palettes.py:84 ../src/jarabe/journal/palettes.py:217 +msgid "No activity to start entry" +msgstr "No se encontró una actividad para iniciar la entrada" + +#: ../src/jarabe/journal/palettes.py:100 - msgid "Send to" - msgstr "Enviar a" - --#: ../src/jarabe/journal/palettes.py:107 ++msgid "Send to" ++msgstr "Enviar a" ++ +#: ../src/jarabe/journal/palettes.py:109 - msgid "View Details" - msgstr "Ver detalles" - --#: ../src/jarabe/journal/palettes.py:185 ++msgid "View Details" ++msgstr "Ver detalles" ++ +#: ../src/jarabe/journal/palettes.py:182 - msgid "No friends present" - msgstr "No hay amigos presentes" - - # tildes --#: ../src/jarabe/journal/palettes.py:190 ++msgid "No friends present" ++msgstr "No hay amigos presentes" ++ ++# tildes +#: ../src/jarabe/journal/palettes.py:187 - msgid "No valid connection found" - msgstr "No se encontró una conexión válida" - - # tildes... --#: ../src/jarabe/journal/palettes.py:218 ++msgid "No valid connection found" ++msgstr "No se encontró una conexión válida" ++ ++# tildes... +#: ../src/jarabe/journal/palettes.py:215 - msgid "No activity to resume entry" - msgstr "No se encontró una actividad para retomar la entrada" - --#: ../src/jarabe/journal/palettes.py:220 --msgid "No activity to start entry" --msgstr "No se encontró una actividad para iniciar la entrada" ++msgid "No activity to resume entry" ++msgstr "No se encontró una actividad para retomar la entrada" ++ +#: ../src/jarabe/journal/processdialog.py:48 +msgid "Running" +msgstr "Corriendo" @@ -1776,6 +2098,15 @@ index 16a132f..da3a3f4 100644 +msgid "Journal content will be repaired" +msgstr "El contenido del Diario será reparado" + ++#: ../src/jarabe/model/feedback_collector.py:161 ++msgid "Cannot submit feedback" ++msgstr "No se puede enviar reporte" ++ ++#: ../src/jarabe/model/feedback_collector.py:162 ++#, python-format ++msgid "Feedback was not sent to %s:%s." ++msgstr "Reporte no fue enviado a %s%s." ++ +#: ../src/jarabe/model/network.py:107 +msgid "The reason for the device state change \\ is unknown" +msgstr "La razón para el cambio de estado del dispositivo \\ es desconocida." @@ -1814,144 +2145,262 @@ index 16a132f..da3a3f4 100644 +msgid "" +"The 802.1X supplicant disconnected from the access point or " +"authentication server." -+msgstr "El suplicante 802.1X fue desconectado desde el punto de " -+"acceso o desde el servidor de autenticación." -+ ++msgstr "" ++"El suplicante 802.1X fue desconectado desde el punto de acceso o desde el " ++"servidor de autenticación." + +-#: ../src/jarabe/journal/expandedentry.py:260 +-msgid "Participants:" +-msgstr "Participantes:" +#: ../src/jarabe/model/network.py:127 +msgid "Configuration of the 802.1X supplicant failed." +msgstr "La configuración del suplicante 802.1X falló." -+ + +-#: ../src/jarabe/journal/expandedentry.py:283 +-msgid "Description:" +-msgstr "Descripción:" +#: ../src/jarabe/model/network.py:129 +msgid "The 802.1X supplicant quit or failed unexpectedly." +msgstr "El suplicante 802.1X terminó o falló de forma inesperada." -+ + +-#: ../src/jarabe/journal/expandedentry.py:309 +-msgid "Tags:" +-msgstr "Etiquetas:" +#: ../src/jarabe/model/network.py:131 +msgid "The 802.1X supplicant took too long to authenticate." +msgstr "El suplicante 802.1X tomó demasiado tiempo para autenticar." -+ + +-#: ../src/jarabe/journal/journalactivity.py:108 +-#: ../src/jarabe/journal/volumestoolbar.py:47 +-msgid "Journal" +-msgstr "Diario" +#: ../src/jarabe/model/network.py:133 +msgid "The PPP service failed to start within the allowed time." +msgstr "El servicio PPP no se pudo iniciar en el plazo fijado." -+ + +-#: ../src/jarabe/journal/journaltoolbox.py:67 +-msgid "Search" +-msgstr "Buscar" +#: ../src/jarabe/model/network.py:135 +msgid "The PPP service disconnected unexpectedly." +msgstr "El servicio PPP se desconectó de forma inesperada." -+ + +-#: ../src/jarabe/journal/journaltoolbox.py:126 +-msgid "Anytime" +-msgstr "Cualquier momento" +#: ../src/jarabe/model/network.py:137 +msgid "The PPP service quit or failed unexpectedly." +msgstr "El servicio PPP terminó o falló de forma inesperada." -+ + +-#: ../src/jarabe/journal/journaltoolbox.py:128 +-msgid "Today" +-msgstr "Hoy" +#: ../src/jarabe/model/network.py:139 +msgid "The DHCP service failed to start within the allowed time." +msgstr "El servicio DHCP no se pudo iniciar en el plazo fijado." -+ + +-#: ../src/jarabe/journal/journaltoolbox.py:130 +-msgid "Since yesterday" +-msgstr "Desde ayer" +#: ../src/jarabe/model/network.py:141 +msgid "The DHCP service reported an unexpected error" +msgstr "El servicio DHCP informó de un error inesperado" -+ + +-# TRANS: Filter entries modified during the last 7 days. +-#. TRANS: Filter entries modified during the last 7 days. +-#: ../src/jarabe/journal/journaltoolbox.py:132 +-msgid "Past week" +-msgstr "Última semana" +#: ../src/jarabe/model/network.py:143 +msgid "The DHCP service quit or failed unexpectedly." +msgstr "El servicio DHCP terminó o falló de forma inesperada." -+ + +-# TRANS: Filter entries modified during the last 30 days. +-#. TRANS: Filter entries modified during the last 30 days. +-#: ../src/jarabe/journal/journaltoolbox.py:134 +-msgid "Past month" +-msgstr "Último mes" +#: ../src/jarabe/model/network.py:145 +msgid "The shared connection service failed to start." +msgstr "La conexión compartida falló en iniciar." -+ + +-# TRANS: Filter entries modified during the last 356 days. +-#. TRANS: Filter entries modified during the last 356 days. +-#: ../src/jarabe/journal/journaltoolbox.py:136 +-msgid "Past year" +-msgstr "Último año" +#: ../src/jarabe/model/network.py:147 +msgid "The shared connection service quit or failed unexpectedly" +msgstr "El servicio de conexión compartida terminó o falló de forma inesperada" -+ + +-#: ../src/jarabe/journal/journaltoolbox.py:143 +-msgid "Anyone" +-msgstr "Cualquiera" +#: ../src/jarabe/model/network.py:149 +msgid "The AutoIP service failed to start." +msgstr "El servicio AutoIP no pudo iniciar." -+ + +-#: ../src/jarabe/journal/journaltoolbox.py:145 +-msgid "My friends" +-msgstr "Mis amigos" +#: ../src/jarabe/model/network.py:151 +msgid "The AutoIP service reported an unexpected error." +msgstr "El servicio AutoIP informó de un error inesperado." -+ + +-#: ../src/jarabe/journal/journaltoolbox.py:146 +-msgid "My class" +-msgstr "Mi clase" +#: ../src/jarabe/model/network.py:153 +msgid "The AutoIP service quit or failed unexpectedly." +msgstr "El servicio AutoIP terminó o falló de forma inesperada." -+ + +-# TRANS: Item in a combo box that filters by entry type. +-#: ../src/jarabe/journal/journaltoolbox.py:274 +-msgid "Anything" +-msgstr "Cualquiera" +#: ../src/jarabe/model/network.py:155 +msgid "Dialing failed because the line was busy." +msgstr "El marcado fracasó porque la línea estaba ocupada." -+ + +-# TODO: Add "Start with" menu item +-#: ../src/jarabe/journal/journaltoolbox.py:350 +-#: ../src/jarabe/journal/palettes.py:90 +-msgid "Copy" +-msgstr "Copiar" +#: ../src/jarabe/model/network.py:157 +msgid "Dialing failed because there was no dial tone. " +msgstr "El marcado falló porque no había tono de marcado." -+ + +-# TRANS: Action label for starting an entry. +-#. TRANS: Action label for starting an entry. +-#: ../src/jarabe/journal/journaltoolbox.py:431 +-#: ../src/jarabe/journal/palettes.py:75 +-msgid "Start" +-msgstr "Iniciar" +#: ../src/jarabe/model/network.py:159 +msgid "Dialing failed because there was carrier." +msgstr "El marcado falló porque no había portador." -+ + +-#: ../src/jarabe/journal/listview.py:361 +-msgid "Your Journal is empty" +-msgstr "Su diario está vacío" +#: ../src/jarabe/model/network.py:161 +msgid "Dialing timed out." +msgstr "El marcado agotó el tiempo de espera." -+ + +-#: ../src/jarabe/journal/listview.py:363 +-msgid "No matching entries" +-msgstr "No hay entradas coincidentes" +#: ../src/jarabe/model/network.py:163 +msgid "Dialing failed." +msgstr "El marcado ha fallado." -+ + +-#: ../src/jarabe/journal/listview.py:374 +-msgid "Clear search" +-msgstr "Limpiar búsqueda" +#: ../src/jarabe/model/network.py:165 +msgid "Modem initialization failed." +msgstr "Inicialización del módem ha fallado." -+ + +-#: ../src/jarabe/journal/modalalert.py:63 +-msgid "Your Journal is full" +-msgstr "Su diario está vacío" +#: ../src/jarabe/model/network.py:167 +msgid "Failed to select the specified GSM APN." +msgstr "No se pudo seleccionar la APN de GSM especificada." -+ + +-#: ../src/jarabe/journal/modalalert.py:67 +-msgid "Please delete some old Journal entries to make space for new ones." +-msgstr "" +-"Por favor borre las entradas viejas del diario para hacer espacio a las " +-"nuevas entradas." +#: ../src/jarabe/model/network.py:169 +msgid "Not searching for networks." +msgstr "No se encuentran redes disponibles" -+ + +-#: ../src/jarabe/journal/modalalert.py:79 +-msgid "Show Journal" +-msgstr "Mostrar diario" +#: ../src/jarabe/model/network.py:171 +msgid "Network registration was denied." +msgstr "El registro de red fue denegado." -+ + +-#: ../src/jarabe/journal/objectchooser.py:146 +-msgid "Choose an object" +-msgstr "Escoja un objeto" +#: ../src/jarabe/model/network.py:173 +msgid "Network registration timed out." +msgstr "Expiró el tiempo de espera durante el registro" -+ + +-#: ../src/jarabe/journal/objectchooser.py:151 +-#: ../src/jarabe/view/viewsource.py:308 +-msgid "Close" +-msgstr "Cerrar" +#: ../src/jarabe/model/network.py:175 +msgid "Failed to register with the requested GSM network." +msgstr "No se pudo registrar en la red GSM solicitada." -+ + +-#: ../src/jarabe/journal/palettes.py:73 +-msgid "Resume with" +-msgstr "Reiniciar con" +#: ../src/jarabe/model/network.py:177 +msgid "PIN check failed." +msgstr "La verificación del número PIN ha fallado." -+ + +-#: ../src/jarabe/journal/palettes.py:76 +-msgid "Start with" +-msgstr "Empezar con" +#: ../src/jarabe/model/network.py:179 +msgid "Necessary firmware for the device may be missing." +msgstr "Firmware necesario para el dispositivo puede estar faltando." -+ + +-#: ../src/jarabe/journal/palettes.py:98 +-msgid "Send to" +-msgstr "Enviar a" +#: ../src/jarabe/model/network.py:181 +msgid "The device was removed." +msgstr "El dispositivo fue retirado." -+ + +-#: ../src/jarabe/journal/palettes.py:107 +-msgid "View Details" +-msgstr "Ver detalles" +#: ../src/jarabe/model/network.py:183 +msgid "NetworkManager went to sleep." +msgstr "NetworkManager se fue a dormir." -+ + +-#: ../src/jarabe/journal/palettes.py:185 +-msgid "No friends present" +-msgstr "No hay amigos presentes" +#: ../src/jarabe/model/network.py:185 +msgid "The device's active connection was removed or disappeared." +msgstr "La conexión activa del dispositivo fue retirada o ha desaparecido." -+ + +-# tildes +-#: ../src/jarabe/journal/palettes.py:190 +-msgid "No valid connection found" +-msgstr "No se encontró una conexión válida" +#: ../src/jarabe/model/network.py:187 +msgid "A user or client requested the disconnection." +msgstr "Un usuario o cliente requirió la desconexión." -+ + +-# tildes... +-#: ../src/jarabe/journal/palettes.py:218 +-msgid "No activity to resume entry" +-msgstr "No se encontró una actividad para retomar la entrada" +#: ../src/jarabe/model/network.py:189 +msgid "The device's carrier/link changed." +msgstr "El portador/enlace del dispositivo ha cambiado." -+ + +-#: ../src/jarabe/journal/palettes.py:220 +-msgid "No activity to start entry" +-msgstr "No se encontró una actividad para iniciar la entrada" +#: ../src/jarabe/model/processmanagement.py:76 +msgid "Error - Call process: " +msgstr "Error - proceso de llamada:" # "Eliminate friend"??? That's a bit harsh. Wouldn't "quitar amigo" be a better choice?-- # agree but i preffer remover :). that verbe has the exact meaning we are looking on here. -@@ -1219,45 +1643,65 @@ msgstr "Agregar amigo" +@@ -1219,45 +2057,66 @@ msgstr "Agregar amigo" msgid "Shutdown" msgstr "Apagar" @@ -1981,12 +2430,12 @@ index 16a132f..da3a3f4 100644 msgid "Starting..." msgstr "Iniciando..." --#. TODO: share-with, keep --#: ../src/jarabe/view/palettes.py:71 +#: ../src/jarabe/view/palettes.py:60 +msgid "Activity failed to start" +msgstr "La actividad falló al iniciar" + + #. TODO: share-with, keep +-#: ../src/jarabe/view/palettes.py:71 +#: ../src/jarabe/view/palettes.py:89 msgid "View Source" msgstr "Ver fuente" @@ -2027,7 +2476,7 @@ index 16a132f..da3a3f4 100644 #: ../src/jarabe/view/viewsource.py:208 msgid "Instance Source" msgstr "Fuente de la instancia" -@@ -1266,182 +1710,195 @@ msgstr "Fuente de la instancia" +@@ -1266,182 +2125,35 @@ msgstr "Fuente de la instancia" msgid "Source" msgstr "Fuente" @@ -2045,313 +2494,188 @@ index 16a132f..da3a3f4 100644 -#: ../extensions/cpsection/accessibility/__init__.py:24 -msgid "Accessibility" -msgstr "Accesibilidad" -+#, fuzzy -+#~ msgid "Activity updater URL." -+#~ msgstr "Fuente del paquete de la actividad" - +- -#: ../extensions/cpsection/accessibility/view.py:77 -msgid "Mouse Keys" -msgstr "Teclas del ratón" -+#~ msgid "Backup URL" -+#~ msgstr "URL de Respaldo" - +- -#: ../extensions/cpsection/accessibility/view.py:84 -msgid "Move the mouse pointer with keyboard number." -msgstr "Mover el puntero del ratón con un teclado numérico o con las teclas de juego." -+#~ msgid "" -+#~ "Color for the XO icon that is used throughout the desktop. The string is " -+#~ "composed of the stroke color and fill color, format is that of rbg " -+#~ "colors. Example: #AC32FF,#9A5200" -+#~ msgstr "" -+#~ "El color para el ícono del XO se utiliza en todo el escritorio. La cadena " -+#~ "está compuesta por el trazo y color de relleno de color, el formato es el " -+#~ "de colores RBG. Ejemplo: #AC32FF, #9A5200" - +- -#: ../extensions/cpsection/accessibility/view.py:90 -msgid "Sticky Keys" -msgstr "Teclas pegajosas" -+# es la mejor traduccion ? -+#~ msgid "Corner Delay" -+#~ msgstr "Retraso de las Esquinas" - +- -#: ../extensions/cpsection/accessibility/view.py:97 -msgid "Instead of having to press two keys at once (such as CTRL + Q), you can press one key at a time." -msgstr "En lugar de tener que pulsar dos teclas a la vez (por ejemplo, CTRL + Q), permite pulsar una tecla a la vez." -+#~ msgid "Delay for the activation of the frame using the corners." -+#~ msgstr "Retraso para la activación del cuadro utilizando las esquinas." - +- -#: ../extensions/cpsection/accessibility/view.py:104 -msgid "Bounce Keys" -msgstr "Teclas de rebote" -+#~ msgid "Delay for the activation of the frame using the edges." -+#~ msgstr "Retraso para la activación del cuadro utilizando los bordes." - +- -#: ../extensions/cpsection/accessibility/view.py:111 -msgid "Ignore rapid, repeated keypresses of the same key." -msgstr "Ignora la presión rápida y repetida de una tecla." -+# es la mejor traduccion ? -+#~ msgid "Edge Delay" -+#~ msgstr "Retraso del Borde" - +- -#: ../extensions/cpsection/accessibility/view.py:89 -msgid "Screen" -msgstr "Pantalla" -+#~ msgid "Favorites Layout" -+#~ msgstr "Diseño de favoritos" - +- -#: ../extensions/cpsection/accessibility/view.py:176 -msgid "Contrast" -msgstr "Contraste" -+#~ msgid "Favorites resume mode" -+#~ msgstr "Modo de reanudar favoritos" - +- -#: ../extensions/cpsection/accessibility/view.py:188 -msgid "Enables the color contrast of the graphic interface." -msgstr "Habilita el contraste de colores en la interfaz gráfica." -+#, fuzzy -+#~ msgid "Font dpi that is used throughout the desktop." -+#~ msgstr "Nombre de usuario que se utiliza en todo el escritorio." - +- -#: ../extensions/cpsection/accessibility/view.py:108 -msgid "Mouse" -msgstr "Ratón" -+#, fuzzy -+#~ msgid "Font face that is used throughout the desktop." -+#~ msgstr "Nombre de usuario que se utiliza en todo el escritorio." - +- -#: ../extensions/cpsection/accessibility/view.py:227 -msgid "White Mouse" -msgstr "Ratón blanco" -+#, fuzzy -+#~ msgid "Font size that is used throughout the desktop." -+#~ msgstr "Nombre de usuario que se utiliza en todo el escritorio." - +- -#: ../extensions/cpsection/accessibility/view.py:239 -msgid "Show the mouse cursor white." -msgstr "Mostrar el puntero del ratón blanco." -+#, fuzzy -+#~ msgid "GSM network APN" -+#~ msgstr "%s's red %s" - +- -#: ../extensions/cpsection/accessibility/view.py:247 -msgid "Acceleration: " -msgstr "Aceleración: " -+#, fuzzy -+#~ msgid "GSM network PIN" -+#~ msgstr "%s's red %s" - +- -#: ../extensions/cpsection/accessibility/view.py:263 -msgid "Controller acceleration mouse." -msgstr "Controla la aceleración del ratón." -+#, fuzzy -+#~ msgid "GSM network PUK" -+#~ msgstr "%s's red %s" - +- -#: ../extensions/cpsection/accessibility/view.py:241 -msgid "Capital letters" -msgstr "Letras mayúsculas" -+#~ msgid "" -+#~ "If TRUE, Sugar will make us searchable for the other users of the Jabber " -+#~ "server." -+#~ msgstr "" -+#~ "Si es TRUE, Azúcar habilitará que otros usuarios nos busquen en el " -+#~ "servidor Jabber." - +- -#: ../extensions/cpsection/accessibility/view.py:253 -msgid "Shows capital letters in the user interface." -msgstr "Muestra las letras en mayúsculas en la interfaz gráfica." -+#~ msgid "If TRUE, Sugar will show a \"Log out\" option." -+#~ msgstr "Si es TRUE, Azúcar mostrará una opción \"Terminar Sesión\"." - +- -#: ../src/jarabe/journal/processdialog.py:48 -msgid "Running" -msgstr "Corriendo" -+#, fuzzy -+#~ msgid "If TRUE, Sugar will show a \"Restart\" option." -+#~ msgstr "Si es TRUE, Azúcar mostrará una opción \"Terminar Sesión\"." - +- -#: ../src/jarabe/journal/processdialog.py:49 -msgid "Failed" -msgstr "Fracasado" -+#~ msgid "Jabber Server" -+#~ msgstr "Servidor Jabber" - +- -#: ../src/jarabe/journal/processdialog.py:50 -msgid "Finished" -msgstr "Finalizado" -+#~ msgid "Keyboard layouts" -+#~ msgstr "Distribuciones del teclado" - +- -#: ../src/jarabe/journal/processdialog.py:221 -msgid "Please wait, saving Journal content to" -msgstr "Espere por favor, guardando el contenido del Diario a" -+#~ msgid "Keyboard model" -+#~ msgstr "Modelo del teclado" - +- -#: ../src/jarabe/journal/processdialog.py:222 -msgid "Do not remove the storage device!" -msgstr "¡No quite el dispositivo de almacenamiento!" -+#~ msgid "Keyboard options" -+#~ msgstr "Opciones del teclado" - +- -#: ../src/jarabe/journal/processdialog.py:224 -msgid "The Journal content has been saved." -msgstr "El contenido del Diario se ha guardado." -+#~ msgid "Layout of the favorites view." -+#~ msgstr "Distribución de las actividades favoritas." - +- -#: ../src/jarabe/journal/processdialog.py:226 -msgid "Backup" -msgstr "Respaldar" -+#~ msgid "" -+#~ "List of keyboard layouts. Each entry should be in the form layout(variant)" -+#~ msgstr "" -+#~ "Lista de las distribuciones de teclado. Cada entrada debe ser en la forma " -+#~ "distribución(variante)" - +- -#: ../src/jarabe/journal/processdialog.py:228 -msgid "Journal content will be saved to" -msgstr "El contenido del Diario se guardará en" -+#~ msgid "List of keyboard options." -+#~ msgstr "Lista de las opciones del teclado." - +- -#: ../src/jarabe/journal/processdialog.py:239 -msgid "Please wait, restoring Journal content from" -msgstr "Espere por favor, restaurando el contenido del Diario desde" -+#~ msgid "Power Automatic" -+#~ msgstr "Manejo automática de energía" - +- -#: ../src/jarabe/journal/processdialog.py:242 -msgid "The Journal content has been restored." -msgstr "El contenido del Diario se ha restaurado." -+#~ msgid "Power Automatic." -+#~ msgstr "Manejo automática de energía." - +- -#: ../src/jarabe/journal/processdialog.py:244 -msgid "Restore" -msgstr "Restaurar" -+#~ msgid "Power Extreme" -+#~ msgstr "Manejo extremo de energía" - +- -#: ../src/jarabe/view/palettes.py:246 -msgid "Journal content will be restored from" -msgstr "El contenido del Diario será restaurado desde" -+#~ msgid "Power Extreme." -+#~ msgstr "Manejo extremo de energía." ++#~ msgid "Checking %s..." ++#~ msgstr "Probando %s..." -#: ../src/jarabe/journal/processdialog.py:247 -msgid "Warning:" -msgstr "Advertencia:" -+#~ msgid "Publish to Gadget" -+#~ msgstr "Publicar en Gadget" - +- -#: ../src/jarabe/journal/processdialog.py:247 -msgid "Current Journal content will be deleted!" -msgstr "¡El contenido actual del Diario será eliminado!" -+#~ msgid "Setting for muting the sound device." -+#~ msgstr "Configuración para silenciar el dispositivo de sonido." - +- -#: ../src/jarabe/view/palettes.py:280 -msgid "Restore Journal" -msgstr "Restaurar Diario" -+#~ msgid "Show Log out" -+#~ msgstr "Mostrar Terminar Sesión" - +- -#: ../src/jarabe/view/palettes.py:290 -msgid "Backup Journal" -msgstr "Respaldar Diario" -+#, fuzzy -+#~ msgid "Show Restart" -+#~ msgstr "Reiniciar" - +- -#: ../src/jarabe/view/palettes.py:307 -msgid "School Server" -msgstr "Servidor Escuela" -+#~ msgid "Sound Muted" -+#~ msgstr "Sonido silenciado" ++#~ msgid "Create new wireless network" ++#~ msgstr "Crear nueva red inalámbrica" -#: ../src/jarabe/view/palettes.py:201 -msgid "Repair" -msgstr "Reparar" -+#~ msgid "The keyboard model to be used" -+#~ msgstr "El modelo del teclado que se utilizará" - +- -#: ../src/jarabe/journal/processdialog.py:286 -msgid "Please wait, repair journal content" -msgstr "Espere por favor, reparando el contenido del Diario" -+#~ msgid "Timezone setting for the system." -+#~ msgstr "Configuración de zona horaria para el sistema." - +- -#: ../src/jarabe/journal/processdialog.py:288 -msgid "The journal content has been reindexed." -msgstr "El contenido del Diario se ha reindexado." -+#~ msgid "Url of the jabber server to use." -+#~ msgstr "URL del servidor de Jabber para usar." - +- -#: ../src/jarabe/journal/processdialog.py:292 -msgid "Journal content will be repaired" -msgstr "El contenido del Diario será reparado" -+#~ msgid "Url where the backup is saved to." -+#~ msgstr "URL donde se guarda el backup." ++#~ msgid "Title" ++#~ msgstr "Título" -#: ../bin/jorunal-reindex:32 -msgid "Reindex failed: %s" -msgstr "Falló al reindexar: %s" -+#~ msgid "User Color" -+#~ msgstr "Color del usuario" ++#~ msgid "Version" ++#~ msgstr "Versión" -#: ../bin/jorunal-reindex:35 -msgid "File does not exist." -msgstr "No existe el archivo." -+#~ msgid "User Name" -+#~ msgstr "Nombre de usuario" ++#~ msgid "Date" ++#~ msgstr "Fecha" -#: ../extensions/cpsection/accessibility/view.py:235 -msgid "Virtual keyboard" -msgstr "Teclado virtual" -+#~ msgid "User name that is used throughout the desktop." -+#~ msgstr "Nombre de usuario que se utiliza en todo el escritorio." ++#~ msgid "Reindex failed: %s" ++#~ msgstr "Falló al reindexar: %s" -#: ../extensions/cpsection/accessibility/view.py:247 -msgid "Show virtual keyboard on frame." -msgstr "Muestra el teclado virtual en el marco." -+#~ msgid "Volume Level" -+#~ msgstr "Nivel de volumen" -+ -+#~ msgid "Volume level for the sound device." -+#~ msgstr "Nivel de volumen para el dispositivo de sonido." -+ -+#~ msgid "" -+#~ "When in resume mode, clicking on a favorite icon will cause the last " -+#~ "entry for that activity to be resumed." -+#~ msgstr "" -+#~ "Cuando en el modo de retomar, al hacer clic en un icono de favoritos " -+#~ "causa que se retome la última entrada de esa actividad." -+ -+#~ msgid "Checking %s..." -+#~ msgstr "Probando %s..." -+ -+#~ msgid "Create new wireless network" -+#~ msgstr "Crear nueva red inalámbrica" -+ -+#~ msgid "Title" -+#~ msgstr "Título" -+ -+#~ msgid "Version" -+#~ msgstr "Versión" -+ -+#~ msgid "Date" -+#~ msgstr "Fecha" -+ -+#~ msgid "Reindex failed: %s" -+#~ msgstr "Falló al reindexar: %s" -+ +#~ msgid "File does not exist." +#~ msgstr "No existe el archivo." #~ msgid "Cannot obtain data needed for registration." #~ msgstr "No se puede obtener datos necesarios para el registro" -@@ -1449,13 +1906,12 @@ msgstr "Muestra el teclado virtual en el marco." +@@ -1449,13 +2161,12 @@ msgstr "Muestra el teclado virtual en el marco." #~ msgid "Unmount" #~ msgstr "Desmontar" @@ -2369,7 +2693,7 @@ index 16a132f..da3a3f4 100644 #~ msgid "Document" #~ msgstr "Documento" -@@ -1474,12 +1930,6 @@ msgstr "Muestra el teclado virtual en el marco." +@@ -1474,12 +2185,6 @@ msgstr "Muestra el teclado virtual en el marco." #~ msgid "Disconnecting..." #~ msgstr "Desconectando..." @@ -2382,7 +2706,7 @@ index 16a132f..da3a3f4 100644 #~ msgid "About my XO" #~ msgstr "Acerca de mi XO" -@@ -1508,7 +1958,6 @@ msgstr "Muestra el teclado virtual en el marco." +@@ -1508,7 +2213,6 @@ msgstr "Muestra el teclado virtual en el marco." #~ msgid "Settings" #~ msgstr "Configuración " @@ -2390,7 +2714,7 @@ index 16a132f..da3a3f4 100644 #~ msgid "Clipboard object: %s." #~ msgstr "Objeto de portapapel: %s." -@@ -1553,16 +2002,12 @@ msgstr "Muestra el teclado virtual en el marco." +@@ -1553,16 +2257,12 @@ msgstr "Muestra el teclado virtual en el marco." #~ msgstr "encendido" #~ msgid "Permission denied. You need to be root to run this method." @@ -2409,7 +2733,7 @@ index 16a132f..da3a3f4 100644 #~ msgid "Changing permission of timezone: %s" #~ msgstr "Cambiando permisos de zona horaria: %s" -@@ -1611,12 +2056,6 @@ msgstr "Muestra el teclado virtual en el marco." +@@ -1611,12 +2311,6 @@ msgstr "Muestra el teclado virtual en el marco." #~ msgid "Share with:" #~ msgstr "Compartir con:" @@ -2422,7 +2746,7 @@ index 16a132f..da3a3f4 100644 #~ msgid "Undo" #~ msgstr "Deshacer" -@@ -1626,43 +2065,18 @@ msgstr "Muestra el teclado virtual en el marco." +@@ -1626,43 +2320,18 @@ msgstr "Muestra el teclado virtual en el marco." #~ msgid "Paste" #~ msgstr "Pegar" @@ -2475,7 +2799,7 @@ index 16a132f..da3a3f4 100644 #~ msgid "Keep error" #~ msgstr "Error de guardado" -@@ -1682,55 +2096,42 @@ msgstr "Muestra el teclado virtual en el marco." +@@ -1682,55 +2351,42 @@ msgstr "Muestra el teclado virtual en el marco." #~ msgid "OK" #~ msgstr "OK" diff --git a/rpms/sugar/sugar-1-2-Enable-disable-personalized-and-anonymous-feedback-submits-unrelated.patch b/rpms/sugar/sugar-1-2-Enable-disable-personalized-and-anonymous-feedback-submits-unrelated.patch index 47b9dc4..6a2a399 100644 --- a/rpms/sugar/sugar-1-2-Enable-disable-personalized-and-anonymous-feedback-submits-unrelated.patch +++ b/rpms/sugar/sugar-1-2-Enable-disable-personalized-and-anonymous-feedback-submits-unrelated.patch @@ -64,7 +64,7 @@ index 880c9d1..7e4a923 100644 + <applyto>/desktop/sugar/feedback/anonymous_delay</applyto> + <owner>sugar</owner> + <type>int</type> -+ <default>60</default> ++ <default>0</default> + <locale name="C"> + <short>Delay in seconds to send anonymous reports automatically</short> + <long>Submit will not contain any information about submiter, only anonymous data (but see anonymous_with_sn). Setting value to 0 will disable automatic submiting.</long> @@ -79,7 +79,7 @@ index 880c9d1..7e4a923 100644 - <applyto>/desktop/sugar/feedback/auto_submit_delay</applyto> - <owner>sugar</owner> - <type>int</type> -- <default>60</default> +- <default>0</default> - <locale name="C"> - <short>Delay in seconds to send anonymous reports automatically</short> - <long>Setting value to 0 will disable automatic submiting.</long> diff --git a/rpms/sugar/sugar-2-2-Initial-client-implementation-for-feedback-feature.patch b/rpms/sugar/sugar-2-2-Initial-client-implementation-for-feedback-feature.patch index 1fbe756..f09ce0e 100644 --- a/rpms/sugar/sugar-2-2-Initial-client-implementation-for-feedback-feature.patch +++ b/rpms/sugar/sugar-2-2-Initial-client-implementation-for-feedback-feature.patch @@ -91,7 +91,7 @@ index a3817e9..880c9d1 100644 + <applyto>/desktop/sugar/feedback/auto_submit_delay</applyto> + <owner>sugar</owner> + <type>int</type> -+ <default>60</default> ++ <default>0</default> + <locale name="C"> + <short>Delay in seconds to send anonymous reports automatically</short> + <long>Setting value to 0 will disable automatic submiting.</long> diff --git a/rpms/sugar/sugar-More-robust-completed-activity-downloads.patch b/rpms/sugar/sugar-More-robust-completed-activity-downloads.patch new file mode 100644 index 0000000..b2db802 --- /dev/null +++ b/rpms/sugar/sugar-More-robust-completed-activity-downloads.patch @@ -0,0 +1,102 @@ +From patchwork Sat Feb 5 23:46:28 2011 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [sugar] More robust completed activity downloads +Date: Sun, 06 Feb 2011 04:46:28 -0000 +From: Aleksey Lim <alsroot@member.fsf.org> +X-Patchwork-Id: 630 +Message-Id: <1296949588-22694-1-git-send-email-alsroot@member.fsf.org> +To: dextrose@lists.sugarlabs.org + +Previous code relies on percent==1, that might happen in two cases, one for +regular progress event and one when completed download was detected. + +--- +extensions/cpsection/updater/model.py | 36 ++++++++++++++------------------ + 1 files changed, 16 insertions(+), 20 deletions(-) + +diff --git a/extensions/cpsection/updater/model.py b/extensions/cpsection/updater/model.py +index 059d112..ff2eb2c 100755 +--- a/extensions/cpsection/updater/model.py ++++ b/extensions/cpsection/updater/model.py +@@ -150,7 +150,7 @@ class UpdateModel(gobject.GObject): + + self._downloader = _Downloader(bundle_update) + self._downloader.connect('progress', self.__downloader_progress_cb) +- self._downloader.connect('error', self.__downloader_error_cb) ++ self._downloader.connect('finish', self.__downloader_finish_cb) + + def __downloader_progress_cb(self, downloader, progress): + logging.debug('__downloader_progress_cb %r', progress) +@@ -166,21 +166,20 @@ class UpdateModel(gobject.GObject): + self._downloader.bundle_update.bundle.get_name(), + current, total) + +- if progress == 1: +- self._install_update(self._downloader.bundle_update, +- self._downloader.get_local_file_path()) +- self._downloader = None +- +- def __downloader_error_cb(self, downloader, error_message): +- logging.error('Error downloading update:\n%s', error_message) +- ++ def __downloader_finish_cb(self, downloader, success): + if self._cancelling: + self._cancel_updating() + return + +- total = self._total_bundles_to_update +- current = total - len(self._bundles_to_update) +- self.emit('progress', UpdateModel.ACTION_UPDATING, '', current, total) ++ if success: ++ self._install_update(self._downloader.bundle_update, ++ self._downloader.get_local_file_path()) ++ else: ++ total = self._total_bundles_to_update ++ current = total - len(self._bundles_to_update) ++ self.emit('progress', UpdateModel.ACTION_UPDATING, '', current, total) ++ ++ self._downloader = None + + if self._bundles_to_update: + # do it in idle so the UI has a chance to refresh +@@ -212,10 +211,6 @@ class UpdateModel(gobject.GObject): + bundle_update.bundle.get_name(), + current + 0.5, total) + +- if self._bundles_to_update: +- # do it in idle so the UI has a chance to refresh +- gobject.idle_add(self._download_next_update) +- + def cancel(self): + self._cancelling = True + +@@ -261,9 +256,9 @@ class _Downloader(gobject.GObject): + 'progress': (gobject.SIGNAL_RUN_FIRST, + gobject.TYPE_NONE, + ([float])), +- 'error': (gobject.SIGNAL_RUN_FIRST, ++ 'finish': (gobject.SIGNAL_RUN_FIRST, + gobject.TYPE_NONE, +- ([str])), ++ ([bool])), + } + + def __init__(self, bundle_update): +@@ -290,7 +285,8 @@ class _Downloader(gobject.GObject): + try: + self._input_stream = self._input_file.read_finish(result) + except: +- self.emit('error', traceback.format_exc()) ++ logging.exception('Error downloading update') ++ self.emit('finish', False) + return + + temp_file_path = self._get_temp_file_path(self.bundle_update.link) +@@ -373,4 +369,4 @@ class _Downloader(gobject.GObject): + logging.debug('closing output stream') + self._output_stream.close() + +- self.emit('progress', 1.0) ++ self.emit('finish', True) diff --git a/rpms/sugar/sugar-Notify-on-not-sent-feedbacks-fix-issue-with-not-auto-resend.patch b/rpms/sugar/sugar-Notify-on-not-sent-feedbacks-fix-issue-with-not-auto-resend.patch new file mode 100644 index 0000000..eb93ccf --- /dev/null +++ b/rpms/sugar/sugar-Notify-on-not-sent-feedbacks-fix-issue-with-not-auto-resend.patch @@ -0,0 +1,115 @@ +From patchwork Sun Feb 6 10:52:50 2011 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [sugar] Notify on not sent feedbacks; fix issue with not auto resend +Date: Sun, 06 Feb 2011 15:52:50 -0000 +From: Aleksey Lim <alsroot@activitycentral.org> +X-Patchwork-Id: 634 +Message-Id: <1296989570-2997-1-git-send-email-alsroot@activitycentral.org> +To: dextrose@lists.sugarlabs.org + +--- + src/jarabe/model/feedback_collector.py | 32 ++++++++++++++++++++------------ + 1 files changed, 20 insertions(+), 12 deletions(-) + + +diff --git a/src/jarabe/model/feedback_collector.py b/src/jarabe/model/feedback_collector.py +index 4671437..43540a0 100644 +--- a/src/jarabe/model/feedback_collector.py ++++ b/src/jarabe/model/feedback_collector.py +@@ -25,12 +25,14 @@ from email.mime.multipart import MIMEMultipart + from email.mime.application import MIMEApplication + from email.generator import Generator + from email.encoders import encode_noop ++from gettext import gettext as _ + + import gconf + import gobject + import simplejson + + from sugar import logger, feedback, util ++from jarabe import frame + + + _reports = {} +@@ -47,7 +49,7 @@ def start(host, port, auto_submit_delay): + _port = port + + if auto_submit_delay > 0: +- gobject.timeout_add_seconds(auto_submit_delay, anonymous_submit) ++ gobject.timeout_add_seconds(auto_submit_delay, anonymous_submit, True) + + + def update(bundle_id, report, log_file): +@@ -86,24 +88,26 @@ def submit(message): + 'nick': nick, + 'jabber_server': jabber, + } +- _submit(data) ++ _submit(data, False) + + +-def anonymous_submit(): ++def anonymous_submit(implicit=False): + from jarabe.journal import misc + + data = {} + client = gconf.client_get_default() + if client.get_bool('/desktop/sugar/feedback/anonymous_with_sn'): + data['serial_number'] = misc.get_xo_serial() +- _submit(data) ++ _submit(data, implicit) ++ ++ return True + + +-def _submit(data=None): ++def _submit(data, implicit): + if data: + _reports.update(data) + if is_empty(): +- return True ++ return + + logging.debug('Sending feedback report: %r', _reports) + +@@ -126,16 +130,15 @@ def _submit(data=None): + + tar.close() + +- _SubmitThread(tar_file).run() +- +- return True ++ _SubmitThread(tar_file, implicit).run() + + + class _SubmitThread(threading.Thread): + +- def __init__(self, tar_file): ++ def __init__(self, tar_file, implicit): + threading.Thread.__init__(self) + self._tar_file = tar_file ++ self._implicit = implicit + + def run(self): + try: +@@ -151,11 +154,16 @@ class _SubmitThread(threading.Thread): + response = conn.getresponse() + + if response.status != 200: +- logging.error('Incorrect feedback submit: %s, %s', ++ raise Exception('Incorrect feedback submit: %s, %s', + response.status, response.read()) + + except Exception: +- logging.exception('Cannot submit feedback') ++ title = _('Cannot submit feedback') ++ msg = _('Feedback was not sent to %s:%s.') % (_host, _port) ++ if not self._implicit: ++ gobject.idle_add(lambda: ++ frame.get_view().add_message(summary=title, body=msg)) ++ logging.exception('%s: %s', title, msg) + finally: + os.unlink(self._tar_file) + self._tar_file = None diff --git a/rpms/sugar/sugar.spec b/rpms/sugar/sugar.spec index 0da94e5..5082e94 100644 --- a/rpms/sugar/sugar.spec +++ b/rpms/sugar/sugar.spec @@ -3,7 +3,7 @@ Summary: Constructionist learning platform Name: sugar Version: 0.88.1 -Release: 5.51dxo%{?dist} +Release: 5.52dxo%{?dist} URL: http://sugarlabs.org/ Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2 @@ -163,6 +163,12 @@ patch2602: sugar-2-2-Send-XO-serial-numbers-with-anonymous-reports.patch #Remove favourites-view|register via gconf patch2701: Show-register-gconf-value.patch +#activity microformat updater +patch2801: sugar-More-robust-completed-activity-downloads.patch + +#feedback feature fixes +patch2901: sugar-Notify-on-not-sent-feedbacks-fix-issue-with-not-auto-resend.patch + License: GPLv2+ Group: User Interface/Desktops Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -360,6 +366,10 @@ multiple instances of sugar. %patch2701 -p1 +%patch2801 -p1 + +%patch2901 -p1 + %build autoreconf %configure @@ -436,6 +446,10 @@ rm -rf %{buildroot} %{_datadir}/icons/hicolor/scalable/apps/sugar-xo.svg %changelog +* Tue Feb 10 2011 Anish Mangal <anish@sugarlabs.org> 0.88.1-5.52 +- More robust completed activity downloads +- Notify if feedback is not sent + * Thu Feb 3 2011 Anish Mangal <anish@sugarlabs.org> 0.88.1-5.51 - Remove register option from favourites view via GConf - Feedback related fixes (new gconf keys) |