Update Spanish tranhslations

1 files changed, 408 insertions, 192 deletions

diff --git a/po/es.po b/po/es.po
index 7ef4a0a..194f920 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,9 +6,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: olpc-sugar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-23 07:44-0400\n"
-"PO-Revision-Date: 2008-07-24 12:27-0400\n"
-"Last-Translator: Rafael Ortiz <rafael@laptop.org>\n"
+"POT-Creation-Date: 2008-09-25 00:30-0400\n"
+"PO-Revision-Date: 2008-11-03 03:40-0500\n"
+"Last-Translator: Sebastian Silva <sebastian@fuentelibre.org>\n"
 "Language-Team: Fedora Spanish <fedora-trans-es@redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,44 +18,47 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-Basepath: .\n"
 
-#: ../src/intro/intro.py:65 ../src/controlpanel/view/aboutme.py:100
+#: ../src/intro/window.py:93 ../src/controlpanel/aboutme/view.py:100
 msgid "Name:"
 msgstr "Nombre:"
 
-#: ../src/intro/intro.py:94
+#: ../src/intro/window.py:125
 msgid "Click to change color:"
 msgstr "Clic para cambiar de color:"
 
-#: ../src/intro/intro.py:145
+#: ../src/intro/window.py:175 ../src/journal/detailview.py:119
 msgid "Back"
 msgstr "Atrás"
 
-#: ../src/intro/intro.py:159 ../src/controlpanel/toolbar.py:61
+#: ../src/intro/window.py:189 ../src/controlpanel/toolbar.py:61
 msgid "Done"
 msgstr "Hecho"
 
-#: ../src/intro/intro.py:162
+#: ../src/intro/window.py:192
 msgid "Next"
 msgstr "Siguiente"
 
-#: ../src/view/BuddyMenu.py:58
+# "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.
+#: ../src/view/BuddyMenu.py:60
 msgid "Remove friend"
-msgstr "Eliminar amigo"
+msgstr "Remover amigo"
 
-#: ../src/view/BuddyMenu.py:61
+#: ../src/view/BuddyMenu.py:63
 msgid "Make friend"
 msgstr "Agregar amigo"
 
-#: ../src/view/BuddyMenu.py:91
+#: ../src/view/BuddyMenu.py:92
 #, python-format
 msgid "Invite to %s"
 msgstr "invitar a %s"
 
-#: ../src/view/clipboardmenu.py:48
+#: ../src/view/clipboardmenu.py:51
 msgid "Remove"
 msgstr "Eliminar"
 
-#: ../src/view/clipboardmenu.py:53 ../src/view/clipboardmenu.py:79
+#: ../src/view/clipboardmenu.py:56 ../src/view/clipboardmenu.py:78
 msgid "Open"
 msgstr "Abrir"
 
@@ -63,26 +66,23 @@ msgstr "Abrir"
 # TODO: Implement stopping downloads
 # self._stop_item.connect('activate', self._stop_item_activate_cb)
 # self.append_menu_item(self._stop_item)
-#. self._stop_item = MenuItem(_('Stop download'), 'stock-close')
-#. TODO: Implement stopping downloads
-#. self._stop_item.connect('activate', self._stop_item_activate_cb)
-#. self.append_menu_item(self._stop_item)
-#: ../src/view/clipboardmenu.py:63 ../src/view/home/HomeBox.py:86
+#: ../src/view/clipboardmenu.py:61 ../src/view/home/HomeBox.py:84
 msgid "Keep"
 msgstr "Guardar"
 
-#: ../src/view/clipboardmenu.py:84
+#: ../src/view/clipboardmenu.py:83
 msgid "Open with"
 msgstr "Abrir con"
 
-#: ../src/view/clipboardmenu.py:216
+#: ../src/view/clipboardmenu.py:228
 #, python-format
-msgid "Clipboard object: %s."
-msgstr "Objeto de portapapel: %s."
+msgid "%s clipping"
+msgstr ""
 
+# This is an encryption key type, not a keyboard key
 #: ../src/hardware/keydialog.py:150
 msgid "Key Type:"
-msgstr "Tipo de Tecla"
+msgstr "Tipo de Clave:"
 
 #: ../src/hardware/keydialog.py:170
 msgid "Authentication Type:"
