Bump sugar version and integrate fixes

* Add lease information to 'Control Panel' -> 'About my Computer' * Add spanish translations and update POTFILES * Feedback feature: - All feedback reports for international build will be sent to jita.sugarlabs.org:8080 and be present in /srv/feedback/reports - Move the feedback icon from extreme right of frame. * Bump sugar version to sugar-0.88.1-5.50dxo.fc11.noarch
author: Anish Mangal <anish@sugarlabs.org> 2011-02-03 18:46:29 (GMT)
committer: Anish Mangal <anish@sugarlabs.org> 2011-02-03 18:46:29 (GMT)
commit: 8875e64fbc7915dcf7c7b9cfa0ba1ed501ce390f (patch)
tree: 018233b04c5fc7ac9cf985f29c3029c5959cb707
parent: d2b96196018d202ef41e0c5244cccf500704e6aa (diff)
6 files changed, 2636 insertions, 8 deletions
diff --git a/rpms/sugar/Add-lease-duration-information-in-about-my-computer.patch b/rpms/sugar/Add-lease-duration-information-in-about-my-computer.patch
new file mode 100644
index 0000000..3a02329
--- /dev/null
+++ b/rpms/sugar/Add-lease-duration-information-in-about-my-computer.patch
@@ -0,0 +1,75 @@
+From 18bc7c340b94f2bc723ceef96a99635f78227ca3 Mon Sep 17 00:00:00 2001
+From: Anish Mangal <anish@sugarlabs.org>
+Date: Thu, 20 Jan 2011 23:18:42 -0300
+Subject: [PATCH] Add lease duration information in about my computer
+Organization: Sugar Labs Foundation
+
+
+Signed-off-by: Anish Mangal <anish@sugarlabs.org>
+---
+ extensions/cpsection/aboutcomputer/model.py |   15 +++++++++++++++
+ extensions/cpsection/aboutcomputer/view.py  |   15 +++++++++++++++
+ 2 files changed, 30 insertions(+), 0 deletions(-)
+
+diff --git a/extensions/cpsection/aboutcomputer/model.py b/extensions/cpsection/aboutcomputer/model.py
+index 898d79c..1f6f69a 100644
+--- a/extensions/cpsection/aboutcomputer/model.py
++++ b/extensions/cpsection/aboutcomputer/model.py
+@@ -21,6 +21,7 @@ import re
+ import subprocess
+ from gettext import gettext as _
+ import errno
++from datetime import datetime
+ 
+ from jarabe import config
+ 
+@@ -35,6 +36,20 @@ def get_aboutcomputer():
+ def print_aboutcomputer():
+     print get_aboutcomputer()
+ 
++def get_lease_days():
++    lease_file = _read_file('/security/lease.sig')
++    if lease_file == None: 
++        return 'Information not available!'
++
++    encoded_date = str(str.split(lease_file)[3])
++    expiry_date = datetime.strptime(encoded_date
++            , '%Y%m%dT%H%M%SZ')
++    current_date = datetime.today()
++    days_remaining = (expiry_date - current_date).days
++    #TODO: gettext str_days_remaining
++    str_days_remaining = str(days_remaining) + ' days remaining'
++    return str_days_remaining
++
+ def get_serial_number():
+     serial_no = _read_file('/ofw/serial-number')
+     if serial_no is None:
+diff --git a/extensions/cpsection/aboutcomputer/view.py b/extensions/cpsection/aboutcomputer/view.py
+index dd4f8f3..f255792 100644
+--- a/extensions/cpsection/aboutcomputer/view.py
++++ b/extensions/cpsection/aboutcomputer/view.py
+@@ -80,6 +80,21 @@ class AboutComputer(SectionView):
+         vbox_identity.pack_start(box_identity, expand=False)
+         box_identity.show()
+
++        box_lease = gtk.HBox(spacing=style.DEFAULT_SPACING)
++        label_lease = gtk.Label(_('Lease: '))
++        label_lease.set_alignment(1, 0)
++        label_lease.modify_fg(gtk.STATE_NORMAL,
++                              style.COLOR_SELECTION_GREY.get_gdk_color())
++        box_lease.pack_start(label_lease, expand=False)
++        self._group.add_widget(label_lease)
++        label_lease.show()
++        label_lease_ver = gtk.Label(self._model.get_lease_days())
++        label_lease_ver.set_alignment(0, 0)
++        box_lease.pack_start(label_lease_ver, expand=False)
++        label_lease_ver.show()
++        vbox_identity.pack_start(box_lease, expand=False)
++        box_lease.show()
++
+         self._vbox.pack_start(vbox_identity, expand=False)
+         vbox_identity.show()
+ 
+-- 
+1.7.3.4
+
diff --git a/rpms/sugar/Add-spanish-translations-and-update-POTFILES.patch b/rpms/sugar/Add-spanish-translations-and-update-POTFILES.patch
new file mode 100644
index 0000000..91b84b3
--- /dev/null
+++ b/rpms/sugar/Add-spanish-translations-and-update-POTFILES.patch
@@ -0,0 +1,2536 @@
+From 25da7bc0d1c20f208342bdaa0c64022aacb80958 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.skip |    1 +
+ po/es.po         | 1685 +++++++++++++++++++++++++++++++++---------------------
+ 3 files changed, 1062 insertions(+), 647 deletions(-)
+
+diff --git a/po/POTFILES.in b/po/POTFILES.in
+index e9a7f1c..eef2c33 100644
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -1,9 +1,12 @@
+-extensions/cpsection/aboutme/__init__.py
+-extensions/cpsection/aboutme/model.py
+-extensions/cpsection/aboutme/view.py
++data/sugar.schemas.in
+ extensions/cpsection/aboutcomputer/__init__.py
+ extensions/cpsection/aboutcomputer/model.py
+ extensions/cpsection/aboutcomputer/view.py
++extensions/cpsection/aboutme/__init__.py
++extensions/cpsection/aboutme/model.py
++extensions/cpsection/aboutme/view.py
++extensions/cpsection/accessibility/__init__.py
++extensions/cpsection/accessibility/view.py
+ extensions/cpsection/datetime/__init__.py
+ extensions/cpsection/datetime/model.py
+ extensions/cpsection/datetime/view.py
+@@ -26,11 +29,15 @@ extensions/cpsection/power/view.py
+ extensions/cpsection/updater/__init__.py
+ extensions/cpsection/updater/view.py
+ extensions/deviceicon/battery.py
++extensions/deviceicon/feedback.py
+ extensions/deviceicon/network.py
++extensions/deviceicon/resources.py
+ extensions/deviceicon/speaker.py
++extensions/deviceicon/touchpad.py
++extensions/deviceicon/virtualkeyboard.py
+ extensions/deviceicon/volume.py
+ extensions/globalkey/screenshot.py
+-data/sugar.schemas.in
++extensions/globalkey/touchpad.py
+ src/jarabe/controlpanel/cmd.py
+ src/jarabe/controlpanel/gui.py
+ src/jarabe/controlpanel/sectionview.py
+@@ -39,6 +46,7 @@ src/jarabe/desktop/activitieslist.py
+ src/jarabe/desktop/favoriteslayout.py
+ src/jarabe/desktop/favoritesview.py
+ src/jarabe/desktop/homebox.py
++src/jarabe/desktop/homewindow.py
+ src/jarabe/desktop/keydialog.py
+ src/jarabe/desktop/meshbox.py
+ src/jarabe/desktop/schoolserver.py
+@@ -46,21 +54,26 @@ src/jarabe/frame/activitiestray.py
+ src/jarabe/frame/clipboardmenu.py
+ src/jarabe/frame/clipboardobject.py
+ src/jarabe/frame/devicestray.py
++src/jarabe/frame/eventarea.py
++src/jarabe/frame/notification.py
+ src/jarabe/frame/zoomtoolbar.py
+ src/jarabe/intro/window.py
+ src/jarabe/journal/detailview.py
+ src/jarabe/journal/expandedentry.py
+ src/jarabe/journal/journalactivity.py
+ src/jarabe/journal/journaltoolbox.py
++src/jarabe/journal/listmodel.py
+ src/jarabe/journal/listview.py
+ src/jarabe/journal/misc.py
+ src/jarabe/journal/modalalert.py
+ src/jarabe/journal/objectchooser.py
+ src/jarabe/journal/palettes.py
++src/jarabe/journal/processdialog.py
+ src/jarabe/journal/volumestoolbar.py
++src/jarabe/model/network.py
++src/jarabe/model/processmanagement.py
+ src/jarabe/view/buddymenu.py
+ src/jarabe/view/keyhandler.py
+ src/jarabe/view/launcher.py
+ src/jarabe/view/palettes.py
+ src/jarabe/view/viewsource.py
+-
+diff --git a/po/POTFILES.skip b/po/POTFILES.skip
+index f199f9c..0889e57 100644
+--- a/po/POTFILES.skip
++++ b/po/POTFILES.skip
+@@ -1 +1,2 @@
+ data/sugar.xml.in
++data/em.py
+diff --git a/po/es.po b/po/es.po
+index 16a132f..da3a3f4 100644
+--- a/po/es.po
++++ b/po/es.po
+@@ -6,64 +6,20 @@ 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"
+ "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"
+-"Language: es\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
++"Language: es\n"
+ "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+ "X-Generator: Pootle 2.0.1\n"
+ "X-Poedit-Language: Spanish\n"
+ "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"
++
++#: ../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:94
++msgid "Name:"
++msgstr "Nombre:"
++
++#: ../extensions/cpsection/aboutme/view.py:128
++msgid "Click to change your color:"
++msgstr "Clic para cambiar su color:"
++
++#: ../extensions/cpsection/accessibility/__init__.py:24
++msgid "Accessibility"
++msgstr "Accesibilidad"
++
++#: ../extensions/cpsection/accessibility/view.py:68
++#: ../extensions/cpsection/keyboard/__init__.py:21
++#: ../extensions/cpsection/keyboard/view.py:31
++msgid "Keyboard"
++msgstr "Teclado"
++
++#: ../extensions/cpsection/accessibility/view.py:90
++msgid "Screen"
++msgstr "Pantalla"
++
++#: ../extensions/cpsection/accessibility/view.py:110
++msgid "Mouse"
++msgstr "Ratón"
++
++#: ../extensions/cpsection/accessibility/view.py:195
++msgid "Mouse Keys"
++msgstr "Teclas del ratón"
++
++#: ../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."
++
++#: ../extensions/cpsection/accessibility/view.py:208
++msgid "Sticky Keys"
++msgstr "Teclas pegajosas"
++
++#: ../extensions/cpsection/accessibility/view.py:215
++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."
++
++#: ../extensions/cpsection/accessibility/view.py:222
++msgid "Bounce Keys"
++msgstr "Teclas de rebote"
++
++#: ../extensions/cpsection/accessibility/view.py:229
++msgid "Ignore rapid, repeated keypresses of the same key."
++msgstr "Ignora la presión rápida y repetida de una tecla."
++
++#: ../extensions/cpsection/accessibility/view.py:235
++msgid "Virtual keyboard"
++msgstr "Teclado virtual"
++
++#: ../extensions/cpsection/accessibility/view.py:247
++msgid "Show virtual keyboard on frame."
++msgstr "Muestra el teclado virtual en el marco."
++
++#: ../extensions/cpsection/accessibility/view.py:253
++msgid "Contrast"
++msgstr "Contraste"
++
++#: ../extensions/cpsection/accessibility/view.py:265
++msgid "Enables the color contrast of the graphic interface."
++msgstr "Habilita el contraste de colores en la interfaz gráfica."
++
++#: ../extensions/cpsection/accessibility/view.py:271
++msgid "Capital letters"
++msgstr "Letras mayúsculas"
++
++#: ../extensions/cpsection/accessibility/view.py:283
++msgid "Shows capital letters in the user interface."
++msgstr "Muestra las letras en mayúsculas en la interfaz gráfica."
++
++#: ../extensions/cpsection/accessibility/view.py:289
++msgid "White Mouse"
++msgstr "Ratón blanco"
++
++#: ../extensions/cpsection/accessibility/view.py:301
++msgid "Show the mouse cursor white."
++msgstr "Mostrar el puntero del ratón blanco."
++
++#: ../extensions/cpsection/accessibility/view.py:309
++msgid "Acceleration: "
++msgstr "Aceleración: "
++
++#: ../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"
+ 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 "Edge"
+ msgstr "Borde"
+ 
+-#: ../extensions/cpsection/keyboard/__init__.py:21
+-#: ../extensions/cpsection/keyboard/view.py:31
+-msgid "Keyboard"
+-msgstr "Teclado"
+-
+-#: ../extensions/cpsection/keyboard/view.py:187
++#: ../extensions/cpsection/keyboard/view.py:189
+ msgid "Keyboard Model"
+ msgstr "Modelo de teclado"
+ 
+-#: ../extensions/cpsection/keyboard/view.py:243
++#: ../extensions/cpsection/keyboard/view.py:248
+ msgid "Key(s) to change layout"
+ msgstr "Tecla(s) para cambiar el diseño"
+ 
+-#: ../extensions/cpsection/keyboard/view.py:311
++#: ../extensions/cpsection/keyboard/view.py:318
+ msgid "Keyboard Layout(s)"
+ msgstr "Diseño(s) de teclado"
+ 
+@@ -191,7 +273,7 @@ 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."
+ 
+ #: ../extensions/cpsection/language/model.py:124
+@@ -212,20 +294,56 @@ msgstr ""
+ "Añade idiomas en el orden que prefieres. Si una traducción no se encuentra "
+ "disponible, se usará la siguiente en la lista."
+ 
++#: ../extensions/cpsection/modemconfiguration/__init__.py:21
++msgid "Modem Configuration"
++msgstr "Configuración del módem"
++
++#: ../extensions/cpsection/modemconfiguration/view.py:91
++msgid "Username:"
++msgstr "Nombre de usuario:"
++
++#: ../extensions/cpsection/modemconfiguration/view.py:102
++msgid "Password:"
++msgstr "Contraseña:"
++
++#: ../extensions/cpsection/modemconfiguration/view.py:113
++msgid "Number:"
++msgstr "Número:"
++
++#: ../extensions/cpsection/modemconfiguration/view.py:124
++msgid "Access Point Name (APN):"
++msgstr "Nombre del Punto de Acceso (APN):"
++
++#: ../extensions/cpsection/modemconfiguration/view.py:135
++msgid "Personal Identity Number (PIN):"
++msgstr "Número de Identidad Personal (PIN):"
++
++#: ../extensions/cpsection/modemconfiguration/view.py:146
++msgid "Personal Unblocking Key (PUK):"
++msgstr "Clave de desbloqueo personal (PUK):"
++
++#: ../extensions/cpsection/modemconfiguration/view.py:167
++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)"
++
+ #: ../extensions/cpsection/network/__init__.py:21
+ #: ../extensions/cpsection/network/view.py:28
+ msgid "Network"
+ msgstr "Red"
+ 
+-#: ../extensions/cpsection/network/model.py:79
++#: ../extensions/cpsection/network/model.py:80
+ msgid "State is unknown."
+ msgstr "Estado desconocido."
+ 
+-#: ../extensions/cpsection/network/model.py:105
++#: ../extensions/cpsection/network/model.py:106
+ msgid "Error in specified radio argument use on/off."
+ msgstr "Error en argumento especificado de radio use on/off."
+ 
+-#: ../extensions/cpsection/network/model.py:137
++#: ../extensions/cpsection/network/model.py:141
+ 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"
+ msgid "Discard network history"
+ msgstr "Descarte historial de la red"
+ 
+-#: ../extensions/cpsection/network/view.py:118
++#: ../extensions/cpsection/network/view.py:120
+ msgid "Collaboration"
+ msgstr "Colaboración"
+ 
+-#: ../extensions/cpsection/network/view.py:126
++#: ../extensions/cpsection/network/view.py:128
+ 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 ""
+ "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."
+ 
+-#: ../extensions/cpsection/network/view.py:136
++#: ../extensions/cpsection/network/view.py:138
+ msgid "Server:"
+ msgstr "Servidor:"
+ 
+@@ -270,11 +388,11 @@ msgstr "Servidor:"
+ msgid "Power"
+ msgstr "Energía"
+ 
+-#: ../extensions/cpsection/power/model.py:54
++#: ../extensions/cpsection/power/model.py:85
+ msgid "Error in automatic pm argument, use on/off."
+ msgstr "Error en argumento automático de pm, use on/off."
+ 
+-#: ../extensions/cpsection/power/model.py:81
++#: ../extensions/cpsection/power/model.py:112
+ msgid "Error in extreme pm argument, use on/off."
+ msgstr "Error en argumento extremo de pm, use on/off."
+ 
+@@ -298,7 +416,7 @@ msgstr ""
+ msgid "Software update"
+ msgstr "Actualización de Software"
+ 
+-#: ../extensions/cpsection/updater/view.py:62
++#: ../extensions/cpsection/updater/view.py:63
+ msgid ""
+ "Software updates correct errors, eliminate security vulnerabilities, and "
+ "provide new features."
+@@ -306,79 +424,80 @@ msgstr ""
+ "Las actualizaciones de software corrigen errores, eliminan vulnerabilidades "
+ "de seguridad y proveen nuevas características."
+ 
+-#: ../extensions/cpsection/updater/view.py:122
++#: ../extensions/cpsection/updater/view.py:125
+ #, python-format
+-msgid "Checking %s..."
+-msgstr "Probando %s..."
++msgid "%s..."
++msgstr "%s..."
+ 
+-#: ../extensions/cpsection/updater/view.py:124
++#: ../extensions/cpsection/updater/view.py:127
+ #, python-format
+ msgid "Downloading %s..."
+ msgstr "Descargando %s..."
+ 
+-#: ../extensions/cpsection/updater/view.py:126
++#: ../extensions/cpsection/updater/view.py:129
+ #, python-format
+ msgid "Updating %s..."
+ msgstr "Actualizando %s..."
+ 
+-#: ../extensions/cpsection/updater/view.py:135
++#: ../extensions/cpsection/updater/view.py:139
+ msgid "Your software is up-to-date"
+ msgstr "Tu software esta actualizado"
+ 
+-#: ../extensions/cpsection/updater/view.py:137
++#: ../extensions/cpsection/updater/view.py:141
+ #, python-format
+ msgid "You can install %s update"
+ msgid_plural "You can install %s updates"
+ msgstr[0] "Puedes instalar %s actualización"
+ msgstr[1] "Puedes instalar %s actualizaciones"
+ 
+-#: ../extensions/cpsection/updater/view.py:155
++#: ../extensions/cpsection/updater/view.py:159
+ msgid "Checking for updates..."
+ msgstr "Buscando actualizaciones..."
+ 
+-#: ../extensions/cpsection/updater/view.py:160
++#: ../extensions/cpsection/updater/view.py:164
+ msgid "Installing updates..."
+ msgstr "Instalando actualizaciones..."
+ 
+-#: ../extensions/cpsection/updater/view.py:165
++#: ../extensions/cpsection/updater/view.py:172
+ #, python-format
+ msgid "%s update was installed"
+ msgid_plural "%s updates were installed"
+ msgstr[0] "%s actualización fue instalada"
+ msgstr[1] "%s actualizaciones fueron instaladas"
+ 
+-#: ../extensions/cpsection/updater/view.py:244
++#: ../extensions/cpsection/updater/view.py:253
+ msgid "Install selected"
+ msgstr "Instalación seleccionada"
+ 
+-#: ../extensions/cpsection/updater/view.py:265
++#: ../extensions/cpsection/updater/view.py:274
+ #, python-format
+ msgid "Download size: %s"
+ msgstr "Tamaño de descarga: %s"
+ 
+-#: ../extensions/cpsection/updater/view.py:353
++#: ../extensions/cpsection/updater/view.py:363
+ #, python-format
+ 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)"
++
++#: ../extensions/cpsection/updater/view.py:388
+ msgid "None"
+ msgstr "Ninguno"
+ 
+-#. 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'
+-#: ../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'
+-#: ../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"
+ msgid "Charged"
+ msgstr "Cargada"
+ 
+-#: ../extensions/deviceicon/network.py:44
++#: ../extensions/deviceicon/feedback.py:48
++msgid "Feedback"
++msgstr "Comentarios"
++
++#: ../extensions/deviceicon/feedback.py:62
++msgid "Personalized submit..."
++msgstr "Personalizar el envío..."
++
++#: ../extensions/deviceicon/feedback.py:68
++msgid "Anonymous submit"
++msgstr "Enviar anónimamente"
++
++#: ../extensions/deviceicon/feedback.py:115
++msgid "Submit feedback with contact infromation"
++msgstr "Enviar comentarios con información de contacto"
++
++#: ../extensions/deviceicon/feedback.py:120
++msgid "Submit"
++msgstr "Enviar"
++
++#: ../extensions/deviceicon/feedback.py:124
++#: ../extensions/deviceicon/network.py:309
++#: ../src/jarabe/controlpanel/toolbar.py:115
++#: ../src/jarabe/desktop/homebox.py:68
++#: ../src/jarabe/frame/activitiestray.py:710
++#: ../src/jarabe/frame/activitiestray.py:809
++#: ../src/jarabe/frame/activitiestray.py:837
++msgid "Cancel"
++msgstr "Cancelar"
++
++#: ../extensions/deviceicon/network.py:54
+ #, python-format
+ msgid "IP address: %s"
+ msgstr "Direccion IP: %s"
+@@ -417,42 +566,130 @@ 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
+-#: ../extensions/deviceicon/network.py:110
++#: ../extensions/deviceicon/network.py:115
+ msgid "Disconnect..."
+-msgstr "Desconectando..."
+-
+-#: ../extensions/deviceicon/network.py:114
+-msgid "Create new wireless network"
+-msgstr "Crear nueva red inalámbrica"
++msgstr "Desconectar"
+ 
+-#: ../extensions/deviceicon/network.py:120
+-#: ../src/jarabe/desktop/meshbox.py:264
++#: ../extensions/deviceicon/network.py:122
++#: ../extensions/deviceicon/network.py:310
++#: ../src/jarabe/desktop/meshbox.py:246 ../src/jarabe/desktop/meshbox.py:572
++#: ../src/jarabe/desktop/meshbox.py:699
+ msgid "Connecting..."
+ msgstr "Conectando..."
+ 
+ # TODO: show the channel number
+-#: ../extensions/deviceicon/network.py:124
+-#: ../extensions/deviceicon/network.py:186
+-#: ../src/jarabe/desktop/meshbox.py:270
++#: ../extensions/deviceicon/network.py:126
++#: ../extensions/deviceicon/network.py:192
++#: ../src/jarabe/desktop/meshbox.py:252 ../src/jarabe/desktop/meshbox.py:578
++#: ../src/jarabe/desktop/meshbox.py:705
+ msgid "Connected"
+ msgstr "Conectado"
+ 
+-#: ../extensions/deviceicon/network.py:146
++#: ../extensions/deviceicon/network.py:152
+ msgid "Channel"
+ msgstr "Canal"
+ 
+-#: ../extensions/deviceicon/network.py:161
++#: ../extensions/deviceicon/network.py:167
+ msgid "Wired Network"
+ msgstr "Red Cableada"
+ 
+-#: ../extensions/deviceicon/network.py:189
++#: ../extensions/deviceicon/network.py:195
+ msgid "Speed"
+ msgstr "Velocidad"
+ 
+-#: ../extensions/deviceicon/network.py:415
++#: ../extensions/deviceicon/network.py:227
++msgid "Wireless modem"
++msgstr "Módem Inalámbrico"
++
++#: ../extensions/deviceicon/network.py:298
++#: ../extensions/deviceicon/network.py:399
++msgid "Please wait..."
++msgstr "Por favor espere..."
++
++#: ../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/deviceicon/network.py:303
++msgid "Disconnected"
++msgstr "Desconectado"
++
++#: ../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
+ #, python-format
+ 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 ""
+-"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 ""
+-"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:3
+-msgid "Corner Delay"
+-msgstr "Retraso de las Esquinas"
+-
+-#: ../data/sugar.schemas.in.h:4
+-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:5
+-msgid "Delay for the activation of the frame using the edges."
+-msgstr "Retraso para la activación del cuadro utilizando los bordes."
+-
+-# es la mejor traduccion ?
+-#: ../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"
+ 
+-#: ../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"
+ 
+-#: ../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"
+ 
+-#: ../data/sugar.schemas.in.h:9
+-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:10
+-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:11
+-msgid "Jabber Server"
+-msgstr "Servidor Jabber"
+-
+-#: ../data/sugar.schemas.in.h:12
+-msgid "Keyboard layouts"
+-msgstr "Distribuciones del teclado"
+-
+-#: ../data/sugar.schemas.in.h:13
+-msgid "Keyboard model"
+-msgstr "Modelo del teclado"
+-
+-#: ../data/sugar.schemas.in.h:14
+-msgid "Keyboard options"
+-msgstr "Opciones del teclado"
+-
+-#: ../data/sugar.schemas.in.h:15
+-msgid "Layout of the favorites view."
+-msgstr "Distribución de las actividades favoritas."
+-
+-#: ../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)"
+-
+-#: ../data/sugar.schemas.in.h:17
+-msgid "List of keyboard options."
+-msgstr "Lista de las opciones del teclado."
+-
+-#: ../data/sugar.schemas.in.h:18
+-msgid "Power Automatic"
+-msgstr "Manejo automática de energía"
+-
+-#: ../data/sugar.schemas.in.h:19
+-msgid "Power Automatic."
+-msgstr "Manejo automática de energía."
+-
+-#: ../data/sugar.schemas.in.h:20
+-msgid "Power Extreme"
+-msgstr "Manejo extremo de energía"
+-
+-#: ../data/sugar.schemas.in.h:21
+-msgid "Power Extreme."
+-msgstr "Manejo extremo de energía."
+-
+-#: ../data/sugar.schemas.in.h:22
+-msgid "Publish to Gadget"
+-msgstr "Publicar en Gadget"
+-
+-#: ../data/sugar.schemas.in.h:23
+-msgid "Setting for muting the sound device."
+-msgstr "Configuración para silenciar el dispositivo de sonido."
+-
+-#: ../data/sugar.schemas.in.h:24
+-msgid "Show Log out"
+-msgstr "Mostrar Terminar Sesión"
+-
+-#: ../data/sugar.schemas.in.h:25
+-msgid "Sound Muted"
+-msgstr "Sonido silenciado"
+-
+-#: ../data/sugar.schemas.in.h:26
+-msgid "The keyboard model to be used"
+-msgstr "El modelo del teclado que se utilizará"
+-
+-#: ../data/sugar.schemas.in.h:28
+-msgid "Timezone setting for the system."
+-msgstr "Configuración de zona horaria para el sistema."
+-
+-#: ../data/sugar.schemas.in.h:29
+-msgid "Url of the jabber server to use."
+-msgstr "URL del servidor de Jabber para usar."
+-
+-#: ../data/sugar.schemas.in.h:30
+-msgid "Url where the backup is saved to."
+-msgstr "URL donde se guarda el backup."
+-
+-#: ../data/sugar.schemas.in.h:31
+-msgid "User Color"
+-msgstr "Color del usuario"
+-
+-#: ../data/sugar.schemas.in.h:32
+-msgid "User Name"
+-msgstr "Nombre de usuario"
+-
+-#: ../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."
+-
+-#: ../data/sugar.schemas.in.h:34
+-msgid "Volume Level"
+-msgstr "Nivel de volumen"
+-
+-#: ../data/sugar.schemas.in.h:35
+-msgid "Volume level for the sound device."
+-msgstr "Nivel de volumen para el dispositivo de sonido."
+-
+-#: ../data/sugar.schemas.in.h:36
+-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."
+-
+-#: ../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 ""
+ 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/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/sectionview.py:42
+ msgid "Changes require restart"
+ msgstr "Los cambios requieren reiniciar"
+ 
+-#: ../src/jarabe/controlpanel/gui.py:284
++#: ../src/jarabe/controlpanel/gui.py:296
+ 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
+ msgid "Later"
+ msgstr "Después"
+ 
+-#: ../src/jarabe/controlpanel/gui.py:293
++#: ../src/jarabe/controlpanel/gui.py:305
+ msgid "Restart now"
+ msgstr "Reiniciar ahora"
+ 
+-#: ../src/jarabe/controlpanel/toolbar.py:61 ../src/jarabe/intro/window.py:188
++#: ../src/jarabe/controlpanel/toolbar.py:61 ../src/jarabe/intro/window.py:207
+ msgid "Done"
+ msgstr "Hecho"
+ 
+-#: ../src/jarabe/controlpanel/toolbar.py:115
+-#: ../src/jarabe/desktop/homebox.py:68
+-#: ../src/jarabe/frame/activitiestray.py:726
+-#: ../src/jarabe/frame/activitiestray.py:822
+-#: ../src/jarabe/frame/activitiestray.py:850
+-msgid "Cancel"
+-msgstr "Cancelar"
+-
+ #: ../src/jarabe/controlpanel/toolbar.py:121
+-#: ../src/jarabe/desktop/favoritesview.py:332
++#: ../src/jarabe/desktop/favoritesview.py:336
+ msgid "Ok"
+ msgstr "Ok"
+ 
+-#: ../src/jarabe/desktop/activitieslist.py:80
+-#: ../src/jarabe/journal/listview.py:147
+-msgid "Title"
+-msgstr "Título"
+-
+-#: ../src/jarabe/desktop/activitieslist.py:91
+-msgid "Version"
+-msgstr "Versión"
+-
+-#: ../src/jarabe/desktop/activitieslist.py:105
+-#: ../src/jarabe/journal/listview.py:178
+-msgid "Date"
+-msgstr "Fecha"
+-
+-#: ../src/jarabe/desktop/activitieslist.py:234
++#: ../src/jarabe/desktop/activitieslist.py:238
+ #, python-format
+ msgid "Version %s"
+ msgstr "Versión %s"
+ 
+-#: ../src/jarabe/desktop/activitieslist.py:355
++#: ../src/jarabe/desktop/activitieslist.py:359
+ msgid "Confirm erase"
+ msgstr "Confirmar borrado"
+ 
+-#: ../src/jarabe/desktop/activitieslist.py:357
++#: ../src/jarabe/desktop/activitieslist.py:361
+ #, 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?"
+ # TODO: Implement stopping downloads
+ # self._stop_item.connect('activate', self._stop_item_activate_cb)
+ # self.append_menu_item(self._stop_item)
+-#: ../src/jarabe/desktop/activitieslist.py:361
+-#: ../src/jarabe/frame/clipboardmenu.py:62
++#: ../src/jarabe/desktop/activitieslist.py:365
++#: ../src/jarabe/frame/clipboardmenu.py:63
+ #: ../src/jarabe/view/viewsource.py:218
+ msgid "Keep"
+ msgstr "Guardar"
+ 
+-#: ../src/jarabe/desktop/activitieslist.py:364
+-#: ../src/jarabe/desktop/activitieslist.py:407
+-#: ../src/jarabe/journal/journaltoolbox.py:360
+-#: ../src/jarabe/journal/palettes.py:112
++#: ../src/jarabe/desktop/activitieslist.py:368
++#: ../src/jarabe/desktop/activitieslist.py:412
++#: ../src/jarabe/journal/journaltoolbox.py:387
++#: ../src/jarabe/journal/palettes.py:114
+ msgid "Erase"
+ msgstr "Borrar"
+ 
+-#: ../src/jarabe/desktop/activitieslist.py:428
++#: ../src/jarabe/desktop/activitieslist.py:433
+ msgid "Remove favorite"
+ msgstr "Remover favorito"
+ 
+-#: ../src/jarabe/desktop/activitieslist.py:432
++#: ../src/jarabe/desktop/activitieslist.py:437
+ 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
+ msgid "Triangle"
+ msgstr "Triángulo"
+ 
+-#: ../src/jarabe/desktop/favoritesview.py:323
++#: ../src/jarabe/desktop/favoritesview.py:326
+ msgid "Registration Failed"
+ msgstr "Registro fallido"
+ 
+-#: ../src/jarabe/desktop/favoritesview.py:324
++#: ../src/jarabe/desktop/favoritesview.py:327
+ #, python-format
+ msgid "%s"
+ msgstr "%s"
+ 
+-#: ../src/jarabe/desktop/favoritesview.py:326
++#: ../src/jarabe/desktop/favoritesview.py:329
+ msgid "Registration Successful"
+ msgstr "Registro exitoso"
+ 
+-#: ../src/jarabe/desktop/favoritesview.py:327
++#: ../src/jarabe/desktop/favoritesview.py:330
+ msgid "You are now registered with your school server."
+ msgstr "Ahora estás registrado en el servidor de colegio."
+ 
+-#: ../src/jarabe/desktop/favoritesview.py:671
++#: ../src/jarabe/desktop/favoritesview.py:636
+ msgid "Register"
+ msgstr "Registro"
+ 
++#: ../src/jarabe/desktop/favoritesview.py:638
++#: ../src/jarabe/desktop/favoritesview.py:654
++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"
+ msgstr "Pruebe ahora"
+ 
+ #: ../src/jarabe/desktop/homebox.py:192
++#: ../src/jarabe/journal/journaltoolbox.py:522
+ msgid "List view"
+ msgstr "Vista en lista"
+ 
+@@ -876,113 +962,121 @@ msgstr "Vista de favoritos"
+ msgid "<Ctrl>1"
+ msgstr "<Ctrl>1"
+ 
++#: ../src/jarabe/desktop/homewindow.py:96
++msgid "System alert"
++msgstr "Alerta de sistema"
++
++#: ../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."
++
++#: ../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."
++
+ # This is an encryption key type, not a keyboard key
+-#: ../src/jarabe/desktop/keydialog.py:131
++#: ../src/jarabe/desktop/keydialog.py:135
+ msgid "Key Type:"
+ msgstr "Tipo de clave:"
+ 
+-#: ../src/jarabe/desktop/keydialog.py:151
++#: ../src/jarabe/desktop/keydialog.py:155
+ msgid "Authentication Type:"
+ msgstr "Tipo de autenticación:"
+ 
+-#: ../src/jarabe/desktop/keydialog.py:215
++#: ../src/jarabe/desktop/keydialog.py:220
+ msgid "WPA & WPA2 Personal"
+ msgstr "WPA y WPA2 Personal"
+ 
+-#: ../src/jarabe/desktop/keydialog.py:224
++#: ../src/jarabe/desktop/keydialog.py:229
+ msgid "Wireless Security:"
+ msgstr "Seguridad inalámbrica:"
+ 
+-#: ../src/jarabe/desktop/meshbox.py:136
+-msgid "Connect"
+-msgstr "Conectar"
++#: ../src/jarabe/desktop/meshbox.py:523
++#, python-format
++msgid "Ad-hoc Network %d"
++msgstr "Red Ad-hoc %d"
+ 
+-#: ../src/jarabe/desktop/meshbox.py:140
+-msgid "Disconnect"
+-msgstr "Desconectar"
++#: ../src/jarabe/desktop/meshbox.py:654
++#, python-format
++msgid "Mesh Network %d"
++msgstr "Red Malla %d"
+ 
+ # 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
+-#: ../src/jarabe/journal/palettes.py:72 ../src/jarabe/view/palettes.py:64
++#: ../src/jarabe/desktop/meshbox.py:793
++#: ../src/jarabe/frame/activitiestray.py:745
++#: ../src/jarabe/journal/journaltoolbox.py:481
++#: ../src/jarabe/journal/palettes.py:67 ../src/jarabe/view/palettes.py:82
+ msgid "Resume"
+ msgstr "Retomar"
+ 
+-#: ../src/jarabe/desktop/meshbox.py:471
+-#: ../src/jarabe/frame/activitiestray.py:235
++#: ../src/jarabe/desktop/meshbox.py:798
++#: ../src/jarabe/frame/activitiestray.py:242
+ msgid "Join"
+ msgstr "Unirse"
+ 
+-#: ../src/jarabe/desktop/schoolserver.py:103
++#: ../src/jarabe/desktop/schoolserver.py:104
+ msgid "Cannot connect to the server."
+ msgstr "No se puede conectar al servidor."
+ 
+-#: ../src/jarabe/desktop/schoolserver.py:108
++#: ../src/jarabe/desktop/schoolserver.py:109
+ msgid "The server could not complete the request."
+ msgstr "El servidor no pudo completar el pedido."
+ 
+-#: ../src/jarabe/frame/activitiestray.py:240
+-#: ../src/jarabe/frame/activitiestray.py:698
++#: ../src/jarabe/frame/activitiestray.py:247
++#: ../src/jarabe/frame/activitiestray.py:682
+ msgid "Decline"
+ msgstr "Rechazar"
+ 
+-#: ../src/jarabe/frame/activitiestray.py:650
++#: ../src/jarabe/frame/activitiestray.py:634
+ #, python-format
+ msgid "%dB"
+ msgstr "%dB"
+ 
+-#: ../src/jarabe/frame/activitiestray.py:652
++#: ../src/jarabe/frame/activitiestray.py:636
+ #, python-format
+ msgid "%dKB"
+ msgstr "%dKB"
+ 
+-#: ../src/jarabe/frame/activitiestray.py:654
++#: ../src/jarabe/frame/activitiestray.py:638
+ #, python-format
+ msgid "%dMB"
+ msgstr "%dMB"
+ 
+-#: ../src/jarabe/frame/activitiestray.py:671
++#: ../src/jarabe/frame/activitiestray.py:655
+ #, python-format
+ msgid "%s of %s"
+ msgstr "%s de %s"
+ 
+-#: ../src/jarabe/frame/activitiestray.py:683
++#: ../src/jarabe/frame/activitiestray.py:667
+ #, python-format
+ msgid "Transfer from %r"
+ msgstr "Transferencia desde %r"
+ 
+-#: ../src/jarabe/frame/activitiestray.py:693
++#: ../src/jarabe/frame/activitiestray.py:677
+ msgid "Accept"
+ msgstr "Aceptar"
+ 
+-#: ../src/jarabe/frame/activitiestray.py:716
+-#: ../src/jarabe/frame/activitiestray.py:840
++#: ../src/jarabe/frame/activitiestray.py:700
++#: ../src/jarabe/frame/activitiestray.py:827
+ #, python-format
+ msgid "%s (%s)"
+ msgstr "%s (%s)"
+ 
+-#: ../src/jarabe/frame/activitiestray.py:750
+-#: ../src/jarabe/frame/activitiestray.py:875
++#: ../src/jarabe/frame/activitiestray.py:734
++#: ../src/jarabe/frame/activitiestray.py:862
+ msgid "Dismiss"
+ msgstr "Descartar"
+ 
+-#: ../src/jarabe/frame/activitiestray.py:810
++#: ../src/jarabe/frame/activitiestray.py:797
+ #, python-format
+ msgid "Transfer to %r"
+ msgstr "Transferencia a %r"
+ 
+-#: ../src/jarabe/frame/clipboardmenu.py:52 ../src/jarabe/view/palettes.py:218
++#: ../src/jarabe/frame/clipboardmenu.py:53 ../src/jarabe/view/palettes.py:253
+ msgid "Remove"
+ msgstr "Quitar"
+ 
+-#: ../src/jarabe/frame/clipboardmenu.py:57
+-#: ../src/jarabe/frame/clipboardmenu.py:80
+-msgid "Open"
+-msgstr "Abrir"
+-
+-#: ../src/jarabe/frame/clipboardmenu.py:85
++#: ../src/jarabe/frame/clipboardmenu.py:86
+ msgid "Open with"
+ msgstr "Abrir con"
+ 
+@@ -991,6 +1085,10 @@ msgstr "Abrir con"
+ msgid "%s clipping"
+ msgstr "recorte de %s"
+ 
++#: ../src/jarabe/frame/notification.py:175
++msgid "Clear history"
++msgstr "Limpiar Historial"
++
+ #: ../src/jarabe/frame/zoomtoolbar.py:37
+ msgid "Neighborhood"
+ msgstr "Vecindario"
+@@ -1011,150 +1109,206 @@ msgstr "F3"
+ msgid "F4"
+ msgstr "F4"
+ 
+-#: ../src/jarabe/intro/window.py:124
++#: ../src/jarabe/intro/window.py:129
+ msgid "Click to change color:"
+ msgstr "Clic para cambiar de color:"
+ 
+-#: ../src/jarabe/intro/window.py:174 ../src/jarabe/journal/detailview.py:103
++#: ../src/jarabe/intro/window.py:193 ../src/jarabe/journal/detailview.py:103
+ msgid "Back"
+ msgstr "Atrás"
+ 
+-#: ../src/jarabe/intro/window.py:191
++#: ../src/jarabe/intro/window.py:210
+ msgid "Next"
+ msgstr "Siguiente"
+ 
+-#: ../src/jarabe/journal/expandedentry.py:164
+-#: ../src/jarabe/journal/palettes.py:66
++#: ../src/jarabe/journal/expandedentry.py:151
++#: ../src/jarabe/journal/listmodel.py:147 ../src/jarabe/journal/palettes.py:60
+ msgid "Untitled"
+ msgstr "Sin título"
+ 
+-#: ../src/jarabe/journal/expandedentry.py:210
++#: ../src/jarabe/journal/expandedentry.py:242
+ msgid "No preview"
+ msgstr "Sin vista previa"
+ 
+-#: ../src/jarabe/journal/expandedentry.py:229
++#: ../src/jarabe/journal/expandedentry.py:261
+ #, python-format
+ msgid "Kind: %s"
+ msgstr "Tipo: %s"
+ 
+-#: ../src/jarabe/journal/expandedentry.py:229
++#: ../src/jarabe/journal/expandedentry.py:261
++#: ../src/jarabe/journal/listmodel.py:153
+ msgid "Unknown"
+ msgstr "Desconocido"
+ 
+-#: ../src/jarabe/journal/expandedentry.py:230
++#: ../src/jarabe/journal/expandedentry.py:262
+ #, python-format
+ msgid "Date: %s"
+ msgstr "Fecha: %s"
+ 
+-#: ../src/jarabe/journal/expandedentry.py:231
++#: ../src/jarabe/journal/expandedentry.py:263
+ #, python-format
+ msgid "Size: %s"
+ msgstr "Tamaño: %s"
+ 
+-#: ../src/jarabe/journal/expandedentry.py:253 ../src/jarabe/journal/misc.py:92
++#: ../src/jarabe/journal/expandedentry.py:291
++#: ../src/jarabe/journal/misc.py:108
+ msgid "No date"
+ msgstr "Sin fecha"
+ 
+-#: ../src/jarabe/journal/expandedentry.py:260
++#: ../src/jarabe/journal/expandedentry.py:298
+ msgid "Participants:"
+ msgstr "Participantes:"
+ 
+-#: ../src/jarabe/journal/expandedentry.py:283
++#: ../src/jarabe/journal/expandedentry.py:321
+ msgid "Description:"
+ msgstr "Descripción:"
+ 
+-#: ../src/jarabe/journal/expandedentry.py:309
++#: ../src/jarabe/journal/expandedentry.py:346
+ msgid "Tags:"
+ msgstr "Etiquetas:"
+ 
+-#: ../src/jarabe/journal/journalactivity.py:108
+-#: ../src/jarabe/journal/volumestoolbar.py:47
++#: ../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
++#: ../src/jarabe/journal/journaltoolbox.py:69
+ msgid "Search"
+ msgstr "Buscar"
+ 
+-#: ../src/jarabe/journal/journaltoolbox.py:126
++#: ../src/jarabe/journal/journaltoolbox.py:137
+ msgid "Anytime"
+ msgstr "Cualquier momento"
+ 
+-#: ../src/jarabe/journal/journaltoolbox.py:128
++#: ../src/jarabe/journal/journaltoolbox.py:139
+ msgid "Today"
+ msgstr "Hoy"
+ 
+-#: ../src/jarabe/journal/journaltoolbox.py:130
++#: ../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
++#: ../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
++#: ../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
++#: ../src/jarabe/journal/journaltoolbox.py:147
+ msgid "Past year"
+ msgstr "Último año"
+ 
+-#: ../src/jarabe/journal/journaltoolbox.py:143
++#: ../src/jarabe/journal/journaltoolbox.py:154
+ msgid "Anyone"
+ msgstr "Cualquiera"
+ 
+-#: ../src/jarabe/journal/journaltoolbox.py:145
++#: ../src/jarabe/journal/journaltoolbox.py:156
+ msgid "My friends"
+ msgstr "Mis amigos"
+ 
+-#: ../src/jarabe/journal/journaltoolbox.py:146
++#: ../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
++#: ../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
++#: ../src/jarabe/journal/journaltoolbox.py:377
++#: ../src/jarabe/journal/palettes.py:92
+ msgid "Copy"
+ msgstr "Copiar"
+ 
++#: ../src/jarabe/journal/journaltoolbox.py:432
++#: ../src/jarabe/journal/volumestoolbar.py:182
++msgid "Entries without a file cannot be copied."
++msgstr "Las entradas sin un archivo no pueden ser copiadas."
++
++#: ../src/jarabe/journal/journaltoolbox.py:441
++#: ../src/jarabe/journal/volumestoolbar.py:191
++#, python-format
++msgid "Error while copying the entry. %s"
++msgstr "Error de copiado. %s"
++
++#: ../src/jarabe/journal/journaltoolbox.py:442
++#: ../src/jarabe/journal/volumestoolbar.py:192
++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
++#: ../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
++#: ../src/jarabe/journal/journaltoolbox.py:511
++msgid "View by last edit"
++msgstr "Ver por última edición"
++
++#: ../src/jarabe/journal/journaltoolbox.py:512
++msgid "View by creation date"
++msgstr "Ver por fecha de creación"
++
++#: ../src/jarabe/journal/journaltoolbox.py:513
++msgid "View by size"
++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
++#: ../src/jarabe/journal/listview.py:382
+ msgid "No matching entries"
+ msgstr "No hay entradas coincidentes"
+ 
+-#: ../src/jarabe/journal/listview.py:374
++#: ../src/jarabe/journal/listview.py:393
+ 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"
++
++#: ../src/jarabe/journal/misc.py:252
++#, python-format
++msgid "Cannot install %s activity"
++msgstr "No se puede instalar la actividad %s"
++
++#: ../src/jarabe/journal/misc.py:256
++#, python-format
++msgid "Cannot install activity %s"
++msgstr "No se puede instalar la actividad %s"
++
++#: ../src/jarabe/journal/misc.py:257
++msgid "Malformed activity bundle"
++msgstr "Paquete de actividad con formato incorrecto."
++
++#: ../src/jarabe/journal/misc.py:273
++#, python-format
++msgid "Older Version Of %s Activity"
++msgstr "Versión anterior de la actividad %s"
++
++#: ../src/jarabe/journal/misc.py:274
++#, python-format
++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/palettes.py:68
+ msgid "Resume with"
+ msgstr "Reiniciar con"
+ 
+-#: ../src/jarabe/journal/palettes.py:76
++#: ../src/jarabe/journal/palettes.py:71
+ msgid "Start with"
+ msgstr "Empezar con"
+ 
+-#: ../src/jarabe/journal/palettes.py:98
++#: ../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
++#: ../src/jarabe/journal/palettes.py:109
+ msgid "View Details"
+ msgstr "Ver detalles"
+ 
+-#: ../src/jarabe/journal/palettes.py:185
++#: ../src/jarabe/journal/palettes.py:182
+ msgid "No friends present"
+ msgstr "No hay amigos presentes"
+ 
+ # tildes
+-#: ../src/jarabe/journal/palettes.py:190
++#: ../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
++#: ../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"
++#: ../src/jarabe/journal/processdialog.py:48
++msgid "Running"
++msgstr "Corriendo"
++
++#: ../src/jarabe/journal/processdialog.py:49
++msgid "Failed"
++msgstr "Fracasado"
++
++#: ../src/jarabe/journal/processdialog.py:50
++msgid "Finished"
++msgstr "Finalizado"
++
++#: ../src/jarabe/journal/processdialog.py:137
++#: ../src/jarabe/view/buddymenu.py:90
++msgid "Restart"
++msgstr "Reiniciar"
++
++#: ../src/jarabe/journal/processdialog.py:229
++#: ../src/jarabe/journal/processdialog.py:269
++msgid "Please wait, saving Journal content to"
++msgstr "Espere por favor, guardando el contenido del Diario a"
++
++#: ../src/jarabe/journal/processdialog.py:230
++#: ../src/jarabe/journal/processdialog.py:248
++msgid "Do not remove the storage device!"
++msgstr "¡No quite el dispositivo de almacenamiento!"
++
++#: ../src/jarabe/journal/processdialog.py:232
++msgid "The Journal content has been saved."
++msgstr "El contenido del Diario se ha guardado."
++
++#: ../src/jarabe/journal/processdialog.py:234
++#: ../src/jarabe/journal/processdialog.py:273
++msgid "Backup"
++msgstr "Respaldar"
++
++#: ../src/jarabe/journal/processdialog.py:236
++#: ../src/jarabe/journal/processdialog.py:275
++msgid "Journal content will be saved to"
++msgstr "El contenido del Diario se guardará en"
++
++#: ../src/jarabe/journal/processdialog.py:247
++msgid "Please wait, restoring Journal content from"
++msgstr "Espere por favor, restaurando el contenido del Diario desde"
++
++#: ../src/jarabe/journal/processdialog.py:250
++msgid "The Journal content has been restored."
++msgstr "El contenido del Diario se ha restaurado."
++
++#: ../src/jarabe/journal/processdialog.py:252
++#: ../src/jarabe/journal/processdialog.py:288
++msgid "Restore"
++msgstr "Restaurar"
++
++#: ../src/jarabe/journal/processdialog.py:254
++#: ../src/jarabe/journal/processdialog.py:290
++msgid "Journal content will be restored from"
++msgstr "El contenido del Diario será restaurado desde"
++
++#: ../src/jarabe/journal/processdialog.py:255
++msgid "Warning:"
++msgstr "Advertencia:"
++
++#: ../src/jarabe/journal/processdialog.py:255
++msgid "Current Journal content will be deleted!"
++msgstr "¡El contenido actual del Diario será eliminado!"
++
++#: ../src/jarabe/journal/processdialog.py:257
++#: ../src/jarabe/journal/processdialog.py:292
++#: ../src/jarabe/journal/processdialog.py:311
++msgid ", please close all the running activities."
++msgstr ", por favor, cierre todas las actividades en ejecución."
++
++#: ../src/jarabe/journal/processdialog.py:271
++msgid "The journal content has been saved."
++msgstr "El contenido del Diario se ha guardado."
++
++#: ../src/jarabe/journal/processdialog.py:284
++msgid "Please wait, restoring journal content from"
++msgstr "Espere por favor, restaurando el contenido del Diario desde"
++
++#: ../src/jarabe/journal/processdialog.py:286
++msgid "The journal content has been restored."
++msgstr "El contenido del Diario se ha restaurado."
++
++#: ../src/jarabe/journal/processdialog.py:303
++msgid "Please wait, repair journal content"
++msgstr "Espere por favor, reparando el contenido del Diario"
++
++#: ../src/jarabe/journal/processdialog.py:305
++msgid "The journal content has been reindexed."
++msgstr "El contenido del Diario se ha reindexado."
++
++#: ../src/jarabe/journal/processdialog.py:307
++#: ../src/jarabe/view/palettes.py:202
++msgid "Repair"
++msgstr "Reparar"
++
++#: ../src/jarabe/journal/processdialog.py:309
++msgid "Journal content will be repaired"
++msgstr "El contenido del Diario será reparado"
++
++#: ../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."
++
++#: ../src/jarabe/model/network.py:109
++msgid "The state change is normal."
++msgstr "El cambio de estado es normal."
++
++#: ../src/jarabe/model/network.py:111
++msgid "The device is now managed."
++msgstr "El dispositivo ya es administrado."
++
++#: ../src/jarabe/model/network.py:113
++msgid "The device is no longer managed."
++msgstr "El dispositivo ya no es administrado."
++
++#: ../src/jarabe/model/network.py:115
++msgid "The device could not be readied for configuration."
++msgstr "El dispositivo no se pudo preparar para la configuración."
++
++#: ../src/jarabe/model/network.py:117
++msgid ""
++"IP configuration could not be reserved          (no available address, "
++"timeout, etc)."
++msgstr "No se logró la configuración del IP"
++
++#: ../src/jarabe/model/network.py:120
++msgid "The IP configuration is no longer valid."
++msgstr "La configuración IP ya no es válida."
++
++#: ../src/jarabe/model/network.py:122
++msgid "Secrets were required, but not provided."
++msgstr "Se requieren secretos, pero no fueron proveídos."
++
++#: ../src/jarabe/model/network.py:124
++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."
++
++#: ../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/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/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/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/model/network.py:135
++msgid "The PPP service disconnected unexpectedly."
++msgstr "El servicio PPP se desconectó de forma inesperada."
++
++#: ../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/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/model/network.py:141
++msgid "The DHCP service reported an unexpected error"
++msgstr "El servicio DHCP informó de un error inesperado"
++
++#: ../src/jarabe/model/network.py:143
++msgid "The DHCP service quit or failed unexpectedly."
++msgstr "El servicio DHCP terminó o falló de forma inesperada."
++
++#: ../src/jarabe/model/network.py:145
++msgid "The shared connection service failed to start."
++msgstr "La conexión compartida falló en iniciar."
++
++#: ../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/model/network.py:149
++msgid "The AutoIP service failed to start."
++msgstr "El servicio AutoIP no pudo iniciar."
++
++#: ../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/model/network.py:153
++msgid "The AutoIP service quit or failed unexpectedly."
++msgstr "El servicio AutoIP terminó o falló de forma inesperada."
++
++#: ../src/jarabe/model/network.py:155
++msgid "Dialing failed because the line was busy."
++msgstr "El marcado fracasó porque la línea estaba ocupada."
++
++#: ../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."
++
++#: ../src/jarabe/model/network.py:159
++msgid "Dialing failed because there was carrier."
++msgstr "El marcado falló porque no había portador."
++
++#: ../src/jarabe/model/network.py:161
++msgid "Dialing timed out."
++msgstr "El marcado agotó el tiempo de espera."
++
++#: ../src/jarabe/model/network.py:163
++msgid "Dialing failed."
++msgstr "El marcado ha fallado."
++
++#: ../src/jarabe/model/network.py:165
++msgid "Modem initialization failed."
++msgstr "Inicialización del módem ha fallado."
++
++#: ../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/model/network.py:169
++msgid "Not searching for networks."
++msgstr "No se encuentran redes disponibles"
++
++#: ../src/jarabe/model/network.py:171
++msgid "Network registration was denied."
++msgstr "El registro de red fue denegado."
++
++#: ../src/jarabe/model/network.py:173
++msgid "Network registration timed out."
++msgstr "Expiró el tiempo de espera durante el registro"
++
++#: ../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/model/network.py:177
++msgid "PIN check failed."
++msgstr "La verificación del número PIN ha fallado."
++
++#: ../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/model/network.py:181
++msgid "The device was removed."
++msgstr "El dispositivo fue retirado."
++
++#: ../src/jarabe/model/network.py:183
++msgid "NetworkManager went to sleep."
++msgstr "NetworkManager se fue a dormir."
++
++#: ../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."
++
++#: ../src/jarabe/model/network.py:187
++msgid "A user or client requested the disconnection."
++msgstr "Un usuario o cliente requirió la desconexión."
++
++#: ../src/jarabe/model/network.py:189
++msgid "The device's carrier/link changed."
++msgstr "El portador/enlace del dispositivo ha cambiado."
++
++#: ../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"
+ msgid "Shutdown"
+ msgstr "Apagar"
+ 
+-#: ../src/jarabe/view/buddymenu.py:90
++#: ../src/jarabe/view/buddymenu.py:96
+ msgid "Logout"
+ msgstr "Salir"
+ 
+-#: ../src/jarabe/view/buddymenu.py:95
++#: ../src/jarabe/view/buddymenu.py:101
+ msgid "My Settings"
+ msgstr "Mis ajustes"
+ 
+-#: ../src/jarabe/view/buddymenu.py:130
++#: ../src/jarabe/view/buddymenu.py:136
+ #, python-format
+ msgid "Invite to %s"
+ msgstr "Invitar a %s"
+ 
+-#: ../src/jarabe/view/palettes.py:45
++#: ../src/jarabe/view/launcher.py:193
++#, python-format
++msgid "<b>%s</b> failed to start."
++msgstr "<b>%s</b> no se pudo iniciar."
++
++#: ../src/jarabe/view/palettes.py:50
+ 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"
++
++#: ../src/jarabe/view/palettes.py:89
+ msgid "View Source"
+ msgstr "Ver fuente"
+ 
+-#: ../src/jarabe/view/palettes.py:82
++#: ../src/jarabe/view/palettes.py:100
+ msgid "Stop"
+ msgstr "Parar"
+ 
+-#: ../src/jarabe/view/palettes.py:122
++#: ../src/jarabe/view/palettes.py:140
+ msgid "Start new"
+ msgstr "Empezar nuevo"
+ 
+-#: ../src/jarabe/view/palettes.py:171
++#: ../src/jarabe/view/palettes.py:190
+ msgid "Show contents"
+ msgstr "Mostrar contenidos"
+ 
+-#: ../src/jarabe/view/palettes.py:193 ../src/jarabe/view/palettes.py:243
++#: ../src/jarabe/view/palettes.py:228 ../src/jarabe/view/palettes.py:278
+ #, python-format
+ msgid "%(free_space)d MB Free"
+ msgstr "%(free_space)d MB libres"
+ 
++#: ../src/jarabe/view/palettes.py:297 ../src/jarabe/view/palettes.py:345
++msgid "Restore Journal"
++msgstr "Restaurar Diario"
++
++#: ../src/jarabe/view/palettes.py:307 ../src/jarabe/view/palettes.py:335
++msgid "Backup Journal"
++msgstr "Respaldar Diario"
++
++#: ../src/jarabe/view/palettes.py:324
++msgid "School Server"
++msgstr "Servidor Escuela"
++
+ #: ../src/jarabe/view/viewsource.py:208
+ msgid "Instance Source"
+ msgstr "Fuente de la instancia"
+@@ -1266,182 +1710,195 @@ msgstr "Fuente de la instancia"
+ msgid "Source"
+ msgstr "Fuente"
+ 
+-#: ../src/jarabe/view/viewsource.py:292
++#: ../src/jarabe/view/viewsource.py:294
+ msgid "Activity Bundle Source"
+ msgstr "Fuente del paquete de la actividad"
+ 
+-#: ../src/jarabe/view/viewsource.py:299
++#: ../src/jarabe/view/viewsource.py:301
+ #, python-format
+ msgid "View source: %r"
+ msgstr "Ver código fuente: %r"
+ 
+-#: ../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."
+ 
+-#: ../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"
+ 
+-#: ../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."
+ 
+-#: ../bin/jorunal-reindex:32
+-msgid "Reindex failed: %s"
+-msgstr "Falló al reindexar: %s"
++#~ msgid "User Color"
++#~ msgstr "Color del usuario"
+ 
+-#: ../bin/jorunal-reindex:35
+-msgid "File does not exist."
+-msgstr "No existe el archivo."
++#~ msgid "User Name"
++#~ msgstr "Nombre de usuario"
+ 
+-#: ../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."
+ 
+-#: ../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."
+ #~ msgid "Unmount"
+ #~ msgstr "Desmontar"
+ 
+-#~ msgid "Restart"
+-#~ msgstr "Reiniciar"
+-
+ #~ msgid ""
+-#~ "© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
++#~ "© 2008 One Laptop per Child Association Inc; Red Hat Inc; and "
++#~ "Contributors."
+ #~ msgstr ""
+-#~ "© 2008 One Laptop per Child Association Inc; Red Hat Inc; y Contribuyentes."
++#~ "© 2008 One Laptop per Child Association Inc; Red Hat Inc; y "
++#~ "Contribuyentes."
+ 
+ #~ msgid "Document"
+ #~ msgstr "Documento"
+@@ -1474,12 +1930,6 @@ msgstr "Muestra el teclado virtual en el marco."
+ #~ msgid "Disconnecting..."
+ #~ msgstr "Desconectando..."
+ 
+-#~ msgid "Mesh Network"
+-#~ msgstr "Red Malla"
+-
+-#~ msgid "Disconnected"
+-#~ msgstr "Desconectado"
+-
+ #~ msgid "About my XO"
+ #~ msgstr "Acerca de mi XO"
+ 
+@@ -1508,7 +1958,6 @@ msgstr "Muestra el teclado virtual en el marco."
+ #~ msgid "Settings"
+ #~ msgstr "Configuración "
+ 
+-#, python-format
+ #~ msgid "Clipboard object: %s."
+ #~ msgstr "Objeto de portapapel: %s."
+ 
+@@ -1553,16 +2002,12 @@ msgstr "Muestra el teclado virtual en el marco."
+ #~ msgstr "encendido"
+ 
+ #~ msgid "Permission denied. You need to be root to run this method."
+-#~ msgstr "permiso denegado. Usted necesita ser root para ejecutar este método."
++#~ msgstr ""
++#~ "permiso denegado. Usted necesita ser root para ejecutar este método."
+ 
+ #~ msgid "Error in reading timezone"
+ #~ msgstr "Error en la lectura de la zona horaria"
+ 
+-#, python-format
+-#~ msgid "Error copying timezone (from %s): %s"
+-#~ msgstr "Error copiando zona horaria (desde %s): %s"
+-
+-#, python-format
+ #~ 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."
+ #~ msgid "Share with:"
+ #~ msgstr "Compartir con:"
+ 
+-#~ msgid "Private"
+-#~ msgstr "Privado"
+-
+-#~ msgid "My Neighborhood"
+-#~ msgstr "Mi Vecindario"
+-
+ #~ msgid "Undo"
+ #~ msgstr "Deshacer"
+ 
+@@ -1626,43 +2065,18 @@ msgstr "Muestra el teclado virtual en el marco."
+ #~ msgid "Paste"
+ #~ msgstr "Pegar"
+ 
+-#, python-format
+ #~ msgid "%s Activity"
+ #~ msgstr "Actividad %s"
+ 
+-#, python-format
+-#~ msgid "Text snippet"
+-#~ "Web Page"
+-#~ "PDF file"
+-#~ "MS Word file"
+-#~ "RTF file"
+-#~ "Abiword file"
+-#~ "Squeak project"
+-#~ "OpenOffice text file"
+-#~ "Object"
+-#~ "Pick a buddy picture"
+-#~ "My Picture:"
+-#~ "My Color:"
+-#~ "Stop download"
+-#~ "Close"
+-#~ "No options"
+-#~ "Send"
+-#~ msgstr "Recorte de texto"
+-#~ "Página web"
+-#~ "Archivo PDF"
+-#~ "Archivo MS-Word"
+-#~ "Archivo RTF"
+-#~ "Archivo Abiword"
+-#~ "Proyecto de Squeak"
+-#~ "Archivo de texto de OpenOffice"
+-#~ "Objeto"
+-#~ "Elegir la imagen de amigo"
+-#~ "Mi imagen:"
+-#~ "Mi color:"
+-#~ "Interrumpir la bajada"
+-#~ "Cerrar"
+-#~ "Ninguna opción"
+-#~ "Enviar"
++#~ msgid ""
++#~ "Text snippetWeb PagePDF fileMS Word fileRTF fileAbiword fileSqueak "
++#~ "projectOpenOffice text fileObjectPick a buddy pictureMy Picture:My Color:"
++#~ "Stop downloadCloseNo optionsSend"
++#~ msgstr ""
++#~ "Recorte de textoPágina webArchivo PDFArchivo MS-WordArchivo RTFArchivo "
++#~ "AbiwordProyecto de SqueakArchivo de texto de OpenOfficeObjetoElegir la "
++#~ "imagen de amigoMi imagen:Mi color:Interrumpir la bajadaCerrarNinguna "
++#~ "opciónEnviar"
+ 
+ #~ msgid "Keep error"
+ #~ msgstr "Error de guardado"
+@@ -1682,55 +2096,42 @@ msgstr "Muestra el teclado virtual en el marco."
+ #~ msgid "OK"
+ #~ msgstr "OK"
+ 
+-#, python-format
+ #~ msgid "%d year"
+ #~ msgstr "%d año"
+ 
+-#, python-format
+ #~ msgid "%d years"
+ #~ msgstr "%d años"
+ 
+-#, python-format
+ #~ msgid "%d month"
+ #~ msgstr "%d mes"
+ 
+-#, python-format
+ #~ msgid "%d months"
+ #~ msgstr "%d meses"
+ 
+-#, python-format
+ #~ msgid "%d week"
+ #~ msgstr "%d semana"
+ 
+-#, python-format
+ #~ msgid "%d weeks"
+ #~ msgstr "%d semanas"
+ 
+-#, python-format
+ #~ msgid "%d day"
+ #~ msgstr "%d día"
+ 
+-#, python-format
+ #~ msgid "%d days"
+ #~ msgstr "%d días"
+ 
+-#, python-format
+ #~ msgid "%d hour"
+ #~ msgstr "%d hora"
+ 
+-#, python-format
+ #~ msgid "%d hours"
+ #~ msgstr "%d horas"
+ 
+-#, python-format
+ #~ msgid "%d minute"
+ #~ msgstr "%d minuto"
+ 
+-#, python-format
+ #~ msgid "%d minutes"
+ #~ msgstr "%d minutos"
+ 
+-#, python-format
+ #~ msgid "%d second"
+ #~ msgstr "%d segundo"
+ 
+-- 
+1.7.3.4
+
diff --git a/rpms/sugar/sugar-1-2-Two-kinds-of-feedback-submits.patch b/rpms/sugar/sugar-1-2-Two-kinds-of-feedback-submits.patch
index 66cd383..34ce5f9 100644
--- a/rpms/sugar/sugar-1-2-Two-kinds-of-feedback-submits.patch
+++ b/rpms/sugar/sugar-1-2-Two-kinds-of-feedback-submits.patch
@@ -47,7 +47,7 @@ index 2a0075e..add633c 100644
 +
  class DeviceView(TrayIcon):
 +
