From 6cc37ed0e0e456946b1a04332546596402fca045 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter@sugarlabs.org>
Date: Sun, 26 May 2013 19:33:45 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:xo-colors/mainline

---
diff --git a/po/en.po b/po/en.po
index add97d9..1b89af3 100644
--- a/po/en.po
+++ b/po/en.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-17 00:32-0400\n"
-"PO-Revision-Date: 2012-04-17 11:22+0200\n"
+"POT-Creation-Date: 2013-05-25 00:31-0400\n"
+"PO-Revision-Date: 2013-05-26 05:26+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: en\n"
@@ -17,29 +17,34 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: activity/activity.info:2
+#. TRANS: "name" option from activity.info file
 msgid "xoEditor"
 msgstr "xoEditor"
 
-#: XOEditorActivity.py:104
-msgid "Game"
-msgstr "Game"
-
-#: XOEditorActivity.py:120
-msgid "Save colors"
-msgstr "Save colors"
+#. TRANS: "summary" option from activity.info file
+#. TRANS: "description" option from activity.info file
+msgid "select colors for your XO icon"
+msgstr "select colors for your XO icon"
 
-#: XOEditorActivity.py:132 XOEditorActivity.py:154
+#: XOEditorActivity.py:84 XOEditorActivity.py:104
 msgid "Saving colors"
 msgstr "Saving colors"
 
-#: XOEditorActivity.py:133
+#: XOEditorActivity.py:85
 msgid "Do you want to save these colors?"
 msgstr "Do you want to save these colors?"
 
-#: XOEditorActivity.py:155
+#: XOEditorActivity.py:105
 msgid "A restart is required before your new colors will appear."
 msgstr "A restart is required before your new colors will appear."
 
+#: XOEditorActivity.py:145
+msgid "Game"
+msgstr "Game"
+
+#: XOEditorActivity.py:154
+msgid "Save colors"
+msgstr "Save colors"
+
 #~ msgid "Rotate colors"
 #~ msgstr "Rotate colors"
diff --git a/po/en_US.po b/po/en_US.po
index a1c9dab..61e4968 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-17 00:32-0400\n"
-"PO-Revision-Date: 2012-04-18 06:47+0200\n"
+"POT-Creation-Date: 2013-05-25 00:31-0400\n"
+"PO-Revision-Date: 2013-05-26 06:07+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: en_US\n"
@@ -17,29 +17,34 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: activity/activity.info:2
+#. TRANS: "name" option from activity.info file
 msgid "xoEditor"
 msgstr "xoEditor"
 
-#: XOEditorActivity.py:104
-msgid "Game"
-msgstr "Game"
-
-#: XOEditorActivity.py:120
-msgid "Save colors"
-msgstr "Save colors"
+#. TRANS: "summary" option from activity.info file
+#. TRANS: "description" option from activity.info file
+msgid "select colors for your XO icon"
+msgstr "select colors for your XO icon"
 
-#: XOEditorActivity.py:132 XOEditorActivity.py:154
+#: XOEditorActivity.py:84 XOEditorActivity.py:104
 msgid "Saving colors"
 msgstr "Saving colors"
 
-#: XOEditorActivity.py:133
+#: XOEditorActivity.py:85
 msgid "Do you want to save these colors?"
 msgstr "Do you want to save these colors?"
 
-#: XOEditorActivity.py:155
+#: XOEditorActivity.py:105
 msgid "A restart is required before your new colors will appear."
 msgstr "A restart is required before your new colors will appear."
 
+#: XOEditorActivity.py:145
+msgid "Game"
+msgstr "Game"
+
+#: XOEditorActivity.py:154
+msgid "Save colors"
+msgstr "Save colors"
+
 #~ msgid "Rotate colors"
 #~ msgstr "Rotate colors"
--
cgit v0.9.1