@@ -92,51 +92,75 @@ msgstr "Tipo de Autenticación:"
 msgid "Encryption Type:"
 msgstr "Tipo de Encriptación:"
 
-#: ../src/view/Shell.py:240
+#: ../src/hardware/schoolserver.py:17
+msgid "Cannot obtain data needed for registration."
+msgstr "No se puede obtener datos necesarios para el registro"
+
+#: ../src/hardware/schoolserver.py:31
+msgid "Cannot connect to the server."
+msgstr "No se puede conectar al servidor."
+
+#: ../src/hardware/schoolserver.py:36
+msgid "The server could not complete the request."
+msgstr "El servidor no pudo completar el pedido."
+
+#: ../src/view/Shell.py:251
 msgid "Screenshot"
 msgstr "Captura de pantalla"
 
-#: ../src/view/home/HomeBox.py:80
+#: ../src/view/home/HomeBox.py:78
 msgid "Confirm erase"
 msgstr "Confirmar borrado"
 
-#: ../src/view/home/HomeBox.py:82
+#: ../src/view/home/HomeBox.py:80
 #, python-format
 msgid "Confirm erase: Do you want to permanently erase %s?"
 msgstr "Confirmar borrado:Quiere borrar permanentemente%s?"
 
-#: ../src/view/home/HomeBox.py:89 ../src/view/palettes.py:120
+#: ../src/view/home/HomeBox.py:87 ../src/view/palettes.py:120
+#: ../src/journal/journaltoolbox.py:335 ../src/journal/palettes.py:75
 msgid "Erase"
 msgstr "Borrar"
 
-#: ../src/view/home/HomeBox.py:215
+#: ../src/view/home/HomeBox.py:117
+msgid "Software Update"
+msgstr "Actualización de Software"
+
+#: ../src/view/home/HomeBox.py:118
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+"Actualice sus actividades para asegurar compatibilidad con su nuevo software"
+
+#: ../src/view/home/HomeBox.py:122 ../src/controlpanel/toolbar.py:115
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: ../src/view/home/HomeBox.py:124 ../src/controlpanel/gui.py:273
+msgid "Later"
+msgstr "Después"
+
+#: ../src/view/home/HomeBox.py:127
+msgid "Check now"
+msgstr "Pruebe ahora"
+
+#: ../src/view/home/HomeBox.py:261
 msgid "List view"
 msgstr "Vista en lista"
 
-#: ../src/view/home/HomeBox.py:216
+#: ../src/view/home/HomeBox.py:262
 #, fuzzy
 msgid "<Ctrl>2"
 msgstr "<Ctrl>L"
 
-#: ../src/view/home/HomeBox.py:273
+#: ../src/view/home/HomeBox.py:320
 msgid "Favorites view"
 msgstr "Vista de Favoritos"
 
-#: ../src/view/home/HomeBox.py:274
+#: ../src/view/home/HomeBox.py:321
 #, fuzzy
 msgid "<Ctrl>1"
 msgstr "<Ctrl>L"
 
-#. TRANS: label for the freeform layout in the favorites view
-#: ../src/view/home/HomeBox.py:282
-msgid "Freeform"
-msgstr "Forma libre"
-
-#. TRANS: label for the ring layout in the favorites view
-#: ../src/view/home/HomeBox.py:289
-msgid "Ring"
-msgstr "Anillo"
-
 #: ../src/view/home/MeshBox.py:97
 msgid "Connect"
 msgstr "Conectar"
@@ -154,17 +178,17 @@ msgstr "Desconectar"
 msgid "Disconnecting..."
 msgstr "Desconectando..."
 
-#: ../src/view/home/MeshBox.py:152
+#: ../src/view/home/MeshBox.py:159
 msgid "Connecting..."
 msgstr "Conectando..."
 
 # TODO: show the channel number
 #. TODO: show the channel number
-#: ../src/view/home/MeshBox.py:159
+#: ../src/view/home/MeshBox.py:166
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../src/view/home/MeshBox.py:211 ../src/view/devices/network/mesh.py:41
+#: ../src/view/home/MeshBox.py:218 ../src/view/devices/network/mesh.py:41
 #: ../src/view/devices/network/mesh.py:68
 #: ../src/view/devices/network/mesh.py:72
 msgid "Mesh Network"
