version 2

34 files changed, 105 insertions, 230 deletions

diff --git a/MANIFEST b/MANIFEST
index 6470cc3..5bc0764 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,42 +1,40 @@
-conozcoal.py
-run.py
-activity.py
 setup.py
 NEWS
 COPYING
-activity/conozco-alimentos.svg
-activity/activity.info
-olpcgames/COPYING
+conozcoal.py
+activity.py
+recursos/lamina/zonas.txt
+recursos/lamina/zonas.png
+recursos/lamina/niveles.txt
+recursos/lamina/LICENSE
+recursos/lamina/lamina.png
+recursos/comun/sonidos/junggle_btn045.wav
+recursos/comun/imagenes/terron.png
+recursos/comun/imagenes/LICENSE
+recursos/comun/imagenes/globito.png
+recursos/comun/imagenes/bicho.png
+recursos/comun/fuentes/Share-Regular.ttf
+recursos/comun/datos/creditos.txt
+olpcgames/__init__.py
+olpcgames/_version.py
+olpcgames/_gtkmain.py
 olpcgames/_cairoimage.py
-olpcgames/svgsprite.py
+olpcgames/video.py
 olpcgames/util.py
-olpcgames/__init__.py
+olpcgames/textsprite.py
+olpcgames/svgsprite.py
+olpcgames/pausescreen.py
 olpcgames/pangofont.py
-olpcgames/_gtkmain.py
-olpcgames/canvas.py
+olpcgames/mesh.py
 olpcgames/gtkEvent.py
-olpcgames/_version.py
-olpcgames/video.py
 olpcgames/eventwrap.py
+olpcgames/dbusproxy.py
+olpcgames/COPYING
+olpcgames/canvas.py
 olpcgames/camera.py
-olpcgames/mesh.py
-olpcgames/pausescreen.py
-olpcgames/activity.py
-olpcgames/textsprite.py
 olpcgames/buildmanifest.py
-olpcgames/dbusproxy.py
+olpcgames/activity.py
 olpcgames/data/__init__.py
 olpcgames/data/sleeping_svg.py
-recursos/comun/datos/creditos.txt
-recursos/comun/fuentes/AllCaps.ttf
-recursos/comun/fuentes/Share-Regular.ttf
-recursos/comun/imagenes/globito.png
-recursos/comun/imagenes/bicho.png
-recursos/comun/imagenes/terron.png
-recursos/comun/imagenes/LICENSE
-recursos/comun/sonidos/junggle_btn045.wav
-recursos/lamina/niveles.txt
-recursos/lamina/zonas.txt
-recursos/lamina/zonas.png
-recursos/lamina/lamina.png
-recursos/lamina/LICENSE
+activity/conozco-alimentos.svg
+activity/activity.info
diff --git a/NEWS b/NEWS
index 2f92850..efdd378 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
-2010-08-11
+2012-01-15
 
-Primera versión de Conozco Alimentos
+Segunda versión.
+Se corrigen detalles.
+Se agrega compatibilidad con Sugar 0.90 o posterior.
+Se modifica icono con estilo Sugar.
+
+2010-08-11
+
+Primera versión de Conozco Alimentos.
diff --git a/activity.py b/activity.py
index 1bc88e8..1bc88e8 100644..100755
--- a/activity.py
+++ b/activity.py
diff --git a/activity/activity.info b/activity/activity.info
index f0d79fe..ae77d1b 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,8 +1,7 @@
 [Activity]
 name = Conozco Alimentos
-activity_version = 1
-host_version = 1
+activity_version = 2
 bundle_id = org.ceibaljam.conozcoalimentos
 icon = conozco-alimentos
 exec = sugar-activity activity.Activity
