Merge branch 'master' of git://git.sugarlabs.org/followmebutia/mainline

1 files changed, 87 insertions, 37 deletions

diff --git a/po/es.po b/po/es.po
index adff1ff..d468d6d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,11 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-20 23:00-0200\n"
-"PO-Revision-Date: 2012-02-22 02:09+0200\n"
+"POT-Creation-Date: 2012-07-06 00:32-0400\n"
+"PO-Revision-Date: 2012-08-06 22:49+0200\n"
 "Last-Translator: AlanJAS <alanjas@hotmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,87 +21,137 @@ msgstr ""
 msgid "FollowMe Butia"
 msgstr "FollowMe Butiá"
 
-#: /home/alan/Documentos/GIT/followmeButia/mainline/followme.py:83
-msgid "Error on initialization of the camera"
-msgstr "Error en la inicialización de la cámara"
-
-#: /home/alan/Documentos/GIT/followmeButia/mainline/followme.py:90
-msgid "Camera was not found"
-msgstr "La cámara no fue encontrada"
-
-#: /home/alan/Documentos/GIT/followmeButia/mainline/followme.py:228
-msgid "Butia robot was not detected"
-msgstr "El robot Butiá no ha sido detectado"
-
-#: /home/alan/Documentos/GIT/followmeButia/mainline/activity.py:102
+#: activity.py:85
 msgid "Calibrate/Follow"
 msgstr "Calibrar/Seguir"
 
-#: /home/alan/Documentos/GIT/followmeButia/mainline/activity.py:111
-#: /home/alan/Documentos/GIT/followmeButia/mainline/activity.py:539
+#: activity.py:90 activity.py:459
 msgid "Stop"
 msgstr "Parar"
 
-#: /home/alan/Documentos/GIT/followmeButia/mainline/activity.py:131
+#: activity.py:101 activity.py:357 activity.py:366 activity.py:375
 msgid "Calibrated color:"
 msgstr "Color calibrado:"
 
-#: /home/alan/Documentos/GIT/followmeButia/mainline/activity.py:131
-#: /home/alan/Documentos/GIT/followmeButia/mainline/activity.py:257
+#: activity.py:101 activity.py:177 activity.py:357 activity.py:361
 msgid "Red"
 msgstr "Rojo"
 
-#: /home/alan/Documentos/GIT/followmeButia/mainline/activity.py:159
-#: /home/alan/Documentos/GIT/followmeButia/mainline/activity.py:285
+#: activity.py:116 activity.py:192 activity.py:358 activity.py:362
 msgid "Green"
 msgstr "Verde"
 
-#: /home/alan/Documentos/GIT/followmeButia/mainline/activity.py:187
-#: /home/alan/Documentos/GIT/followmeButia/mainline/activity.py:313
+#: activity.py:131 activity.py:207 activity.py:359 activity.py:363
 msgid "Blue"
 msgstr "Azul"
 
-#: /home/alan/Documentos/GIT/followmeButia/mainline/activity.py:211
+#: activity.py:145
 msgid "Calibrate"
 msgstr "Calibrar"
 
-#: /home/alan/Documentos/GIT/followmeButia/mainline/activity.py:222
+#: activity.py:158
 msgid "Pixels"
 msgstr "Píxeles"
 
-#: /home/alan/Documentos/GIT/followmeButia/mainline/activity.py:257
+#: activity.py:177 activity.py:361 activity.py:370 activity.py:379
 msgid "Threshold:"
 msgstr "Umbral:"
 
-#: /home/alan/Documentos/GIT/followmeButia/mainline/activity.py:337
+#: activity.py:221
 msgid "Options"
 msgstr "Opciones"
 
-#: /home/alan/Documentos/GIT/followmeButia/mainline/activity.py:348
+#: activity.py:234
 msgid "Show size"
 msgstr "Mostrar tamaño"
 
-#: /home/alan/Documentos/GIT/followmeButia/mainline/activity.py:400
+#: activity.py:268
 msgid "Show grid"
 msgstr "Mostrar grilla"
 
-#: /home/alan/Documentos/GIT/followmeButia/mainline/activity.py:416
+#: activity.py:282
 msgid "Show captures"
 msgstr "Mostrar capturas"
 
-#: /home/alan/Documentos/GIT/followmeButia/mainline/activity.py:426
-#: /home/alan/Documentos/GIT/followmeButia/mainline/activity.py:560
+#: activity.py:288 activity.py:469
 msgid "Hide"
 msgstr "Ocultar"
 
-#: /home/alan/Documentos/GIT/followmeButia/mainline/activity.py:431
+#: activity.py:292
 msgid "Resolution"
 msgstr "Resolución"
 
-#: /home/alan/Documentos/GIT/followmeButia/mainline/activity.py:534
+#: activity.py:304
+msgid "Color mode"
+msgstr "Modo de color"
+
+#: activity.py:320
+msgid "Show threshold view"
+msgstr "Mostrar vista umbral"
+
+#: activity.py:326 activity.py:390
+msgid "Yes"
+msgstr "Si"
+
+#: activity.py:329
+msgid "Colors"
+msgstr "Colores"
+
+#: activity.py:345
+msgid "<Ctrl>Q"
+msgstr "<Ctrl>Q"
+
+#: activity.py:366 activity.py:370
+msgid "Luma"
+msgstr "Luma"
+
+#: activity.py:367 activity.py:371
+msgid "U"
+msgstr "U"
+
+#: activity.py:368 activity.py:372
+msgid "V"
+msgstr "V"
+
+#: activity.py:375 activity.py:379
+msgid "Hue"
+msgstr "Hue"
+
+#: activity.py:376 activity.py:380
+msgid "Saturation"
+msgstr "Saturación"
+
+#: activity.py:377 activity.py:381
+msgid "Value"
+msgstr "Valor"
+
+#: activity.py:393
+msgid "No"
+msgstr "No"
+
+#: activity.py:456
 msgid "Start"
 msgstr "Empezar"
 
-#: /home/alan/Documentos/GIT/followmeButia/mainline/activity.py:555
+#: activity.py:472
 msgid "Show"
 msgstr "Mostrar"
+
+#: followme.py:65
+msgid "Error in stop camera"
+msgstr "Error en detener cámara"
+
+#: followme.py:83
+msgid "Error on initialization of the camera"
+msgstr "Error en la inicialización de la cámara"
+
+#: followme.py:85
+msgid "No cameras was found"
+msgstr "No se encontraron cámaras"
+
+#: followme.py:201
+msgid "Butia robot was not detected"
+msgstr "El robot Butiá no ha sido detectado"
+
+#~ msgid "Camera was not found"
+#~ msgstr "La cámara no fue encontrada"