@@ -174,16 +198,18 @@ msgstr "Red Malla"
 # 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
-#: ../src/view/home/MeshBox.py:214 ../src/view/devices/network/wireless.py:119
+#: ../src/view/home/MeshBox.py:221 ../src/view/devices/network/wireless.py:125
 #: ../src/view/devices/network/mesh.py:89
 msgid "Disconnect..."
 msgstr "Desconectando..."
 
-#: ../src/view/home/MeshBox.py:302 ../src/view/palettes.py:61
+#. TRANS: Action label for resuming an activity.
+#: ../src/view/home/MeshBox.py:309 ../src/view/palettes.py:61
+#: ../src/journal/journaltoolbox.py:399 ../src/journal/palettes.py:57
 msgid "Resume"
-msgstr "Resumir"
+msgstr "Retomar"
 
-#: ../src/view/home/MeshBox.py:307 ../src/view/frame/activitiestray.py:205
+#: ../src/view/home/MeshBox.py:314 ../src/view/frame/activitiestray.py:206
 msgid "Join"
 msgstr "Unirse"
 
@@ -213,12 +239,12 @@ msgid "My Speakers"
 msgstr "Mis parlantes"
 
 # la traducción la tome del AlsaMixer de Gnome.
-#: ../src/view/devices/speaker.py:119
+#: ../src/view/devices/speaker.py:125
 #, fuzzy
 msgid "Unmute"
 msgstr "Dar voz"
 
-#: ../src/view/devices/speaker.py:122
+#: ../src/view/devices/speaker.py:128
 msgid "Mute"
 msgstr "Silenciar"
 
@@ -226,23 +252,23 @@ msgstr "Silenciar"
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: ../src/view/devices/network/wireless.py:137
+#: ../src/view/devices/network/wireless.py:143
 msgid "Channel"
 msgstr "Canal"
 
-#: ../src/view/frame/zoomtoolbar.py:34
+#: ../src/view/frame/zoomtoolbar.py:37
 msgid "Neighborhood"
 msgstr "Vecindario"
 
-#: ../src/view/frame/zoomtoolbar.py:36
+#: ../src/view/frame/zoomtoolbar.py:39
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/view/frame/zoomtoolbar.py:38
+#: ../src/view/frame/zoomtoolbar.py:41
 msgid "Home"
 msgstr "Hogar"
 
-#: ../src/view/frame/zoomtoolbar.py:40
+#: ../src/view/frame/zoomtoolbar.py:43
 msgid "Activity"
 msgstr "Actividad"
 
@@ -265,7 +291,10 @@ msgstr "sugar-control-panel: clave=%s no es una opción disponible"
 msgid "sugar-control-panel: %s"
 msgstr "sugar-control-panel: %s"
 
-#: ../src/controlpanel/cmd.py:33
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/controlpanel/cmd.py:35
+#, fuzzy
 msgid ""
 "Usage: sugar-control-panel [ option ] key [ args ... ] \n"
 "    Control for the sugar environment. \n"
@@ -275,6 +304,7 @@ msgid ""
 "    -h key       show information about this key \n"
 "    -g key       get the current value of the key \n"
 "    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
 "    "
 msgstr ""
 "Uso: sugar-control-panel [opción] clave [args ...] \n"
@@ -287,232 +317,266 @@ msgstr ""
 "    -s clave       establece el valor actual para la clave \n"
 "    "
 
-#: ../src/controlpanel/cmd.py:45
+#: ../src/controlpanel/cmd.py:48
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "Para aplicar sus cambios tiene que reiniciar sugar.\n"
 
-#: ../src/controlpanel/toolbar.py:115
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: ../src/controlpanel/toolbar.py:121 ../src/view/home/favoritesview.py:294
+#: ../src/controlpanel/toolbar.py:121 ../src/view/home/favoritesview.py:305
 msgid "Ok"
 msgstr "Ok"
 
-#: ../src/controlpanel/sectionview.py:34 ../src/controlpanel/gui.py:260
+#: ../src/controlpanel/sectionview.py:42 ../src/controlpanel/gui.py:265
 msgid "Changes require restart"
 msgstr "Los cambios requieren reiniciar"
 