-     FRAME_POSITION_RELATIVE = 100
+     FRAME_POSITION_RELATIVE = 500
 +
      def __init__(self):
 -        client = gconf.client_get_default()
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 6a44665..1fbe756 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
@@ -58,7 +58,7 @@ index a3817e9..880c9d1 100644
 +      <applyto>/desktop/sugar/feedback/enabled</applyto>
 +      <owner>sugar</owner>
 +      <type>bool</type>
-+      <default>false</default>
++      <default>true</default>
 +      <locale name="C">
 +        <short>Enable of disable feedback feature</short>
 +        <long>Setting value to false will disable any feedback reports.</long>
@@ -69,7 +69,7 @@ index a3817e9..880c9d1 100644
 +      <applyto>/desktop/sugar/feedback/server_host</applyto>
 +      <owner>sugar</owner>
 +      <type>string</type>
-+      <default>feedback.sugarlabs.org</default>
++      <default>jita.sugarlabs.org</default>
 +      <locale name="C">
 +        <short>Server host to send reports to</short>
 +        <long>Server that will handle reports sent via HTTPS POST requests.</long>
@@ -80,7 +80,7 @@ index a3817e9..880c9d1 100644
 +      <applyto>/desktop/sugar/feedback/server_port</applyto>
 +      <owner>sugar</owner>
 +      <type>int</type>
