[gcompris] In 3 activities removed token in sentences to ease translation

From: Bruno Coudoin <bcoudoin src gnome org>
To: commits-list gnome org
Cc:
Subject: [gcompris] In 3 activities removed token in sentences to ease translation
Date: Sat, 10 Aug 2013 07:27:53 +0000 (UTC)
commit d46d11e83eb3ea71344ff574ed159eb3a380e226
Author: Bruno Coudoin <bcoudoin gcompris net>
Date:   Sat Aug 10 09:23:00 2013 +0200

    In 3 activities removed token in sentences to ease translation
    
    It is not always possible to create a valid translation using
    a {text} replacement token in a sentence because for example of
    gender issues. This patch replaces such strings by the full
    sentence.

 .../resources/advanced_colors/activity.desktop.in  |  330 ++++++++++----------
 .../resources/colors/activity.desktop.in           |   69 ++---
 src/findit-activity/findit.py                      |   34 ++-
 .../resources/instruments/activity.desktop.in      |  109 ++++----
 4 files changed, 269 insertions(+), 273 deletions(-)
---
diff --git a/src/advanced_colors-activity/resources/advanced_colors/activity.desktop.in 
b/src/advanced_colors-activity/resources/advanced_colors/activity.desktop.in
index ec3f5c4..2edb6ea 100644
--- a/src/advanced_colors-activity/resources/advanced_colors/activity.desktop.in
+++ b/src/advanced_colors-activity/resources/advanced_colors/activity.desktop.in
@@ -21,8 +21,6 @@ questionFont=gcompris/board/title bold
 background=background.svgz
 
 questionPosition=400,30
-# Translator: Do not translate {text}.
-_questionText=Find the {text} butterfly
 
 okPosition=700,55
 
@@ -32,367 +30,367 @@ okPosition=700,55
 
 [1]
 object1Image=coral_butterfly.svg
-_object1Text=coral
+_object1Text=Find the coral butterfly
 object2Image=claret_butterfly.svg
-_object2Text=claret
-object3Image=sienna_butterfly.svg
-_object3Text=sienna
+_object2Text=Find the claret butterfly
+object3Image=navy_butterfly.svg
+_object3Text=Find the navy butterfly
 object4Image=corn_butterfly.svg
-_object4Text=corn
+_object4Text=Find the corn butterfly
 object5Image=cobalt_butterfly.svg
-_object5Text=cobalt
+_object5Text=Find the cobalt butterfly
 object6Image=cyan_butterfly.svg
-_object6Text=cyan
+_object6Text=Find the cyan butterfly
 object7Image=chestnut_butterfly.svg
-_object7Text=chestnut
+_object7Text=Find the chestnut butterfly
 object8Image=almond_butterfly.svg
-_object8Text=almond
+_object8Text=Find the almond butterfly
 
 [2]
 object1Image=claret_butterfly.svg
-_object1Text=claret
-object2Image=sienna_butterfly.svg
-_object2Text=sienna
+_object1Text=Find the claret butterfly
+object2Image=sapphire_butterfly.svg
+_object2Text=Find the sapphire butterfly
 object3Image=corn_butterfly.svg
-_object3Text=corn
+_object3Text=Find the corn butterfly
 object4Image=cobalt_butterfly.svg
-_object4Text=cobalt
+_object4Text=Find the cobalt butterfly
 object5Image=cyan_butterfly.svg
-_object5Text=cyan
+_object5Text=Find the cyan butterfly
 object6Image=chestnut_butterfly.svg
-_object6Text=chestnut
+_object6Text=Find the chestnut butterfly
 object7Image=almond_butterfly.svg
-_object7Text=almond
+_object7Text=Find the almond butterfly
 object8Image=ruby_butterfly.svg
-_object8Text=ruby
+_object8Text=Find the ruby butterfly
 
 [3]
-object1Image=sapphire_butterfly.svg
-_object1Text=sapphire
+object1Image=sienna_butterfly.svg
+_object1Text=Find the sienna butterfly
 object2Image=sage_butterfly.svg
-_object2Text=sage
+_object2Text=Find the sage butterfly
 object3Image=salmon_butterfly.svg
-_object3Text=salmon
+_object3Text=Find the salmon butterfly
 object4Image=sepia_butterfly.svg
-_object4Text=sepia
+_object4Text=Find the sepia butterfly
 object5Image=sulphur_butterfly.svg
-_object5Text=sulfur
+_object5Text=Find the sulfur butterfly
 object6Image=tea_butterfly.svg
-_object6Text=tea
+_object6Text=Find the tea butterfly
 object7Image=lime_butterfly.svg