-#: ../src/controlpanel/gui.py:259
+#: ../src/controlpanel/gui.py:264
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../src/controlpanel/gui.py:263
+#: ../src/controlpanel/gui.py:268
 msgid "Cancel changes"
 msgstr "Cancelar cambios"
 
-#: ../src/controlpanel/gui.py:267
-msgid "Later"
-msgstr "Después"
-
-#: ../src/controlpanel/gui.py:271
+#: ../src/controlpanel/gui.py:277
 msgid "Restart now"
 msgstr "Reiniciar ahora"
 
-#: ../src/controlpanel/model/aboutme.py:44
+#: ../src/controlpanel/aboutme/model.py:44
 msgid "You must enter a name."
 msgstr "Debe ingresar un nombre."
 
-#: ../src/controlpanel/model/aboutme.py:69
+#: ../src/controlpanel/aboutme/model.py:69
 #, python-format
 msgid "stroke:   color=%s hue=%s"
 msgstr "Borde:   color=%s tonalidad=%s"
 
-#: ../src/controlpanel/model/aboutme.py:72
+#: ../src/controlpanel/aboutme/model.py:72
 #, python-format
 msgid "stroke:   %s"
 msgstr "Borde:   %s"
 
-#: ../src/controlpanel/model/aboutme.py:74
+#: ../src/controlpanel/aboutme/model.py:74
 #, python-format
 msgid "fill:     color=%s hue=%s"
 msgstr "relleno:     color=%s tonalidad=%s"
 
-#: ../src/controlpanel/model/aboutme.py:76
+#: ../src/controlpanel/aboutme/model.py:76
 #, python-format
 msgid "fill:     %s"
 msgstr "relleno:     %s"
 
-#: ../src/controlpanel/model/aboutme.py:87
+#: ../src/controlpanel/aboutme/model.py:87
 msgid "Error in specified color modifiers."
 msgstr "Error en modificadores de color especificados."
 
-#: ../src/controlpanel/model/aboutme.py:90
+#: ../src/controlpanel/aboutme/model.py:90
 msgid "Error in specified colors."
 msgstr "Error en colores especificados."
 
-#: ../src/controlpanel/model/aboutxo.py:24
-msgid "Not available"
-msgstr "No disponible"
-
-#: ../src/controlpanel/model/datetime.py:85
-msgid "Error timezone does not exist."
-msgstr "Error, zona horaria no existe."
-
-#: ../src/controlpanel/model/frame.py:38 ../src/controlpanel/model/frame.py:60
-msgid "Value must be an integer."
-msgstr "El valor debe ser un número entero."
-
-#: ../src/controlpanel/model/language.py:28
-msgid "Could not access ~/.i18n. Create standard settings."
-msgstr ""
-"No se puede acceder a ~/.i18n. Crear configuración internacional estándar."
-
-#: ../src/controlpanel/model/language.py:104
-#, python-format
-msgid "Language for code=%s could not be determined."
-msgstr "El lenguaje del código=%s no pudo ser determinado."
-
-#: ../src/controlpanel/model/language.py:121
-#, python-format
-msgid "Sorry I do not speak '%s'."
-msgstr "Lo siento yo no hablo '%s'."
-
-#: ../src/controlpanel/model/network.py:48
-msgid "You must enter a server."
-msgstr "Debe ingresar un servidor"
-
-#: ../src/controlpanel/model/network.py:63
-msgid "State is unknown."
-msgstr "Estado desconocido."
-
-#: ../src/controlpanel/model/network.py:83
-msgid "Error in specified radio argument use on/off."
-msgstr "Error en argumento especificado de radio use on/off."
-
-#: ../src/controlpanel/model/power.py:57
-msgid "Error in automatic pm argument, use on/off."
-msgstr "Error en argumento automatico de pm, use on/off "
-
-#: ../src/controlpanel/model/power.py:86
-msgid "Error in extreme pm argument, use on/off."
-msgstr "Error en argumento extremo de pm, use on/off"
-
-#: ../src/controlpanel/view/aboutme.py:32
+#: ../src/controlpanel/aboutme/view.py:32
+#: ../src/controlpanel/aboutme/__init__.py:22
 msgid "About Me"
 msgstr "Acerca de mí."
 
