Fix conflicts

1 files changed, 117 insertions, 3 deletions

diff --git a/po/mn.po b/po/mn.po
index 1007f7e..13307cd 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -15,7 +15,65 @@ msgstr ""
 msgid "Turtle Art"
 msgstr "Яст мэлхий уран бүтээл"
 
-#:
+#: tasetup.py:46 tasetup.py:49 tasetup.py:50 tasetup.py:51 tasetup.py:52
+#: tasetup.py:53 tasetup.py:54
+msgid "title"
+msgstr ""
+
+#: tasetup.py:66
+msgid "text"
+msgstr ""
+
+
+msgid "Save as"
+msgstr ""
+
+#: TurtleArtActivity.py:173 TurtleArtActivity.py:262
+#: TurtleArtActivity.py:293
+msgid "hide palette"
+msgstr ""
+
+#: TurtleArtActivity.py:181 TurtleArtActivity.py:286
+msgid "hide blocks"
+msgstr ""
+
+#: TurtleArtActivity.py:194
+msgid "run"
+msgstr ""
+
+#: TurtleArtActivity.py:202
+msgid "step"
+msgstr ""
+
+#: TurtleArtActivity.py:210
+msgid "stop turtle"
+msgstr ""
+
+#: TurtleArtActivity.py:236
+msgid "samples"
+msgstr ""
+
+#: TurtleArtActivity.py:249
+msgid "save as HTML"
+msgstr ""
+
+#: TurtleArtActivity.py
+msgid "save Logo"
+msgstr ""
+
+#: TurtleArtActivity.py
+msgid "load my block"
+msgstr ""
+
+#: TurtleArtActivity.py:259 TurtleArtActivity.py:267
+#: TurtleArtActivity.py:290 TurtleArtActivity.py:299
+msgid "show palette"
+msgstr ""
+
+#: TurtleArtActivity.py:283 TurtleArtActivity.py:297
+msgid "show blocks"
+msgstr ""
+
 msgid "Flow"
 msgstr "Урсахуй"
 
@@ -52,6 +110,12 @@ msgid "My Blocks"
 msgstr "Миний Блокуд"
 
 #:
+msgid "start"
+msgstr ""
+
+msgid "box"
+msgstr "богц"
+
 msgid "box 1"
 msgstr "богц 1"
 
@@ -59,7 +123,9 @@ msgstr "богц 1"
 msgid "box 2"
 msgstr "богц 2"
 
-#:
+msgid "stack"
+msgstr "залгас"
+
 msgid "stack 1"
 msgstr "залгас 1"
 
@@ -75,7 +141,9 @@ msgstr "богц 1-д хадгал"
 msgid "store in box 2"
 msgstr "богц 2-д хадгал"
 
-#:
+msgid "name"
+msgstr ""
+
 msgid "Numbers"
 msgstr "Тооны Уйлдзл"
 
@@ -156,6 +224,9 @@ msgid "set color"
 msgstr "өнгө"
 
 #:
+msgid "set text color"
+msgstr ""
+
 msgid "Blocks"
 msgstr "Блокууд"
 
@@ -230,3 +301,46 @@ msgstr ""
 #:
 msgid "Samples"
 msgstr "Жишээ"
+msgid "Sensors"
+msgstr ""
+
+#:
+msgid "volume"
+msgstr ""
+
+#:
+msgid "pitch"
+msgstr ""
+
+#:
+msgid "voltage"
+msgstr ""
+
+#:
+msgid "resistance"
+msgstr ""
+
+#:
+msgid "Templates"
+msgstr ""
+
+#:
+msgid "Keyboard"
+msgstr ""
+
+#:
+msgid "read key"
+msgstr ""
+
+#:
+msgid "sound"
+msgstr ""
+
+#:
+msgid "hres"
+msgstr ""
+
+#:
+msgid "vres"
+msgstr ""
+