-_object7Text=lime
+_object7Text=Find the lime butterfly
 object8Image=turquoise_butterfly.svg
-_object8Text=turquoise
+_object8Text=Find the turquoise butterfly
 
 [4]
 
 object1Image=absinthe_butterfly.svg
-_object1Text=absinthe
+_object1Text=Find the absinthe butterfly
 object2Image=mahogany_butterfly.svg
-_object2Text=mahogany
+_object2Text=Find the mahogany butterfly
 object3Image=aquamarine_butterfly.svg
-_object3Text=aquamarine
+_object3Text=Find the aquamarine butterfly
 object4Image=alabaster_butterfly.svg
-_object4Text=alabaster
+_object4Text=Find the alabaster butterfly
 object5Image=amber_butterfly.svg
-_object5Text=amber
+_object5Text=Find the amber butterfly
 object6Image=amethyst_butterfly.svg
-_object6Text=amethyst
+_object6Text=Find the amethyst butterfly
 object7Image=anise_butterfly.svg
-_object7Text=anise
+_object7Text=Find the anise butterfly
 object8Image=vermilion_butterfly.svg
-_object8Text=vermilion
+_object8Text=Find the vermilion butterfly
 
 [5]
 object1Image=ceruse_butterfly.svg
-_object1Text=ceruse
+_object1Text=Find the ceruse butterfly
 object2Image=fawn_butterfly.svg
-_object2Text=fawn
+_object2Text=Find the fawn butterfly
 object3Image=chartreuse_butterfly.svg
-_object3Text=chartreuse
+_object3Text=Find the chartreuse butterfly
 object4Image=emerald_butterfly.svg
-_object4Text=emerald
+_object4Text=Find the emerald butterfly
 object5Image=aubergine_butterfly.svg
-_object5Text=aubergine
+_object5Text=Find the aubergine butterfly
 object6Image=fuchsia_butterfly.svg
-_object6Text=fuchsia
+_object6Text=Find the fuchsia butterfly
 object7Image=ruby_butterfly.svg
-_object7Text=ruby
+_object7Text=Find the ruby butterfly
 object8Image=glaucous_butterfly.svg
-_object8Text=glaucous
+_object8Text=Find the glaucous butterfly
 
 [6]
 object1Image=aubergine_butterfly.svg
-_object1Text=aubergine
+_object1Text=Find the aubergine butterfly
 object2Image=auburn_butterfly.svg
-_object2Text=auburn
+_object2Text=Find the auburn butterfly
 object3Image=azure_butterfly.svg
-_object3Text=azure
+_object3Text=Find the azure butterfly
 object4Image=greyish-brown_butterfly.svg
-_object4Text=grayish brown
+_object4Text=Find the grayish brown butterfly
 object5Image=bistre_butterfly.svg
-_object5Text=bistre
+_object5Text=Find the bistre butterfly
 object6Image=crimson_butterfly.svg
-_object6Text=crimson
+_object6Text=Find the crimson butterfly
 object7Image=celadon_butterfly.svg
-_object7Text=celadon
+_object7Text=Find the celadon butterfly
 object8Image=cerulean_butterfly.svg
-_object8Text=cerulean
+_object8Text=Find the cerulean butterfly
 
 [7]
 object1Image=dove_butterfly.svg
-_object1Text=dove
+_object1Text=Find the dove butterfly
 object2Image=garnet_butterfly.svg
-_object2Text=garnet
+_object2Text=Find the garnet butterfly
 object3Image=indigo_butterfly.svg
-_object3Text=indigo
+_object3Text=Find the indigo butterfly
 object4Image=ivory_butterfly.svg
-_object4Text=ivory
+_object4Text=Find the ivory butterfly
 object5Image=jade_butterfly.svg
-_object5Text=jade
+_object5Text=Find the jade butterfly
 object6Image=lavender_butterfly.svg
-_object6Text=lavender
+_object6Text=Find the lavender butterfly
 object7Image=lichen_butterfly.svg
-_object7Text=lichen
+_object7Text=Find the lichen butterfly
 object8Image=wine_butterfly.svg
-_object8Text=wine
+_object8Text=Find the wine butterfly
 
 [8]
 object1Image=lilac_butterfly.svg
-_object1Text=lilac
+_object1Text=Find the lilac butterfly
 object2Image=magenta_butterfly.svg
-_object2Text=magenta
+_object2Text=Find the magenta butterfly
 object3Image=malachite_butterfly.svg
-_object3Text=malachite
+_object3Text=Find the malachite butterfly
 object4Image=navy_butterfly.svg
-_object4Text=navy
+_object4Text=Find the navy butterfly
 object5Image=larch_butterfly.svg
