From ac77fff2cf7b887286f5b18cc796f87ee6c1f5e1 Mon Sep 17 00:00:00 2001
From: Rafael Ortiz <rafael@activitycentral.com>
Date: Thu, 26 May 2011 17:54:29 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:words-activity/words-activity

---
diff --git a/po/hy.po b/po/hy.po
index d0456a4..257fef3 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-03-13 08:25+0000\n"
-"PO-Revision-Date: 2011-03-24 07:38+0200\n"
+"PO-Revision-Date: 2011-05-16 15:34+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: hy\n"
@@ -32,4 +32,4 @@ msgstr "Բառ"
 
 #: /home/olpc/Activities/words-activity/pippy_app.py:105
 msgid "Translation"
-msgstr ""
+msgstr "Թարգմանություն"
diff --git a/po/templates.po b/po/templates.po
new file mode 100644
index 0000000..0820e26
--- /dev/null
+++ b/po/templates.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-13 08:25+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 1.7.0\n"
+
+#: activity/activity.info:2
+msgid "Words"
+msgstr ""
+
+#: /home/olpc/Activities/words-activity/activity.py:26
+#, python-format
+msgid "%s Source"
+msgstr ""
+
+#: /home/olpc/Activities/words-activity/pippy_app.py:104
+msgid "Word"
+msgstr ""
+
+#: /home/olpc/Activities/words-activity/pippy_app.py:105
+msgid "Translation"
+msgstr ""
--
cgit v0.9.1