Merge branch 'master' of git.sugarlabs.org:network/webui

Conflicts:
	po/es.po

2 files changed, 479 insertions, 18 deletions

diff --git a/po/en.po b/po/en.po
new file mode 100644
index 0000000..b185268
--- /dev/null
+++ b/po/en.po
@@ -0,0 +1,459 @@
+# Translations template for PROJECT.
+# Copyright (C) 2012 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2012-10-19 00:33-0400\n"
+"PO-Revision-Date: 2012-10-13 08:38+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: en\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 2.0.5\n"
+"Generated-By: Babel 0.9.4\n"
+
+#: red-azucar.py:31 red-azucar.py:35 app/env.py:30
+msgid "address to listen for Web clients"
+msgstr "address to listen for Web clients"
+
+#: red-azucar.py:57
+msgid "Run application in debug mode"
+msgstr "Run application in debug mode"
+
+#: red-azucar.py:79
+msgid "Flask server to serve Sugar Network users"
+msgstr "Flask server to serve Sugar Network users"
+
+#: red-azucar.py:80
+msgid "See http://wiki.sugarlabs.org/go/Platform_Team/Sugar_Network/Browser."
+msgstr "See http://wiki.sugarlabs.org/go/Platform_Team/Sugar_Network/Browser."
+
+#: app/app.py:82
+msgid "MMMM d, yyyy"
+msgstr "MMMM d, yyyy"
+
+#: app/app.py:352
+msgid "Artifact has been downloaded."
+msgstr "Artifact has been downloaded."
+
+#: app/app.py:353
+#, python-format
+msgid ""
+"Success!\n"
+"\n"
+"File %s has been copied to your Documents folder.\n"
+"You can access it from the Journal."
+msgstr ""
+"Success!\n"
+"\n"
+"File %s has been copied to your Documents folder.\n"
+"You can access it from the Journal."
+
+#: app/app.py:495
+msgid "zero results"
+msgstr "zero results"
+
+#: app/app.py:497
+#, python-format
+msgid "page %(page)s of %(total)s"
+msgstr "page %(page)s of %(total)s"
+
+#: app/app.py:536 app/app.py:825 app/templates/_browser-grid.html:5
+#: app/templates/context-view.html:5 app/templates/context-view.html:25
+#: app/templates/resource-list.html:6
+msgid "questions"
+msgstr "questions"
+
+#: app/app.py:539 app/app.py:828 app/templates/_browser-grid.html:11
+#: app/templates/context-view.html:11 app/templates/context-view.html:31
+#: app/templates/resource-list.html:12
+msgid "problems"
+msgstr "problems"
+
+#: app/app.py:542 app/app.py:831 app/templates/_browser-grid.html:8
+#: app/templates/context-view.html:8 app/templates/context-view.html:28
+#: app/templates/resource-list.html:9
+msgid "ideas"
+msgstr "ideas"
+
+#: app/app.py:545 app/app.py:763 app/templates/_browser-grid.html:14
+#: app/templates/context-view.html:14 app/templates/context-view.html:34
+#: app/templates/resource-list.html:15
+msgid "reviews"
+msgstr "reviews"
+
+#: app/app.py:548 app/app.py:835
+msgid "artifacts"
+msgstr "artifacts"
+
+#: app/app.py:551 app/app.py:838
+msgid "resources"
+msgstr "resources"
+
+#: app/app.py:565 app/app.py:847
+#, python-format
+msgid "browsing %(total)s %(resource_label)s"
+msgstr "browsing %(total)s %(resource_label)s"
+
+#: app/app.py:590 app/app.py:599
+msgid "Error"
+msgstr "Error"
+
+#: app/app.py:593
+msgid "Object not found."
+msgstr "Object not found."
+
+#: app/app.py:602
+msgid "Server error."
+msgstr "Server error."
+
+#: app/app.py:635
+msgid "activities"
+msgstr "activities"
+
+#: app/app.py:638
+msgid "projects"
+msgstr "projects"
+
+#: app/app.py:642
+msgid "contexts"
+msgstr "contexts"
+
+#: app/app.py:657
+#, python-format
+msgid "browsing %(total)s %(label)s"
+msgstr "browsing %(total)s %(label)s"
+
+#: app/env.py:22
+msgid "start web application to serve Sugar Network content"
+msgstr "start web application to serve Sugar Network content"
+
+#: app/env.py:26
+msgid "hostname to bind"
+msgstr "hostname to bind"
+
+#: app/templates/_artifact-list.html:6 app/templates/_resource-list.html:6
+msgid "context resources"
+msgstr "context resources"
+
+#: app/templates/_artifact-list.html:16
+msgid "download artifact"
+msgstr "download artifact"
+
+#: app/templates/_artifact-list.html:22 app/templates/_artifact-list.html:27
+#: app/templates/_resource-list.html:22 app/templates/_resource-list.html:27
+msgid "see more"
+msgstr "see more"
+
+#: app/templates/_artifact-list.html:31
+#: app/templates/_context-artifact-list.html:39
+#: app/templates/_context-comment-list.html:9
+#: app/templates/_context-resource-list.html:39
+#: app/templates/_context-review-list.html:27
+#: app/templates/_context-solution-list.html:14
+#: app/templates/_context-solution-list.html:54
+#: app/templates/_resource-list.html:31
+#, python-format
+msgid "by %(author)s on %(date)s"
+msgstr "by %(author)s on %(date)s"
+
+#: app/templates/_artifact-list.html:49
+#: app/templates/_context-artifact-list.html:48
+#: app/templates/_context-resource-list.html:48
+#: app/templates/_resource-list.html:49
+msgid "followers"
+msgstr "followers"
+
+#: app/templates/_artifact-list.html:52
+#: app/templates/_context-artifact-list.html:51
+#: app/templates/_context-resource-list.html:51
+#: app/templates/_resource-list.html:52
+msgid "comments"
+msgstr "comments"
+
+#: app/templates/_artifact-list.html:55
+#: app/templates/_context-artifact-list.html:54
+#: app/templates/_context-resource-list.html:54
+#: app/templates/_resource-list.html:55
+msgid "solutions"
+msgstr "solutions"
+
+#: app/templates/_browser-grid.html:17 app/templates/context-view.html:17
+#: app/templates/context-view.html:40 app/templates/resource-list.html:18
+msgid "all resources"
+msgstr "all resources"
+
+#: app/templates/_browser-grid.html:20 app/templates/context-view.html:20
+#: app/templates/context-view.html:37 app/templates/resource-list.html:21
+msgid "artifact gallery"
+msgstr "artifact gallery"
+
+#: app/templates/_browser-grid.html:24 app/templates/context-view.html:42
+msgid "launch"
+msgstr "launch"
+
+#: app/templates/_browser-grid.html:27
+msgid "see"
+msgstr "see"
+
+#: app/templates/_browser-grid.html:35 app/templates/context-view.html:54
+msgid "available offline"
+msgstr "available offline"
+
+#: app/templates/_browser-grid.html:42 app/templates/context-view.html:61
+msgid "favorite"
+msgstr "favorite"
+
+#: app/templates/_context-artifact-list.html:62
+#: app/templates/_context-resource-list.html:62
+#, python-format
+msgid ""
+"No %(resource)s have been shared yet for this context.<br><br>Be the "
+"first to contribute with the community!"
+msgstr ""
+"No %(resource)s have been shared yet for this context.<br><br>Be the first "
+"to contribute with the community!"
+
+#: app/templates/_context-comment-list.html:11
+msgid "delete"
+msgstr "delete"
+
+#: app/templates/_context-comment-list.html:29
+#: app/templates/_context-comment-list.html:32
+#: app/templates/_context-review-list.html:46
+#: app/templates/_context-solution-list.html:31
+#: app/templates/_context-solution-list.html:73
+msgid "comment"
+msgstr "comment"
+
+#: app/templates/_context-comment-list.html:32
+msgid "can't comment in offline mode yet"
+msgstr "can't comment in offline mode yet"
+
+#: app/templates/_context-comment-list.html:36
+msgid "collapse"
+msgstr "collapse"
+
+#: app/templates/_context-review-list.html:6
+msgid "contribute a review"
+msgstr "contribute a review"
+
+#: app/templates/_context-review-list.html:10
+#: app/templates/_context-solution-list.html:98
+msgid "can't contribute in offline mode yet"
+msgstr "can't contribute in offline mode yet"
+
+#: app/templates/_context-review-list.html:16
+#: app/templates/_context-solution-list.html:43
+#, python-format
+msgid ""
+"No %(resource)s have been shared yet for this context.<br><br>Be the "
+"first to share with the community!"
+msgstr ""
+"No %(resource)s have been shared yet for this context.<br><br>Be the first "
+"to share with the community!"
+
+#: app/templates/_context-review-list.html:36
+#: app/templates/_context-solution-list.html:63
+msgid "edit"
+msgstr "edit"
+
+#: app/templates/_context-solution-list.html:94
+msgid "contribute a solution"
+msgstr "contribute a solution"
+
+#: app/templates/_resource-list.html:16
+#, python-format
+msgid "context %(resource)s"
+msgstr "context %(resource)s"
+
+#: app/templates/base.html:4
+msgid "Welcome to Sugar Network"
+msgstr "Welcome to Sugar Network"
+
+#: app/templates/base.html:70 app/templates/base.html:307
+msgid "New resource"
+msgstr "New resource"
+
+#: app/templates/base.html:70 app/templates/base.html:307
+#: app/templates/upload-form.html:13
+msgid "Sugar Network"
+msgstr "Sugar Network"
+
+#: app/templates/base.html:81 app/templates/base.html:151
+#: app/templates/base.html:212 app/templates/resource-form.html:21
+msgid "Title"
+msgstr "Title"
+
+#: app/templates/base.html:89 app/templates/context-view.html:83
+msgid "Summary"
+msgstr "Summary"
+
+#: app/templates/base.html:93 app/templates/base.html:152
+#: app/templates/base.html:213 app/templates/resource-form.html:25
+msgid "Details"
+msgstr "Details"
+
+#: app/templates/base.html:108 app/templates/report-form.html:27
+#: app/templates/upload-form.html:34
+msgid "Alpha Version"
+msgstr "Alpha Version"
+
+#: app/templates/base.html:110 app/templates/report-form.html:29
+#: app/templates/upload-form.html:36
+msgid ""
+"For the time being you need to be connected to the Internet in order to "
+"contribute!"
+msgstr ""
+"For the time being you need to be connected to the Internet in order to "
+"contribute!"
+
+#: app/templates/base.html:140
+msgid "Edit project"
+msgstr "Edit project"
+
+#: app/templates/base.html:141 app/templates/base.html:202
+msgid "Name"
+msgstr "Name"
+
+#: app/templates/base.html:142 app/templates/base.html:203
+msgid "Article"
+msgstr "Article"
+
+#: app/templates/base.html:201
+msgid "Create new project"
+msgstr "Create new project"
+
+#: app/templates/base.html:257
+msgid "Edit resource"
+msgstr "Edit resource"
+
+#: app/templates/browser-view.html:72 app/templates/browser-view.html:80
+#: app/templates/context-view.html:237 app/templates/resource-list.html:111
+msgid "page '+new_page+' of"
+msgstr "page '+new_page+' of"
+
+#: app/templates/context-view.html:73
+msgid "Author(s)"
+msgstr "Author(s)"
+
+#: app/templates/context-view.html:86
+msgid "License"
+msgstr "License"
+
+#: app/templates/context-view.html:87
+msgid "Work in progress."
+msgstr "Work in progress."
+
+#: app/templates/report-form.html:5
+msgid "Report to developers: Activity failed to start!"
+msgstr "Report to developers: Activity failed to start!"
+
+#: app/templates/report-form.html:13
+msgid "You may also add a comment regarding failure conditions."
+msgstr "You may also add a comment regarding failure conditions."
+
+#: app/templates/report-form.html:20
+msgid "Report"
+msgstr "Report"
+
+#: app/templates/resource-form.html:5
+msgid "Improve the system"
+msgstr "Improve the system"
+
+#: app/templates/resource-form.html:13 app/templates/upload-form.html:13
+msgid "Context"
+msgstr "Context"
+
+#: app/templates/toolbar.html:8 app/templates/toolbar.html:46
+msgid "Activities"
+msgstr "Activities"
+
+#: app/templates/toolbar.html:9 app/templates/toolbar.html:47
+msgid "Projects"
+msgstr "Projects"
+
+#: app/templates/toolbar.html:10 app/templates/toolbar.html:49
+#: app/templates/toolbar.html:62 app/templates/toolbar.html:75
+msgid "All"
+msgstr "All"
+
+#: app/templates/toolbar.html:18
+msgid "connect with"
+msgstr "connect with"
+
+#: app/templates/toolbar.html:41
+msgid "context grid"
+msgstr "context grid"
+
+#: app/templates/toolbar.html:53
+msgid "resources list"
+msgstr "resources list"
+
+#: app/templates/toolbar.html:57 app/templates/toolbar.html:70
+msgid "Questions"
+msgstr "Questions"
+
+#: app/templates/toolbar.html:58 app/templates/toolbar.html:71
+msgid "Ideas"
+msgstr "Ideas"
+
+#: app/templates/toolbar.html:59 app/templates/toolbar.html:72
+msgid "Problems"
+msgstr "Problems"
+
+#: app/templates/toolbar.html:60 app/templates/toolbar.html:73
+msgid "Reviews"
+msgstr "Reviews"
+
+#: app/templates/toolbar.html:66
+msgid "artifacts list"
+msgstr "artifacts list"
+
+#: app/templates/toolbar.html:81
+msgid "type to search contexts"
+msgstr "type to search contexts"
+
+#: app/templates/toolbar.html:86
+msgid "create new resource"
+msgstr "create new resource"
+
+#: app/templates/toolbar.html:91
+msgid "create new context"
+msgstr "create new context"
+
+#: app/templates/toolbar.html:96
+msgid "reload"
+msgstr "reload"
+
+#: app/templates/upload-form.html:5
+msgid "Upload an artifact: Share your work!"
+msgstr "Upload an artifact: Share your work!"
+
+#: app/templates/upload-form.html:16
+msgid "Please add a short description."
+msgstr "Please add a short description."
+
+#: app/templates/upload-form.html:24
+msgid "Upload and share"
+msgstr "Upload and share"
+
+#: app/templates/upload-form.html:27
+msgid ""
+"You must use free licenses on everything you publish (conforming to Sugar"
+" Labs Licensing Policy)."
+msgstr ""
+"You must use free licenses on everything you publish (conforming to Sugar "
+"Labs Licensing Policy)."
+
+#~ msgid "Article (optional)"
+#~ msgstr "Article (optional)"
+
+#~ msgid "Back"
+#~ msgstr "Back"
diff --git a/po/es.po b/po/es.po
index fa8eddf..0dba7c7 100644
--- a/po/es.po
+++ b/po/es.po
@@ -2,7 +2,6 @@
 # Copyright (C) 2012 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