-_object5Text=larch
+_object5Text=Find the larch butterfly
 object6Image=mimosa_butterfly.svg
-_object6Text=mimosa
+_object6Text=Find the mimosa butterfly
 object7Image=ochre_butterfly.svg
-_object7Text=ochre
+_object7Text=Find the ochre butterfly
 object8Image=olive_butterfly.svg
-_object8Text=olive
+_object8Text=Find the olive butterfly
 
 [9]
 
 object1Image=opaline_butterfly.svg
-_object1Text=opaline
+_object1Text=Find the opaline butterfly
 object2Image=vermilion_butterfly.svg
-_object2Text=vermilion
+_object2Text=Find the vermilion butterfly
 object3Image=ultramarine_butterfly.svg
-_object3Text=ultramarine
+_object3Text=Find the ultramarine butterfly
 object4Image=mauve_butterfly.svg
-_object4Text=mauve
+_object4Text=Find the mauve butterfly
 object5Image=greyish_blue_butterfly.svg
-_object5Text=grayish blue
+_object5Text=Find the grayish blue butterfly
 object6Image=pistachio_butterfly.svg
-_object6Text=pistachio
+_object6Text=Find the pistachio butterfly
 object7Image=platinum_butterfly.svg
-_object7Text=platinum
+_object7Text=Find the platinum butterfly
 object8Image=purple_butterfly.svg
-_object8Text=purple
+_object8Text=Find the purple butterfly
 
 [10]
 object1Image=plum_butterfly.svg
-_object1Text=plum
+_object1Text=Find the plum butterfly
 object2Image=prussian_blue_butterfly.svg
-_object2Text=prussian blue
+_object2Text=Find the prussian blue butterfly
 object3Image=rust_butterfly.svg
-_object3Text=rust
+_object3Text=Find the rust butterfly
 object4Image=saffron_butterfly.svg
-_object4Text=saffron
+_object4Text=Find the saffron butterfly
 object5Image=vanilla_butterfly.svg
-_object5Text=vanilla
+_object5Text=Find the vanilla butterfly
 object6Image=veronese_butterfly.svg
-_object6Text=veronese
+_object6Text=Find the veronese butterfly
 object7Image=verdigris_butterfly.svg
-_object7Text=verdigris
+_object7Text=Find the verdigris butterfly
 object8Image=dark_purple_butterfly.svg
-_object8Text=dark purple
+_object8Text=Find the dark purple butterfly
 
 # Now all the colors have been seen, propose here
 # a new random set of them
 [11]
 object1Image=olive_butterfly.svg
-_object1Text=olive
+_object1Text=Find the olive butterfly
 object1Image=auburn_butterfly.svg
-_object1Text=auburn
+_object1Text=Find the auburn butterfly
 object2Image=dark_purple_butterfly.svg
-_object2Text=dark purple
+_object2Text=Find the dark purple butterfly
 object3Image=mauve_butterfly.svg
-_object3Text=mauve
+_object3Text=Find the mauve butterfly
 object4Image=azure_butterfly.svg
-_object4Text=azure
+_object4Text=Find the azure butterfly
 object5Image=sienna_butterfly.svg
-_object5Text=sienna
+_object5Text=Find the sienna butterfly
 object6Image=plum_butterfly.svg
-_object6Text=plum
+_object6Text=Find the plum butterfly
 object7Image=sepia_butterfly.svg
-_object7Text=sepia
+_object7Text=Find the sepia butterfly
 object8Image=aubergine_butterfly.svg
-_object8Text=aubergine
+_object8Text=Find the aubergine butterfly
 
 [12]
 object1Image=aubergine_butterfly.svg
-_object1Text=aubergine
+_object1Text=Find the aubergine butterfly
 object2Image=cyan_butterfly.svg
-_object2Text=cyan
+_object2Text=Find the cyan butterfly
 object3Image=fawn_butterfly.svg
-_object3Text=fawn
+_object3Text=Find the fawn butterfly
 object4Image=mimosa_butterfly.svg
-_object4Text=mimosa
+_object4Text=Find the mimosa butterfly
 object5Image=ochre_butterfly.svg
-_object5Text=ochre
+_object5Text=Find the ochre butterfly
 object6Image=prussian_blue_butterfly.svg
-_object6Text=prussian blue
+_object6Text=Find the prussian blue butterfly
 object7Image=rust_butterfly.svg
-_object7Text=rust
+_object7Text=Find the rust butterfly
 object8Image=salmon_butterfly.svg
-_object8Text=salmon
+_object8Text=Find the salmon butterfly
 
 [13]
 object1Image=alabaster_butterfly.svg
-_object1Text=alabaster
+_object1Text=Find the alabaster butterfly
 object2Image=chestnut_butterfly.svg