-license = GPL+
+license = GPLv3+
diff --git a/activity/conozco-alimentos.svg b/activity/conozco-alimentos.svg
index ec700d0..99d47f0 100644
--- a/activity/conozco-alimentos.svg
+++ b/activity/conozco-alimentos.svg
@@ -1,134 +1,33 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="55"
-   height="55"
-   id="svg3703"
-   version="1.1"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="conozco-alimentos-v7.svg">
-  <defs
-     id="defs3705">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective3711" />
-    <inkscape:perspective
-       id="perspective3721"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective2849"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
+<?xml version="1.0" ?><!-- Created with Inkscape (http://www.inkscape.org/) --><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#666666">
+	<!ENTITY fill_color "#008000">
+]><svg height="55" id="svg3703" inkscape:version="0.47 r22583" sodipodi:docname="conozco-alimentos-v7.svg" version="1.1" width="55" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg">
+  <defs id="defs3705">
+    <inkscape:perspective id="perspective3711" inkscape:persp3d-origin="372.04724 : 350.78739 : 1" inkscape:vp_x="0 : 526.18109 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="744.09448 : 526.18109 : 1" sodipodi:type="inkscape:persp3d"/>
+    <inkscape:perspective id="perspective3721" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="1 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
+    <inkscape:perspective id="perspective2849" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="1 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.12"
-     inkscape:cx="-11.558121"
-     inkscape:cy="28.858461"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="800"
-     inkscape:window-height="544"
-     inkscape:window-x="-4"
-     inkscape:window-y="-4"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata3708">
+  <sodipodi:namedview bordercolor="#666666" borderopacity="1.0" id="base" inkscape:current-layer="layer1" inkscape:cx="-11.558121" inkscape:cy="28.858461" inkscape:document-units="px" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="544" inkscape:window-maximized="1" inkscape:window-width="800" inkscape:window-x="-4" inkscape:window-y="-4" inkscape:zoom="5.12" pagecolor="#ffffff" showgrid="false"/>
+  <metadata id="metadata3708">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Capa 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-997.36218)">
-    <circle
-       d="m 47.278,27.5 c 0,10.992123 -8.910877,19.903 -19.903,19.903 -10.992123,0 -19.9029999,-8.910877 -19.9029999,-19.903 0,-10.992123 8.9108769,-19.9029999 19.9029999,-19.9029999 10.992123,0 19.903,8.9108769 19.903,19.9029999 z"
-       style="fill:none;stroke:#666666;stroke-width:3.50000000000000000;display:inline;stroke-opacity:1"
-       sodipodi:ry="19.903"
-       sodipodi:rx="19.903"
-       sodipodi:cy="27.5"
-       sodipodi:cx="27.375"
-       id="circle5"
-       r="19.903"
-       display="inline"
-       cy="27.5"
-       cx="27.375"
-       transform="translate(-3.3515626,994.55146)" />
-    <line
-       x1="24.257486"
-       x2="24.257486"
-       y1="1002.6155"
-       y2="1042.4196"
-       id="line13"
-       style="fill:none;stroke:#666666;stroke-width:3.50000000000000000;stroke-opacity:1" />
-    <line
-       x1="7.6935368"
-       x2="35.94717"
-       y1="1010.8835"
-       y2="1038.9209"
-       id="line15-4"
-       style="fill:none;stroke:#666666;stroke-width:3.50000000000000000;stroke-opacity:1" />
-    <line
-       x1="40.838814"
-       x2="12.58518"
-       y1="1010.8294"
-       y2="1038.8667"
-       id="line15-4-0"
-       style="fill:none;stroke:#666666;stroke-width:3.50000000000000000;stroke-opacity:1" />
-    <g
-       style="fill:#008000;display:inline"
-       id="terron"
-       transform="matrix(0.5,0,0,0.5,32.292818,1026.5221)">
-      <path
-         id="cuerpo"
-         d="m 38.822128,44.108722 c 0,0 -0.376363,0 -0.729309,0 0,-1.361344 0.0042,-5.649084 0.0042,-6.783539 0,0 0,0 0,-0.0017 l 0,-12.760539 -0.0075,-7.751552 c -0.0033,-0.878581 -0.727637,-1.586579 -1.609164,-1.582439 -0.427382,0 -0.831345,0.16727 -1.132437,0.467859 -0.301927,0.302245 -0.465854,0.702202 -0.464182,1.127001 0,0.03975 0.0017,2.534719 0.0042,4.633873 l -12.816435,0 c -1.740473,0 -3.151419,1.396952 -3.151419,3.117679 l 0,1.724867 -5.654655,0.0033 c -0.887382,0.0058 -1.601636,0.72042 -1.59829,1.593205 0.0017,0.424799 0.170617,0.823099 0.474217,1.121205 0.305274,0.298933 0.709237,0.461234 1.135782,0.459578 0.04935,0 3.419892,-0.0017 5.642109,-0.0033 l 0,7.540395 c 0,0.01159 -0.0033,0.02153 -0.0033,0.03229 0,0.05797 0.0033,5.498377 0.0033,7.060942 -0.352109,0 -0.729309,0 -0.729309,0 -0.904108,0.01739 -1.605818,0.74195 -1.590763,1.616391 0.0184,0.876924 0.752727,1.572502 1.635091,1.555112 l 2.303345,-0.0017 c 0.9016,-0.01656 1.607491,-0.741949 1.589091,-1.616389 l -0.0033,-5.219318 12.764581,0 -0.0059,5.219318 c -0.01673,0.875268 0.689163,1.600657 1.590764,1.616389 l 2.301672,0.0017 c 0.886545,0.01739 1.619201,-0.678188 1.636764,-1.555112 0.01756,-0.874441 -0.687491,-1.598173 -1.589091,-1.615563 z M 30.604855,25.673428 c 0.592982,-0.08281 1.143309,0.326259 1.227782,0.914187 0.08531,0.587101 -0.329527,1.132798 -0.922509,1.217261 -0.596328,0.08281 -1.145818,-0.327914 -1.229455,-0.914187 -0.08531,-0.588757 0.329528,-1.134454 0.924182,-1.217261 z m -5.654654,0.794117 c 0.592145,-0.08281 1.143309,0.32626 1.226946,0.914189 0.08531,0.588756 -0.329528,1.131969 -0.921674,1.217261 -0.596327,0.08446 -1.145817,-0.32626 -1.229454,-0.914188 -0.08447,-0.588758 0.327855,-1.132798 0.924182,-1.217262 z m 1.434364,9.080603 c -1.020364,-0.72042 -2.6404,-2.733455 -2.058292,-4.100596 0.205746,-0.481109 0.658219,-0.182176 1.150837,0.0621 1.175927,0.594553 2.576,0.670735 3.831382,0.29562 0.638145,-0.190456 1.183454,-0.499326 1.703673,-0.911703 0.316144,-0.252562 1.179272,-1.257009 1.654326,-0.803228 0.371346,0.355242 0.43491,0.795775 0.43491,0.799915 0.532763,3.368583 -3.68251,6.798445 -6.716836,4.657887 z"
-         style="fill:#008000" />
-      <path
-         id="pelo_oscuro"
-         d="m 17.233073,11.642631 c 1.738801,-2.9454406 7.191892,-2.9669703 8.1788,0.590413 0.3312,1.195731 0.305274,3.767713 -1.020363,4.464947 -0.465855,0.245108 -0.627273,-0.269951 -0.851418,-0.768448 -0.536946,-1.193247 -1.570691,-2.129793 -2.784255,-2.622494 -0.6164,-0.251732 -1.236146,-0.356897 -1.901891,-0.36021 -0.407309,-0.0033 -1.716218,0.237656 -1.793163,-0.414034 -0.06022,-0.505122 0.17229,-0.888518 0.17229,-0.890174 z"
-         style="fill:#008000" />
-      <g
-         transform="matrix(0.8363636,0,0,0.8280687,4.3773279,7.643887)"
-         id="pelo_claro"
-         style="fill:#008000">
-        <path
-           d="M 30.514,13.666 C 25.959,9.955 27.36,0.759 33.675,0.043 c 2.124,-0.241 6.496,0.494 7.331,2.911 0.293,0.848 -0.624,0.982 -1.533,1.226 -2.174,0.585 -4.039,2.081 -5.2,3.992 -0.592,0.972 -0.931,1.989 -1.113,3.109 -0.113,0.683 -0.052,2.955 -1.178,2.913 -0.875,-0.032 -1.466,-0.526 -1.468,-0.528 z"
-           id="path2674"
-           style="fill:#008000" />
+  <g id="layer1" inkscape:groupmode="layer" inkscape:label="Capa 1" transform="translate(0,-997.36218)">
+    <circle cx="27.375" cy="27.5" d="m 47.278,27.5 c 0,10.992123 -8.910877,19.903 -19.903,19.903 -10.992123,0 -19.9029999,-8.910877 -19.9029999,-19.903 0,-10.992123 8.9108769,-19.9029999 19.9029999,-19.9029999 10.992123,0 19.903,8.9108769 19.903,19.9029999 z" display="inline" id="circle5" r="19.903" sodipodi:cx="27.375" sodipodi:cy="27.5" sodipodi:rx="19.903" sodipodi:ry="19.903" style="fill:none;stroke:&stroke_color;;stroke-width:3.50000000000000000;display:inline;stroke-opacity:1" transform="translate(-3.3515626,994.55146)"/>
+    <line id="line13" style="fill:none;stroke:&stroke_color;;stroke-width:3.50000000000000000;stroke-opacity:1" x1="24.257486" x2="24.257486" y1="1002.6155" y2="1042.4196"/>
+    <line id="line15-4" style="fill:none;stroke:&stroke_color;;stroke-width:3.50000000000000000;stroke-opacity:1" x1="7.6935368" x2="35.94717" y1="1010.8835" y2="1038.9209"/>
+    <line id="line15-4-0" style="fill:none;stroke:&stroke_color;;stroke-width:3.50000000000000000;stroke-opacity:1" x1="40.838814" x2="12.58518" y1="1010.8294" y2="1038.8667"/>
+    <g id="terron" style="fill:&fill_color;;display:inline" transform="matrix(0.5,0,0,0.5,32.292818,1026.5221)">
+      <path d="m 38.822128,44.108722 c 0,0 -0.376363,0 -0.729309,0 0,-1.361344 0.0042,-5.649084 0.0042,-6.783539 0,0 0,0 0,-0.0017 l 0,-12.760539 -0.0075,-7.751552 c -0.0033,-0.878581 -0.727637,-1.586579 -1.609164,-1.582439 -0.427382,0 -0.831345,0.16727 -1.132437,0.467859 -0.301927,0.302245 -0.465854,0.702202 -0.464182,1.127001 0,0.03975 0.0017,2.534719 0.0042,4.633873 l -12.816435,0 c -1.740473,0 -3.151419,1.396952 -3.151419,3.117679 l 0,1.724867 -5.654655,0.0033 c -0.887382,0.0058 -1.601636,0.72042 -1.59829,1.593205 0.0017,0.424799 0.170617,0.823099 0.474217,1.121205 0.305274,0.298933 0.709237,0.461234 1.135782,0.459578 0.04935,0 3.419892,-0.0017 5.642109,-0.0033 l 0,7.540395 c 0,0.01159 -0.0033,0.02153 -0.0033,0.03229 0,0.05797 0.0033,5.498377 0.0033,7.060942 -0.352109,0 -0.729309,0 -0.729309,0 -0.904108,0.01739 -1.605818,0.74195 -1.590763,1.616391 0.0184,0.876924 0.752727,1.572502 1.635091,1.555112 l 2.303345,-0.0017 c 0.9016,-0.01656 1.607491,-0.741949 1.589091,-1.616389 l -0.0033,-5.219318 12.764581,0 -0.0059,5.219318 c -0.01673,0.875268 0.689163,1.600657 1.590764,1.616389 l 2.301672,0.0017 c 0.886545,0.01739 1.619201,-0.678188 1.636764,-1.555112 0.01756,-0.874441 -0.687491,-1.598173 -1.589091,-1.615563 z M 30.604855,25.673428 c 0.592982,-0.08281 1.143309,0.326259 1.227782,0.914187 0.08531,0.587101 -0.329527,1.132798 -0.922509,1.217261 -0.596328,0.08281 -1.145818,-0.327914 -1.229455,-0.914187 -0.08531,-0.588757 0.329528,-1.134454 0.924182,-1.217261 z m -5.654654,0.794117 c 0.592145,-0.08281 1.143309,0.32626 1.226946,0.914189 0.08531,0.588756 -0.329528,1.131969 -0.921674,1.217261 -0.596327,0.08446 -1.145817,-0.32626 -1.229454,-0.914188 -0.08447,-0.588758 0.327855,-1.132798 0.924182,-1.217262 z m 1.434364,9.080603 c -1.020364,-0.72042 -2.6404,-2.733455 -2.058292,-4.100596 0.205746,-0.481109 0.658219,-0.182176 1.150837,0.0621 1.175927,0.594553 2.576,0.670735 3.831382,0.29562 0.638145,-0.190456 1.183454,-0.499326 1.703673,-0.911703 0.316144,-0.252562 1.179272,-1.257009 1.654326,-0.803228 0.371346,0.355242 0.43491,0.795775 0.43491,0.799915 0.532763,3.368583 -3.68251,6.798445 -6.716836,4.657887 z" id="cuerpo" style="fill:&fill_color;"/>
+      <path d="m 17.233073,11.642631 c 1.738801,-2.9454406 7.191892,-2.9669703 8.1788,0.590413 0.3312,1.195731 0.305274,3.767713 -1.020363,4.464947 -0.465855,0.245108 -0.627273,-0.269951 -0.851418,-0.768448 -0.536946,-1.193247 -1.570691,-2.129793 -2.784255,-2.622494 -0.6164,-0.251732 -1.236146,-0.356897 -1.901891,-0.36021 -0.407309,-0.0033 -1.716218,0.237656 -1.793163,-0.414034 -0.06022,-0.505122 0.17229,-0.888518 0.17229,-0.890174 z" id="pelo_oscuro" style="fill:&fill_color;"/>
+      <g id="pelo_claro" style="fill:&fill_color;" transform="matrix(0.8363636,0,0,0.8280687,4.3773279,7.643887)">
+        <path d="M 30.514,13.666 C 25.959,9.955 27.36,0.759 33.675,0.043 c 2.124,-0.241 6.496,0.494 7.331,2.911 0.293,0.848 -0.624,0.982 -1.533,1.226 -2.174,0.585 -4.039,2.081 -5.2,3.992 -0.592,0.972 -0.931,1.989 -1.113,3.109 -0.113,0.683 -0.052,2.955 -1.178,2.913 -0.875,-0.032 -1.466,-0.526 -1.468,-0.528 z" id="path2674" style="fill:&fill_color;"/>
       </g>
     </g>
   </g>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/conozcoal.py b/conozcoal.py