-#: ../src/controlpanel/view/aboutme.py:134
-#, fuzzy
+#: ../src/controlpanel/aboutme/view.py:134
 msgid "Click to change your color:"
-msgstr "Clic para cambiar sus colores:"
+msgstr "Clic para cambiar su color:"
 
-#: ../src/controlpanel/view/aboutxo.py:26
-msgid "About my XO"
-msgstr "Acerca de mi XO"
+#: ../src/controlpanel/aboutxo/model.py:24
+msgid "Not available"
+msgstr "No disponible"
 
-#: ../src/controlpanel/view/aboutxo.py:47
+#: ../src/controlpanel/aboutxo/view.py:55
 msgid "Identity"
 msgstr "Identidad"
 
-#: ../src/controlpanel/view/aboutxo.py:56
+#: ../src/controlpanel/aboutxo/view.py:64
 msgid "Serial Number:"
 msgstr "Número de Serie:"
 
-#: ../src/controlpanel/view/aboutxo.py:79
+#: ../src/controlpanel/aboutxo/view.py:87
 msgid "Software"
 msgstr "Software"
 
-#: ../src/controlpanel/view/aboutxo.py:88
-#, fuzzy
+# Por ahora..
+#: ../src/controlpanel/aboutxo/view.py:96
 msgid "Build:"
-msgstr "Ensamble"
+msgstr "Ensamble:"
 
-#: ../src/controlpanel/view/aboutxo.py:103
+#: ../src/controlpanel/aboutxo/view.py:111
+msgid "Sugar:"
+msgstr "Azucar:"
+
+#: ../src/controlpanel/aboutxo/view.py:126
 msgid "Firmware:"
 msgstr "Firmware"
 
-#: ../src/controlpanel/view/datetime.py:29
-msgid "Date & Time"
-msgstr "Fecha y Hora"
+#: ../src/controlpanel/aboutxo/view.py:148
+msgid "Copyright and License"
+msgstr "Licencia y Copyright"
+
+#: ../src/controlpanel/aboutxo/view.py:156
+msgid ""
+"© 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."
 
-#: ../src/controlpanel/view/datetime.py:72
+#: ../src/controlpanel/aboutxo/view.py:163
+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."
+
+#: ../src/controlpanel/aboutxo/view.py:175
+msgid "Full license:"
+msgstr "Licencia Completa:"
+
+#: ../src/controlpanel/aboutxo/__init__.py:21
+msgid "About my XO"
+msgstr "Acerca de mi XO"
+
+#: ../src/controlpanel/datetime/model.py:89
+msgid "Error timezone does not exist."
+msgstr "Error, zona horaria no existe."
+
+#: ../src/controlpanel/datetime/view.py:68
 msgid "Timezone"
 msgstr "Zona horaria"
 
-#: ../src/controlpanel/view/frame.py:28
-msgid "Frame"
-msgstr "Cuadro"
+#: ../src/controlpanel/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr "Fecha y Hora"
+
+#: ../src/controlpanel/frame/model.py:38 ../src/controlpanel/frame/model.py:60
+msgid "Value must be an integer."
+msgstr "El valor debe ser un número entero."
 
-#: ../src/controlpanel/view/frame.py:30
+#: ../src/controlpanel/frame/view.py:26
 msgid "never"
 msgstr "nunca"
 
-#: ../src/controlpanel/view/frame.py:31
+#: ../src/controlpanel/frame/view.py:27
 msgid "instantaneous"
 msgstr "instantáneo"
 
-#: ../src/controlpanel/view/frame.py:32
+#: ../src/controlpanel/frame/view.py:28
 #, python-format
 msgid "%s seconds"
 msgstr "%s segundos"
 
-#: ../src/controlpanel/view/frame.py:56
+#: ../src/controlpanel/frame/view.py:52
 msgid "Activation Delay"
-msgstr "Activación del retraso"
+msgstr "Retraso de activación"
 
-#: ../src/controlpanel/view/frame.py:80
+#: ../src/controlpanel/frame/view.py:76
 msgid "Corner"
 msgstr "Esquina"
 
-#: ../src/controlpanel/view/frame.py:115
+#: ../src/controlpanel/frame/view.py:111
 msgid "Edge"
 msgstr "Borde"
 