-_object2Text=chestnut
+_object2Text=Find the chestnut butterfly
 object3Image=coral_butterfly.svg
-_object3Text=coral
+_object3Text=Find the coral butterfly
 object4Image=ivory_butterfly.svg
-_object4Text=ivory
+_object4Text=Find the ivory butterfly
 object5Image=mauve_butterfly.svg
-_object5Text=mauve
+_object5Text=Find the mauve butterfly
 object6Image=plum_butterfly.svg
-_object6Text=plum
+_object6Text=Find the plum butterfly
 object7Image=rust_butterfly.svg
-_object7Text=rust
+_object7Text=Find the rust butterfly
 object8Image=vermilion_butterfly.svg
-_object8Text=vermilion
+_object8Text=Find the vermilion butterfly
 
 [14]
 object1Image=navy_butterfly.svg
-_object1Text=navy
+_object1Text=Find the navy butterfly
 object2Image=cerulean_butterfly.svg
-_object2Text=cerulean
+_object2Text=Find the cerulean butterfly
 object3Image=malachite_butterfly.svg
-_object3Text=malachite
+_object3Text=Find the malachite butterfly
 object4Image=opaline_butterfly.svg
-_object4Text=opaline
+_object4Text=Find the opaline butterfly
 object5Image=wine_butterfly.svg
-_object5Text=wine
+_object5Text=Find the wine butterfly
 object6Image=pistachio_butterfly.svg
-_object6Text=pistachio
+_object6Text=Find the pistachio butterfly
 object7Image=chestnut_butterfly.svg
-_object7Text=chestnut
+_object7Text=Find the chestnut butterfly
 object8Image=claret_butterfly.svg
-_object8Text=claret
+_object8Text=Find the claret butterfly
 
 [15]
 object1Image=chestnut_butterfly.svg
-_object1Text=chestnut
+_object1Text=Find the chestnut butterfly
 object2Image=dark_purple_butterfly.svg
-_object2Text=dark purple
+_object2Text=Find the dark purple butterfly
 object3Image=aubergine_butterfly.svg
-_object3Text=aubergine
+_object3Text=Find the aubergine butterfly
 object4Image=opaline_butterfly.svg
-_object4Text=opaline
+_object4Text=Find the opaline butterfly
 object5Image=wine_butterfly.svg
-_object5Text=wine
+_object5Text=Find the wine butterfly
 object6Image=fawn_butterfly.svg
-_object6Text=fawn
+_object6Text=Find the fawn butterfly
 object7Image=magenta_butterfly.svg
-_object7Text=magenta
+_object7Text=Find the magenta butterfly
 object8Image=anise_butterfly.svg
-_object8Text=anise
+_object8Text=Find the anise butterfly
 
 [16]
 object1Image=claret_butterfly.svg
-_object1Text=claret
+_object1Text=Find the claret butterfly
 object2Image=fawn_butterfly.svg
-_object2Text=fawn
+_object2Text=Find the fawn butterfly
 object3Image=platinum_butterfly.svg
-_object3Text=platinum
+_object3Text=Find the platinum butterfly
 object4Image=indigo_butterfly.svg
-_object4Text=indigo
+_object4Text=Find the indigo butterfly
 object5Image=dove_butterfly.svg
-_object5Text=dove
+_object5Text=Find the dove butterfly
 object6Image=crimson_butterfly.svg
-_object6Text=crimson
+_object6Text=Find the crimson butterfly
 object7Image=veronese_butterfly.svg
-_object7Text=veronese
+_object7Text=Find the veronese butterfly
 object8Image=greyish-brown_butterfly.svg
-_object8Text=grayish brown
+_object8Text=Find the grayish brown butterfly
 
 [17]
 object1Image=chestnut_butterfly.svg
-_object1Text=chestnut
+_object1Text=Find the chestnut butterfly
 object2Image=greyish_blue_butterfly.svg
-_object2Text=grayish blue
+_object2Text=Find the grayish blue butterfly
 object3Image=aubergine_butterfly.svg
-_object3Text=aubergine
+_object3Text=Find the aubergine butterfly
 object4Image=salmon_butterfly.svg
-_object4Text=salmon
+_object4Text=Find the salmon butterfly
 object5Image=amber_butterfly.svg
-_object5Text=amber
+_object5Text=Find the amber butterfly
 object6Image=chartreuse_butterfly.svg
-_object6Text=chartreuse
+_object6Text=Find the chartreuse butterfly
 object7Image=claret_butterfly.svg
-_object7Text=claret
+_object7Text=Find the claret butterfly
 object8Image=purple_butterfly.svg
