From 33ecb81827179580521c8d0b1088097128183035 Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Tue, 31 Mar 2009 10:26:16 +0000
Subject: Merge branch 'master' of gitorious@git.sugarlabs.org:browse/mainline

---
diff --git a/po/es.po b/po/es.po
index 1326ab9..caa4100 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,59 +6,49 @@ msgid ""
 msgstr ""
 "Project-Id-Version: web-activity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-16 00:30+0000\n"
-"PO-Revision-Date: 2008-01-24 12:09-0500\n"
-"Last-Translator: Esteban Bordón <ebordon@gmail.com>\n"
+"POT-Creation-Date: 2008-11-08 00:30-0500\n"
+"PO-Revision-Date: 2008-12-14 03:59-0500\n"
+"Last-Translator: Javier Mariosa <javier.mariosa@gmail.com>\n"
 "Language-Team: Fedora Spanish <fedora-trans-es@redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 1.0.2\n"
+"X-Generator: Pootle 1.1.0rc2\n"
 "X-Poedit-Language: Spanish\n"
 
-#: activity/activity.info:2 webactivity.py:105
+#: activity/activity.info:2 webactivity.py:106
 msgid "Browse"
 msgstr "Navegar"
 
-#: browser.py:132
-#, fuzzy
-msgid "Source"
-msgstr "Origen"
-
-#: downloadmanager.py:140
+#: downloadmanager.py:152
 msgid "Download started"
 msgstr "Descarga iniciada"
 
-#: downloadmanager.py:142 downloadmanager.py:156
+#: downloadmanager.py:153 downloadmanager.py:166
 #, python-format
 msgid "%s"
 msgstr "%s"
 
-#: downloadmanager.py:154
+#: downloadmanager.py:165
 msgid "Download completed"
 msgstr "Descarga terminada"
 
-#: downloadmanager.py:158
-msgid "Open"
-msgstr "Abrir"
+# Just added "el" to make it more clear.
+#: downloadmanager.py:169
+msgid "Show in Journal"
+msgstr "Mostrar en el Diario"
 
-#: downloadmanager.py:161
-#, fuzzy
+#: downloadmanager.py:172
 msgid "Ok"
 msgstr "Ok"
 
-#: downloadmanager.py:162
+#: downloadmanager.py:178
 #, python-format
-msgid ""
-"File %s downloaded from\n"
-"%s."
-msgstr ""
-"El archivo %s se bajó de\n"
-"%s."
+msgid "File %s from %s."
+msgstr "Archivo %s desde %s"
 
-#: downloadmanager.py:243
-#, python-format
+#: downloadmanager.py:260
 #, python-format
 msgid ""
 "Downloading %s from \n"
@@ -67,49 +57,113 @@ msgstr ""
 "Bajando %s desde \n"
 "%s."
 
-#: linkbutton.py:96
+#: edittoolbar.py:90
+msgid "Previous"
+msgstr "Anterior"
+
+#: edittoolbar.py:97
+msgid "Next"
+msgstr "Siguiente"
+
+#: linkbutton.py:94
 msgid "Remove"
 msgstr "Eliminar"
 
-#: webactivity.py:113
+#: palettes.py:95
+msgid "Follow link"
+msgstr "Seguir el enlace"
+
+#: palettes.py:100 palettes.py:157
+msgid "Copy"
+msgstr "Copiar"
+
+#: palettes.py:108
+msgid "Download link"
+msgstr "Descargar enlace"
+
+#: palettes.py:165
+msgid "Download image"
+msgstr "Descargar imagen"
+
+#: viewtoolbar.py:34
+msgid "Zoom out"
+msgstr "Acercarse"
+
+#: viewtoolbar.py:40
+msgid "Zoom in"
+msgstr "Alejarse"
+
+#: viewtoolbar.py:51
+msgid "Fullscreen"
+msgstr "Pantalla completa"
+
+#: viewtoolbar.py:87
+msgid "Show Tray"
+msgstr "Mostrar Bandeja"
+
+#: viewtoolbar.py:91
+msgid "Hide Tray"
+msgstr "Esconder Bandeja"
+
+#: webactivity.py:102
+msgid "Edit"
+msgstr "Editar"
+
+#: webactivity.py:114
 msgid "View"
 msgstr "Ver"
 
-#: webactivity.py:131 webactivity.py:132
+#: webactivity.py:132 webactivity.py:133
 msgid "blank"
 msgstr "vacío"
 
-#: webactivity.py:440
+#: webactivity.py:444
 msgid "Download in progress"
 msgstr "Descarga en curso"
 
-#: webactivity.py:441
+#: webactivity.py:445
 msgid "Stopping now will cancel your download"
 msgstr "Parar ahora cancelará la descarga"
 
-#: webactivity.py:443
+#: webactivity.py:447
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: webactivity.py:445 webtoolbar.py:171
+#: webactivity.py:449 webtoolbar.py:352
 msgid "Stop"
 msgstr "Parar"
 
-#: webtoolbar.py:53
+#: webtoolbar.py:231
 msgid "Back"
 msgstr "Volver"
 
-#: webtoolbar.py:60
+#: webtoolbar.py:238
 msgid "Forward"
 msgstr "Avanzar"
 
-#: webtoolbar.py:83
+#: webtoolbar.py:261
 msgid "Bookmark"
 msgstr "Marcador"
 
-#: webtoolbar.py:174
+# Recargar is more consistent with the term "cargar" used for "download" in these menus.
+#: webtoolbar.py:355
 msgid "Reload"
-msgstr "Refrescar"
+msgstr "Recargar"
+
+# Fuente is commonly used to denote "source"
+#~ msgid "Source"
+#~ msgstr "Fuente"
+
+#~ msgid "Open"
+#~ msgstr "Abrir"
+
+#, python-format
+#~ msgid ""
+#~ "File %s downloaded from\n"
+#~ "%s."
+#~ msgstr ""
+#~ "El archivo %s se bajó de\n"
+#~ "%s."
 
 #~ msgid ""
 #~ "Downloading %s from\n"
@@ -136,33 +190,3 @@ msgstr "Refrescar"
 #, python-format
 #~ msgid "All files"
 #~ msgstr "Todos los archivos"
-
-#: downloadmanager.py:167
-#, python-format
-msgid "File %s from %s."
-msgstr "Archivo %s desde %s"
-
-#: viewtoolbar.py:34
-msgid "Zoom out"
-msgstr "Acercarse"
-
-#: viewtoolbar.py:40
-msgid "Zoom in"
-msgstr "Alejarse"
-
-#: viewtoolbar.py:51
-msgid "Fullscreen"
-msgstr "Pantalla completa"
-
-#: viewtoolbar.py:87
-msgid "Show Tray"
-msgstr "Mostrar Bandeja"
-
-#: viewtoolbar.py:91
-msgid "Hide Tray"
-msgstr "Esconder Bandeja"
-
-#: downloadmanager.py:158
-#, fuzzy
-msgid "Show in Journal"
-msgstr "Mostrar en Diario"
--
cgit v0.9.1