index 423e4ac..f21789b 100644..100755
--- a/conozcoal.py
+++ b/conozcoal.py
@@ -90,7 +90,11 @@ class Zona():
     def estaAca(self,pos):
         """Devuelve True si la coordenada pos esta en la zona"""
         if pos[0] < XMAPAMAX*scale+shift_x:
-            colorAca = self.mapa.get_at((pos[0]-shift_x, pos[1]-shift_y))
+            try:
+                colorAca = self.mapa.get_at((int(pos[0]-shift_x),
+                                            int(pos[1]-shift_y)))
+            except: # probablemente click fuera de la imagen
+                return False
             if colorAca[0] == self.claveColor:
                 return True
             else:
@@ -105,7 +109,7 @@ class Zona():
         textrect = textrot.get_rect()
         textrect.center = (self.posicion[0], self.posicion[1])
         pantalla.blit(textrot, textrect)
-	if flipAhora:
+        if flipAhora:
             pygame.display.flip()
 
 
@@ -141,7 +145,7 @@ class Nivel():
 
     def devolverAyuda(self):
         """Devuelve la linea de ayuda"""
-	self.preguntaActual = self.preguntas[self.indicePreguntaActual-1]
+        self.preguntaActual = self.preguntas[self.indicePreguntaActual-1]
         return self.preguntaActual[2].split("\\")
 
     def mostrarPregunta(self,pantalla,fuente,sufijo,prefijo):