-_object8Text=purple
+_object8Text=Find the purple butterfly
 
 [18]
 object1Image=plum_butterfly.svg
-_object1Text=plum
+_object1Text=Find the plum butterfly
 object2Image=claret_butterfly.svg
-_object2Text=claret
+_object2Text=Find the claret butterfly
 object3Image=ultramarine_butterfly.svg
-_object3Text=ultramarine
+_object3Text=Find the ultramarine butterfly
 object4Image=greyish_blue_butterfly.svg
-_object4Text=grayish blue
+_object4Text=Find the grayish blue butterfly
 object5Image=dark_purple_butterfly.svg
-_object5Text=dark purple
+_object5Text=Find the dark purple butterfly
 object6Image=lilac_butterfly.svg
-_object6Text=lilac
+_object6Text=Find the lilac butterfly
 object7Image=aquamarine_butterfly.svg
-_object7Text=aquamarine
+_object7Text=Find the aquamarine butterfly
 object8Image=magenta_butterfly.svg
-_object8Text=magenta
+_object8Text=Find the magenta butterfly
 
 [19]
 object1Image=anise_butterfly.svg
-_object1Text=anise
+_object1Text=Find the anise butterfly
 object2Image=cerulean_butterfly.svg
-_object2Text=cerulean
+_object2Text=Find the cerulean butterfly
 object3Image=ivory_butterfly.svg
-_object3Text=ivory
+_object3Text=Find the ivory butterfly
 object4Image=sepia_butterfly.svg
-_object4Text=sepia
+_object4Text=Find the sepia butterfly
 object5Image=verdigris_butterfly.svg
-_object5Text=verdigris
+_object5Text=Find the verdigris butterfly
 object6Image=fuchsia_butterfly.svg
-_object6Text=fuchsia
+_object6Text=Find the fuchsia butterfly
 object7Image=plum_butterfly.svg
-_object7Text=plum
+_object7Text=Find the plum butterfly
 object8Image=purple_butterfly.svg
-_object8Text=purple
+_object8Text=Find the purple butterfly
 
 [20]
 object1Image=tea_butterfly.svg
-_object1Text=tea
+_object1Text=Find the tea butterfly
 object2Image=dark_purple_butterfly.svg
-_object2Text=dark purple
+_object2Text=Find the dark purple butterfly
 object3Image=sienna_butterfly.svg
-_object3Text=sienna
+_object3Text=Find the sienna butterfly
 object4Image=aubergine_butterfly.svg
-_object4Text=aubergine
+_object4Text=Find the aubergine butterfly
 object5Image=rust_butterfly.svg
-_object5Text=rust
+_object5Text=Find the rust butterfly
 object6Image=pistachio_butterfly.svg
-_object6Text=pistachio
+_object6Text=Find the pistachio butterfly
 object7Image=sapphire_butterfly.svg
-_object7Text=sapphire
+_object7Text=Find the sapphire butterfly
 object8Image=claret_butterfly.svg
-_object8Text=claret
+_object8Text=Find the claret butterfly
 
diff --git a/src/colors-activity/resources/colors/activity.desktop.in 
b/src/colors-activity/resources/colors/activity.desktop.in
index c4295cb..0bca144 100644
--- a/src/colors-activity/resources/colors/activity.desktop.in
+++ b/src/colors-activity/resources/colors/activity.desktop.in
@@ -24,80 +24,75 @@ background=background.svgz
 [1]
 
 questionPosition=400,30
-# Translator: Do not translate {text}.
-_questionText=Find the {text} duck
-questionAudio=voices/$LOCALE/colors/{text}.ogg
 
 okPosition=470,310
 
 object1Image=yellow_duck.svg
-_object1Text=yellow
-object1Audio=voices/$LOCALE/colors/{text}.ogg
+_object1Text=Find the yellow duck
+object1Audio=voices/$LOCALE/colors/yellow.ogg
 
 object2Image=black_duck.svg
-_object2Text=black
-object2Audio=voices/$LOCALE/colors/{text}.ogg
+_object2Text=Find the black duck
+object2Audio=voices/$LOCALE/colors/black.ogg
 
 object3Image=green_duck.svg
-_object3Text=green
-object3Audio=voices/$LOCALE/colors/{text}.ogg
+_object3Text=Find the green duck
+object3Audio=voices/$LOCALE/colors/green.ogg
 
 object4Image=red_duck.svg
-_object4Text=red
-object4Audio=voices/$LOCALE/colors/{text}.ogg
+_object4Text=Find the red duck
+object4Audio=voices/$LOCALE/colors/red.ogg
 
 object5Image=white_duck.svg
