From 8f715ebd18e6403bdcc81811660bf6cfba9e0adf Mon Sep 17 00:00:00 2001
From: Pootle Translation <pootle@dev.laptop.org>
Date: Sun, 15 Feb 2009 18:17:06 +0000
Subject: Fix conflicts

---
(limited to 'po/es.po')

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"
--
cgit v0.9.1