@@ -11,11 +10,29 @@ msgstr ""
 "PO-Revision-Date: 2012-04-21 20:49-0500\n"
 "Last-Translator: Sebastian Silva <sebastian@sugarlabs.org>\n"
 "Language-Team: es <LL@li.org>\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.5\n"
+"Generated-By: Babel 0.9.4\n"
+
+#: red-azucar.py:31 red-azucar.py:35 app/env.py:30
+msgid "address to listen for Web clients"
+msgstr "dirección para escuchar a los clientes Web"
+
+#: red-azucar.py:57
+msgid "Run application in debug mode"
+msgstr "Correr aplicación en modo depuración"
+
+#: red-azucar.py:79
+msgid "Flask server to serve Sugar Network users"
+msgstr "Servidor  Flask para usuarios de la red Sugar."
+
+#: red-azucar.py:80
+msgid "See http://wiki.sugarlabs.org/go/Platform_Team/Sugar_Network/Browser."
+msgstr "Vea http://wiki.sugarlabs.org/go/Platform_Team/Sugar_Network/Browser."
 
 #: sugar_network_webui/app.py:89
 msgid "MMMM d, yyyy"
@@ -133,10 +150,6 @@ msgstr "iniciar la aplicación para servir contenido de la Red Azúcar"
 msgid "hostname to bind"
 msgstr "nombre de host"
 
-#: sugar_network_webui/env.py:30
-msgid "address to listen for Web clients"
-msgstr "dirección para escuchar a los clientes Web"
-
 #: sugar_network_webui/templates/_artifact-list.html:6
 #: sugar_network_webui/templates/_resource-list.html:6
 msgid "context resources"
@@ -621,14 +634,3 @@ msgid ""
 " a public domain or similar free resource. <b>Do not submit copyrighted "
 "work without permission!</b>"
 msgstr ""
-
-#~ msgid ""
-#~ "You must use free licenses on "
-#~ "everything you publish (conforming to "
-#~ "Sugar Labs Licensing Policy)."
-#~ msgstr ""
-#~ "Debes usar licencias libres para todo"
-#~ " lo que publiques (en conformidad con"
-#~ " las políticas de licenciamiento de "
-#~ "Sugar Labs)."
-