-_object5Text=white
-object5Audio=voices/$LOCALE/colors/{text}.ogg
+_object5Text=Find the white duck
+object5Audio=voices/$LOCALE/colors/white.ogg
 
 object6Image=blue_duck.svg
-_object6Text=blue
-object6Audio=voices/$LOCALE/colors/{text}.ogg
+_object6Text=Find the blue duck
+object6Audio=voices/$LOCALE/colors/blue.ogg
 
 [2]
 
 questionPosition=400,30
-_questionText=Find the {text} duck
-questionAudio=voices/$LOCALE/colors/{text}.ogg
 
 okPosition=470,310
 
 object1Image=yellow_duck.svg
-_object1Text=yellow
-object1Audio=voices/$LOCALE/colors/{text}.ogg
+_object1Text=Find the yellow duck
+object1Audio=voices/$LOCALE/colors/yellow.ogg
 
 object2Image=black_duck.svg
-_object2Text=black
-object2Audio=voices/$LOCALE/colors/{text}.ogg
+_object2Text=Find the black duck
+object2Audio=voices/$LOCALE/colors/black.ogg
 
 object3Image=brown_duck.svg
-_object3Text=brown
-object3Audio=voices/$LOCALE/colors/{text}.ogg
+_object3Text=Find the brown duck
+object3Audio=voices/$LOCALE/colors/brown.ogg
 
 object4Image=green_duck.svg
-_object4Text=green
-object4Audio=voices/$LOCALE/colors/{text}.ogg
+_object4Text=Find the green duck
+object4Audio=voices/$LOCALE/colors/green.ogg
 
 object5Image=grey_duck.svg
-_object5Text=grey
-object5Audio=voices/$LOCALE/colors/{text}.ogg
+_object5Text=Find the grey duck
+object5Audio=voices/$LOCALE/colors/grey.ogg
 
 object6Image=orange_duck.svg
-_object6Text=orange
-object6Audio=voices/$LOCALE/colors/{text}.ogg
+_object6Text=Find the orange duck
+object6Audio=voices/$LOCALE/colors/orange.ogg
 
 object7Image=purple_duck.svg
-_object7Text=purple
-object7Audio=voices/$LOCALE/colors/{text}.ogg
+_object7Text=Find the purple duck
+object7Audio=voices/$LOCALE/colors/purple.ogg
 
 object8Image=red_duck.svg
-_object8Text=red
-object8Audio=voices/$LOCALE/colors/{text}.ogg
+_object8Text=Find the red duck
+object8Audio=voices/$LOCALE/colors/red.ogg
 
 object9Image=white_duck.svg
-_object9Text=white
-object9Audio=voices/$LOCALE/colors/{text}.ogg
+_object9Text=Find the white duck
+object9Audio=voices/$LOCALE/colors/white.ogg
 
 object10Image=blue_duck.svg
-_object10Text=blue
-object10Audio=voices/$LOCALE/colors/{text}.ogg
+_object10Text=Find the blue duck
+object10Audio=voices/$LOCALE/colors/blue.ogg
diff --git a/src/findit-activity/findit.py b/src/findit-activity/findit.py
index 1c55881..6f86e2b 100644
--- a/src/findit-activity/findit.py
+++ b/src/findit-activity/findit.py
@@ -241,12 +241,15 @@ class Gcompris_findit:
   def play_audio_question(self, question, object_):
     # Play the audio question if provided
     audio = question
-    try:
-      # The question audio can be formatted with {text} and if so this
-      # is replaced by the target text
-      audio = audio.format(text = object_.text)
-    except:
-      pass
+    if audio:
+      try:
+        # The question audio can be formatted with {text} and if so this
+        # is replaced by the target text
+        audio = audio.format(text = object_.text)
+      except:
+        pass
+    else:
+      audio = object_.audio
 
     try:
       # The question audio can be formatted with {audio} and if so this
@@ -277,12 +280,15 @@ class Gcompris_findit:
   def display_question(self, datasetlevel, object_target):
     # The question
     text = datasetlevel.question_text
-    try:
-      # The question can be formatted with {text} and if so this
-      # is replaced by the target name
-      text = _(text.format(text = _(object_target.text)))
-    except:
-      pass
+    if text:
+      try:
+        # The question can be formatted with {text} and if so this
+        # is replaced by the target name
+        text = _(text.format(text = _(object_target.text)))
+      except:
+        pass
+    else:
+      text = _(object_target.text)
 
     try:
       # The question can be formatted with {audio} and if so this
@@ -435,13 +441,13 @@ class finditDataSetLevel:
             load_common_prop(dataset, section, "questionPosition", "").split(','))
 
     try:
-      self.question_text = _( load_common_prop(dataset, section, "questionText", "") )
+      self.question_text = _( load_common_prop(dataset, section, "questionText", None) )
     except:
       self.question_text = None
 
     #print "     finditDataSetLevel " + self.question_text
     try:
-      self.question_audio = load_common_prop(dataset, section, "questionAudio", "")
+      self.question_audio = load_common_prop(dataset, section, "questionAudio", None)
     except:
       self.question_audio = None
 
diff --git a/src/instruments-activity/resources/instruments/activity.desktop.in 
b/src/instruments-activity/resources/instruments/activity.desktop.in
index 7701c3c..6110891 100644
--- a/src/instruments-activity/resources/instruments/activity.desktop.in
+++ b/src/instruments-activity/resources/instruments/activity.desktop.in
@@ -22,233 +22,230 @@ questionFont=gcompris/board/title bold
 background=background.svgz
 
 questionPosition=400,30
-# Translator: Do not translate {text}.
-_questionText=Find {text}
-questionAudio={audio}
 
 okPosition=680,30
 
 [1]
 object1Image=clarinet.svg
-_object1Text=the clarinet
+_object1Text=Find the clarinet
 object1Audio=instruments/clarinet.ogg
 
 object2Image=flute_traversiere.svg
-_object2Text=the transverse flute
+_object2Text=Find the transverse flute
 object2Audio=instruments/flute_traversiere.ogg
 
 object3Image=guitar.svg
-_object3Text=the guitar
+_object3Text=Find the guitar
 object3Audio=instruments/guitar.ogg
 
 object4Image=harp.svg
-_object4Text=the harp
+_object4Text=Find the harp
 object4Audio=instruments/harp.ogg
 
 [2]
 object1Image=piano.svg
-_object1Text=the piano
+_object1Text=Find the piano
 object1Audio=instruments/piano.ogg
 
 object2Image=saxophone.svg
-_object2Text=the saxophone
+_object2Text=Find the saxophone
 object2Audio=instruments/saxophone.ogg
 
 object3Image=trombone.svg
-_object3Text=the trombone
+_object3Text=Find the trombone
 object3Audio=instruments/trombone.ogg
 
 object4Image=trumpet.svg
-_object4Text=the trumpet
+_object4Text=Find the trumpet
 object4Audio=instruments/trumpet.ogg
 
 object5Image=violin.svg
-_object5Text=the violin
+_object5Text=Find the violin
 object5Audio=instruments/violin.ogg
 
 [3]
 object1Image=clarinet.svg
-_object1Text=the clarinet
+_object1Text=Find the clarinet
 object1Audio=instruments/clarinet.ogg
 
 object2Image=flute_traversiere.svg
-_object2Text=the flute traversiere
+_object2Text=Find the flute traversiere
 object2Audio=instruments/flute_traversiere.ogg
 
 object3Image=guitar.svg
-_object3Text=the guitar
+_object3Text=Find the guitar
 object3Audio=instruments/guitar.ogg
 
 object4Image=harp.svg
-_object4Text=the harp
+_object4Text=Find the harp
 object4Audio=instruments/harp.ogg
 
 object5Image=piano.svg
-_object5Text=the piano
+_object5Text=Find the piano
 object5Audio=instruments/piano.ogg
 
 object6Image=saxophone.svg
-_object6Text=the saxophone
+_object6Text=Find the saxophone
 object6Audio=instruments/saxophone.ogg
 
 object7Image=trombone.svg
-_object7Text=the trombone
+_object7Text=Find the trombone
 object7Audio=instruments/trombone.ogg
 
 object8Image=trumpet.svg
-_object8Text=the trumpet
+_object8Text=Find the trumpet
 object8Audio=instruments/trumpet.ogg
 
 [4]
 object1Image=violin.svg
-_object1Text=the violin
+_object1Text=Find the violin
 object1Audio=instruments/violin.ogg
 
 object2Image=flute_traversiere.svg
-_object2Text=the flute traversiere
+_object2Text=Find the flute traversiere
 object2Audio=instruments/flute_traversiere.ogg
 
 object3Image=guitar.svg
-_object3Text=the guitar
+_object3Text=Find the guitar
 object3Audio=instruments/guitar.ogg
 
 object4Image=harp.svg
-_object4Text=the harp
+_object4Text=Find the harp
 object4Audio=instruments/harp.ogg
 
 object5Image=piano.svg
-_object5Text=the piano
+_object5Text=Find the piano
 object5Audio=instruments/piano.ogg
 
 object6Image=saxophone.svg
-_object6Text=the saxophone
+_object6Text=Find the saxophone
 object6Audio=instruments/saxophone.ogg
 
 object7Image=trombone.svg
