Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWalter Bender <walter.bender@gmail.com>2013-04-20 18:40:00 (GMT)
committer Walter Bender <walter.bender@gmail.com>2013-04-20 18:40:00 (GMT)
commit18aaf5a185e807a3b0b38dda0a486e42b178b8fe (patch)
tree15adf41bbcf216299a663772c1718a238f3b9790
parent7b92d235aedf6026f784ab6cdab057d0422a6884 (diff)
parent68e0c6e9e0419689bc07d2b11c7c9dd19d77cc93 (diff)
Merge branch 'master' of git.sugarlabs.org:turtleart/mainlineHEADmaster
-rw-r--r--po/en_GB.po7
-rw-r--r--po/hy.po7
2 files changed, 6 insertions, 8 deletions
diff --git a/po/en_GB.po b/po/en_GB.po
index 41da0f2..e451750 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -11,8 +11,8 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-02-24 00:31-0500\n"
-"PO-Revision-Date: 2013-02-11 10:14+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"PO-Revision-Date: 2013-03-04 11:44+0200\n"
+"Last-Translator: Robert <robert_readman@hotmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: en_GB\n"
"MIME-Version: 1.0\n"
@@ -947,9 +947,8 @@ msgid "Load Python block"
msgstr "Load Python block"
#: TurtleArtActivity.py:766
-#, fuzzy
msgid "Palettes"
-msgstr "palette"
+msgstr "Palettes"
#: TurtleArtActivity.py:810
msgid "Sharing blocks disabled"
diff --git a/po/hy.po b/po/hy.po
index 1b68bb2..33a3338 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -7,8 +7,8 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-02-24 00:31-0500\n"
-"PO-Revision-Date: 2012-08-23 15:08+0200\n"
-"Last-Translator: anush.mkrtchyan <anush.mkrtchyan@ca1492.com>\n"
+"PO-Revision-Date: 2013-04-18 20:40+0200\n"
+"Last-Translator: anushnur <anush.mkrtchyan@ca1492.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: hy\n"
"MIME-Version: 1.0\n"
@@ -18,9 +18,8 @@ msgstr ""
"X-Generator: Pootle 2.0.5\n"
#. TRANS: "name" option from activity.info file
-#, fuzzy
msgid "TurtleBlocks"
-msgstr "Կրիայի Բոտերը"
+msgstr "ԿրիայիԲլոկ"
#. TRANS: "summary" option from activity.info file
#. TRANS: "description" option from activity.info file