-+      <default>80</default>
++      <default>8080</default>
 +      <locale name="C">
 +        <short>Server port to send reports to</short>
 +        <long>TCP port that will used to send HTTPS POST requests.</long>
@@ -91,7 +91,7 @@ index a3817e9..880c9d1 100644
 +      <applyto>/desktop/sugar/feedback/auto_submit_delay</applyto>
 +      <owner>sugar</owner>
 +      <type>int</type>
-+      <default>0</default>
++      <default>60</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-Patch-to-add-feedback-icon-to-frame.patch b/rpms/sugar/sugar-Patch-to-add-feedback-icon-to-frame.patch
index 5cf3625..4724be8 100644
--- a/rpms/sugar/sugar-Patch-to-add-feedback-icon-to-frame.patch
+++ b/rpms/sugar/sugar-Patch-to-add-feedback-icon-to-frame.patch
@@ -71,7 +71,7 @@ index 0000000..2a0075e
 +_ICON_NAME = 'feedback-icon'
 +
 +class DeviceView(TrayIcon):
-+    FRAME_POSITION_RELATIVE = 100
++    FRAME_POSITION_RELATIVE = 500
 +    def __init__(self):
 +        client = gconf.client_get_default()
 +        self._color = XoColor(client.get_string('/desktop/sugar/user/color'))