@@ -157,7 +161,7 @@ class Nivel():
             textrect.center = (XCENTROPANEL,yLinea)
             pantalla.blit(text, textrect)
             yLinea = yLinea + fuente.get_height()
-	pygame.display.flip()
+        pygame.display.flip()
 
 
 class ConozcoAl():
@@ -216,7 +220,7 @@ class ConozcoAl():
                 continue
             if linea.find("=") == -1:
                 linea = f.readline()
-                continue         
+                continue
             [var,valor] = linea.strip().split("=")
             if var.startswith("Prefijo"):
                 self.listaPrefijos.append(
@@ -282,11 +286,12 @@ class ConozcoAl():
                           (int(600*scale+shift_x),
                            int(800*scale+shift_y)),
                           (255,155,155))
-	pygame.display.flip()
+        pygame.display.flip()
         while 1:
             for event in wait_events():
                 if event.type == pygame.KEYDOWN:
-                    self.click.play()
+                    if self.sound:
+                        self.click.play()
                     self.pantalla.blit(self.pantallaTemp,(0,0))
                     pygame.display.flip()
                     return
@@ -339,11 +344,13 @@ class ConozcoAl():
             for event in wait_events():
                 if event.type == pygame.KEYDOWN:
                     if event.key == 27: # escape: volver