-#: ../src/controlpanel/view/language.py:29
-#: ../src/controlpanel/view/language.py:74
+#: ../src/controlpanel/frame/__init__.py:21
+msgid "Frame"
+msgstr "Cuadro"
+
+#: ../src/controlpanel/language/model.py:28
+msgid "Could not access ~/.i18n. Create standard settings."
+msgstr ""
+"No se puede acceder a ~/.i18n. Crear configuración internacional estándar."
+
+#: ../src/controlpanel/language/model.py:114
+#, python-format
+msgid "Language for code=%s could not be determined."
+msgstr "El lenguaje del código=%s no pudo ser determinado."
+
+#: ../src/controlpanel/language/model.py:131
+#, python-format
+msgid "Sorry I do not speak '%s'."
+msgstr "Lo siento yo no hablo '%s'."
+
+#: ../src/controlpanel/language/view.py:70
+#: ../src/controlpanel/language/__init__.py:21
 msgid "Language"
 msgstr "Idioma"
 
-#: ../src/controlpanel/view/network.py:28
+#: ../src/controlpanel/network/model.py:62
+msgid "State is unknown."
+msgstr "Estado desconocido."
+
+#: ../src/controlpanel/network/model.py:82
+msgid "Error in specified radio argument use on/off."
+msgstr "Error en argumento especificado de radio use on/off."
+
+#: ../src/controlpanel/network/view.py:28
+#: ../src/controlpanel/network/__init__.py:21
 msgid "Network"
 msgstr "Red"
 
-#: ../src/controlpanel/view/network.py:53
+#: ../src/controlpanel/network/view.py:54
 msgid "Wireless"
 msgstr "Inalámbrica"
 
-#: ../src/controlpanel/view/network.py:61
-msgid "Radio:"
+#: ../src/controlpanel/network/view.py:62
+msgid "Turn of the wireless radio to save battery life"
+msgstr "Apague el radio de la inalámbrica y ahorre vida de batería."
+
+#: ../src/controlpanel/network/view.py:75
+#, fuzzy
+msgid "Radio"
 msgstr "Radio:"
 
-#: ../src/controlpanel/view/network.py:94
+#: ../src/controlpanel/network/view.py:91
+#, fuzzy
+msgid "Discard network history if you have trouble connecting to the network"
+msgstr "Descarte la historia de la red si tiene problemas de conexión "
+
+#: ../src/controlpanel/network/view.py:100
+msgid "Discard network history"
+msgstr "Descarte historial de la red."
+
+#: ../src/controlpanel/network/view.py:113
 msgid "Mesh"
 msgstr "Malla"
 
-#: ../src/controlpanel/view/network.py:103
+#: ../src/controlpanel/network/view.py:122
 msgid "Server:"
 msgstr "Servidor:"
 
-#: ../src/controlpanel/view/power.py:27
-msgid "Power"
-msgstr "Energía "
+#: ../src/controlpanel/power/model.py:55
+msgid "Error in automatic pm argument, use on/off."
+msgstr "Error en argumento automatico de pm, use on/off "
+
+#: ../src/controlpanel/power/model.py:84
+msgid "Error in extreme pm argument, use on/off."
+msgstr "Error en argumento extremo de pm, use on/off"
 
-#: ../src/controlpanel/view/power.py:51
+#: ../src/controlpanel/power/view.py:47
 msgid "Power management"
 msgstr "Manejo de energía"
 
-#: ../src/controlpanel/view/power.py:61
+#: ../src/controlpanel/power/view.py:57
 msgid "Automatic power management (increases battery life)"
 msgstr "Manejo automático de Energía (incrementa la vida de la batería)"
 
-#: ../src/controlpanel/view/power.py:89
+#: ../src/controlpanel/power/view.py:85
+#, fuzzy
 msgid ""
-"Extreme power management (disables wireless radio, increases battery life)"
+"Extreme power management (disableswireless radio, increases battery life)"
 msgstr ""
 "Manejo extremo de energía (deshabilita el radio wireless, incrementa la vida "
 "de la batería)"
 
+#: ../src/controlpanel/power/__init__.py:21
+msgid "Power"
+msgstr "Energía "
+
 #: ../src/view/devices/network/mesh.py:111
 msgid "Connected to a School Mesh Portal"
 msgstr "Conectado a un enlace escolar de red malla"