diff --git a/rpms/sugar/sugar.spec b/rpms/sugar/sugar.spec
index c43afb5..788b819 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.49dxo%{?dist}
+Release: 5.50dxo%{?dist}
 URL: http://sugarlabs.org/
 Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
 
@@ -147,9 +147,17 @@ patch2101: Message-Notifications-second-behaviour-enhancement.patch
 patch2201: Database-support-for-3G-control-panel.patch
 patch2202: Fix-no-restart-after-provider-info-selection.patch
 
-# CP enhancement
+#CP enhancement
 patch2301: activate-busy-cursor-when-opening-cp-sections.patch
 
+#Spanish translations
+patch2401: Add-spanish-translations-and-update-POTFILES.patch
+
+#lease info
+patch2501: Add-lease-duration-information-in-about-my-computer.patch
+
+#lease info
+
 License: GPLv2+
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -338,6 +346,10 @@ multiple instances of sugar.
 
 %patch2301 -p1
 
+%patch2401 -p1
+
+%patch2501 -p1
+
 %build
 autoreconf
 %configure
@@ -414,6 +426,11 @@ rm -rf %{buildroot}
 %{_datadir}/icons/hicolor/scalable/apps/sugar-xo.svg
 
 %changelog
+* Wed Feb  2 2011 Anish Mangal <anish@sugarlabs.org> 0.88.1-5.50
+- Add spanish translations
+- Display lease information
+- Enable and configure feedback feature
+
 * Tue Feb  1 2011 Anish Mangal <anish@sugarlabs.org> 0.88.1-5.49
 - sl#2201 fix
 - Message notification enhancement
author	Anish Mangal <anish@sugarlabs.org>	2011-02-03 18:46:29 (GMT)
committer	Anish Mangal <anish@sugarlabs.org>	2011-02-03 18:46:29 (GMT)
commit	8875e64fbc7915dcf7c7b9cfa0ba1ed501ce390f (patch)
tree	018233b04c5fc7ac9cf985f29c3029c5959cb707
parent	d2b96196018d202ef41e0c5244cccf500704e6aa (diff)