-_object7Text=the trombone
+_object7Text=Find the trombone
 object7Audio=instruments/trombone.ogg
 
 object8Image=trumpet.svg
-_object8Text=the trumpet
+_object8Text=Find the trumpet
 object8Audio=instruments/trumpet.ogg
 
 [5]
 object1Image=drum_kit.svg
-_object1Text=the drum kit
+_object1Text=Find the drum kit
 object1Audio=instruments/drum_kit.ogg
 
 object2Image=accordion.png
-_object2Text=the accordion
+_object2Text=Find the accordion
 object2Audio=instruments/accordion.ogg
 
 object3Image=banjo.svg
-_object3Text=the banjo
+_object3Text=Find the banjo
 object3Audio=instruments/banjo.ogg
 
 object4Image=bongo.png
-_object4Text=the bongo
+_object4Text=Find the bongo
 object4Audio=instruments/bongo.ogg
 
 object5Image=electric_guitar.svg
-_object5Text=the electric guitar
+_object5Text=Find the electric guitar
 object5Audio=instruments/electric_guitar.ogg
 
 object6Image=castanets.svg
-_object6Text=the castanets
+_object6Text=Find the castanets
 object6Audio=instruments/castanets.ogg
 
 [6]
 object1Image=drum_kit.svg
-_object1Text=the drum kit
+_object1Text=Find the drum kit
 object1Audio=instruments/drum_kit.ogg
 
 object2Image=accordion.png
-_object2Text=the accordion
+_object2Text=Find the accordion
 object2Audio=instruments/accordion.ogg
 
 object3Image=banjo.svg
-_object3Text=the banjo
+_object3Text=Find the banjo
 object3Audio=instruments/banjo.ogg
 
 object4Image=cymbal.svg
-_object4Text=the cymbal
+_object4Text=Find the cymbal
 object4Audio=instruments/cymbal.ogg
 
 object5Image=cello.svg
-_object5Text=the cello
+_object5Text=Find the cello
 object5Audio=instruments/cello.ogg
 
 [7]
 
 object1Image=bongo.png
-_object1Text=the bongo
+_object1Text=Find the bongo
 object1Audio=instruments/bongo.ogg
 
 object2Image=electric_guitar.svg
-_object2Text=the electric guitar
+_object2Text=Find the electric guitar
 object2Audio=instruments/electric_guitar.ogg
 
 object3Image=harmonica.svg
-_object3Text=the harmonica
+_object3Text=Find the harmonica
 object3Audio=instruments/harmonica.ogg
 
 object4Image=horn.svg
-_object4Text=the horn
+_object4Text=Find the horn
 object4Audio=instruments/horn.ogg
 
 object5Image=maracas.svg
-_object5Text=the maracas
+_object5Text=Find the maracas
 object5Audio=instruments/maracas.ogg
 
 object6Image=organ.png
-_object6Text=the organ
+_object6Text=Find the organ
 object6Audio=instruments/organ.ogg
 
 [8]
 
 object1Image=snare_drum.svg
-_object1Text=the snare drum
+_object1Text=Find the snare drum
 object1Audio=instruments/snare_drum.ogg
 
 object2Image=timpani.svg
-_object2Text=the timpani
+_object2Text=Find the timpani
 object2Audio=instruments/timpani.ogg
 
 object3Image=triangle.png
-_object3Text=the triangle
+_object3Text=Find the triangle
 object3Audio=instruments/triangle.ogg
 
 object4Image=horn.svg
-_object4Text=the horn
+_object4Text=Find the horn
 object4Audio=instruments/horn.ogg
 
 object5Image=maracas.svg
-_object5Text=the maracas
+_object5Text=Find the maracas
 object5Audio=instruments/maracas.ogg
 
 object6Image=organ.png
-_object6Text=the organ
+_object6Text=Find the organ
 object6Audio=instruments/organ.ogg
 
 [9]
 
 object1Image=snare_drum.svg
-_object1Text=the snare drum
+_object1Text=Find the snare drum
 object1Audio=instruments/snare_drum.ogg
 
 object2Image=timpani.svg
-_object2Text=the timpani
+_object2Text=Find the timpani
 object2Audio=instruments/timpani.ogg
 
 object3Image=triangle.png
-_object3Text=the triangle
+_object3Text=Find the triangle
 object3Audio=instruments/triangle.ogg
 
 object4Image=tambourine.svg
-_object4Text=the tambourine
+_object4Text=Find the tambourine
 object4Audio=instruments/tambourine.ogg
 
 object5Image=tuba.svg
-_object5Text=the tuba
+_object5Text=Find the tuba
 object5Audio=instruments/tuba.ogg
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]