@@ -523,14 +587,12 @@ msgid "Looking for a School Mesh Portal..."
 msgstr "Buscando un enlace escolar de red malla..."
 
 #: ../src/view/devices/network/mesh.py:116
-#, fuzzy
 msgid "Connected to an XO Mesh Portal"
-msgstr "Conectado a un enlace individual de red malla"
+msgstr "Conectado a un Portal Malla XO"
 
 #: ../src/view/devices/network/mesh.py:118
-#, fuzzy
 msgid "Looking for an XO Mesh Portal..."
-msgstr "Buscando un enlace individual de red malla..."
+msgstr "Buscando un Portal Malla XO..."
 
 #: ../src/view/devices/network/mesh.py:121
 msgid "Connected to a Simple Mesh"
@@ -544,40 +606,68 @@ msgstr "Empezando una Red Malla Simple"
 msgid "Unknown Mesh"
 msgstr "Red Malla Desconocida"
 
-#: ../src/view/frame/activitiestray.py:210
+#: ../src/view/frame/activitiestray.py:211
 msgid "Decline"
 msgstr "Rechazar"
 
-#: ../src/view/home/favoritesview.py:285
+# TRANS: label for the freeform layout in the favorites view
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/view/home/favoriteslayout.py:107
+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/view/home/favoriteslayout.py:189
+msgid "Ring"
+msgstr "Anillo"
+
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/view/home/favoriteslayout.py:334
+msgid "Spiral"
+msgstr "Espiral"
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/view/home/favoriteslayout.py:401
+msgid "Box"
+msgstr "Caja"
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/view/home/favoriteslayout.py:442
+msgid "Triangle"
+msgstr "Triángulo"
+
+#: ../src/view/home/favoritesview.py:295
 msgid "Registration Failed"
 msgstr "Registro Fallido"
 
-#: ../src/view/home/favoritesview.py:286
+#: ../src/view/home/favoritesview.py:296
 #, python-format
 msgid "%s"
-msgstr ""
+msgstr "%s"
 
-#: ../src/view/home/favoritesview.py:288
+#: ../src/view/home/favoritesview.py:298
 msgid "Registration Successful"
 msgstr "Registro Exitoso"
 
-#: ../src/view/home/favoritesview.py:289
+#: ../src/view/home/favoritesview.py:299
 msgid "You are now registered with your school server."
 msgstr "Ahora estas registrado en el servidor de colegio"
 
-#: ../src/view/home/favoritesview.py:405
-msgid "Control Panel"
-msgstr "Panel de Control"
+#: ../src/view/home/favoritesview.py:420
+#, fuzzy
+msgid "Settings"
+msgstr "Configuración "
 
-#: ../src/view/home/favoritesview.py:416
+#: ../src/view/home/favoritesview.py:425
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: ../src/view/home/favoritesview.py:421
+#: ../src/view/home/favoritesview.py:430
 msgid "Shutdown"
 msgstr "Apagar"
 
-#: ../src/view/home/favoritesview.py:427
+#: ../src/view/home/favoritesview.py:436
 msgid "Register"
 msgstr "Registro"
 
@@ -589,27 +679,156 @@ msgstr "Iniciando..."
 msgid "Stop"
 msgstr "Parar"
 
-#: ../src/view/palettes.py:104
+#. TRANS: Action label for starting an entry.
+#: ../src/view/palettes.py:104 ../src/journal/journaltoolbox.py:402
+#: ../src/journal/palettes.py:59
 msgid "Start"
 msgstr "Iniciar"
 
-#: ../src/view/palettes.py:132
+#: ../src/view/palettes.py:138
 msgid "Remove favorite"
 msgstr "Remover favorito"
 
-#: ../src/view/palettes.py:136
+#: ../src/view/palettes.py:142
 msgid "Make favorite"
 msgstr "Hacer favorito"
 
-#: ../src/view/palettes.py:185
+#: ../src/view/palettes.py:191
 msgid "Show contents"
 msgstr "Mostrar contenidos"
 
-#: ../src/view/palettes.py:209
+#: ../src/view/palettes.py:215
 #, python-format
 msgid "%(free_space)d MB Free"
 msgstr "%(free_space)d MB libres"
 
