Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Moleri <pmoleri@gmail.com>2011-03-11 22:06:22 (GMT)
committer Pablo Moleri <pmoleri@gmail.com>2011-03-11 22:06:22 (GMT)
commit20cd7c529d70cd24cfa5347187061a10d2159f54 (patch)
treeae474115e83dffd8ed9c48c4109c4c8d4d7cfde9
parentc9c75d7acd0c2a71ae8ffaeb42e04d6a9986e9d6 (diff)
New guides tab
Character disapears when only one loop is configured
-rwxr-xr-xSaludame.activity/actions_creator.py142
-rwxr-xr-xSaludame.activity/activity.py15
-rwxr-xr-xSaludame.activity/animation.py21
-rwxr-xr-xSaludame.activity/app_init.py18
-rw-r--r--Saludame.activity/assets/slides/screen_loading.jpgbin0 -> 60491 bytes
-rwxr-xr-xSaludame.activity/content_window.py4
-rw-r--r--Saludame.activity/events_windows.py20
-rwxr-xr-xSaludame.activity/game.py46
-rw-r--r--Saludame.activity/guides/00-Introducción.html31
-rw-r--r--Saludame.activity/guides_window.py152
-rw-r--r--Saludame.activity/hotkeys.py25
-rw-r--r--Saludame.activity/locale/es/LC_MESSAGES/org.ceibaljam.Saludame.mobin7681 -> 7635 bytes
-rwxr-xr-xSaludame.activity/po/Saludame.pot386
-rwxr-xr-xSaludame.activity/po/es.po454
14 files changed, 889 insertions, 425 deletions
diff --git a/Saludame.activity/actions_creator.py b/Saludame.activity/actions_creator.py
index 905a5bf..729735a 100755
--- a/Saludame.activity/actions_creator.py
+++ b/Saludame.activity/actions_creator.py
@@ -45,169 +45,169 @@ actions_list = [
),
# Breakfast - drinks
- ("leche", 0.3, 5, 70, 3, DRINK_PATH, 3, 1, HOT_DRINK_PATH, 4, BLIP_PATH,
+ ("leche", 0.3, 5, 70, 0, DRINK_PATH, 3, 1, HOT_DRINK_PATH, 4, BLIP_PATH,
effects.Effect(None, [("l_quesos", 2.0), ("agua", 1.0), ("weight", 2.0)]), None, ["morning", "afternoon"], None
),
- ("leche_chocolatada", 0.3, 5, 70, 3, DRINK_PATH, 3, 1, HOT_DRINK_PATH, 4, BLIP_PATH,
+ ("leche_chocolatada", 0.3, 5, 70, 0, DRINK_PATH, 3, 1, HOT_DRINK_PATH, 4, BLIP_PATH,
effects.Effect(None, [("l_quesos", 2.0), ("dulces", 2.0), ("agua", 1.0), ("weight", 2.0)]), None, ["morning", "afternoon"], None
),
- ("leche_cafe", 0.3, 5, 70, 3, DRINK_PATH, 3, 1, HOT_DRINK_PATH, 4, BLIP_PATH,
+ ("leche_cafe", 0.3, 5, 70, 0, DRINK_PATH, 3, 1, HOT_DRINK_PATH, 4, BLIP_PATH,
effects.Effect(None, [("l_quesos", 2.0), ("agua", 1.0), ("weight", 2.0)]), None, ["morning", "afternoon"], None
),
- ("yogur", 0.3, 5, 70, 3, DRINK_PATH, 3, 1, HOT_DRINK_PATH, 4, BLIP_PATH,
+ ("yogur", 0.3, 5, 70, 0, DRINK_PATH, 3, 1, HOT_DRINK_PATH, 4, BLIP_PATH,
effects.Effect(None, [("l_quesos", 2.0), ("agua", 1.0), ("weight", 2.0)]), None, ["morning", "afternoon"], None
),
- ("jugo_natural", 0.3, 5, 70, 3, DRINK_PATH, 3, 1, HOT_DRINK_PATH, 4, BLIP_PATH,
+ ("jugo_natural", 0.3, 5, 70, 0, DRINK_PATH, 3, 1, HOT_DRINK_PATH, 4, BLIP_PATH,
effects.Effect(None, [("l_quesos", 2.0), ("agua", 1.0), ("weight", 2.0)]), None, ["morning", "afternoon"], None
),
- ("licuado", 0.3, 5, 70, 3, DRINK_PATH, 3, 1, HOT_DRINK_PATH, 4, BLIP_PATH,
+ ("licuado", 0.3, 5, 70, 0, DRINK_PATH, 3, 1, HOT_DRINK_PATH, 4, BLIP_PATH,
effects.Effect(None, [("l_quesos", 2.0), ("agua", 1.0), ("weight", 2.0)]), None, ["morning", "afternoon"], None
),
- ("refresco", 0.3, 5, 70, 3, DRINK_PATH, 3, 1, HOT_DRINK_PATH, 4, BLIP_PATH,
+ ("refresco", 0.3, 5, 70, 0, DRINK_PATH, 3, 1, HOT_DRINK_PATH, 4, BLIP_PATH,
effects.Effect(None, [("l_quesos", 2.0), ("agua", 1.0), ("weight", 2.0)]), None, ["morning", "afternoon"], None
),
- ("mate", 0.3, 5, 70, 3, DRINK_PATH, 3, 1, HOT_DRINK_PATH, 4, BLIP_PATH,
+ ("mate", 0.3, 5, 70, 0, DRINK_PATH, 3, 1, HOT_DRINK_PATH, 4, BLIP_PATH,
effects.Effect(None, [("l_quesos", 2.0), ("agua", 1.0), ("weight", 2.0)]), None, ["morning", "afternoon"], None
),
- ("cafe", 0.3, 5, 70, 3, DRINK_PATH, 3, 1, HOT_DRINK_PATH, 4, BLIP_PATH,
+ ("cafe", 0.3, 5, 70, 0, DRINK_PATH, 3, 1, HOT_DRINK_PATH, 4, BLIP_PATH,
effects.Effect(None, [("l_quesos", 2.0), ("agua", 1.0), ("weight", 2.0)]), None, ["morning", "afternoon"], None
),
# Breakfast - meals
- ("pan_queso", 0.3, 5, 70, 3, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
+ ("pan_queso", 0.3, 5, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
effects.Effect(None, [("c_leguminosas", 1.5), ("dulces", 1.5), ("weight", 1.0)]), None, ["morning", "afternoon"], None
),
- ("pan_manteca", 0.3, 5, 70, 3, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
+ ("pan_manteca", 0.3, 5, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
effects.Effect(None, [("c_leguminosas", 1.5), ("l_quesos", 1.5), ("weight", 1.0)]), None, ["morning", "afternoon"], None
),
- ("galletas_dulce", 0.3, 5, 70, 3, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
+ ("galletas_dulce", 0.3, 5, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
effects.Effect(None, [("c_leguminosas", 2.0), ("weight", 1.0)]), None, ["morning", "afternoon"], None
),
- ("torta_frita", 0.3, 5, 70, 3, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
+ ("torta_frita", 0.3, 5, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
effects.Effect(None, [("c_leguminosas", 2.0), ("weight", 1.0)]), None, ["morning", "afternoon"], None
),
- ("refuerzo_fiambre", 0.3, 5, 70, 3, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
+ ("refuerzo_fiambre", 0.3, 5, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
effects.Effect(None, [("c_leguminosas", 2.0), ("weight", 1.0)]), None, ["morning", "afternoon"], None
),
- ("bizcochos", 0.3, 5, 70, 3, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
+ ("bizcochos", 0.3, 5, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
effects.Effect(None, [("c_leguminosas", 2.0), ("weight", 1.0)]), None, ["morning", "afternoon"], None
),
- ("torta", 0.3, 5, 70, 3, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
+ ("torta", 0.3, 5, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
effects.Effect(None, [("c_leguminosas", 2.0), ("dulces", 2.0), ("weight", 1.0)]), None, ["morning", "afternoon"], None
),
- ("rosca_chicharrones", 0.3, 5, 70, 3, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
+ ("rosca_chicharrones", 0.3, 5, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
effects.Effect(None, [("c_leguminosas", 2.0), ("dulces", 2.0), ("weight", 1.0)]), None, ["morning", "afternoon"], None
),
# Breakfast - others
- ("avena_leche", 0.3, 5, 70, 3, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
+ ("avena_leche", 0.3, 5, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
effects.Effect(None, [("c_leguminosas", 2.0), ("l_quesos", 2.0), ("weight", 1.0)]), None, ["morning", "afternoon"], None
),
- ("arroz_leche", 0.3, 5, 70, 3, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
+ ("arroz_leche", 0.3, 5, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
effects.Effect(None, [("c_leguminosas", 2.0), ("l_quesos", 2.0), ("weight", 1.0)]), None, ["morning", "afternoon"], None
),
- ("crema", 0.3, 5, 70, 3, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
+ ("crema", 0.3, 5, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
effects.Effect(None, [("c_leguminosas", 2.0), ("l_quesos", 2.0), ("weight", 1.0)]), None, ["morning", "afternoon"], None
),
- ("flan", 0.3, 5, 70, 3, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
+ ("flan", 0.3, 5, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
effects.Effect(None, [("c_leguminosas", 2.0), ("l_quesos", 2.0), ("weight", 1.0)]), None, ["morning", "afternoon"], None
),
# Fruit
- ("manzana", 0.3, 5, 70, 3, CHEW_PATH, 3, 1, FRUIT_PATH, 4, BLIP_PATH,
+ ("manzana", 0.3, 5, 70, 0, CHEW_PATH, 3, 1, FRUIT_PATH, 4, BLIP_PATH,
effects.Effect(None, [("v_frutas", 3.0), ("weight", 20)]), None, None, None
),
- ("naranja", 0.3, 5, 70, 3, CHEW_PATH, 3, 1, FRUIT_PATH, 4, BLIP_PATH,
+ ("naranja", 0.3, 5, 70, 0, CHEW_PATH, 3, 1, FRUIT_PATH, 4, BLIP_PATH,
effects.Effect(None, [("v_frutas", 3.0), ("weight", 0.5)]), None, None, None
),
- ("banana", 0.3, 5, 70, 3, CHEW_PATH, 3, 1, FRUIT_PATH, 4, BLIP_PATH,
+ ("banana", 0.3, 5, 70, 0, CHEW_PATH, 3, 1, FRUIT_PATH, 4, BLIP_PATH,
effects.Effect(None, [("v_frutas", 3.0), ("weight", 0.5)]), None, None, None
),
- ("ciruelas", 0.3, 5, 70, 3, CHEW_PATH, 3, 1, FRUIT_PATH, 4, BLIP_PATH,
+ ("ciruelas", 0.3, 5, 70, 0, CHEW_PATH, 3, 1, FRUIT_PATH, 4, BLIP_PATH,
effects.Effect(None, [("v_frutas", 3.0), ("weight", 0.5)]), None, None, None
),
- ("pelon", 0.3, 5, 70, 3, CHEW_PATH, 3, 1, FRUIT_PATH, 4, BLIP_PATH,
+ ("pelon", 0.3, 5, 70, 0, CHEW_PATH, 3, 1, FRUIT_PATH, 4, BLIP_PATH,
effects.Effect(None, [("v_frutas", 3.0), ("weight", 0.5)]), None, None, None
),
- ("frutillas", 0.3, 5, 70, 3, CHEW_PATH, 3, 1, FRUIT_PATH, 4, BLIP_PATH,
+ ("frutillas", 0.3, 5, 70, 0, CHEW_PATH, 3, 1, FRUIT_PATH, 4, BLIP_PATH,
effects.Effect(None, [("v_frutas", 3.0), ("weight", 0.5)]), None, None, None
),
- ("durazno", 0.3, 5, 70, 3, CHEW_PATH, 3, 1, FRUIT_PATH, 4, BLIP_PATH,
+ ("durazno", 0.3, 5, 70, 0, CHEW_PATH, 3, 1, FRUIT_PATH, 4, BLIP_PATH,
effects.Effect(None, [("v_frutas", 3.0), ("weight", 0.5)]), None, None, None
),
- ("mandarina", 0.3, 5, 70, 3, CHEW_PATH, 3, 1, FRUIT_PATH, 4, BLIP_PATH,
+ ("mandarina", 0.3, 5, 70, 0, CHEW_PATH, 3, 1, FRUIT_PATH, 4, BLIP_PATH,
effects.Effect(None, [("v_frutas", 3.0), ("weight", 0.5)]), None, None, None
),
# Sweets & Snacks
- ("papas_chips", 0.3, 5, 70, 3, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
+ ("papas_chips", 0.3, 5, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
effects.Effect(None, [("candy", 3.0), ("weight", 0.5)]), None, None, None
),
- ("ticholos", 0.3, 5, 70, 3, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
+ ("ticholos", 0.3, 5, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
effects.Effect(None, [("candy", 3.0), ("weight", 0.5)]), None, None, None
),
- ("rapadura", 0.3, 5, 70, 3, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
+ ("rapadura", 0.3, 5, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
effects.Effect(None, [("candy", 3.0), ("weight", 0.5)]), None, None, None
),
- ("caramelo", 0.3, 5, 70, 3, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
+ ("caramelo", 0.3, 5, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
effects.Effect(None, [("candy", 3.0), ("weight", 0.5)]), None, None, None
),
- ("galletitas_dulces", 0.3, 5, 70, 3, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
+ ("galletitas_dulces", 0.3, 5, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
effects.Effect(None, [("candy", 3.0), ("weight", 0.5)]), None, None, None
),
- ("alfajor", 0.3, 5, 70, 3, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
+ ("alfajor", 0.3, 5, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
effects.Effect(None, [("candy", 3.0), ("weight", 0.5)]), None, None, None
),
- ("chicle", 0.3, 5, 70, 3, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
+ ("chicle", 0.3, 5, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
effects.Effect(None, [("candy", 3.0), ("weight", 0.5)]), None, None, None
),
- ("chupetin", 0.3, 5, 70, 3, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
+ ("chupetin", 0.3, 5, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
effects.Effect(None, [("candy", 3.0), ("weight", 0.5)]), None, None, None
),
- ("chocolate", 0.3, 5, 70, 3, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
+ ("chocolate", 0.3, 5, 70, 0, CHEW_PATH, 3, 1, BREAKFAST_PATH, 4, BLIP_PATH,
effects.Effect(None, [("candy", 3.0), ("weight", 0.5)]), None, None, None
),
# Meals
- ("eat_stew", 0.3, 5, 70, 3, CHEW_PATH, 3, 1, STEW_PATH, 4, BLIP_PATH,
+ ("eat_stew", 0.3, 5, 70, 0, CHEW_PATH, 3, 1, STEW_PATH, 4, BLIP_PATH,
effects.Effect(None, [("c_leguminosas", 2.0), ("v_frutas", 1.0), ("c_huevos", 0.5), ("g_aceites", 1.0), ("agua", 1.0), ("weight", 1.0)]), None, None, None
),
- ("eat_churrasco", 0.3, 5, 70, 3, CHEW_PATH, 3, 1, STEW_PATH, 4, BLIP_PATH,
+ ("eat_churrasco", 0.3, 5, 70, 0, CHEW_PATH, 3, 1, STEW_PATH, 4, BLIP_PATH,
effects.Effect(None, [("c_leguminosas", 2.0), ("v_frutas", 1.0), ("c_huevos", 0.5), ("g_aceites", 1.0), ("agua", 1.0), ("weight", 1.0)]), None, None, None
),
- ("eat_beaver", 0.3, 5, 70, 3, CHEW_PATH, 3, 1, STEW_PATH, 4, BLIP_PATH,
+ ("eat_beaver", 0.3, 5, 70, 0, CHEW_PATH, 3, 1, STEW_PATH, 4, BLIP_PATH,
effects.Effect(None, [("c_huevos", 3.0), ("g_aceites", 2.0), ("weight", 1.0)]), None, None, None
),
- ("eat_milanesa", 0.3, 5, 70, 3, CHEW_PATH, 3, 1, STEW_PATH, 4, BLIP_PATH,
+ ("eat_milanesa", 0.3, 5, 70, 0, CHEW_PATH, 3, 1, STEW_PATH, 4, BLIP_PATH,
effects.Effect(None, [("c_huevos", 3.0), ("g_aceites", 2.0), ("weight", 2.0)]), None, None, None
),
- ("eat_torta_frita", 0.3, 5, 70, 3, CHEW_PATH, 3, 1, STEW_PATH, 4, BLIP_PATH,
+ ("eat_torta_frita", 0.3, 5, 70, 0, CHEW_PATH, 3, 1, STEW_PATH, 4, BLIP_PATH,
effects.Effect(None, [("c_huevos", 3.0), ("weight", 1.0)]), None, None, None
),
- ("salad", 0.3, 5, 70, 3, CHEW_PATH, 3, 1, STEW_PATH, 4, BLIP_PATH,
+ ("salad", 0.3, 5, 70, 0, CHEW_PATH, 3, 1, STEW_PATH, 4, BLIP_PATH,
effects.Effect(None, [("v_frutas", 2.0), ("weight", 0.5)]), None, None, None
),
- ("pascualina", 0.3, 5, 70, 3, CHEW_PATH, 3, 1, STEW_PATH, 4, BLIP_PATH,
+ ("pascualina", 0.3, 5, 70, 0, CHEW_PATH, 3, 1, STEW_PATH, 4, BLIP_PATH,
effects.Effect(None, [("v_frutas", 2.0), ("c_leguminosas", 1.0), ("weight", 1.0)]), None, None, None
),
- ("tortilla_verdura", 0.3, 5, 70, 3, CHEW_PATH, 3, 1, STEW_PATH, 4, BLIP_PATH,
+ ("tortilla_verdura", 0.3, 5, 70, 0, CHEW_PATH, 3, 1, STEW_PATH, 4, BLIP_PATH,
effects.Effect(None, [("v_frutas", 2.0), ("g_aceites", 1.0), ("weight", 1.0)]), None, None, None
),
# Liquid
- ("agua", 0.3, 5, 70, 3, DRINK_PATH, 3, 1, None, 4, BLIP_PATH,
+ ("agua", 0.3, 5, 70, 0, DRINK_PATH, 3, 1, COLD_DRINK_PATH, 4, BLIP_PATH,
effects.Effect(None, [("agua", 1.0)]), None, None, None
),
- ("limonada", 0.3, 5, 70, 3, DRINK_PATH, 3, 1, None, 4, BLIP_PATH,
+ ("limonada", 0.3, 5, 70, 0, DRINK_PATH, 3, 1, COLD_DRINK_PATH, 4, BLIP_PATH,
effects.Effect(None, [("agua", 1.0)]), None, None, None
),
- ("jugo_naranja", 0.3, 5, 70, 3, DRINK_PATH, 3, 1, None, 4, BLIP_PATH,
+ ("jugo_naranja", 0.3, 5, 70, 0, DRINK_PATH, 3, 1, COLD_DRINK_PATH, 4, BLIP_PATH,
effects.Effect(None, [("agua", 1.0)]), None, None, None
),
- ("jugo_peras", 0.3, 5, 70, 3, DRINK_PATH, 3, 1, None, 4, BLIP_PATH,
+ ("jugo_peras", 0.3, 5, 70, 0, DRINK_PATH, 3, 1, COLD_DRINK_PATH, 4, BLIP_PATH,
effects.Effect(None, [("agua", 1.0)]), None, None, None
),
- ("jugo_zanahorias", 0.3, 5, 70, 3, DRINK_PATH, 3, 1, None, 4, BLIP_PATH,
+ ("jugo_zanahorias", 0.3, 5, 70, 0, DRINK_PATH, 3, 1, COLD_DRINK_PATH, 4, BLIP_PATH,
effects.Effect(None, [("agua", 1.0)]), None, None, None
),
@@ -223,19 +223,19 @@ actions_list = [
),
# Do
- ("housekeeping", 0.3, 5, 28, 0, "assets/kid/actions/twister", 3, 1, "assets/action-icons/clean", 4, None,
+ ("housekeeping", 0.3, 5, 70, 1, "assets/kid/actions/twister", 3, 1, "assets/action-icons/clean", 4, None,
effects.Effect(None, [("energy", -2.0), ("shower", -2.0), ("w_hands", -2.0), ("sports", 1.0), ("fun", -2.0), ("relaxing", -3.0), ("housekeeping", 6.0)]), None, None, None
),
- ("homework", 0.3, 5, 28, 0, "assets/kid/actions/twister", 3, 1, "assets/action-icons/clean", 4, None,
+ ("homework", 0.3, 5, 70, 1, "assets/kid/actions/twister", 3, 1, "assets/action-icons/clean", 4, None,
effects.Effect(None, [("energy", -3.0), ("weight", -0.5), ("nutrition", -0.5), ("sports", -2.0), ("fun", -2.0), ("relaxing", -3.0), ("homework", 8.0)]), None, None, None
),
("study_xo", 0.3, 5, 70, 0, "assets/kid/actions/studyXO", 3, 1, None, 4, None,
effects.Effect(None, [("energy", -3.0), ("weight", -0.5), ("nutrition", -0.5), ("sports", -2.0), ("fun", -1.0), ("relaxing", -3.0), ("responsability", 2.0)]), None, None, None
),
- ("help_field", 0.3, 5, 70, 0, "assets/kid/actions/twister", 3, 1, None, 4, None,
+ ("help_field", 0.3, 5, 70, 1, "assets/kid/actions/twister", 3, 1, None, 4, None,
effects.Effect(None, [("energy", -4.0), ("defenses", 1.0), ("weight", -1.0), ("nutrition", -0.5), ("water", -1.5), ("shower", -4.0), ("w_hands", -7.0), ("sports", -2), ("fun", -2), ("relaxing", -4), ("responsability", -4.0)]), None, None, None
),
- ("help_cook", 0.3, 5, 70, 0, "assets/kid/actions/twister", 3, 1, "assets/action-icons/cook", 4, None,
+ ("help_cook", 0.3, 5, 70, 1, "assets/kid/actions/twister", 3, 1, "assets/action-icons/cook", 4, None,
effects.Effect(None, [("energy", -2.0), ("shower", -1.0), ("w_hands", -5.0), ("relaxing", -1.0)]), None, None, None
),
("relax", 0.3, 5, 70, 0, "assets/kid/actions/rest", 3, 1, None, 4, None,
@@ -244,56 +244,56 @@ actions_list = [
("talk", 0.3, 5, 70, 0, None, 3, 1, "assets/action-icons/talktofriend", 4, None,
effects.Effect(None, [("fun", 3.0)]), None, None, None
),
- ("clean", 0.3, 5, 28, 0, "assets/kid/actions/twister", 3, 1, "assets/action-icons/clean", 4, None,
+ ("clean", 0.3, 5, 70, 1, "assets/kid/actions/twister", 3, 1, "assets/action-icons/clean", 4, None,
effects.Effect(None, [("energy", -2.0), ("shower", -1.0), ("w_hands", -4.0), ("sports", 1.0), ("fun", -2.0), ("relaxing", -2.0), ("housekeeping", 2)]), None, None, None
),
- ("wash_hands", 0.3, 5, 28, 0, "assets/kid/actions/twister", 3, 1, "assets/action-icons/washhands", 4, None,
+ ("wash_hands", 0.3, 5, 70, 1, "assets/kid/actions/twister", 3, 1, "assets/action-icons/washhands", 4, None,
effects.Effect(None, [("defenses", 2.0), ("shower", 10.0), ("w_hands", 10.0)]), None, None, None
),
("brush_teeth", 0.3, 5, 70, 0, "assets/kid/actions/brushteeth", 3, 1, None, 4, None,
effects.Effect(None, [("defenses", 1.0), ("b_teeth", 10.0)]), None, None, None, 1, "un link"
),
- ("shower", 0.3, 5, 70, 0, "assets/kid/actions/twister", 3, 1, "assets/action-icons/shower", 4, None,
+ ("shower", 0.3, 5, 70, 1, "assets/kid/actions/twister", 3, 1, "assets/action-icons/shower", 4, None,
effects.Effect(None, [("energy", -1.0), ("defenses", 2.0), ("water", -1.0), ("shower", 10.0)]), None, None, None, 1, "un link"
),
# Farm
- ("farm_plow", 0.3, 5, 28, 0, "assets/kid/actions/twister", 3, 1, "assets/action-icons/trident", 4, None,
+ ("farm_plow", 0.3, 5, 70, 1, "assets/kid/actions/twister", 3, 1, "assets/action-icons/trident", 4, None,
effects.Effect(None, [("energy", -4.0), ("weight", -1.0), ("nutrition", -0.5), ("water", -3.5), ("shower", -6.0), ("w_hands", -10.0), ("sports", 3.0), ("fun", 3.0), ("relaxing", -4.0), ("Huerta", 15.0)]), None, None, None
),
- ("farm_sow", 0.3, 5, 28, 0, "assets/kid/actions/twister", 3, 1, "assets/action-icons/sow", 4, None,
+ ("farm_sow", 0.3, 5, 70, 1, "assets/kid/actions/twister", 3, 1, "assets/action-icons/sow", 4, None,
effects.Effect(None, [("energy", -4.0), ("weight", -1.0), ("nutrition", -0.5), ("water", -3.5), ("shower", -6.0), ("w_hands", -10.0), ("sports", 3.0), ("fun", 3.0), ("relaxing", -4.0), ("Huerta", 15.0)]), None, None, None
),
- ("farm_irrigate", 0.3, 5, 28, 0, "assets/kid/actions/twister", 3, 1, "assets/action-icons/irrigate", 4, None,
+ ("farm_irrigate", 0.3, 5, 70, 1, "assets/kid/actions/twister", 3, 1, "assets/action-icons/irrigate", 4, None,
effects.Effect(None, [("energy", -4.0), ("weight", -1.0), ("nutrition", -0.5), ("water", -3.5), ("shower", -6.0), ("w_hands", -10.0), ("sports", 3.0), ("fun", 3.0), ("relaxing", -4.0), ("Huerta", 5.0)]), None, None, None
),
- ("farm_fumigate", 0.3, 5, 28, 0, "assets/kid/actions/twister", 3, 1, "assets/action-icons/fumigate", 4, None,
+ ("farm_fumigate", 0.3, 5, 70, 1, "assets/kid/actions/twister", 3, 1, "assets/action-icons/fumigate", 4, None,
effects.Effect(None, [("energy", -4.0), ("weight", -1.0), ("nutrition", -0.5), ("water", -3.5), ("shower", -6.0), ("w_hands", -10.0), ("sports", 3.0), ("fun", 3.0), ("relaxing", -4.0), ("Huerta", 5.0)]), None, None, None
),
- ("farm_clean", 0.3, 5, 28, 0, "assets/kid/actions/twister", 3, 1, "assets/action-icons/sow", 4, None,
+ ("farm_clean", 0.3, 5, 70, 1, "assets/kid/actions/twister", 3, 1, "assets/action-icons/sow", 4, None,
effects.Effect(None, [("energy", -4.0), ("weight", -1.0), ("nutrition", -0.5), ("water", -3.5), ("shower", -6.0), ("w_hands", -10.0), ("sports", 3.0), ("fun", 3.0), ("relaxing", -4.0), ("Huerta", 5.0)]), None, None, None
),
- ("farm_harvest", 0.3, 5, 28, 0, "assets/kid/actions/twister", 3, 1, "assets/action-icons/harvest", 4, None,
+ ("farm_harvest", 0.3, 5, 70, 1, "assets/kid/actions/twister", 3, 1, "assets/action-icons/harvest", 4, None,
effects.Effect(None, [("energy", -4.0), ("weight", -1.0), ("nutrition", -0.5), ("water", -3.5), ("shower", -6.0), ("w_hands", -10.0), ("sports", 3.0), ("fun", 3.0), ("relaxing", -4.0), ("Huerta", 15.0)]), None, None, None
),
# Fun
- ("playXO", 0.3, 5, 70, 1, "assets/kid/actions/playXO", 3, 1, None, 4, None,
+ ("playXO", 0.3, 5, 70, 0, "assets/kid/actions/playXO", 3, 1, None, 4, None,
effects.Effect(None, [("energy", -2.0), ("hands", -1.0), ("sports", -3.0), ("fun", 6.0), ("rest", -2.0)]), None, None, None, 1, "un link"
),
("hidenseek", 0.3, 5, 70, 0, "assets/kid/actions/hidenseek", 3, 1, None, 4, None,
effects.Effect(None, [("energy", -3.0), ("weight", -1.0), ("nutrition", -1.0), ("shower", -2.0), ("w_hands", -2.0), ("sports", 2.0), ("fun", 6.0), ("relaxing", -4.0)]), None, None, None
),
- ("hopscotch", 0.3, 5, 70, 0, "assets/kid/actions/hopscotch", 3, 1, None, 4, None,
+ ("hopscotch", 0.3, 5, 92, 2, "assets/kid/actions/hopscotch", 3, 1, None, 4, None,
effects.Effect(None, [("energy", -3.0), ("weight", -1.0), ("nutrition", -1.0), ("shower", -2.0), ("w_hands", -2.0), ("sports", 1.0), ("fun", 6.0), ("relaxing", -4.0)]), None, None, None
),
("tv", 0.3, 5, 70, 0, "assets/kid/actions/tv", 3, 1, None, 4, None,
effects.Effect(None, [("energy", -2.0), ("sports", -3.0), ("fun", 4.0), ("relaxing", 1.0)]), None, None, None
),
- ("read", 0.3, 5, 70, 1, "assets/kid/actions/read", 3, 1, None, 4, None,
+ ("read", 0.3, 5, 70, 0, "assets/kid/actions/read", 3, 1, None, 4, None,
effects.Effect(None, [("energy", -2.0), ("sports", -3.0), ("fun", 5.0), ("relaxing", 1.0)]), None, None, None, 1, "un link"
),
- ("music", 0.3, 5, 70, 1, None, 3, 1, None, 4, None,
+ ("music", 0.3, 5, 70, 0, None, 3, 1, None, 4, None,
effects.Effect(None, [("energy", -1.0), ("sports", -4.0), ("fun", 5.0), ("relaxing", 2.0)]), None, None, None, 1, "un link"
),
#("sing", 0.3, 5, 70, 1, "assets/kid/actions/sing", 3, 1, None, 4, None,
@@ -310,13 +310,13 @@ actions_list = [
("sleep", 0.3, 5, 70, 0, "assets/kid/actions/sleep", 3, 1, None, 4, None,
effects.Effect(None, [("energy", 9.0), ("defenses", 2.0), ("nutrition", -3.0), ("water", -4.0), ("shower", -4.0), ("w_hands", -4.0), ("b_teeth", -4.0), ("toilet", -8.0), ("sports", -3.0), ("relaxing", 9.0), ("housekeeping", -3.0), ("homework", -3.0)]), None, None, None
),
- ("toilet", 0.3, 3, 35, 3, "assets/kid/actions/toilet", 3, 1, None, 4, None,
+ ("toilet", 0.3, 3, 35, 1, "assets/kid/actions/toilet", 3, 1, None, 4, None,
effects.Effect(None, [("defenses", 1.0), ("w_hands", -10.0), ("toilet", 10.0), ("fun", -1.0)]), None, None, None, 1, "/elPropioLinkDePrueba/link"
),
- ("dentist", 0.3, 3, 35, 3, "assets/kid/actions/twister", 3, 1, "assets/action-icons/dentist", 4, None,
+ ("dentist", 0.3, 3, 70, 1, "assets/kid/actions/twister", 3, 1, "assets/action-icons/dentist", 4, None,
effects.Effect(None, [("h_check", 8.0)]), None, None, None, 1, "/elPropioLinkDePrueba/link"
),
- ("doctor", 0.3, 3, 35, 3, "assets/kid/actions/twister", 3, 1, "assets/action-icons/doctor", 4, None,
+ ("doctor", 0.3, 3, 70, 1, "assets/kid/actions/twister", 3, 1, "assets/action-icons/doctor", 4, None,
effects.Effect(None, [("h_check", 8.0)]), None, None, None, 1, "/elPropioLinkDePrueba/link"
),
diff --git a/Saludame.activity/activity.py b/Saludame.activity/activity.py
index 380de80..5531150 100755
--- a/Saludame.activity/activity.py
+++ b/Saludame.activity/activity.py
@@ -21,6 +21,7 @@ import startup_window
import game
import credits
import content_window
+import guides_window
class SaludameActivity(Activity):
''' Clase llamada por sugar cuando se ejecuta la actividad.
@@ -41,6 +42,10 @@ class SaludameActivity(Activity):
self.health_library_toolbar = gtk.Toolbar()
toolbox.add_toolbar(_("Health Library"), self.health_library_toolbar)
self.health_library_toolbar.show()
+
+ self.guides_toolbar = gtk.Toolbar()
+ toolbox.add_toolbar(_("Guides"), self.guides_toolbar)
+ self.guides_toolbar.show()
self.credits_toolbar = gtk.Toolbar()
toolbox.add_toolbar(_("Credits"), self.credits_toolbar)
@@ -58,6 +63,9 @@ class SaludameActivity(Activity):
# Create Health Library Window
self.health_library = content_window.ContentWindow()
+ # Create Guides Window
+ self.guides = guides_window.GuidesWindow()
+
# Create Credits Window
self.credits = credits.Credits()
@@ -66,6 +74,7 @@ class SaludameActivity(Activity):
self.items.add(self.pygame_canvas)
self.items.add(self.credits)
self.items.add(self.health_library)
+ self.items.add(self.guides)
self.set_canvas(self.items)
@@ -90,6 +99,7 @@ class SaludameActivity(Activity):
self.startup_window.hide()
self.pygame_canvas.hide()
self.health_library.ditch()
+ self.guides.ditch()
self.credits.hide()
if index == 0:
@@ -104,8 +114,11 @@ class SaludameActivity(Activity):
self.health_library.show()
if index == 3:
+ self.guides.show()
+
+ if index == 4:
self.credits.show()
-
+
#Override activity.Activity's can_close method
def can_close(self):
game.running = False
diff --git a/Saludame.activity/animation.py b/Saludame.activity/animation.py
index 3241619..f05866d 100755
--- a/Saludame.activity/animation.py
+++ b/Saludame.activity/animation.py
@@ -36,7 +36,9 @@ class Kid(gui.Widget):
self.sprite = None
self.set_animation()
-
+
+ self.visible = True
+
##### Moods #####
def change_mood(self):
self.mood_index += 1
@@ -68,6 +70,8 @@ class Kid(gui.Widget):
sex = self.character.sex
clothes = self.character.clothes
+ self.loops = 0
+ self.visible = True
self.index = 0 # Sequence number of the current animation
if self.action and self.action.kid_animation_path: # An action with animation is enabled
directory = "%s/%s/%s" % (self.action.kid_animation_path, sex, clothes)
@@ -86,9 +90,20 @@ class Kid(gui.Widget):
maps = self.character.mappings
self.change_color(COLORS_TO_MAP, maps["hair"] + maps["skin"] + maps["sweater"] + maps["pants"] + maps["shoes"])
- self.index = (self.index + 1) % len(self.file_list)
-
+ self.index += 1
+ if self.index >= len(self.file_list):
+ self.index = 0
+ self.loops += 1
+ if self.action and self.action.kid_loop_times > 0 and self.loops == self.action.kid_loop_times:
+ self.visible = False
+
self.set_dirty()
+
+ def draw(self, frames):
+ if self.visible:
+ return gui.Widget.draw(self, frames)
+ else:
+ return self.rect_absolute
##### Colors #####
def change_color(self, old, new):
diff --git a/Saludame.activity/app_init.py b/Saludame.activity/app_init.py
index 4f3f69c..cd010f5 100755
--- a/Saludame.activity/app_init.py
+++ b/Saludame.activity/app_init.py
@@ -16,7 +16,7 @@ CONFIGURATION_LEVEL_LIST = [{# LEVEL 1
"multiple_choice_vector" : (12, 7, -5),
"master_challenge_text" : "Tienes nuevas acciones, ¿te animas a encontrarlas?",
"min_qty_correct_ans" : 3, #min qty of corrent answers to pass master challenge.
- "slide" : "assets/slides/history1.png",
+ "slide" : None,
"events_qty" : 2,
"events_qty_personal" : 1,
"events_qty_social" : 1,
@@ -28,7 +28,7 @@ CONFIGURATION_LEVEL_LIST = [{# LEVEL 1
"multiple_choice_vector" : (12, 7, -5),
"master_challenge_text" : "Vas muy bien! Cuando llueva recuerda ponerte bajo techo.",
"min_qty_correct_ans" : 3,
- "slide" : "assets/slides/history1.png",
+ "slide" : None,
"events_qty" : 2,
"events_qty_personal" : 1,
"events_qty_social" : 1,
@@ -40,7 +40,7 @@ CONFIGURATION_LEVEL_LIST = [{# LEVEL 1
"multiple_choice_vector" : (12, 7, -5),
"master_challenge_text" : u"¡Vas muy bien, continúa!",
"min_qty_correct_ans" : 3,
- "slide" : "assets/slides/history1.png",
+ "slide" : "assets/slides/history3.png",
"events_qty" : 2,
"events_qty_personal" : 1,
"events_qty_social" : 2,
@@ -52,7 +52,7 @@ CONFIGURATION_LEVEL_LIST = [{# LEVEL 1
"multiple_choice_vector" : (10, 5, -7),
"master_challenge_text" : "Vas muy bien! ¿Has visitado la plaza?",
"min_qty_correct_ans" : 4,
- "slide" : "assets/slides/history1.png",
+ "slide" : None,
"events_qty" : 2,
"events_qty_personal" : 2,
"events_qty_social" : 2,
@@ -64,7 +64,7 @@ CONFIGURATION_LEVEL_LIST = [{# LEVEL 1
"multiple_choice_vector" : (10, 5, -7),
"master_challenge_text" : u"Muy bien! Recuerda que el clima frio puede hacer que pierdas más energía.",
"min_qty_correct_ans" : 4,
- "slide" : "assets/slides/history1.png",
+ "slide" : None,
"events_qty" : 3,
"events_qty_personal" : 1,
"events_qty_social" : 2,
@@ -76,7 +76,7 @@ CONFIGURATION_LEVEL_LIST = [{# LEVEL 1
"multiple_choice_vector" : (10, 5, -7),
"master_challenge_text" : u"¡Vas muy bien, continúa!",
"min_qty_correct_ans" : 4,
- "slide" : "assets/slides/history1.png",
+ "slide" : "assets/slides/history4.png",
"events_qty" : 3,
"events_qty_personal" : 2,
"events_qty_social" : 2,
@@ -88,7 +88,7 @@ CONFIGURATION_LEVEL_LIST = [{# LEVEL 1
"multiple_choice_vector" : (8, 3, -9),
"master_challenge_text" : u"Estás muy cerca de ganar el campeonato.",
"min_qty_correct_ans" : 5,
- "slide" : "assets/slides/history1.png",
+ "slide" : None,
"events_qty" : 3,
"events_qty_personal" : 3,
"events_qty_social" : 3,
@@ -100,7 +100,7 @@ CONFIGURATION_LEVEL_LIST = [{# LEVEL 1
"multiple_choice_vector" : (8, 3, -9),
"master_challenge_text" : u"Llegaste al último nivel, si continúas saludable ganarás el campeonato.",
"min_qty_correct_ans" : 5,
- "slide" : "assets/slides/history1.png",
+ "slide" : None,
"events_qty" : 4,
"events_qty_personal" : 2,
"events_qty_social" : 3,
@@ -112,7 +112,7 @@ CONFIGURATION_LEVEL_LIST = [{# LEVEL 1
"multiple_choice_vector" : (8, 3, -9),
"master_challenge_text" : u"¡Vas muy bien, continúa!",
"min_qty_correct_ans" : 5,
- "slide" : "assets/slides/history1.png",
+ "slide" : "assets/slides/win.png",
"events_qty" : 4,
"events_qty_personal" : 3,
"events_qty_social" : 3,
diff --git a/Saludame.activity/assets/slides/screen_loading.jpg b/Saludame.activity/assets/slides/screen_loading.jpg
new file mode 100644
index 0000000..e6814e6
--- /dev/null
+++ b/Saludame.activity/assets/slides/screen_loading.jpg
Binary files differ
diff --git a/Saludame.activity/content_window.py b/Saludame.activity/content_window.py
index b63c8f5..46e17c8 100755
--- a/Saludame.activity/content_window.py
+++ b/Saludame.activity/content_window.py
@@ -83,9 +83,9 @@ class ContentWindow(gtk.HBox):
path = self.treestore.get_value(it, 1)
real_path = os.path.join(ROOT_PATH, path)
- #print real_path
- self.web_view.load_uri( unicode(real_path) )
+ if real_path.endswith(".html"):
+ self.web_view.load_uri( unicode(real_path) )
#def selection(self, treeview, tree_path, view_column):
#it = self.treestore.get_iter(tree_path)
diff --git a/Saludame.activity/events_windows.py b/Saludame.activity/events_windows.py
index 6cd03ec..b51d338 100644
--- a/Saludame.activity/events_windows.py
+++ b/Saludame.activity/events_windows.py
@@ -88,10 +88,8 @@ class PersonalWindow(gui.Window):
def _cb_button_click_personal(self, button):
print "personal"
if game.set_library_function:
- #game.set_library_function("99-Eventos.html") #diarrhea")
- #NameError: global name 'library' is not defined
- pass
-
+ game.set_library_function("99-Eventos.html")
+
def _cb_button_click_personal_next(self, button):
if self.index_personal_event < len (self.active_personal_events) - 1:
self.remove_button(self.current_animation)
@@ -108,6 +106,15 @@ class PersonalWindow(gui.Window):
self.current_animation = self.active_personal_events[self.index_personal_event][1]
self.add_button(self.current_animation, 0)
+ def handle_mouse_down(self, coords):
+ if self.personal_next.rect_absolute.collidepoint(coords):
+ return self.personal_next.handle_mouse_down(coords)
+ elif self.personal_back.rect_absolute.collidepoint(coords):
+ return self.personal_back.handle_mouse_down(coords)
+ elif self.active_personal_events:
+ self._cb_button_click_personal(None)
+ return True
+
class SocialWindow(gui.Window):
def __init__(self, container, rect, frame_rate, windows_controller):
@@ -191,9 +198,7 @@ class SocialWindow(gui.Window):
def _cb_button_click_social(self, button):
print "social"
if game.set_library_function:
- #game.set_library_function("99-Eventos.html") #diarrhea")
- #NameError: global name 'library' is not defined
- pass
+ game.set_library_function("99-Eventos.html")
def _cb_button_click_social_next(self, button):
if self.index_social_event < len (self.active_social_events) - 1:
@@ -210,4 +215,3 @@ class SocialWindow(gui.Window):
self.refresh_count_social_events()
self.current_animation = self.active_social_events[self.index_social_event][1]
self.add_button(self.current_animation, 0)
-
diff --git a/Saludame.activity/game.py b/Saludame.activity/game.py
index 5dc463d..c01265e 100755
--- a/Saludame.activity/game.py
+++ b/Saludame.activity/game.py
@@ -35,30 +35,20 @@ running = True
main_class = None
def set_library_function(link):
- print library
+ print link
class Main():
+
def __init__(self):
self.windows_controller = None
global main_class
main_class = self
def main(self, from_sugar):
- """Main function of the game.
-
- This function initializes the game and enters the PyGame main loop.
- """
- global running, pauses
-
- if from_sugar:
- import gtk
-
- import app_init
- import challenges_creator
- import customization
- import sound_manager
- import saludame_windows_controller
+ self.init(from_sugar)
+ self.run(from_sugar)
+ def init(self, from_sugar):
# Optimizes sound quality and buffer for quick loading
pygame.mixer.quit() # When executting from sugar pygame it's already initialized
pygame.mixer.pre_init(22050, -16, 1, 512)
@@ -75,7 +65,26 @@ class Main():
screen = pygame.display.get_surface()
assert screen, "No screen"
- pygame.display.update()
+ screen.blit(pygame.image.load("assets/slides/screen_loading.jpg"), (0,0))
+ pygame.display.flip()
+
+ def run(self, from_sugar):
+ """Main function of the game.
+
+ This function initializes the game and enters the PyGame main loop.
+ """
+ global running, pauses
+
+ if from_sugar:
+ import gtk
+
+ import app_init
+ import challenges_creator
+ import customization
+ import sound_manager
+ import saludame_windows_controller
+
+ screen = pygame.display.get_surface()
# This clock is used to keep the game at the desired FPS.
clock = pygame.time.Clock()
@@ -95,7 +104,7 @@ class Main():
self.windows_controller.create_windows_and_activate_main(app_loader, clock, bars_loader)
game_man.load_game()
-
+
frames = 0
# Main loop
@@ -152,4 +161,5 @@ class Main():
pygame.quit()
if __name__ == "__main__":
- Main().main(False)
+ m = Main()
+ m.main(False)
diff --git a/Saludame.activity/guides/00-Introducción.html b/Saludame.activity/guides/00-Introducción.html
new file mode 100644
index 0000000..7ddd35f
--- /dev/null
+++ b/Saludame.activity/guides/00-Introducción.html
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<HEAD>
+ <META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8">
+ <TITLE></TITLE>
+ <META NAME="GENERATOR" CONTENT="OpenOffice.org 3.2 (Linux)">
+ <META NAME="AUTHOR" CONTENT="Pablo Moleri">
+ <META NAME="CREATED" CONTENT="20110309;20095200">
+ <META NAME="CHANGEDBY" CONTENT="Pablo Moleri">
+ <META NAME="CHANGED" CONTENT="20110309;20140000">
+ <STYLE TYPE="text/css">
+ <!--
+ @page { margin: 0.79in }
+ P { margin-bottom: 0.08in }
+ -->
+ </STYLE>
+</HEAD>
+<BODY LANG="en-US" DIR="LTR">
+<P STYLE="margin-bottom: 0in"><FONT FACE="Verdana, sans-serif">Las
+guías se dividen en 2 partes:</FONT></P>
+<UL>
+ <LI><P STYLE="margin-bottom: 0in"><FONT FACE="Verdana, sans-serif">Manual
+ del juego: Indica como utilizar las distintas funciones del juego.</FONT></P>
+ <LI><P STYLE="margin-bottom: 0in"><FONT FACE="Verdana, sans-serif">Guías
+ didácticas: Son guías didácticas para uso del juego dentro y
+ fuera de clases.</FONT></P>
+</UL>
+<P STYLE="margin-bottom: 0in"><BR>
+</P>
+</BODY>
+</HTML> \ No newline at end of file
diff --git a/Saludame.activity/guides_window.py b/Saludame.activity/guides_window.py
new file mode 100644
index 0000000..3bee862
--- /dev/null
+++ b/Saludame.activity/guides_window.py
@@ -0,0 +1,152 @@
+# -*- coding: utf-8 -*-
+
+import gtk, gobject
+import os
+from gettext import gettext as _
+
+if __name__ == "__main__":
+ ROOT_PATH = os.path.realpath('guides/')
+ STARTUP_DIR = os.path.realpath('gecko')
+else:
+ from sugar.activity import activity
+ ROOT_PATH = os.path.join(activity.get_bundle_path(), 'guides/')
+ STARTUP_DIR = os.path.join(activity.get_activity_root(), 'data/gecko')
+
+HOME_PAGE = os.path.join(ROOT_PATH, u'01-Introducción.html')
+
+hulahop_ok = True
+try:
+ import hulahop
+ hulahop.startup(STARTUP_DIR)
+ from hulahop.webview import WebView
+except:
+ hulahop_ok = False
+
+gobject.threads_init()
+
+class GuidesWindow(gtk.HBox):
+
+ def __init__(self):
+ gtk.HBox.__init__(self, False)
+
+ self._create_treeview()
+ self.pack_start(self.treeview, False)
+
+ self.web_view = None
+ self.last_uri = HOME_PAGE
+
+ self.connect("expose-event", self._exposed)
+ self.show_all()
+
+ def _create_browser(self):
+ if hulahop_ok:
+ self.web_view = WebView()
+ self.pack_start(self.web_view, True, True)
+
+ print HOME_PAGE
+ self.web_view.load_uri(self.last_uri)
+ self.web_view.show()
+ else:
+ self.web_view = gtk.Button()
+ self.web_view.load_uri = self.web_view.set_label
+ self.web_view.load_uri(self.last_uri)
+ self.add(self.web_view)
+ self.web_view.show()
+
+ def _create_treeview(self):
+ # Provided by Poteland:
+ # create a TreeStore with one string column to use as the model
+ self.treestore = gtk.TreeStore(str, str)
+
+ # create the TreeView using treestore
+ self.treeview = gtk.TreeView(self.treestore)
+
+ # create the TreeViewColumn to display the data
+ tvcolumn = gtk.TreeViewColumn("")
+ cell = gtk.CellRendererText()
+ tvcolumn.pack_start(cell, True)
+ self.treeview.append_column(tvcolumn)
+
+ # set the cell "text" attribute to column 0 - retrieve text
+ tvcolumn.add_attribute(cell, 'text', 0)
+
+ # make it searchable
+ self.treeview.set_search_column(0)
+
+ self.treeview_loaded = False
+ self.treeview.connect("cursor-changed", self.cursor_changed_cb)
+
+ def cursor_changed_cb(self, treeview):
+ tree_path, column = self.treeview.get_cursor()
+
+ it = self.treestore.get_iter(tree_path)
+ path = self.treestore.get_value(it, 1)
+
+ real_path = os.path.join(ROOT_PATH, path)
+
+ if real_path.endswith(".html"):
+ self.web_view.load_uri( unicode(real_path) )
+
+ #def selection(self, treeview, tree_path, view_column):
+ #it = self.treestore.get_iter(tree_path)
+ #path = self.treestore.get_value(it, 1)
+
+ #real_path = os.path.join(ROOT_PATH, path)
+ #print real_path
+
+ #self.web_view.load_uri( unicode(real_path) )
+
+ def _exposed(self, widget, event):
+ if not self.treeview_loaded:
+ self.treeview_loaded = True
+ self._load_treeview()
+ self.treeview.expand_row((0), False) # Expand the root path
+
+ if not self.web_view:
+ self._create_browser()
+
+ def ditch(self):
+ """ Called when we need to ditch the browsing window and hide the whole window """
+ if self.web_view:
+ self.remove(self.web_view)
+ self.web_view = None
+ self.hide()
+
+ def _load_treeview(self):
+ root_iter = self.treestore.append(None, (_("Library"), "ROOT"))
+ iters = {ROOT_PATH: root_iter}
+
+ for root, dirs, files in os.walk(ROOT_PATH):
+ all = []
+ all += [(file, 'f') for file in files]
+ all += [(dir, 'd') for dir in dirs]
+ all = sorted(all)
+
+ for node_name, node_type in all:
+ if node_type == 'f':
+ if node_name.endswith(".html"):
+ display_name = self.get_display_name(node_name)
+ fullpath = os.path.join(root, node_name)
+ self.treestore.append(iters[root], (display_name, fullpath))
+ else:
+ display_name = self.get_display_name(node_name)
+ _iter = self.treestore.append(iters[root], (display_name, root))
+ iters[os.path.join(root, node_name)] = _iter
+
+ def get_display_name(self, file_name):
+ display_name = file_name.replace(".html", "")
+ display_name = display_name.split("-", 1)[-1]
+ return display_name
+
+ def set_url(self, link):
+ link = ROOT_PATH + link
+ self.last_uri = unicode(link)
+ if self.web_view:
+ self.web_view.load_uri( self.last_uri )
+
+if __name__ == "__main__":
+ window = GuidesWindow()
+ main_window = gtk.Window(gtk.WINDOW_TOPLEVEL)
+ main_window.add(window)
+ main_window.show_all()
+ gtk.main()
diff --git a/Saludame.activity/hotkeys.py b/Saludame.activity/hotkeys.py
index d987426..39883c4 100644
--- a/Saludame.activity/hotkeys.py
+++ b/Saludame.activity/hotkeys.py
@@ -15,28 +15,28 @@ def alt_l_minus_handling():
if game_manager.instance:
game_manager.instance.previous_level()
-def alt_c_1_handling():
+def alt_c_2_handling():
print u"MULTIPLE CHOICE"
if game_manager.instance:
game_manager.instance.windows_controller.main_window.kidW._cb_button_click_mc_challenges(None)
-def alt_c_2_handling():
+def alt_c_3_handling():
print "MASTER CHALLENGE"
if game_manager.instance:
game_manager.instance.windows_controller.main_window.kidW._cb_button_click_master_challenge(None)
-def alt_c_3_handling():
+def alt_c_4_handling():
print "TRUE OR FALSE"
if game_manager.instance:
game_manager.instance.windows_controller.main_window.kidW._cb_button_click_tf_challenges(None)
-def alt_c_4_handling():
+def alt_c_5_handling():
print "COOKING"
if game_manager.instance:
game_manager.instance.windows_controller.main_window.kidW._cb_button_click_cooking_challenge(None)
-def alt_shift_s_handling():
+def alt_shift_o_handling():
print "ADD SOCIAL EVENT"
if game_manager.instance:
game_manager.instance.add_random_social_event()
@@ -51,7 +51,7 @@ def alt_shift_w_handling():
if game_manager.instance:
game_manager.instance.change_current_weather()
-def alt_shift_r_handling():
+def alt_shift_t_handling():
print "RESET GAME"
if game_manager.instance:
game_manager.instance.reset_game()
@@ -65,27 +65,27 @@ def alt_shift_a_handling():
## HOTKEYS DEF
ALT_L_PLUS = (pygame.K_LALT, pygame.K_l, pygame.K_PLUS)
ALT_L_MINUS = (pygame.K_LALT, pygame.K_l, pygame.K_MINUS)
-ALT_C_1 = (pygame.K_LALT, pygame.K_c, pygame.K_1)
ALT_C_2 = (pygame.K_LALT, pygame.K_c, pygame.K_2)
ALT_C_3 = (pygame.K_LALT, pygame.K_c, pygame.K_3)
ALT_C_4 = (pygame.K_LALT, pygame.K_c, pygame.K_4)
-ALT_SHIFT_S = (pygame.K_LALT, pygame.K_LSHIFT, pygame.K_s)
+ALT_C_5 = (pygame.K_LALT, pygame.K_c, pygame.K_5)
+ALT_SHIFT_O = (pygame.K_LALT, pygame.K_LSHIFT, pygame.K_o)
ALT_SHIFT_P = (pygame.K_LALT, pygame.K_LSHIFT, pygame.K_p)
ALT_SHIFT_W = (pygame.K_LALT, pygame.K_LSHIFT, pygame.K_w)
-ALT_SHIFT_R = (pygame.K_LALT, pygame.K_LSHIFT, pygame.K_r)
+ALT_SHIFT_T = (pygame.K_LALT, pygame.K_LSHIFT, pygame.K_t)
ALT_SHIFT_A = (pygame.K_LALT, pygame.K_LSHIFT, pygame.K_a)
##HOTKEYS DIC
hotkeys = {ALT_L_PLUS: alt_l_plus_handling,
ALT_L_MINUS: alt_l_minus_handling,
- ALT_C_1: alt_c_1_handling,
ALT_C_2: alt_c_2_handling,
ALT_C_3: alt_c_3_handling,
ALT_C_4: alt_c_4_handling,
- ALT_SHIFT_S: alt_shift_s_handling,
+ ALT_C_5: alt_c_5_handling,
+ ALT_SHIFT_O: alt_shift_o_handling,
ALT_SHIFT_P: alt_shift_p_handling,
ALT_SHIFT_W: alt_shift_w_handling,
- ALT_SHIFT_R: alt_shift_r_handling,
+ ALT_SHIFT_T: alt_shift_t_handling,
ALT_SHIFT_A: alt_shift_a_handling
}
@@ -99,7 +99,6 @@ class HotKeyHandler:
def handle_keydown(self, event):
"""handle key down
"""
- print
self.buff.append(event.key)
if len(self.buff) >= 3:
self.verify_hot_key()
diff --git a/Saludame.activity/locale/es/LC_MESSAGES/org.ceibaljam.Saludame.mo b/Saludame.activity/locale/es/LC_MESSAGES/org.ceibaljam.Saludame.mo
index 2ef0b05..41c4f6e 100644
--- a/Saludame.activity/locale/es/LC_MESSAGES/org.ceibaljam.Saludame.mo
+++ b/Saludame.activity/locale/es/LC_MESSAGES/org.ceibaljam.Saludame.mo
Binary files differ
diff --git a/Saludame.activity/po/Saludame.pot b/Saludame.activity/po/Saludame.pot
index 249637e..6ec3fc5 100755
--- a/Saludame.activity/po/Saludame.pot
+++ b/Saludame.activity/po/Saludame.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-28 22:08-0200\n"
+"POT-Creation-Date: 2011-03-10 00:30-0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,52 +20,52 @@ msgstr ""
msgid "Saludame"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/app_init.py:190
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:200
msgid "Warm"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/app_init.py:191
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:201
msgid "Rainy"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/app_init.py:192
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:202
msgid "Cold"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/app_init.py:193
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:203
msgid "Hot"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/app_init.py:210
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:220
msgid "Constipation"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/app_init.py:215
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:225
msgid "Diarrhea"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/app_init.py:220
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:230
msgid "Headache"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/app_init.py:225
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:235
msgid "Caries"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/app_init.py:230
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:240
msgid "Stomach ache"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/app_init.py:236
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:246
msgid "Prevenir caries"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/app_init.py:240
-#: /home/pmoleri/saludame/Saludame.activity/app_init.py:244
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:250
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:254
msgid "Estudiar"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/app_init.py:248
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:258
msgid "Control médico"
msgstr ""
@@ -74,335 +74,427 @@ msgid "Alimentarse..."
msgstr ""
#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:14
+msgid "Almuerzo..."
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:15
msgid "Comidas completas..."
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:16
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:17
msgid "Stew"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:17
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:18
msgid "Currasco"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:19
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:20
msgid "Milanesa"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:20
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:21
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:59
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:94
msgid "Torta frita"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:21
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:22
msgid "Ensalada"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:22
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:23
msgid "Pascualina"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:27
-msgid "Fruta..."
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:28
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:66
+msgid "Frutas..."
msgstr ""
#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:29
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:67
msgid "Manzana"
msgstr ""
#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:30
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:68
msgid "Naranja"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:32
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:31
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:69
msgid "Banana"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:33
-msgid "Kiwi"
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:32
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:34
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:70
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:72
+msgid "Ciruelas"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:37
-msgid "Desayuno y merienda..."
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:33
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:71
+msgid "Pelón"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:39
-msgid "Tostadas con membrillo"
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:35
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:73
+msgid "Frutillas"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:40
-msgid "Queso"
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:36
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:74
+msgid "Durazno"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:41
-msgid "Galletitas saladas"
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:37
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:75
+msgid "Mandarina"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:42
-msgid "Galletitas dulces"
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:41
+msgid "Desayuno y merienda..."
msgstr ""
#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:43
-msgid "Galletitas con dulce de leche"
+msgid "Bebidas..."
msgstr ""
#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:44
-msgid "Leche chocolatada"
+msgid "Leche"
msgstr ""
#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:45
-msgid "Café con leche"
+msgid "Leche Chocolatada"
msgstr ""
#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:46
-msgid "Leche"
+msgid "Café con leche"
msgstr ""
#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:47
-msgid "Leche con cereales"
+msgid "Yogur"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:48
+msgid "Jugo Natural"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:49
+msgid "Licuado con Leche"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:50
+msgid "refresco"
msgstr ""
#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:51
+msgid "Mate"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:52
+msgid "Café"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:55
+msgid "Platos..."
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:56
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:91
+msgid "Pan con queso"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:57
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:92
+msgid "Pan con manteca"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:58
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:93
+msgid "Galletas con dulce"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:60
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:95
+msgid "Refuerzo fiambre"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:61
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:96
+msgid "Bizcochos"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:62
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:97
+msgid "Torta"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:63
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:98
+msgid "Rosca Chicharrones"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:78
+msgid "Golosinas y Snacks..."
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:79
+msgid "Papas chips"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:80
+msgid "Ticholos"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:81
+msgid "Rapadura"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:82
+msgid "Caramelo"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:83
+msgid "Galletitas dulces"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:84
+msgid "Alfajor"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:85
+msgid "Chicle"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:86
+msgid "Chupetin"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:87
+msgid "Chocolate"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:90
+msgid "Otros..."
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:104
msgid "Líquidos..."
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:53
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:106
#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:35
msgid "Agua"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:54
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:107
msgid "Limonada"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:55
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:108
msgid "Jugo de naranja"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:56
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:109
msgid "Jugo de peras"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:57
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:110
msgid "Jugo de zanahorias"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:63
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:116
msgid "Diversión..."
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:64
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:117
msgid "Jugar XO"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:65
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:118
msgid "Escondida"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:67
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:120
msgid "Rayuela"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:68
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:121
msgid "Ver televisión"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:69
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:122
msgid "Leer"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:70
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:123
msgid "Escuchar música"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:71
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:124
msgid "Locuras"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:72
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:125
msgid "Bailar"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:73
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:126
msgid "Cantar"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:76
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:129
msgid "Hacer..."
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:77
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:130
msgid "Talk with a friend"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:78
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:131
msgid "Do homework"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:79
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:132
msgid "Clean up the bedroom"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:80
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:133
msgid "Cocinar"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:81
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:121
-msgid "Huerta..."
-msgstr ""
-
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:82
-msgid "Arar"
-msgstr ""
-
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:83
-msgid "Cosechar"
-msgstr ""
-
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:84
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:125
-msgid "Regar"
-msgstr ""
-
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:85
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:123
-msgid "Sembrar"
-msgstr ""
-
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:86
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:127
-msgid "Limpiar"
-msgstr ""
-
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:88
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:134
msgid "Cambiar de ropa..."
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:89
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:135
msgid "School"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:90
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:136
msgid "Normal"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:92
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:138
msgid "Deporte..."
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:93
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:139
msgid "Run"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:94
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:140
msgid "Jump the rope"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:95
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:141
msgid "Play footbal"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:99
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:145
msgid "Ir a..."
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:100
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:146
msgid "Schoolyard"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:101
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:147
msgid "Classroom"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:102
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:148
msgid "Square"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:103
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:149
msgid "Home..."
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:104
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:150
msgid "Living room"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:105
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:151
msgid "Bedroom"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:107
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:153
msgid "Ir al baño"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:108
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:154
msgid "Go to sleep"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:109
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:155
msgid "Ir al médico..."
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:110
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:156
msgid "Dentista"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:111
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:157
msgid "Doctor"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:115
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:161
msgid "Higiene..."
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:116
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:162
msgid "Bañarse"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:117
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:163
msgid "Cepillarse los dientes"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:118
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:164
msgid "Lavarse las manos"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:122
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:167
+msgid "Huerta..."
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:168
msgid "Preparar tierra"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:124
-msgid "Mantener"
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:169
+msgid "Sembrar"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:126
-msgid "Fumigar"
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:170
+msgid "Mantener"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:129
-msgid "Cocechar"
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:171
+msgid "Regar"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/kid_window.py:41
-msgid "Multiple choice"
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:172
+msgid "Fumigar"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/kid_window.py:46
-msgid "True or false"
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:173
+msgid "Limpiar"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/kid_window.py:51
-msgid "Master challenge"
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:175
+msgid "Cocechar"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/challenges.py:280
+#: /home/pmoleri/saludame/Saludame.activity/challenges.py:289
#: /home/pmoleri/saludame/Saludame.activity/customization.py:58
msgid "Continue"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/main_window.py:37
-msgid "Reset"
-msgstr ""
-
#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:42
msgid "Which foods do we need to eat every day?"
msgstr ""
@@ -534,35 +626,39 @@ msgstr ""
msgid "Es bueno ayudar en las tareas domésticas"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/startup_window.py:52
+#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:97
+msgid "False"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:97
+msgid "True"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/startup_window.py:50
msgid "New game"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/startup_window.py:56
+#: /home/pmoleri/saludame/Saludame.activity/startup_window.py:54
msgid "Load last game"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/startup_window.py:60
+#: /home/pmoleri/saludame/Saludame.activity/startup_window.py:58
msgid "Load game from journal"
msgstr ""
#: /home/pmoleri/saludame/Saludame.activity/startup_window.py:78
-msgid "Name"
-msgstr ""
-
-#: /home/pmoleri/saludame/Saludame.activity/startup_window.py:86
msgid "Boy"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/startup_window.py:91
+#: /home/pmoleri/saludame/Saludame.activity/startup_window.py:83
msgid "Girl"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/startup_window.py:166
+#: /home/pmoleri/saludame/Saludame.activity/startup_window.py:153
msgid "< Back"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/startup_window.py:173
+#: /home/pmoleri/saludame/Saludame.activity/startup_window.py:160
msgid "Next >"
msgstr ""
@@ -606,19 +702,24 @@ msgstr ""
msgid "Shoes"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/activity.py:38
+#: /home/pmoleri/saludame/Saludame.activity/activity.py:39
msgid "Game"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/activity.py:42
+#: /home/pmoleri/saludame/Saludame.activity/activity.py:43
msgid "Health Library"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/activity.py:46
+#: /home/pmoleri/saludame/Saludame.activity/activity.py:47
+msgid "Guides"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/activity.py:51
msgid "Credits"
msgstr ""
#: /home/pmoleri/saludame/Saludame.activity/content_window.py:116
+#: /home/pmoleri/saludame/Saludame.activity/guides_window.py:116
msgid "Library"
msgstr ""
@@ -739,6 +840,7 @@ msgid "Housekeeping"
msgstr ""
#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:47
+#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:50
msgid "Huerta"
msgstr ""
diff --git a/Saludame.activity/po/es.po b/Saludame.activity/po/es.po
index 84ae08c..d4b7fe2 100755
--- a/Saludame.activity/po/es.po
+++ b/Saludame.activity/po/es.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-28 22:08-0200\n"
+"POT-Creation-Date: 2011-03-10 00:30-0200\n"
"PO-Revision-Date: 2010-11-07 20:45-0200\n"
"Last-Translator: Pablo Moleri <pmoleri@gmail.com>\n"
"Language-Team: Spanish\n"
@@ -21,52 +21,52 @@ msgstr ""
msgid "Saludame"
msgstr "Salúdame"
-#: /home/pmoleri/saludame/Saludame.activity/app_init.py:190
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:200
msgid "Warm"
msgstr "Templado"
-#: /home/pmoleri/saludame/Saludame.activity/app_init.py:191
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:201
msgid "Rainy"
msgstr "Luvioso"
-#: /home/pmoleri/saludame/Saludame.activity/app_init.py:192
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:202
msgid "Cold"
msgstr "Frío"
-#: /home/pmoleri/saludame/Saludame.activity/app_init.py:193
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:203
msgid "Hot"
msgstr "Caluroso"
-#: /home/pmoleri/saludame/Saludame.activity/app_init.py:210
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:220
msgid "Constipation"
msgstr "Constipación"
-#: /home/pmoleri/saludame/Saludame.activity/app_init.py:215
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:225
msgid "Diarrhea"
msgstr "Diarrea"
-#: /home/pmoleri/saludame/Saludame.activity/app_init.py:220
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:230
msgid "Headache"
msgstr "Dolor de Cabeza"
-#: /home/pmoleri/saludame/Saludame.activity/app_init.py:225
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:235
msgid "Caries"
msgstr "Caries"
-#: /home/pmoleri/saludame/Saludame.activity/app_init.py:230
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:240
msgid "Stomach ache"
msgstr "Dolor de panza"
-#: /home/pmoleri/saludame/Saludame.activity/app_init.py:236
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:246
msgid "Prevenir caries"
msgstr "Prevenir caries"
-#: /home/pmoleri/saludame/Saludame.activity/app_init.py:240
-#: /home/pmoleri/saludame/Saludame.activity/app_init.py:244
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:250
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:254
msgid "Estudiar"
msgstr "Estudiar"
-#: /home/pmoleri/saludame/Saludame.activity/app_init.py:248
+#: /home/pmoleri/saludame/Saludame.activity/app_init.py:258
msgid "Control médico"
msgstr "Control médico"
@@ -75,335 +75,427 @@ msgid "Alimentarse..."
msgstr "Alimentarse..."
#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:14
+msgid "Almuerzo..."
+msgstr "Almuerzo..."
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:15
msgid "Comidas completas..."
msgstr "Comidas completas..."
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:16
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:17
msgid "Stew"
msgstr "Guiso"
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:17
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:18
msgid "Currasco"
msgstr "Churrasco"
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:19
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:20
msgid "Milanesa"
msgstr "Milanesa"
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:20
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:21
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:59
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:94
msgid "Torta frita"
msgstr "Torta frita"
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:21
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:22
msgid "Ensalada"
msgstr "Ensalada"
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:22
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:23
msgid "Pascualina"
msgstr "Pascualina"
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:27
-msgid "Fruta..."
-msgstr "Fruta..."
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:28
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:66
+msgid "Frutas..."
+msgstr "Frutas..."
#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:29
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:67
msgid "Manzana"
msgstr "Manzana"
#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:30
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:68
msgid "Naranja"
msgstr "Naranja"
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:32
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:31
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:69
msgid "Banana"
msgstr "Banana"
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:32
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:34
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:70
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:72
+msgid "Ciruelas"
+msgstr ""
+
#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:33
-msgid "Kiwi"
-msgstr "Kiwi"
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:71
+msgid "Pelón"
+msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:37
-msgid "Desayuno y merienda..."
-msgstr "Desayuno y merienda..."
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:35
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:73
+msgid "Frutillas"
+msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:39
-msgid "Tostadas con membrillo"
-msgstr "Tostadas con membrillo"
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:36
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:74
+msgid "Durazno"
+msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:40
-msgid "Queso"
-msgstr "Queso"
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:37
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:75
+msgid "Mandarina"
+msgstr "Mandarina"
#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:41
-msgid "Galletitas saladas"
-msgstr "Galletitas saladas"
-
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:42
-msgid "Galletitas dulces"
-msgstr "Galletitas dulces"
+msgid "Desayuno y merienda..."
+msgstr "Desayuno y merienda..."
#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:43
-msgid "Galletitas con dulce de leche"
-msgstr "Galletitas con dulce de leche"
+msgid "Bebidas..."
+msgstr ""
#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:44
-msgid "Leche chocolatada"
-msgstr "Leche chocolatada"
+msgid "Leche"
+msgstr "Leche"
#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:45
-msgid "Café con leche"
-msgstr "Café con leche"
+msgid "Leche Chocolatada"
+msgstr "Leche Chocolatada"
#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:46
-msgid "Leche"
-msgstr "Leche"
+msgid "Café con leche"
+msgstr "Café con leche"
#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:47
-msgid "Leche con cereales"
-msgstr "Leche con cereales"
+msgid "Yogur"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:48
+msgid "Jugo Natural"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:49
+msgid "Licuado con Leche"
+msgstr "Licuado con Leche"
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:50
+msgid "refresco"
+msgstr "refresco"
#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:51
+msgid "Mate"
+msgstr "Mate"
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:52
+msgid "Café"
+msgstr "Café"
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:55
+msgid "Platos..."
+msgstr "Platos..."
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:56
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:91
+msgid "Pan con queso"
+msgstr "Pan con queso"
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:57
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:92
+msgid "Pan con manteca"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:58
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:93
+msgid "Galletas con dulce"
+msgstr "Galletas con dulce"
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:60
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:95
+msgid "Refuerzo fiambre"
+msgstr "Refuerzo fiambre"
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:61
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:96
+msgid "Bizcochos"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:62
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:97
+msgid "Torta"
+msgstr "Torta"
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:63
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:98
+msgid "Rosca Chicharrones"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:78
+msgid "Golosinas y Snacks..."
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:79
+msgid "Papas chips"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:80
+msgid "Ticholos"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:81
+msgid "Rapadura"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:82
+msgid "Caramelo"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:83
+msgid "Galletitas dulces"
+msgstr "Galletitas dulces"
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:84
+msgid "Alfajor"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:85
+msgid "Chicle"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:86
+msgid "Chupetin"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:87
+msgid "Chocolate"
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:90
+msgid "Otros..."
+msgstr ""
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:104
msgid "Líquidos..."
msgstr "Líquidos..."
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:53
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:106
#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:35
msgid "Agua"
msgstr "Agua"
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:54
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:107
msgid "Limonada"
msgstr "Limonada"
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:55
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:108
msgid "Jugo de naranja"
msgstr "Jugo de naranja"
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:56
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:109
msgid "Jugo de peras"
msgstr "Jugo de peras"
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:57
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:110
msgid "Jugo de zanahorias"
msgstr "Jugo de zanahorias"
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:63
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:116
msgid "Diversión..."
msgstr "Diversión..."
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:64
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:117
msgid "Jugar XO"
msgstr "Jugar XO"
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:65
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:118
msgid "Escondida"
msgstr "Escondida"
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:67
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:120
msgid "Rayuela"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:68
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:121
msgid "Ver televisión"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:69
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:122
msgid "Leer"
msgstr "Leer"
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:70
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:123
msgid "Escuchar música"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:71
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:124
msgid "Locuras"
msgstr "Locuras"
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:72
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:125
msgid "Bailar"
msgstr "Bailar"
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:73
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:126
msgid "Cantar"
msgstr "Cantar"
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:76
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:129
msgid "Hacer..."
msgstr "Hacer..."
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:77
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:130
msgid "Talk with a friend"
msgstr "Hablar con un amigo"
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:78
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:131
msgid "Do homework"
msgstr "Hacer deberes"
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:79
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:132
msgid "Clean up the bedroom"
msgstr "Limpiar el cuarto"
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:80
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:133
msgid "Cocinar"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:81
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:121
-msgid "Huerta..."
-msgstr "Huerta..."
-
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:82
-msgid "Arar"
-msgstr "Arar"
-
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:83
-msgid "Cosechar"
-msgstr "Cosechar"
-
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:84
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:125
-msgid "Regar"
-msgstr "Regar"
-
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:85
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:123
-msgid "Sembrar"
-msgstr "Sembrar"
-
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:86
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:127
-msgid "Limpiar"
-msgstr "Limpiar"
-
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:88
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:134
msgid "Cambiar de ropa..."
msgstr "Cambiar de ropa..."
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:89
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:135
msgid "School"
msgstr "Escuela"
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:90
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:136
msgid "Normal"
msgstr "Normal"
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:92
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:138
msgid "Deporte..."
msgstr "Deporte..."
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:93
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:139
msgid "Run"
msgstr "Correr"
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:94
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:140
msgid "Jump the rope"
msgstr "Saltar la cuerda"
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:95
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:141
msgid "Play footbal"
msgstr "Jugar al fútbol"
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:99
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:145
msgid "Ir a..."
msgstr "Ir a..."
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:100
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:146
msgid "Schoolyard"
msgstr "Patio de la escuela"
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:101
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:147
msgid "Classroom"
msgstr "Clase"
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:102
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:148
msgid "Square"
msgstr "Plaza"
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:103
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:149
msgid "Home..."
msgstr "Casa..."
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:104
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:150
msgid "Living room"
msgstr "Living"
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:105
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:151
msgid "Bedroom"
msgstr "Dormitorio"
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:107
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:153
msgid "Ir al baño"
msgstr "Ir al baño"
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:108
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:154
msgid "Go to sleep"
msgstr "Ir a dormir"
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:109
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:155
msgid "Ir al médico..."
msgstr "Ir al médico..."
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:110
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:156
msgid "Dentista"
msgstr "Dentista"
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:111
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:157
msgid "Doctor"
msgstr "Doctor"
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:115
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:161
msgid "Higiene..."
msgstr "Higiene..."
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:116
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:162
msgid "Bañarse"
msgstr "Bañarse"
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:117
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:163
msgid "Cepillarse los dientes"
msgstr "Cepillarse los dientes"
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:118
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:164
msgid "Lavarse las manos"
msgstr "Lavarse las manos"
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:122
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:167
+msgid "Huerta..."
+msgstr "Huerta..."
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:168
msgid "Preparar tierra"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:124
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:169
+msgid "Sembrar"
+msgstr "Sembrar"
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:170
msgid "Mantener"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:126
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:171
+msgid "Regar"
+msgstr "Regar"
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:172
msgid "Fumigar"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:129
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:173
+msgid "Limpiar"
+msgstr "Limpiar"
+
+#: /home/pmoleri/saludame/Saludame.activity/menu_creator.py:175
msgid "Cocechar"
msgstr "Cosechar"
-#: /home/pmoleri/saludame/Saludame.activity/kid_window.py:41
-msgid "Multiple choice"
-msgstr "Múltiple opción"
-
-#: /home/pmoleri/saludame/Saludame.activity/kid_window.py:46
-msgid "True or false"
-msgstr "Verdadero o Falso"
-
-#: /home/pmoleri/saludame/Saludame.activity/kid_window.py:51
-msgid "Master challenge"
-msgstr "Gran desafío"
-
-#: /home/pmoleri/saludame/Saludame.activity/challenges.py:280
+#: /home/pmoleri/saludame/Saludame.activity/challenges.py:289
#: /home/pmoleri/saludame/Saludame.activity/customization.py:58
msgid "Continue"
msgstr "Continuar"
-#: /home/pmoleri/saludame/Saludame.activity/main_window.py:37
-msgid "Reset"
-msgstr "Reiniciar"
-
#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:42
msgid "Which foods do we need to eat every day?"
msgstr "¿Qué comidas necesitamos comer todos los días?"
@@ -535,35 +627,39 @@ msgstr ""
msgid "Es bueno ayudar en las tareas domésticas"
msgstr ""
-#: /home/pmoleri/saludame/Saludame.activity/startup_window.py:52
+#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:97
+msgid "False"
+msgstr "Falso"
+
+#: /home/pmoleri/saludame/Saludame.activity/challenges_creator.py:97
+msgid "True"
+msgstr "Verdadero"
+
+#: /home/pmoleri/saludame/Saludame.activity/startup_window.py:50
msgid "New game"
msgstr "Nuevo juego"
-#: /home/pmoleri/saludame/Saludame.activity/startup_window.py:56
+#: /home/pmoleri/saludame/Saludame.activity/startup_window.py:54
msgid "Load last game"
msgstr "Cargar último juego"
-#: /home/pmoleri/saludame/Saludame.activity/startup_window.py:60
+#: /home/pmoleri/saludame/Saludame.activity/startup_window.py:58
msgid "Load game from journal"
msgstr "Cargar juego del diario"
#: /home/pmoleri/saludame/Saludame.activity/startup_window.py:78
-msgid "Name"
-msgstr "Nombre"
-
-#: /home/pmoleri/saludame/Saludame.activity/startup_window.py:86
msgid "Boy"
msgstr "Niño"
-#: /home/pmoleri/saludame/Saludame.activity/startup_window.py:91
+#: /home/pmoleri/saludame/Saludame.activity/startup_window.py:83
msgid "Girl"
msgstr "Niña"
-#: /home/pmoleri/saludame/Saludame.activity/startup_window.py:166
+#: /home/pmoleri/saludame/Saludame.activity/startup_window.py:153
msgid "< Back"
msgstr "< Atrás"
-#: /home/pmoleri/saludame/Saludame.activity/startup_window.py:173
+#: /home/pmoleri/saludame/Saludame.activity/startup_window.py:160
msgid "Next >"
msgstr "Siguiente >"
@@ -607,19 +703,24 @@ msgstr "Pantalones"
msgid "Shoes"
msgstr "Zapatos"
-#: /home/pmoleri/saludame/Saludame.activity/activity.py:38
+#: /home/pmoleri/saludame/Saludame.activity/activity.py:39
msgid "Game"
msgstr "Juego"
-#: /home/pmoleri/saludame/Saludame.activity/activity.py:42
+#: /home/pmoleri/saludame/Saludame.activity/activity.py:43
msgid "Health Library"
msgstr "Biblioteca"
-#: /home/pmoleri/saludame/Saludame.activity/activity.py:46
+#: /home/pmoleri/saludame/Saludame.activity/activity.py:47
+msgid "Guides"
+msgstr "Guías"
+
+#: /home/pmoleri/saludame/Saludame.activity/activity.py:51
msgid "Credits"
msgstr "Créditos"
#: /home/pmoleri/saludame/Saludame.activity/content_window.py:116
+#: /home/pmoleri/saludame/Saludame.activity/guides_window.py:116
msgid "Library"
msgstr "Biblioteca"
@@ -740,6 +841,7 @@ msgid "Housekeeping"
msgstr "Tareas domésticas"
#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:47
+#: /home/pmoleri/saludame/Saludame.activity/status_bars_creator.py:50
msgid "Huerta"
msgstr "Huerta"
@@ -759,8 +861,44 @@ msgstr "Salir"
msgid "back"
msgstr "Atrás"
-#~ msgid "Eat..."
-#~ msgstr "Comer..."
+#~ msgid "Kiwi"
+#~ msgstr "Kiwi"
+
+#~ msgid "Tostadas con membrillo"
+#~ msgstr "Tostadas con membrillo"
+
+#~ msgid "Queso"
+#~ msgstr "Queso"
+
+#~ msgid "Galletitas saladas"
+#~ msgstr "Galletitas saladas"
+
+#~ msgid "Galletitas con dulce de leche"
+#~ msgstr "Galletitas con dulce de leche"
+
+#~ msgid "Leche con cereales"
+#~ msgstr "Leche con cereales"
+
+#~ msgid "Arar"
+#~ msgstr "Arar"
+
+#~ msgid "Cosechar"
+#~ msgstr "Cosechar"
+
+#~ msgid "Multiple choice"
+#~ msgstr "Múltiple opción"
+
+#~ msgid "True or false"
+#~ msgstr "Verdadero o Falso"
+
+#~ msgid "Master challenge"
+#~ msgstr "Gran desafío"
+
+#~ msgid "Reset"
+#~ msgstr "Reiniciar"
+
+#~ msgid "Name"
+#~ msgstr "Nombre"
#~ msgid "Tiempo libre..."
#~ msgstr "Tiempo libre..."