-                        self.click.play()
+                        if self.sound:
+                            self.click.play()
                         self.elegir_directorio = True
                         return
                 elif event.type == pygame.MOUSEBUTTONDOWN:
-                    self.click.play()
+                    if self.sound:
+                        self.click.play()
                     pos = event.pos
                     if pos[1] > 275*scale + shift_y: # zona de opciones
                         if pos[0] < 600*scale + shift_x: # primera columna
@@ -415,14 +422,18 @@ class ConozcoAl():
         self.camino_sonidos = os.path.join(CAMINORECURSOS,
                                            CAMINOCOMUN,
                                            CAMINOSONIDOS)
-        self.click = pygame.mixer.Sound(os.path.join(\
-                self.camino_sonidos,"junggle_btn045.wav"))
-        self.click.set_volume(0.2)
+        self.sound = True
+        try:
+            self.click = pygame.mixer.Sound(os.path.join(\
+                    self.camino_sonidos,"junggle_btn045.wav"))
+            self.click.set_volume(0.2)
+        except:
+            self.sound = False
         # cargar fuentes
         self.fuente48 = pygame.font.Font(os.path.join(CAMINORECURSOS,\
                                                           CAMINOCOMUN,\
                                                           CAMINOFUENTES,\
-                                                          "AllCaps.ttf"),
+                                                          "Share-Regular.ttf"),
                                          int(48*scale))
         self.fuente40 = pygame.font.Font(os.path.join(CAMINORECURSOS,\
                                                           CAMINOCOMUN,\
@@ -490,7 +501,7 @@ class ConozcoAl():
             textrect.center = (int(XCENTROPANEL*scale+shift_x),yLinea)
             self.pantalla.blit(text, textrect)
             yLinea = yLinea + self.fuente32.get_height() + int(10*scale)
-	pygame.display.flip()
+        pygame.display.flip()
 
     def borrarGlobito(self):
         """ Borra el globito, lo deja en blanco"""
@@ -506,7 +517,7 @@ class ConozcoAl():
         self.mostrarGlobito([self.listaCorrecto[self.correctoActual]])
         self.esCorrecto = True
         pygame.time.set_timer(EVENTORESPUESTA,TIEMPORESPUESTA)
-        
+
     def mal(self):
         """Muestra texto en el globito cuando la respuesta es incorrecta"""
         self.malActual = random.randint(1,self.numeroMal)-1
@@ -556,11 +567,13 @@ class ConozcoAl():
             for event in wait_events():
                 if event.type == pygame.KEYDOWN:
                     if event.key == 27: # escape: salir
-                        self.click.play()
+                        if self.sound:
+                            self.click.play()
                         pygame.time.set_timer(EVENTORESPUESTA,0)
                         return
                 elif event.type == pygame.MOUSEBUTTONDOWN:
-                    self.click.play()
+                    if self.sound:
+                        self.click.play()
                     if self.avanceNivel < TOTALAVANCE:
                         if event.pos[0] < XMAPAMAX*scale+shift_x: # zona mapa
                             self.borrarGlobito()
@@ -629,7 +642,7 @@ class ConozcoAl():
                 pygame.display.flip()
                 # ir al juego
                 self.jugarNivel()
- 
+
 
 def main():
     juego = ConozcoAl()
diff --git a/olpcgames/__init__.py b/olpcgames/__init__.py
index 504388c..504388c 100644..100755
--- a/olpcgames/__init__.py
+++ b/olpcgames/__init__.py
diff --git a/olpcgames/_cairoimage.py b/olpcgames/_cairoimage.py
index 3cfa22c..3cfa22c 100644..100755
--- a/olpcgames/_cairoimage.py
+++ b/olpcgames/_cairoimage.py
diff --git a/olpcgames/_gtkmain.py b/olpcgames/_gtkmain.py
index 33a6a83..33a6a83 100644..100755
--- a/olpcgames/_gtkmain.py
+++ b/olpcgames/_gtkmain.py
diff --git a/olpcgames/_version.py b/olpcgames/_version.py
index 6a4e1db..6a4e1db 100644..100755
--- a/olpcgames/_version.py
+++ b/olpcgames/_version.py
diff --git a/olpcgames/activity.py b/olpcgames/activity.py
index d4a2b5a..d4a2b5a 100644..100755
--- a/olpcgames/activity.py
+++ b/olpcgames/activity.py
diff --git a/olpcgames/buildmanifest.py b/olpcgames/buildmanifest.py
index 899433b..899433b 100644..100755
--- a/olpcgames/buildmanifest.py
+++ b/olpcgames/buildmanifest.py
diff --git a/olpcgames/camera.py b/olpcgames/camera.py
index 249f295..249f295 100644..100755
--- a/olpcgames/camera.py
+++ b/olpcgames/camera.py
diff --git a/olpcgames/canvas.py b/olpcgames/canvas.py
index 2583827..2583827 100644..100755
--- a/olpcgames/canvas.py
+++ b/olpcgames/canvas.py
diff --git a/olpcgames/data/__init__.py b/olpcgames/data/__init__.py
index 8510186..8510186 100644..100755
--- a/olpcgames/data/__init__.py
+++ b/olpcgames/data/__init__.py
diff --git a/olpcgames/data/sleeping_svg.py b/olpcgames/data/sleeping_svg.py
index c52398a..c52398a 100644..100755
--- a/olpcgames/data/sleeping_svg.py
+++ b/olpcgames/data/sleeping_svg.py
diff --git a/olpcgames/dbusproxy.py b/olpcgames/dbusproxy.py
index a103e28..a103e28 100644..100755
--- a/olpcgames/dbusproxy.py
+++ b/olpcgames/dbusproxy.py
diff --git a/olpcgames/eventwrap.py b/olpcgames/eventwrap.py
index 402109c..402109c 100644..100755
--- a/olpcgames/eventwrap.py
+++ b/olpcgames/eventwrap.py
diff --git a/olpcgames/gtkEvent.py b/olpcgames/gtkEvent.py
index 6b20102..6b20102 100644..100755
--- a/olpcgames/gtkEvent.py
+++ b/olpcgames/gtkEvent.py
diff --git a/olpcgames/mesh.py b/olpcgames/mesh.py
index 1ad4c43..1ad4c43 100644..100755
--- a/olpcgames/mesh.py
+++ b/olpcgames/mesh.py
diff --git a/olpcgames/pangofont.py b/olpcgames/pangofont.py
index 441dfd1..441dfd1 100644..100755
--- a/olpcgames/pangofont.py
+++ b/olpcgames/pangofont.py
diff --git a/olpcgames/pausescreen.py b/olpcgames/pausescreen.py
index 113a0ea..113a0ea 100644..100755
--- a/olpcgames/pausescreen.py
+++ b/olpcgames/pausescreen.py
diff --git a/olpcgames/svgsprite.py b/olpcgames/svgsprite.py
index ad247dd..ad247dd 100644..100755
--- a/olpcgames/svgsprite.py
+++ b/olpcgames/svgsprite.py
diff --git a/olpcgames/textsprite.py b/olpcgames/textsprite.py
index 7663630..7663630 100644..100755
--- a/olpcgames/textsprite.py
+++ b/olpcgames/textsprite.py
diff --git a/olpcgames/util.py b/olpcgames/util.py
index 49a23b0..49a23b0 100644..100755
--- a/olpcgames/util.py
+++ b/olpcgames/util.py
diff --git a/olpcgames/video.py b/olpcgames/video.py
index 032aa13..032aa13 100644..100755
--- a/olpcgames/video.py
+++ b/olpcgames/video.py
diff --git a/recursos/comun/datos/creditos.txt b/recursos/comun/datos/creditos.txt
index 6414f9a..a6ae2ef 100644
--- a/recursos/comun/datos/creditos.txt
+++ b/recursos/comun/datos/creditos.txt
@@ -1,9 +1,11 @@
-Autor: Alan Aguiar
-Por consultas, dudas, sugerencias: alanjas@hotmail.com
+Autor: Alan Aguiar (alanjas@gmail.com)
+Idea original: Ana Cichero (ana.cichero@gmail.com)
+Se agradecen todo tipo de consultas, dudas, sugerencias...
 
 Este programa es software libre y desarrollado por la comunidad
 Por más información visitá http://ceibaljam.org
+Basado en "Conozco Uruguay". Autor: Gabriel Eirea (geirea@gmail.com)
 
 Sonidos bajados de freesound.org: btn045.wav gentileza de junggle
 Fuentes bajadas de urbanfonts.com: AllCaps.ttf gentileza de BobFrantic y
-Share-Regular.ttf gentileza de Anónimo
+Share-Regular.ttf gentileza de Anónimo
\ No newline at end of file
diff --git a/recursos/comun/fuentes/AllCaps.ttf b/recursos/comun/fuentes/AllCaps.ttf
deleted file mode 100644
index f73338f..0000000
--- a/recursos/comun/fuentes/AllCaps.ttf
+++ /dev/null
diff --git a/recursos/comun/imagenes/LICENSE b/recursos/comun/imagenes/LICENSE
index 2c92af3..2a29d1f 100644
--- a/recursos/comun/imagenes/LICENSE
+++ b/recursos/comun/imagenes/LICENSE
@@ -8,3 +8,4 @@ California, 94105, USA.
 
 Todas las imágenes fueron creadas por Gabriel Eirea, menos terron.png
 que fue creada por Alejandro Rodríguez Juele.
+El cocinero, cuya lamina es "Bicho.png" fue extraida de www.shutterstock.com
\ No newline at end of file
diff --git a/recursos/comun/imagenes/bicho.png b/recursos/comun/imagenes/bicho.png
index 4686238..d867791 100644
--- a/recursos/comun/imagenes/bicho.png
+++ b/recursos/comun/imagenes/bicho.png
diff --git a/recursos/comun/imagenes/terron.png b/recursos/comun/imagenes/terron.png
index 375a8aa..61ee9b7 100644
--- a/recursos/comun/imagenes/terron.png
+++ b/recursos/comun/imagenes/terron.png
diff --git a/recursos/lamina/niveles.txt b/recursos/lamina/niveles.txt
index e99666d..00607cb 100644
--- a/recursos/lamina/niveles.txt
+++ b/recursos/lamina/niveles.txt
@@ -30,7 +30,7 @@ Pregunta = la fruta con la\que se hace el vino|10|Son de color morado
 Pregunta = la fruta de color\rojo más común en\las ensaladas|15|En la lámina hay dos
 Pregunta = la fruta que contiene\casi un 85 por\ciento de agua|15|En la lámina hay dos
 Pregunta = el lácteo que\comunmente se\come con cereales|20|Son dos potecitos
-Pregunta = el lácteo que\comunmente se\come con cereales|21|Hay una caja y un vaso
+Pregunta = el lácteo que\comunmente se\toma con café o similar|21|Hay una caja y un vaso
 Pregunta = el alimento energético\no grasa que\ponemos en la tostada|22|El pote tiene\una frutilla
 Pregunta = la carne con mayor\proporción de grasa|27|Es roja
 Pregunta = un elemento para\hacer una rica tortilla,\ batimos varios…|28|Vienen de las gallinas
@@ -44,16 +44,13 @@ Pregunta = el grupo de alimentos\del que obtenemos\las vitaminas|30|Esta en verd
 Pregunta = el grupo del que\obtenemos las proteínas|34|Esta en rojo
 Pregunta = el grupo de alimentos\debemos consumir más|29|Esta en amarillo
 Pregunta = por día debemos tomar\dos litros de...|39|Esta en el centro
-Pregunta = un postre rico\y saludable puede ser|11|Es roja
-Pregunta = un postre rico\y saludable puede ser|13|Su nombre\es su color
-Pregunta = un postre rico\y saludable puede ser|41|Es amarilla
 Pregunta = el ingrediente que\debemos evitar\para evitar la\hipertensión|37|Cloruro de sodio
 Pregunta = para evitar las\caries no tenemos\que comer muchos|35|Son dos
 Pregunta = fruta que se dice\es buena para la vista|12|Es de color naranja
 Pregunta = una fruta\rica en potasio|41|Es amarilla
 Pregunta = una fruta\rica en hierro|15|Es rojo
-Pregunta = una fruta que\contiene mucha\vitamina C|14|Es amarillo
-Pregunta = una fruta que\contiene mucha\vitamina C|13|Es de color naranja
+Pregunta = una fruta ácida que\contiene mucha\vitamina C|14|Es amarillo
+Pregunta = una fruta dulce que\contiene mucha\vitamina C|13|Es de color naranja
 Pregunta = el elemento que\en demasia puede\atacar el higado|28|Vienen de las gallinas
 Pregunta = la verdura que\generalmente se\utiliza para\hacer ravioles|42|Es verde
 Pregunta = la verdura que\se utiliza para\hacer polenta|16|Es amarillo
@@ -61,4 +58,4 @@ Pregunta = el elemento que\generalmente se\come con pan|22|Es de sabor dulce
 Pregunta = el elemento\que se produce\mayoritariamente en\Colonia|19|Es un lacteo
 Pregunta = la carne de mayor\concentración de\Omega 3 y 6|26|Vive en el agua
 Pregunta = una grasa insaturada|7|Es liquido
-Pregunta = una grasa saturada|8|Es solido
+Pregunta = una grasa saturada|8|Es solido
\ No newline at end of file
diff --git a/run.py b/run.py
deleted file mode 100644
index b5bf78e..0000000
--- a/run.py
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /usr/bin/env python
-"""Skeleton project file mainloop for new OLPCGames users"""
-import olpcgames, pygame, logging 
-from olpcgames import pausescreen
-
-log = logging.getLogger( 'conozco-alimentos run' )
-log.setLevel( logging.DEBUG )
-
-def main():
-    """The mainloop which is specified in the activity.py file
-    
-    "main" is the assumed function name
-    """
-    size = (800,600)
-    if olpcgames.ACTIVITY:
-        size = olpcgames.ACTIVITY.game_size
-    screen = pygame.display.set_mode(size)
-    
-    clock = pygame.time.Clock()
-
-    running = True
-    while running:
-        screen.fill( (0,0,128))
-        milliseconds = clock.tick(25) # maximum number of frames per second
-        
-        # Event-management loop with support for pausing after X seconds (20 here)
-        events = pausescreen.get_events()
-        # Now the main event-processing loop
-        if events:
-            for event in events:
-                log.debug( "Event: %s", event )
-                if event.type == pygame.QUIT:
-                    running = False
-                elif event.type == pygame.KEYDOWN:
-                    if event.key == pygame.K_ESCAPE:
-                        running = False
-            pygame.display.flip()
-
-if __name__ == "__main__":
-    logging.basicConfig()
-    main()
diff --git a/setup.py b/setup.py
index cf88991..77fda74 100644..100755
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
 #!/usr/bin/env python
 from sugar.activity import bundlebuilder
 if __name__ == "__main__":
-    bundlebuilder.start("conozco-alimentos")
+    bundlebuilder.start()