Fix conflicts

9 files changed, 1164 insertions, 55 deletions

diff --git a/po/TurtleArt.pot b/po/TurtleArt.pot
index 43155ce..97632e1 100644
--- a/po/TurtleArt.pot
+++ b/po/TurtleArt.pot
@@ -1,26 +1,100 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# Turtle Art
+# Copyright (C) 2009 Sugar Labs
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Walter Bender <walter@sugarlabs.org>, 2009.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-17 10:53-0500\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: 4\n"
+"Report-Msgid-Bugs-To: Walter Bender <walter@sugarlabs.org>\n"
+"POT-Creation-Date: 2009-01-21 10:45+0000\n"
+"PO-Revision-Date: 2009-02-12 19:45+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <walter@sugarlabs.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.0.1\n"
 
-#: 
+#: activity/activity.info:2
 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 ""
+
+#: tasetup.py:119 tasetup.py:120
+msgid "stack"
+msgstr ""
+
+#: tasetup.py:125 tasetup.py:126
+msgid "box"
+msgstr ""
+
+#: tasetup.py:127
+msgid "name"
+msgstr ""
+
+#: TurtleArtActivity.py:48
+msgid "Project"
+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 ""
@@ -82,6 +156,14 @@ msgid "store in box 2"
 msgstr ""
 
 #:
+msgid "push"
+msgstr ""
+
+#:
+msgid "pop"
+msgstr ""
+
+#:
 msgid "Numbers"
 msgstr ""
 
@@ -162,6 +244,10 @@ msgid "set color"
 msgstr ""
 
 #:
+msgid "set text color"
+msgstr ""
+
+#:
 msgid "Blocks"
 msgstr ""
 
@@ -170,6 +256,10 @@ msgid "Turtle"
 msgstr ""
 
 #:
+msgid "clean"
+msgstr ""
+
+#:
 msgid "forward"
 msgstr ""
 
@@ -201,15 +291,11 @@ msgstr ""
 msgid "heading"
 msgstr ""
 
-#:
+#
 msgid "set heading"
 msgstr "seth"
 
 #:
-msgid "clean"
-msgstr ""
-
-#:
 msgid "set xy"
 msgstr ""
 
@@ -230,9 +316,49 @@ msgid "ycor"
 msgstr ""
 
 #:
-msgid "Project"
+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 ""
 
 #:
-msgid "Samples"
+msgid "start"
 msgstr ""
diff --git a/po/en.po b/po/en.po
index 21aedbe..277092c 100644
--- a/po/en.po
+++ b/po/en.po
@@ -12,10 +12,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.0.1\n"
 
-#: 
+
+#: activity/activity.info:2
 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 ""
+
+#: tasetup.py:119 tasetup.py:120
+msgid "stack"
+msgstr "action"
+
+#: tasetup.py:125 tasetup.py:126
+msgid "box"
+msgstr ""
+
+#: tasetup.py:127
+msgid "name"
+msgstr ""
+
+#: TurtleArtActivity.py:48
+msgid "Project"
+msgstr ""
+
+#:
+msgid "Save as"
+msgstr "Save/Load"
+
+#: 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 "walk"
+
+#: TurtleArtActivity.py:210
+msgid "stop turtle"
+msgstr ""
+
+#: TurtleArtActivity.py:223
+msgid "clean"
+msgstr ""
+
+#: TurtleArtActivity.py:236
+msgid "samples"
+msgstr ""
+
+#: TurtleArtActivity.py:249
+msgid "save as HTML"
+msgstr ""
+
+#: TurtleArtActivity.py
+msgid "save Logo"
+msgstr "save as Logo"
+
+#: 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 ""
@@ -62,11 +142,11 @@ msgstr ""
 
 #:
 msgid "stack 1"
-msgstr ""
+msgstr "action 1"
 
 #:
 msgid "stack 2"
-msgstr ""
+msgstr "action 2"
 
 #:
 msgid "store in box 1"
@@ -77,6 +157,14 @@ msgid "store in box 2"
 msgstr ""
 
 #:
+msgid "push"
+msgstr ""
+
+#:
+msgid "pop"
+msgstr ""
+
+#:
 msgid "Numbers"
 msgstr ""
 
@@ -157,6 +245,10 @@ msgid "set color"
 msgstr ""
 
 #:
+msgid "set text color"
+msgstr ""
+
+#:
 msgid "Blocks"
 msgstr ""
 
@@ -201,10 +293,6 @@ msgid "set heading"
 msgstr "seth"
 
 #:
-msgid "clean"
-msgstr ""
-
-#:
 msgid "set xy"
 msgstr ""
 
@@ -225,9 +313,49 @@ msgid "ycor"
 msgstr ""
 
 #:
-msgid "Project"
+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 "query kb"
+
+#:
+msgid "sound"
+msgstr ""
+
+#:
+msgid "hres"
+msgstr ""
+
+#:
+msgid "vres"
 msgstr ""
 
 #:
-msgid "Samples"
+msgid "start"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 1868673..de266d5 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,9 +11,88 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.0.1\n"
 
-#: 
+#: activity/activity.info:2
 msgid "Turtle Art"
-msgstr "Tortuga Art "
+msgstr "Tortuga Art"
+
+#: tasetup.py:46 tasetup.py:49 tasetup.py:50 tasetup.py:51 tasetup.py:52
+#: tasetup.py:53 tasetup.py:54
+msgid "title"
+msgstr "título"
+
+#: tasetup.py:66
+msgid "text"
+msgstr "palabra"
+
+#: tasetup.py:119 tasetup.py:120
+msgid "stack"
+msgstr "acción"
+
+#: tasetup.py:125 tasetup.py:126
+msgid "box"
+msgstr "caja"
+
+#: tasetup.py:127
+msgid "name"
+msgstr "nombre"
+
+#: TurtleArtActivity.py:48
+msgid "Project"
+msgstr "Proyecto"
+
+#:
+msgid "Save as"
+msgstr "Guardar a/abrir de"
+
+#: TurtleArtActivity.py:173 TurtleArtActivity.py:262
+#: TurtleArtActivity.py:293
+msgid "hide palette"
+msgstr "oculta los palettes"
+
+#: TurtleArtActivity.py:181 TurtleArtActivity.py:286
+msgid "hide blocks"
+msgstr "oculta los bloques"
+
+#: TurtleArtActivity.py:194
+msgid "run"
+msgstr "correr"
+
+#: TurtleArtActivity.py:202
+msgid "step"
+msgstr "caminar"
+
+#: TurtleArtActivity.py:210
+msgid "stop turtle"
+msgstr "detener tortuga"
+
+#: TurtleArtActivity.py:223
+msgid "clean"
+msgstr "limpiar"
+
+#: TurtleArtActivity.py:236
+msgid "samples"
+msgstr "ejemplos"
+
+#: TurtleArtActivity.py:249
+msgid "save as HTML"
+msgstr "guardar a HTML"
+
+#: TurtleArtActivity.py
+msgid "save Logo"
+msgstr "guardar a Logo"
+
+#: TurtleArtActivity.py:259 TurtleArtActivity.py:267
+#: TurtleArtActivity.py:290 TurtleArtActivity.py:299
+msgid "show palette"
+msgstr "mostrar palette"
+
+#: TurtleArtActivity.py
+msgid "load my block"
+msgstr "carga de mi bloque"
+
+#: TurtleArtActivity.py:283 TurtleArtActivity.py:297
+msgid "show blocks"
+msgstr "mostrar caja"
 
 #:
 msgid "Flow"
@@ -41,7 +120,7 @@ msgstr "repetir"
 
 #:
 msgid "stop stack"
-msgstr "detener pila"
+msgstr "detener acción"
 
 #:
 msgid "wait"
@@ -53,27 +132,43 @@ msgstr "Mis bloques"
 
 #:
 msgid "box 1"
-msgstr "caja1"
+msgstr "caja 1"
 
 #:
 msgid "box 2"
-msgstr "caja2"
+msgstr "caja 2"
 
 #:
 msgid "stack 1"
-msgstr "pila1"
+msgstr "acción 1"
 
 #:
 msgid "stack 2"
-msgstr "pila2"
+msgstr "acción 2"
 
 #:
 msgid "store in box 1"
-msgstr "poner en caja1"
+msgstr "poner en caja 1"
 
 #:
 msgid "store in box 2"
-msgstr "poner en caja2"
+msgstr "poner en caja 2"
+
+#:
+msgid "push"
+msgstr "empujar"
+
+#:
+msgid "pop"
+msgstr "sacar"
+
+#:
+msgid "show heap"
+msgstr "mostrar pila"
+
+#:
+msgid "empty heap"
+msgstr "vaciar pila"
 
 #:
 msgid "Numbers"
@@ -144,6 +239,10 @@ msgid "set pen size"
 msgstr "fijar tamaño"
 
 #:
+msgid "set text color"
+msgstr "fijar el color del texto"
+
+#:
 msgid "pen size"
 msgstr "tamaño"
 
@@ -201,10 +300,6 @@ msgid "set heading"
 msgstr "seth"
 
 #:
-msgid "clean"
-msgstr "limpiar"
-
-#:
 msgid "set xy"
 msgstr "fijar xy"
 
@@ -225,9 +320,51 @@ msgid "ycor"
 msgstr "coory"
 
 #:
-msgid "Project"
-msgstr "Proyecto"
+msgid "Sensors"
+msgstr "Sensores"
 
 #:
 msgid "Samples"
 msgstr "Ejemplos"
+msgid "volume"
+msgstr "volumen"
+
+#:
+msgid "pitch"
+msgstr "tono"
+
+#:
+msgid "voltage"
+msgstr "voltaje"
+
+#:
+msgid "resistance"
+msgstr "resistencia"
+
+#:
+msgid "Templates"
+msgstr "Plantillas"
+
+#:
+msgid "read key"
+msgstr "leer tecla"
+
+#:
+msgid "Keyboard"
+msgstr "Teclado"
+
+#:
+msgid "sound"
+msgstr "sonido"
+
+#: horizontal resolution
+msgid "hres"
+msgstr "res h"
+
+#: vertical resolution
+msgid "vres"
+msgstr "res v"
+
+#:
+msgid "start"
+msgstr "empezar"
diff --git a/po/fi.po b/po/fi.po
index 8298b91..873dd1b 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -16,6 +16,70 @@ msgstr ""
 msgid "Turtle Art"
 msgstr "Kilpikonnataide"
 
+
+#: 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 ""
+
+#: TurtleArtActivity.py:48
+msgid "Project"
+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 "Virtaus"
@@ -53,6 +117,14 @@ msgid "My Blocks"
 msgstr "Minun lohkoni"
 
 #:
+msgid "start"
+msgstr ""
+
+#:
+msgid "box"
+msgstr "laatikko"
+
+#:
 msgid "box 1"
 msgstr "laatikko 1"
 
@@ -61,6 +133,10 @@ msgid "box 2"
 msgstr "laatikko 2"
 
 #:
+msgid "stack"
+msgstr "pino"
+
+#:
 msgid "stack 1"
 msgstr "pino 1"
 
@@ -77,6 +153,10 @@ msgid "store in box 2"
 msgstr "Säilytä laatikossa 2"
 
 #:
+msgid "name"
+msgstr ""
+
+#:
 msgid "Numbers"
 msgstr "Numerot"
 
@@ -157,6 +237,10 @@ msgid "set color"
 msgstr "aseta väri"
 
 #:
+msgid "set text color"
+msgstr ""
+
+#:
 msgid "Blocks"
 msgstr "Lohkot"
 
@@ -225,9 +309,47 @@ msgid "ycor"
 msgstr "y koord"
 
 #:
-msgid "Project"
+msgid "Sensors"
+msgstr ""
+
+#:
+msgid "volume"
+msgstr ""
+
+#:
+msgid "pitch"
+msgstr ""
+
+#:
+msgid "voltage"
+msgstr ""
+
+#:
+msgid "resistance"
+msgstr ""
+
+
+#:
+msgid "Templates"
 msgstr ""
 
 #:
-msgid "Samples"
+msgid "Keyboard"
 msgstr ""
+
+#:
+msgid "read key"
+msgstr ""
+
+#:
+msgid "sound"
+msgstr ""
+
+#:
+msgid "hres"
+msgstr ""
+
+#:
+msgid "vres"
+msgstr ""
+
diff --git a/po/fr.po b/po/fr.po
index 770415d..70c1b28 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -15,6 +15,65 @@ msgstr ""
 msgid "Turtle Art"
 msgstr "ArtTortue"
 
+#: 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 "Flux"
@@ -52,6 +111,14 @@ msgid "My Blocks"
 msgstr "Mes blocs"
 
 #:
+msgid "start"
+msgstr "commencer"
+
+#:
+msgid "box"
+msgstr "boîte"
+
+#:
 msgid "box 1"
 msgstr "boîte 1"
 
@@ -60,6 +127,10 @@ msgid "box 2"
 msgstr "boîte 2"
 
 #:
+msgid "stack"
+msgstr "pile"
+
+#:
 msgid "stack 1"
 msgstr "pile 1"
 
@@ -76,6 +147,10 @@ msgid "store in box 2"
 msgstr "range dans la boîte 2"
 
 #:
+msgid "name"
+msgstr "nom"
+
+#:
 msgid "Numbers"
 msgstr "Nombres"
 
@@ -156,6 +231,10 @@ msgid "set color"
 msgstr "fixe la couleur"
 
 #:
+msgid "set text color"
+msgstr ""
+
+#:
 msgid "Blocks"
 msgstr "Blocs"
 
@@ -228,7 +307,49 @@ msgstr "coord y"
 #:
 msgid "Project"
 msgstr "Projet"
+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 "Samples"
 msgstr "Échantillons"