+#: ../src/journal/journaltoolbox.py:62
+msgid "Search"
+msgstr "Buscar"
+
+#: ../src/journal/journaltoolbox.py:119
+msgid "Anytime"
+msgstr "Cualquier momento"
+
+#: ../src/journal/journaltoolbox.py:121
+msgid "Today"
+msgstr "Hoy"
+
+#: ../src/journal/journaltoolbox.py:123
+msgid "Since yesterday"
+msgstr "Desde ayer"
+
+#. TRANS: Filter entries modified during the last 7 days.
+#: ../src/journal/journaltoolbox.py:125
+msgid "Past week"
+msgstr "Última semana"
+
+#. TRANS: Filter entries modified during the last 30 days.
+#: ../src/journal/journaltoolbox.py:127
+msgid "Past month"
+msgstr "Último mes"
+
+#. TRANS: Filter entries modified during the last 356 days.
+#: ../src/journal/journaltoolbox.py:129
+msgid "Past year"
+msgstr "Último año"
+
+#: ../src/journal/journaltoolbox.py:136
+msgid "Anyone"
+msgstr "Cualquiera"
+
+#: ../src/journal/journaltoolbox.py:138
+msgid "My friends"
+msgstr "Mis amigos"
+
+#: ../src/journal/journaltoolbox.py:139
+msgid "My class"
+msgstr "Mi clase"
+
+#. TRANS: Item in a combo box that filters by entry type.
+#: ../src/journal/journaltoolbox.py:255
+msgid "Anything"
+msgstr "Cualquiera"
+
+#. TODO: Add "Start with" menu item
+#: ../src/journal/journaltoolbox.py:325 ../src/journal/palettes.py:67
+msgid "Copy"
+msgstr "Copiar"
+
+#: ../src/journal/collapsedentry.py:248 ../src/journal/expandedentry.py:176
+#: ../src/journal/palettes.py:51
+msgid "Untitled"
+msgstr "Sin título"
+
+#: ../src/journal/journalactivity.py:119 ../src/journal/volumesmanager.py:57
+msgid "Journal"
+msgstr "Diario"
+
+#: ../src/journal/expandedentry.py:222
+msgid "No preview"
+msgstr "Sin vista previa"
+
+#: ../src/journal/expandedentry.py:241
+msgid "Participants:"
+msgstr "Participantes:"
+
+#: ../src/journal/expandedentry.py:266
+msgid "Description:"
+msgstr "Descripción:"
+
+#: ../src/journal/expandedentry.py:292
+msgid "Tags:"
+msgstr "Etiquetas:"
+
+#: ../src/journal/objectchooser.py:134
+msgid "Choose an object"
+msgstr "Escoja un objeto"
+
+#: ../src/journal/objectchooser.py:139
+msgid "Close"
+msgstr "Cerrar"
+
+#: ../src/journal/volumestoolbar.py:93
+msgid "Unmount"
+msgstr "Desmontar"
+
+#: ../src/journal/misc.py:95
+msgid "No date"
+msgstr "Sin fecha"
+
+#: ../src/journal/listview.py:39
+msgid "Your Journal is empty"
+msgstr "Su diario está vacío"
+
+#: ../src/journal/listview.py:40
+msgid "No matching entries "
+msgstr "No hay entradas coincidentes"
+
+#: ../src/journal/modalalert.py:59
+msgid "Your Journal is full"
+msgstr "Su diario está vacío"
+
+#: ../src/journal/modalalert.py:63
+#, fuzzy
+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/journal/modalalert.py:75
+msgid "Show Journal"
+msgstr "Mostrar Diario"
+
+#, python-format
+#~ msgid "Clipboard object: %s."
+#~ msgstr "Objeto de portapapel: %s."
+
+#~ msgid "You must enter a server."
+#~ msgstr "Debe ingresar un servidor"
+
+#~ msgid "Control Panel"
+#~ msgstr "Panel de Control"
+
 #~ msgid "<Ctrl>R"
 #~ msgstr "<Ctrl>R"
 
@@ -715,9 +934,6 @@ msgstr "%(free_space)d MB libres"
 #~ msgid "Redo"
 #~ msgstr "Rehacer"
 
-#~ msgid "Copy"
-#~ msgstr "Copiar"
-
 #~ msgid "Paste"
 #~ msgstr "Pegar"