+
+msgid "hres"
+msgstr ""
+
+#:
+msgid "vres"
+msgstr ""
+
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 ""
+
diff --git a/po/pt.po b/po/pt.po
index 372a086..6120d89 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -16,6 +16,70 @@ msgstr ""
 msgid "Turtle Art"
 msgstr "Tartaruga"
 
+
+#: 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 ""
+
+#: TurtleArtActivity.py:48
+msgid "Project"
+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 "Fluxo"
@@ -53,6 +117,14 @@ msgid "My Blocks"
 msgstr "Os meus blocos"
 
 #:
+msgid "start"
+msgstr ""
+
+#:
+msgid "box"
+msgstr "caixa"
+
+#:
 msgid "box 1"
 msgstr "caixa 1"
 
@@ -61,6 +133,10 @@ msgid "box 2"
 msgstr "caixa 2"
 
 #:
+msgid "stack"
+msgstr "pilha"
+
+#:
 msgid "stack 1"
 msgstr "pilha 1"
 
@@ -77,6 +153,10 @@ msgid "store in box 2"
 msgstr "por na caixa 2"
 
 #:
+msgid "name"
+msgstr ""
+
+#:
 msgid "Numbers"
 msgstr "Números"
 
@@ -157,6 +237,10 @@ msgid "set color"
 msgstr "ajustar cor"
 
 #:
+msgid "set text color"
+msgstr ""
+
+#:
 msgid "Blocks"
 msgstr "Blocos"
 
@@ -225,9 +309,46 @@ msgid "ycor"
 msgstr "ycor"
 
 #:
-msgid "Project"
+msgid "Sensors"
 msgstr ""
 
 #:
-msgid "Samples"
+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 ""
+
diff --git a/po/ru.po b/po/ru.po
index 9b42168..17b4b2e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -17,6 +17,70 @@ msgid "Turtle Art"
 msgstr "Черепашка"
 
 #:
+msgid "Project"
+msgstr "Проект"
+
+#:
+msgid "Samples"
+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: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 "Передвижение"
 
@@ -53,6 +117,13 @@ msgid "My Blocks"
 msgstr "Мои блоки"
 
 #:
+msgid "start"
+msgstr ""
+
+#:
+msgid "box"
+msgstr "блок"
+#:
 msgid "box 1"
 msgstr "блок 1"
 
@@ -61,6 +132,10 @@ msgid "box 2"
 msgstr "блок 2"
 
 #:
+msgid "stack"
+msgstr "цепь"
+
+#:
 msgid "stack 1"
 msgstr "цепь 1"
 
@@ -77,6 +152,10 @@ msgid "store in box 2"
 msgstr "сохранить в кармане 2"
 
 #:
+msgid "name"
+msgstr ""
+
+#:
 msgid "Numbers"
 msgstr "Числа"
 
@@ -157,6 +236,10 @@ msgid "set color"
 msgstr "цвет"
 
 #:
+msgid "set text color"
+msgstr ""
+
+#:
 msgid "Blocks"
 msgstr "Блоки"
 
@@ -225,9 +308,46 @@ msgid "ycor"
 msgstr "y текущ."
 
 #:
-msgid "Project"
-msgstr "Проект"
+msgid "Sensors"
+msgstr ""
 
 #:
-msgid "Samples"
-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 ""
+
diff --git a/po/tr.po b/po/tr.po
index 847903f..10b92d6 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -16,6 +16,69 @@ 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 ""
+
+#: TurtleArtActivity.py:48
+msgid "Project"
+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 "Akiş"
@@ -53,6 +116,14 @@ msgid "My Blocks"
 msgstr "Parçalar"
 
 #:
+msgid "start"
+msgstr ""
+
+#:
+msgid "box"
+msgstr "kutu"
+
+#:
 msgid "box 1"
 msgstr "kutu 1"
 
@@ -61,6 +132,10 @@ msgid "box 2"
 msgstr "kutu 2"
 
 #:
+msgid "stack"
+msgstr "yığın"
+
+#:
 msgid "stack 1"
 msgstr "yığın 1"
 
@@ -77,6 +152,10 @@ msgid "store in box 2"
 msgstr "kutu 1 de sakla"
 
 #:
+msgid "name"
+msgstr ""
+
+#:
 msgid "Numbers"
 msgstr "Sayılar"
 
@@ -157,6 +236,10 @@ msgid "set color"
 msgstr "renk ayarı"
 
 #:
+msgid "set text color"
+msgstr ""
+
+#:
 msgid "Blocks"
 msgstr "Parçalar"
 
@@ -225,9 +308,46 @@ msgid "ycor"
 msgstr "y ekseni"
 
 #:
-msgid "Project"
+msgid "Sensors"
 msgstr ""
 
 #:
-msgid "Samples"
+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 ""
+