diff options
| author | Bruno Coudoin <bcoudoin@src.gnome.org> | 2007-08-30 23:30:52 (GMT) |
|---|---|---|
| committer | Bruno Coudoin <bcoudoin@src.gnome.org> | 2007-08-30 23:30:52 (GMT) |
| commit | b1f0cb2ebe48546cf96d2367184728af0e1f9bac (patch) | |
| tree | 0a48206124d5e2d73c79dcf73593a1e2c9a611eb | |
| parent | 2ace1e405e664ea889776626947d51dc28ee61f7 (diff) | |
Fixed bug#327462 : Please move data files into a separate CVS module
Now all voices are in a separated svn module.
The voices must now be put under boards/voices/<locale> instead of
boards/sounds/<locale>
To get the voices installed in the proper place, simply run:
make update-voices
svn path=/trunk/; revision=2944
27 files changed, 277 insertions, 280 deletions
@@ -1,3 +1,40 @@ +2007-08-31 Bruno coudoin <bruno.coudoin@free.fr> + + Now all voices are in a separated svn module. + The voices must now be put under boards/voices/<locale> instead of + boards/sounds/<locale> + + To get the voices installed in the proper place, simply run: + make update-voices + + * Makefile.am: + * boards/click_on_letter.xml.in: + * boards/doubleentry/board3_0.xml.in: + * boards/geography.xml.in: + * boards/geography/board1_0.xml.in: + * boards/geography/board2_0.xml.in: + * boards/geography/board2_1.xml.in: + * boards/geography/board3_0.xml.in: + * boards/geography/board3_1.xml.in: + * boards/geography/board4_0.xml.in: + * boards/geography/board4_1.xml.in: + * boards/geography/board4_2.xml.in: + * boards/geography_country.xml.in: + * boards/geography_country/board1_0.xml.in: + * create_dist_sounds: + * src/boards/algebra.c: (algebra_create_item): + * src/boards/click_on_letter.c: (repeat), (sounds_are_fine), + (click_on_letter_next_level), (config_start): + * src/boards/colors.c: (colors_config_start), (repeat): + * src/boards/gletters.c: (gletters_create_item): + * src/boards/python/admin/board_list.py: + * src/boards/smallnumbers.c: (smallnumbers_create_item), + (smallnumber_config_start): + * src/gcompris/bar.c: (bar_play_sound), (item_event_bar): + * src/gcompris/board_config.c: + * src/gcompris/bonus.c: + * src/gcompris/gcompris.c: (main): + 2007-08-30 Bruno coudoin <bruno.coudoin@free.fr> * Thanks to Ronny Standtke for these bug reports. @@ -1,12 +1,16 @@ GCompris Specific Instructions ============================== +WARNING: Starting at GCompris 8.4 voices are in a separate svn module + To get them, you must run: make update-voices + Gcompris can be installed anywhere on your hard drive. for example, you can use: sh configure --prefix=/home/bruno/gcompris make +make update-voices make install Warning: You cannot use ~ in the prefix, it must be a full path. diff --git a/Makefile.am b/Makefile.am index 0293d92..cbd217b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -65,7 +65,7 @@ install-data-local: @$(NORMAL_INSTALL) if test -d $(srcdir)/$(PACKAGE_DATA_DIR); then \ $(mkinstalldirs) $(DESTDIR)/$(pkgdatadir)/$(PACKAGE_DATA_DIR); \ - cd $(srcdir)/$(PACKAGE_DATA_DIR) ; tar cf - --exclude "Makefile.in" --exclude "*.in" --exclude "*~" --exclude "Makefile" --exclude "Makefile.am" --exclude .svn --exclude .xvpics --exclude "1[1-9].ogg" --exclude "2?.ogg" * | ( cd $(DESTDIR)/$(pkgdatadir)/$(PACKAGE_DATA_DIR) ; tar xf -) ; cd .. ; \ + cd $(srcdir)/$(PACKAGE_DATA_DIR) ; tar cf - --exclude "Makefile.in" --exclude "*.in" --exclude "*~" --exclude "Makefile" --exclude "Makefile.am" --exclude .svn --exclude "1[1-9].ogg" --exclude "2?.ogg" * | ( cd $(DESTDIR)/$(pkgdatadir)/$(PACKAGE_DATA_DIR) ; tar xf -) ; cd .. ; \ fi dist-hook: @@ -81,17 +81,13 @@ clean-local: rm -f intltool-extract intltool-merge intltool-update -rm -fr $(BUNDLE_APPDIR) -# Creates separates distribution files for the sounds by locale -dist-sounds: - ./create_dist_sounds en @ALL_LINGUAS@ - -# Create a core dist file without localized sounds file -dist-core: - cp $(distdir).tar.gz $(distcore).tar.gz - gzip -df $(distcore).tar.gz - tar f $(distcore).tar --delete $(distdir)/boards/sounds - gzip --best $(distcore).tar - @echo Created $(distcore).tar.gz +update-voices: + @if test -d $(PACKAGE_DATA_DIR)/voices; then \ + svn up $(PACKAGE_DATA_DIR)/voices; \ + else \ + mkdir $(PACKAGE_DATA_DIR)/voices; \ + svn co svn+ssh://bcoudoin@svn.gnome.org/svn/gcompris/voices $(PACKAGE_DATA_DIR)/voices; \ + fi all-local: diff --git a/boards/click_on_letter.xml.in b/boards/click_on_letter.xml.in index ba4eb16..29aa19f 100644 --- a/boards/click_on_letter.xml.in +++ b/boards/click_on_letter.xml.in @@ -5,7 +5,7 @@ type="click_on_letter" section="/reading" icon="boardicons/click_on_letter.svg" - mandatory_sound_file="sounds/$LOCALE/misc/click_on_letter.ogg" + mandatory_sound_file="voices/$LOCALE/misc/click_on_letter.ogg" difficulty="1" author="Pascal Georges (pascal.georges1@free.fr)" boarddir="click_on_letter"> diff --git a/boards/doubleentry/board3_0.xml.in b/boards/doubleentry/board3_0.xml.in index 3fc589e..2591692 100644 --- a/boards/doubleentry/board3_0.xml.in +++ b/boards/doubleentry/board3_0.xml.in @@ -7,17 +7,17 @@ </Title> <Title x="231" y="90" justification="GTK_JUSTIFY_CENTER"><name>1</name></Title> <Title x="137" y="325" justification="GTK_JUSTIFY_CENTER"><name>C</name></Title> - <Shape name="A" pixmapfile="doubleentry/d-entry_banane_1.png" x="231" y="325" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/alphabet/U0063.ogg sounds/$LOCALE/alphabet/U0031.ogg"/> - <Shape name="B" pixmapfile="doubleentry/d-entry_banane_2.png" x="321" y="325" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/alphabet/U0063.ogg sounds/$LOCALE/alphabet/U0032.ogg"/> - <Shape name="C" pixmapfile="doubleentry/d-entry_banane_3.png" x="418" y="325" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/alphabet/U0063.ogg sounds/$LOCALE/alphabet/U0033.ogg"/> + <Shape name="A" pixmapfile="doubleentry/d-entry_banane_1.png" x="231" y="325" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/alphabet/U0063.ogg voices/$LOCALE/alphabet/U0031.ogg"/> + <Shape name="B" pixmapfile="doubleentry/d-entry_banane_2.png" x="321" y="325" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/alphabet/U0063.ogg voices/$LOCALE/alphabet/U0032.ogg"/> + <Shape name="C" pixmapfile="doubleentry/d-entry_banane_3.png" x="418" y="325" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/alphabet/U0063.ogg voices/$LOCALE/alphabet/U0033.ogg"/> <Title x="321" y="90" justification="GTK_JUSTIFY_CENTER"><name>2</name></Title> <Title x="137" y="170" justification="GTK_JUSTIFY_CENTER"><name>A</name></Title> - <Shape name="D" pixmapfile="doubleentry/d-entry_pomme_1.png" x="231" y="170" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/alphabet/U0061.ogg sounds/$LOCALE/alphabet/U0031.ogg"/> - <Shape name="E" pixmapfile="doubleentry/d-entry_pomme_2.png" x="321" y="170" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/alphabet/U0061.ogg sounds/$LOCALE/alphabet/U0032.ogg"/> - <Shape name="F" pixmapfile="doubleentry/d-entry_pomme_3.png" x="418" y="170" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/lphabet/U0061.ogg sounds/$LOCALE/alphabet/U0033.ogg"/> + <Shape name="D" pixmapfile="doubleentry/d-entry_pomme_1.png" x="231" y="170" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/alphabet/U0061.ogg voices/$LOCALE/alphabet/U0031.ogg"/> + <Shape name="E" pixmapfile="doubleentry/d-entry_pomme_2.png" x="321" y="170" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/alphabet/U0061.ogg voices/$LOCALE/alphabet/U0032.ogg"/> + <Shape name="F" pixmapfile="doubleentry/d-entry_pomme_3.png" x="418" y="170" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/lphabet/U0061.ogg voices/$LOCALE/alphabet/U0033.ogg"/> <Title x="418" y="90" justification="GTK_JUSTIFY_CENTER"><name>3</name></Title> <Title x="137" y="245" justification="GTK_JUSTIFY_CENTER"><name>B</name></Title> - <Shape name="G" pixmapfile="doubleentry/d-entry_galette_1.png" x="231" y="245" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/alphabet/U0062.ogg sounds/$LOCALE/alphabet/U0031.ogg"/> - <Shape name="H" pixmapfile="doubleentry/d-entry_galette_2.png" x="321" y="245" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/alphabet/U0062.ogg sounds/$LOCALE/alphabet/U0032.ogg"/> - <Shape name="I" pixmapfile="doubleentry/d-entry_galette_3.png" x="418" y="245" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/alphabet/U0062.ogg sounds/$LOCALE/alphabet/U0033.ogg"/> + <Shape name="G" pixmapfile="doubleentry/d-entry_galette_1.png" x="231" y="245" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/alphabet/U0062.ogg voices/$LOCALE/alphabet/U0031.ogg"/> + <Shape name="H" pixmapfile="doubleentry/d-entry_galette_2.png" x="321" y="245" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/alphabet/U0062.ogg voices/$LOCALE/alphabet/U0032.ogg"/> + <Shape name="I" pixmapfile="doubleentry/d-entry_galette_3.png" x="418" y="245" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/alphabet/U0062.ogg voices/$LOCALE/alphabet/U0033.ogg"/> </ShapeGame> diff --git a/boards/geography.xml.in b/boards/geography.xml.in index 542a3cb..fc256c3 100644 --- a/boards/geography.xml.in +++ b/boards/geography.xml.in @@ -5,7 +5,7 @@ type="shapegame" section="/discovery/miscelaneous" icon="boardicons/globe.svg" - mandatory_sound_file="sounds/$LOCALE/geography/peru.ogg" + mandatory_sound_file="voices/$LOCALE/geography/peru.ogg" difficulty="2" author="Jean-Philippe Ayanides (jp.ayanides@free.fr)" boarddir="geography"> diff --git a/boards/geography/board1_0.xml.in b/boards/geography/board1_0.xml.in index 2691f2b..197c575 100644 --- a/boards/geography/board1_0.xml.in +++ b/boards/geography/board1_0.xml.in @@ -4,22 +4,22 @@ <Title x="600" y="495" justification="GTK_JUSTIFY_CENTER"> <_name>Continents</_name> </Title> - <Shape name="A" pixmapfile="geography/continents/africa.png" x="433" y="318" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/africa.ogg"> + <Shape name="A" pixmapfile="geography/continents/africa.png" x="433" y="318" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/africa.ogg"> <_tooltip>Africa</_tooltip> </Shape> - <Shape name="B" pixmapfile="geography/continents/america.png" x="232" y="251" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/america.ogg"> + <Shape name="B" pixmapfile="geography/continents/america.png" x="232" y="251" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/america.ogg"> <_tooltip>America</_tooltip> </Shape> - <Shape name="D" pixmapfile="geography/continents/antartica.png" x="370" y="465" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/antartica.ogg"> + <Shape name="D" pixmapfile="geography/continents/antartica.png" x="370" y="465" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/antartica.ogg"> <_tooltip>Antartica</_tooltip> </Shape> - <Shape name="C" pixmapfile="geography/continents/asia.png" x="595" y="211" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/asia.ogg"> + <Shape name="C" pixmapfile="geography/continents/asia.png" x="595" y="211" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/asia.ogg"> <_tooltip>Asia</_tooltip> </Shape> - <Shape name="E" pixmapfile="geography/continents/europa.png" x="430" y="156" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/europe.ogg"> + <Shape name="E" pixmapfile="geography/continents/europa.png" x="430" y="156" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/europe.ogg"> <_tooltip>Europe</_tooltip> </Shape> - <Shape name="F" pixmapfile="geography/continents/oceania.png" x="695" y="398" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/oceania.ogg"> + <Shape name="F" pixmapfile="geography/continents/oceania.png" x="695" y="398" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/oceania.ogg"> <_tooltip>Oceania</_tooltip> </Shape> <Shape name="1" pixmapfile="geography/continents/back.png" type="SHAPE_BACKGROUND" diff --git a/boards/geography/board2_0.xml.in b/boards/geography/board2_0.xml.in index cbff255..9ba4a40 100644 --- a/boards/geography/board2_0.xml.in +++ b/boards/geography/board2_0.xml.in @@ -4,37 +4,37 @@ <Title x="600" y="495" justification="GTK_JUSTIFY_CENTER"> <_name>North America</_name> </Title> - <Shape name="A" pixmapfile="geography/northamerica/bahamas.png" x="399" y="443" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/bahamas.ogg"> + <Shape name="A" pixmapfile="geography/northamerica/bahamas.png" x="399" y="443" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/bahamas.ogg"> <_tooltip>Bahamas</_tooltip> </Shape> - <Shape name="B" pixmapfile="geography/northamerica/canada.png" x="349" y="182" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/canada.ogg"> + <Shape name="B" pixmapfile="geography/northamerica/canada.png" x="349" y="182" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/canada.ogg"> <_tooltip>Canada</_tooltip> </Shape> - <Shape name="C" pixmapfile="geography/northamerica/cuba.png" x="595" y="400" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/cuba.ogg"> + <Shape name="C" pixmapfile="geography/northamerica/cuba.png" x="595" y="400" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/cuba.ogg"> <_tooltip>Cuba</_tooltip> </Shape> - <Shape name="D" pixmapfile="geography/northamerica/dominican_republic.png" x="700" y="429" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/dominican_republic.ogg"> + <Shape name="D" pixmapfile="geography/northamerica/dominican_republic.png" x="700" y="429" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/dominican_republic.ogg"> <_tooltip>Dominican Republic</_tooltip> </Shape> - <Shape name="E" pixmapfile="geography/northamerica/greenland.png" x="442" y="79" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/greenland.ogg"> + <Shape name="E" pixmapfile="geography/northamerica/greenland.png" x="442" y="79" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/greenland.ogg"> <_tooltip>Greenland</_tooltip> </Shape> - <Shape name="F" pixmapfile="geography/northamerica/haiti.png" x="663" y="429" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/haiti.ogg"> + <Shape name="F" pixmapfile="geography/northamerica/haiti.png" x="663" y="429" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/haiti.ogg"> <_tooltip>Haiti</_tooltip> </Shape> - <Shape name="G" pixmapfile="geography/northamerica/iceland.png" x="528" y="48" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/iceland.ogg"> + <Shape name="G" pixmapfile="geography/northamerica/iceland.png" x="528" y="48" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/iceland.ogg"> <_tooltip>Iceland</_tooltip> </Shape> - <Shape name="H" pixmapfile="geography/northamerica/jamaica.png" x="620" y="438" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/jamaica.ogg"> + <Shape name="H" pixmapfile="geography/northamerica/jamaica.png" x="620" y="438" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/jamaica.ogg"> <_tooltip>Jamaica</_tooltip> </Shape> - <Shape name="I" pixmapfile="geography/northamerica/mexico.png" x="255" y="434" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/mexico.ogg"> + <Shape name="I" pixmapfile="geography/northamerica/mexico.png" x="255" y="434" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/mexico.ogg"> <_tooltip>Mexico</_tooltip> </Shape> - <Shape name="J" pixmapfile="geography/northamerica/usa.png" x="323" y="366" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/usa.ogg"> + <Shape name="J" pixmapfile="geography/northamerica/usa.png" x="323" y="366" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/usa.ogg"> <_tooltip>United States of America</_tooltip> </Shape> - <Shape name="K" pixmapfile="geography/northamerica/alaska.png" x="156" y="92" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/alaska.ogg"> + <Shape name="K" pixmapfile="geography/northamerica/alaska.png" x="156" y="92" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/alaska.ogg"> <_tooltip>Alaska</_tooltip> </Shape> <Shape name="1" pixmapfile="geography/northamerica/north_america.png" type="SHAPE_BACKGROUND" x="425" y="260" zoomx="1" zoomy="1" position="0"/> diff --git a/boards/geography/board2_1.xml.in b/boards/geography/board2_1.xml.in index ab6902e..989f98b 100644 --- a/boards/geography/board2_1.xml.in +++ b/boards/geography/board2_1.xml.in @@ -3,46 +3,46 @@ <Title x="600" y="495" justification="GTK_JUSTIFY_CENTER"> <_name>South America</_name> </Title> - <Shape name="A" pixmapfile="geography/southamerica/argentina.png" x="410" y="380" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/argentina.ogg"> + <Shape name="A" pixmapfile="geography/southamerica/argentina.png" x="410" y="380" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/argentina.ogg"> <_tooltip>Argentina</_tooltip> </Shape> - <Shape name="B" pixmapfile="geography/southamerica/bolivia.png" x="390" y="224" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/bolivia.ogg"> + <Shape name="B" pixmapfile="geography/southamerica/bolivia.png" x="390" y="224" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/bolivia.ogg"> <_tooltip>Bolivia</_tooltip> </Shape> - <Shape name="C" pixmapfile="geography/southamerica/brazil.png" x="453" y="203" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/brazil.ogg"> + <Shape name="C" pixmapfile="geography/southamerica/brazil.png" x="453" y="203" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/brazil.ogg"> <_tooltip>Brazil</_tooltip> </Shape> - <Shape name="D" pixmapfile="geography/southamerica/chile.png" x="375" y="369" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/chile.ogg"> + <Shape name="D" pixmapfile="geography/southamerica/chile.png" x="375" y="369" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/chile.ogg"> <_tooltip>Chile</_tooltip> </Shape> - <Shape name="E" pixmapfile="geography/southamerica/colombia.png" x="314" y="81" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/colombia.ogg"> + <Shape name="E" pixmapfile="geography/southamerica/colombia.png" x="314" y="81" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/colombia.ogg"> <_tooltip>Colombia</_tooltip> </Shape> - <Shape name="F" pixmapfile="geography/southamerica/ecuador.png" x="279" y="128" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/ecuador.ogg"> + <Shape name="F" pixmapfile="geography/southamerica/ecuador.png" x="279" y="128" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/ecuador.ogg"> <_tooltip>Ecuador</_tooltip> </Shape> - <Shape name="G" pixmapfile="geography/southamerica/french_guiana.png" x="454" y="77" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/french_guiana.ogg"> + <Shape name="G" pixmapfile="geography/southamerica/french_guiana.png" x="454" y="77" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/french_guiana.ogg"> <_tooltip>French Guiana</_tooltip> </Shape> - <Shape name="H" pixmapfile="geography/southamerica/guyana.png" x="413" y="72" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/guyana.ogg"> + <Shape name="H" pixmapfile="geography/southamerica/guyana.png" x="413" y="72" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/guyana.ogg"> <_tooltip>Guyana</_tooltip> </Shape> - <Shape name="I" pixmapfile="geography/southamerica/panama.png" x="263" y="54" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/panama.ogg"> + <Shape name="I" pixmapfile="geography/southamerica/panama.png" x="263" y="54" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/panama.ogg"> <_tooltip>Panama</_tooltip> </Shape> - <Shape name="J" pixmapfile="geography/southamerica/paraguay.png" x="428" y="270" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/paraguay.ogg"> + <Shape name="J" pixmapfile="geography/southamerica/paraguay.png" x="428" y="270" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/paraguay.ogg"> <_tooltip>Paraguay</_tooltip> </Shape> - <Shape name="K" pixmapfile="geography/southamerica/peru.png" x="305" y="178" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/peru.ogg"> + <Shape name="K" pixmapfile="geography/southamerica/peru.png" x="305" y="178" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/peru.ogg"> <_tooltip>Peru</_tooltip> </Shape> - <Shape name="L" pixmapfile="geography/southamerica/suriname.png" x="434" y="77" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/suriname.ogg"> + <Shape name="L" pixmapfile="geography/southamerica/suriname.png" x="434" y="77" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/suriname.ogg"> <_tooltip>Suriname</_tooltip> </Shape> - <Shape name="M" pixmapfile="geography/southamerica/uruguay.png" x="452" y="333" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/uruguay.ogg"> + <Shape name="M" pixmapfile="geography/southamerica/uruguay.png" x="452" y="333" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/uruguay.ogg"> <_tooltip>Uruguay</_tooltip> </Shape> - <Shape name="N" pixmapfile="geography/southamerica/venezuela.png" x="357" y="66" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/venezuela.ogg"> + <Shape name="N" pixmapfile="geography/southamerica/venezuela.png" x="357" y="66" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/venezuela.ogg"> <_tooltip>Venezuela</_tooltip> </Shape> <Shape name="1" pixmapfile="geography/southamerica/south_america.png" type="SHAPE_BACKGROUND" x="420" y="260" zoomx="1" zoomy="1" position="0"/> diff --git a/boards/geography/board3_0.xml.in b/boards/geography/board3_0.xml.in index 39c0acd..5a23420 100644 --- a/boards/geography/board3_0.xml.in +++ b/boards/geography/board3_0.xml.in @@ -3,55 +3,55 @@ <Title x="270" y="40" justification="GTK_JUSTIFY_CENTER"> <_name>Western Europe</_name> </Title> - <Shape name="E" pixmapfile="geography/europe/austria.png" x="443" y="328" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/austria.ogg"> + <Shape name="E" pixmapfile="geography/europe/austria.png" x="443" y="328" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/austria.ogg"> <_tooltip>Austria</_tooltip> </Shape> - <Shape name="O" pixmapfile="geography/europe/belgium.png" x="335" y="286" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/belgium.ogg"> + <Shape name="O" pixmapfile="geography/europe/belgium.png" x="335" y="286" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/belgium.ogg"> <_tooltip>Belgium</_tooltip> </Shape> - <Shape name="B" pixmapfile="geography/europe/denmark.png" x="399" y="203" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/denmark.ogg"> + <Shape name="B" pixmapfile="geography/europe/denmark.png" x="399" y="203" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/denmark.ogg"> <_tooltip>Denmark</_tooltip> </Shape> - <Shape name="A" pixmapfile="geography/europe/finland.png" x="554" y="75" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/finland.ogg"> + <Shape name="A" pixmapfile="geography/europe/finland.png" x="554" y="75" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/finland.ogg"> <_tooltip>Finland</_tooltip> </Shape> - <Shape name="D" pixmapfile="geography/europe/france.png" x="312" y="351" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/france.ogg"> + <Shape name="D" pixmapfile="geography/europe/france.png" x="312" y="351" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/france.ogg"> <_tooltip>France</_tooltip> </Shape> - <Shape name="H" pixmapfile="geography/europe/germany.png" x="405" y="277" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/germany.ogg"> + <Shape name="H" pixmapfile="geography/europe/germany.png" x="405" y="277" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/germany.ogg"> <_tooltip>Germany</_tooltip> </Shape> - <Shape name="F" pixmapfile="geography/europe/iceland.png" x="141" y="54" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/iceland.ogg"> + <Shape name="F" pixmapfile="geography/europe/iceland.png" x="141" y="54" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/iceland.ogg"> <_tooltip>Iceland</_tooltip> </Shape> - <Shape name="R" pixmapfile="geography/europe/ireland.png" x="186" y="249" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/ireland.ogg"> + <Shape name="R" pixmapfile="geography/europe/ireland.png" x="186" y="249" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/ireland.ogg"> <_tooltip>Ireland</_tooltip> </Shape> - <Shape name="I" pixmapfile="geography/europe/italy.png" x="439" y="417" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/italy.ogg"> + <Shape name="I" pixmapfile="geography/europe/italy.png" x="439" y="417" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/italy.ogg"> <_tooltip>Italy</_tooltip> </Shape> - <Shape name="L" pixmapfile="geography/europe/luxembourg.png" type="SHAPE_BACKGROUND" x="354" y="298" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/luxembourg.ogg"> + <Shape name="L" pixmapfile="geography/europe/luxembourg.png" type="SHAPE_BACKGROUND" x="354" y="298" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/luxembourg.ogg"> <_tooltip>Luxembourg</_tooltip> </Shape> - <Shape name="N" pixmapfile="geography/europe/netherland.png" x="342" y="261" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/netherland.ogg"> + <Shape name="N" pixmapfile="geography/europe/netherland.png" x="342" y="261" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/netherland.ogg"> <_tooltip>The Netherlands</_tooltip> </Shape> - <Shape name="M" pixmapfile="geography/europe/norway.png" x="462" y="85" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/norway.ogg"> + <Shape name="M" pixmapfile="geography/europe/norway.png" x="462" y="85" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/norway.ogg"> <_tooltip>Norway</_tooltip> </Shape> - <Shape name="C" pixmapfile="geography/europe/portugal.png" x="182" y="453" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/portugal.ogg"> + <Shape name="C" pixmapfile="geography/europe/portugal.png" x="182" y="453" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/portugal.ogg"> <_tooltip>Portugal</_tooltip> </Shape> - <Shape name="P" pixmapfile="geography/europe/spain.png" x="252" y="448" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/spain.ogg"> + <Shape name="P" pixmapfile="geography/europe/spain.png" x="252" y="448" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/spain.ogg"> <_tooltip>Spain</_tooltip> </Shape> - <Shape name="Q" pixmapfile="geography/europe/sweden.png" x="467" y="118" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/sweden.ogg"> + <Shape name="Q" pixmapfile="geography/europe/sweden.png" x="467" y="118" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/sweden.ogg"> <_tooltip>Sweden</_tooltip> </Shape> - <Shape name="J" pixmapfile="geography/europe/switz.png" x="383" y="341" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/switz.ogg"> + <Shape name="J" pixmapfile="geography/europe/switz.png" x="383" y="341" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/switz.ogg"> <_tooltip>Switzerland</_tooltip> </Shape> - <Shape name="G" pixmapfile="geography/europe/united_kingdom.png" x="241" y="226" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/united_kingdom.ogg"> + <Shape name="G" pixmapfile="geography/europe/united_kingdom.png" x="241" y="226" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/united_kingdom.ogg"> <_tooltip>United Kingdom</_tooltip> </Shape> <Shape name="Z" pixmapfile="geography/europe/europe.png" type="SHAPE_BACKGROUND" x="450" y="260" zoomx="1" zoomy="1" position="0"/> diff --git a/boards/geography/board3_1.xml.in b/boards/geography/board3_1.xml.in index 81dec06..d130fd3 100644 --- a/boards/geography/board3_1.xml.in +++ b/boards/geography/board3_1.xml.in @@ -3,70 +3,70 @@ <Title x="280" y="40" justification="GTK_JUSTIFY_CENTER"> <_name>Eastern Europe</_name> </Title> - <Shape name="A" pixmapfile="geography/europe/albania.png" x="505" y="431" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/albania.ogg"> + <Shape name="A" pixmapfile="geography/europe/albania.png" x="505" y="431" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/albania.ogg"> <_tooltip>Albania</_tooltip> </Shape> - <Shape name="B" pixmapfile="geography/europe/belarus.png" x="577" y="239" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/belarus.ogg"> + <Shape name="B" pixmapfile="geography/europe/belarus.png" x="577" y="239" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/belarus.ogg"> <_tooltip>Belarus</_tooltip> </Shape> - <Shape name="C" pixmapfile="geography/europe/bosnia_herzegovina.png" x="470" y="388" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/bosnia_herzegovina.ogg"> + <Shape name="C" pixmapfile="geography/europe/bosnia_herzegovina.png" x="470" y="388" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/bosnia_herzegovina.ogg"> <_tooltip>Bosnia Herzegovina</_tooltip> </Shape> - <Shape name="D" pixmapfile="geography/europe/bulgaria.png" x="567" y="404" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/bulgaria.ogg"> + <Shape name="D" pixmapfile="geography/europe/bulgaria.png" x="567" y="404" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/bulgaria.ogg"> <_tooltip>Bulgaria</_tooltip> </Shape> - <Shape name="E" pixmapfile="geography/europe/croatia.png" x="454" y="375" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/croatia.ogg"> + <Shape name="E" pixmapfile="geography/europe/croatia.png" x="454" y="375" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/croatia.ogg"> <_tooltip>Croatia</_tooltip> </Shape> - <Shape name="G" pixmapfile="geography/europe/czech.png" x="438" y="294" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/czech.ogg"> + <Shape name="G" pixmapfile="geography/europe/czech.png" x="438" y="294" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/czech.ogg"> <_tooltip>Czech Republic</_tooltip> </Shape> - <Shape name="H" pixmapfile="geography/europe/estonia.png" x="528" y="167" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/estonia.ogg"> + <Shape name="H" pixmapfile="geography/europe/estonia.png" x="528" y="167" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/estonia.ogg"> <_tooltip>Estonia</_tooltip> </Shape> - <Shape name="I" pixmapfile="geography/europe/hungary.png" x="487" y="336" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/hungary.ogg"> + <Shape name="I" pixmapfile="geography/europe/hungary.png" x="487" y="336" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/hungary.ogg"> <_tooltip>Hungary</_tooltip> </Shape> - <Shape name="J" pixmapfile="geography/europe/latvia.png" x="531" y="193" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/latvia.ogg"> + <Shape name="J" pixmapfile="geography/europe/latvia.png" x="531" y="193" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/latvia.ogg"> <_tooltip>Latvia</_tooltip> </Shape> - <Shape name="K" pixmapfile="geography/europe/lithuania.png" x="524" y="218" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/lithuania.ogg"> + <Shape name="K" pixmapfile="geography/europe/lithuania.png" x="524" y="218" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/lithuania.ogg"> <_tooltip>Lithuania</_tooltip> </Shape> - <Shape name="L" pixmapfile="geography/europe/macedonia.png" x="524" y="421" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/macedonia.ogg"> + <Shape name="L" pixmapfile="geography/europe/macedonia.png" x="524" y="421" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/macedonia.ogg"> <_tooltip>Macedonia</_tooltip> </Shape> - <Shape name="M" pixmapfile="geography/europe/moldova.png" x="596" y="339" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/moldova.ogg"> + <Shape name="M" pixmapfile="geography/europe/moldova.png" x="596" y="339" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/moldova.ogg"> <_tooltip>Moldova</_tooltip> </Shape> - <Shape name="N" pixmapfile="geography/europe/poland.png" x="474" y="264" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/poland.ogg"> + <Shape name="N" pixmapfile="geography/europe/poland.png" x="474" y="264" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/poland.ogg"> <_tooltip>Poland</_tooltip> </Shape> - <Shape name="O" pixmapfile="geography/europe/romania.png" x="558" y="355" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/romania.ogg"> + <Shape name="O" pixmapfile="geography/europe/romania.png" x="558" y="355" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/romania.ogg"> <_tooltip>Romania</_tooltip> </Shape> - <Shape name="P" pixmapfile="geography/europe/russia.png" x="631" y="189" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/russia.ogg"> + <Shape name="P" pixmapfile="geography/europe/russia.png" x="631" y="189" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/russia.ogg"> <_tooltip>Russia</_tooltip> </Shape> - <Shape name="Q" pixmapfile="geography/europe/serbia_montenegro.png" x="510" y="385" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/serbia_montenegro.ogg"> + <Shape name="Q" pixmapfile="geography/europe/serbia_montenegro.png" x="510" y="385" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/serbia_montenegro.ogg"> <_tooltip>Serbia Montenegro</_tooltip> </Shape> - <Shape name="R" pixmapfile="geography/europe/slovakia.png" x="488" y="314" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/slovakia.ogg"> + <Shape name="R" pixmapfile="geography/europe/slovakia.png" x="488" y="314" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/slovakia.ogg"> <_tooltip>Slovak Republic</_tooltip> </Shape> - <Shape name="S" pixmapfile="geography/europe/slovenia.png" x="432" y="351" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/slovenia.ogg"> + <Shape name="S" pixmapfile="geography/europe/slovenia.png" x="432" y="351" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/slovenia.ogg"> <_tooltip>Slovenia</_tooltip> </Shape> - <Shape name="T" pixmapfile="geography/europe/turkey.png" x="677" y="466" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/turkey.ogg"> + <Shape name="T" pixmapfile="geography/europe/turkey.png" x="677" y="466" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/turkey.ogg"> <_tooltip>Turkey</_tooltip> </Shape> - <Shape name="U" pixmapfile="geography/europe/ukraine.png" x="626" y="318" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/ukraine.ogg"> + <Shape name="U" pixmapfile="geography/europe/ukraine.png" x="626" y="318" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/ukraine.ogg"> <_tooltip>Ukraine</_tooltip> </Shape> - <Shape name="V" pixmapfile="geography/europe/greece.png" x="550" y="472" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/greece.ogg"> + <Shape name="V" pixmapfile="geography/europe/greece.png" x="550" y="472" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/greece.ogg"> <_tooltip>Greece</_tooltip> </Shape> - <Shape name="F" pixmapfile="geography/europe/cyprus.png" type="SHAPE_BACKGROUND" x="683" y="521" zoomx="1" zoomy="1" position="0" sound="sounds/$LOCALE/geography/cyprus.ogg"> + <Shape name="F" pixmapfile="geography/europe/cyprus.png" type="SHAPE_BACKGROUND" x="683" y="521" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/cyprus.ogg"> <_tooltip>Cyprus</_tooltip> </Shape> <Shape name="Z" pixmapfile="geography/europe/europe.png" type="SHAPE_BACKGROUND" diff --git a/boards/geography/board4_0.xml.in b/boards/geography/board4_0.xml.in index 9279c7d..0fc1d5d 100644 --- a/boards/geography/board4_0.xml.in +++ b/boards/geography/board4_0.xml.in @@ -5,135 +5,135 @@ <_name>Northern Africa</_name> </Title> -<Shape name="A" pixmapfile="geography/africa/algeria.png" sound="sounds/$LOCALE/geography/africa/algeria.ogg" x="286" y="150" position="0"> +<Shape name="A" pixmapfile="geography/africa/algeria.png" sound="voices/$LOCALE/geography/africa/algeria.ogg" x="286" y="150" position="0"> <_tooltip>Algeria</_tooltip> </Shape> -<Shape name="B" pixmapfile="geography/africa/benin.png" sound="sounds/$LOCALE/geography/africa/benin.ogg" x="275" y="341" position="0"> +<Shape name="B" pixmapfile="geography/africa/benin.png" sound="voices/$LOCALE/geography/africa/benin.ogg" x="275" y="341" position="0"> <_tooltip>Benin</_tooltip> </Shape> -<Shape name="C" pixmapfile="geography/africa/burkina_faso.png" sound="sounds/$LOCALE/geography/africa/burkina_faso.ogg" x="236" y="310" position="0"> +<Shape name="C" pixmapfile="geography/africa/burkina_faso.png" sound="voices/$LOCALE/geography/africa/burkina_faso.ogg" x="236" y="310" position="0"> <_tooltip>Burkina Faso</_tooltip> </Shape> -<Shape name="D" pixmapfile="geography/africa/cameroon.png" sound="sounds/$LOCALE/geography/africa/cameroon.ogg" x="383" y="377" position="0"> +<Shape name="D" pixmapfile="geography/africa/cameroon.png" sound="voices/$LOCALE/geography/africa/cameroon.ogg" x="383" y="377" position="0"> <_tooltip>Cameroon</_tooltip> </Shape> -<Shape name="E" pixmapfile="geography/africa/central_african_republic.png" sound="sounds/$LOCALE/geography/africa/central_african_republic.ogg" x="465" y="370" position="0"> +<Shape name="E" pixmapfile="geography/africa/central_african_republic.png" sound="voices/$LOCALE/geography/africa/central_african_republic.ogg" x="465" y="370" position="0"> <_tooltip>Central African Republic</_tooltip> </Shape> -<Shape name="F" pixmapfile="geography/africa/chad.png" sound="sounds/$LOCALE/geography/africa/chad.ogg" x="446" y="281" position="0"> +<Shape name="F" pixmapfile="geography/africa/chad.png" sound="voices/$LOCALE/geography/africa/chad.ogg" x="446" y="281" position="0"> <_tooltip>Chad</_tooltip> </Shape> -<Shape name="G" pixmapfile="geography/africa/djibouti.png" sound="sounds/$LOCALE/geography/africa/djibouti.ogg" x="684" y="324" position="0"> +<Shape name="G" pixmapfile="geography/africa/djibouti.png" sound="voices/$LOCALE/geography/africa/djibouti.ogg" x="684" y="324" position="0"> <_tooltip>Djibouti</_tooltip> </Shape> -<Shape name="H" pixmapfile="geography/africa/egypt.png" sound="sounds/$LOCALE/geography/africa/egypt.ogg" x="559" y="164" position="0"> +<Shape name="H" pixmapfile="geography/africa/egypt.png" sound="voices/$LOCALE/geography/africa/egypt.ogg" x="559" y="164" position="0"> <_tooltip>Egypt</_tooltip> </Shape> -<Shape name="I" pixmapfile="geography/africa/equatorial_guinea.png" sound="sounds/$LOCALE/geography/africa/equatorial_guinea.ogg" x="373" y="436" position="0"> +<Shape name="I" pixmapfile="geography/africa/equatorial_guinea.png" sound="voices/$LOCALE/geography/africa/equatorial_guinea.ogg" x="373" y="436" position="0"> <_tooltip>Equatorial Guinea</_tooltip> </Shape> -<Shape name="J" pixmapfile="geography/africa/ethiopia.png" sound="sounds/$LOCALE/geography/africa/ethiopia.ogg" x="662" y="356" position="0"> +<Shape name="J" pixmapfile="geography/africa/ethiopia.png" sound="voices/$LOCALE/geography/africa/ethiopia.ogg" x="662" y="356" position="0"> <_tooltip>Ethiopia</_tooltip> </Shape> -<Shape name="erytrea" pixmapfile="geography/africa/eritrea.png" sound="sounds/$LOCALE/geography/eritrea.ogg" x="655" y="293" zoomx="1" zoomy="1" position="0"> +<Shape name="erytrea" pixmapfile="geography/africa/eritrea.png" sound="voices/$LOCALE/geography/eritrea.ogg" x="655" y="293" zoomx="1" zoomy="1" position="0"> <_tooltip>Eritrea</_tooltip> </Shape> -<Shape name="K" pixmapfile="geography/africa/gabon.png" sound="sounds/$LOCALE/geography/africa/gabon.ogg" x="388" y="462" position="0"> +<Shape name="K" pixmapfile="geography/africa/gabon.png" sound="voices/$LOCALE/geography/africa/gabon.ogg" x="388" y="462" position="0"> <_tooltip>Gabon</_tooltip> </Shape> -<Shape name="L" pixmapfile="geography/africa/ganbia.png" sound="sounds/$LOCALE/geography/africa/gambia.ogg" x="101" y="290" position="0"> +<Shape name="L" pixmapfile="geography/africa/ganbia.png" sound="voices/$LOCALE/geography/africa/gambia.ogg" x="101" y="290" position="0"> <_tooltip>Gambia</_tooltip> </Shape> -<Shape name="M" pixmapfile="geography/africa/ghana.png" sound="sounds/$LOCALE/geography/africa/ghana.ogg" x="237" y="355" position="0"> +<Shape name="M" pixmapfile="geography/africa/ghana.png" sound="voices/$LOCALE/geography/africa/ghana.ogg" x="237" y="355" position="0"> <_tooltip>Ghana</_tooltip> </Shape> -<Shape name="N" pixmapfile="geography/africa/guinea_bissau.png" sound="sounds/$LOCALE/geography/africa/guinea_bissau.ogg" x="103" y="306" position="0"> +<Shape name="N" pixmapfile="geography/africa/guinea_bissau.png" sound="voices/$LOCALE/geography/africa/guinea_bissau.ogg" x="103" y="306" position="0"> <_tooltip>Guinea Bissau</_tooltip> </Shape> -<Shape name="O" pixmapfile="geography/africa/guinea.png" sound="sounds/$LOCALE/geography/africa/guinea.ogg" x="137" y="325" position="0"> +<Shape name="O" pixmapfile="geography/africa/guinea.png" sound="voices/$LOCALE/geography/africa/guinea.ogg" x="137" y="325" position="0"> <_tooltip>Guinea</_tooltip> </Shape> -<Shape name="P" pixmapfile="geography/africa/ivory_coast.png" sound="sounds/$LOCALE/geography/africa/ivory_coast.ogg" x="192" y="356" position="0"> +<Shape name="P" pixmapfile="geography/africa/ivory_coast.png" sound="voices/$LOCALE/geography/africa/ivory_coast.ogg" x="192" y="356" position="0"> <_tooltip>Ivory Coast</_tooltip> </Shape> -<Shape name="Q" pixmapfile="geography/africa/liberia.png" sound="sounds/$LOCALE/geography/africa/liberia.ogg" x="152" y="366" position="0"> +<Shape name="Q" pixmapfile="geography/africa/liberia.png" sound="voices/$LOCALE/geography/africa/liberia.ogg" x="152" y="366" position="0"> <_tooltip>Liberia</_tooltip> </Shape> -<Shape name="R" pixmapfile="geography/africa/libya.png" sound="sounds/$LOCALE/geography/africa/libya.ogg" x="432" y="173" position="0"> +<Shape name="R" pixmapfile="geography/africa/libya.png" sound="voices/$LOCALE/geography/africa/libya.ogg" x="432" y="173" position="0"> <_tooltip>Libya</_tooltip> </Shape> -<Shape name="S" pixmapfile="geography/africa/mali.png" sound="sounds/$LOCALE/geography/africa/mali.ogg" x="219" y="250" position="0"> +<Shape name="S" pixmapfile="geography/africa/mali.png" sound="voices/$LOCALE/geography/africa/mali.ogg" x="219" y="250" position="0"> <_tooltip>Mali</_tooltip> </Shape> -<Shape name="T" pixmapfile="geography/africa/mauritania.png" sound="sounds/$LOCALE/geography/africa/mauritania.ogg" x="161" y="211" position="0"> +<Shape name="T" pixmapfile="geography/africa/mauritania.png" sound="voices/$LOCALE/geography/africa/mauritania.ogg" x="161" y="211" position="0"> <_tooltip>Mauritania</_tooltip> </Shape> -<Shape name="U" pixmapfile="geography/africa/moroco.png" sound="sounds/$LOCALE/geography/africa/moroco.ogg" x="212" y="101" position="0"> +<Shape name="U" pixmapfile="geography/africa/moroco.png" sound="voices/$LOCALE/geography/africa/moroco.ogg" x="212" y="101" position="0"> <_tooltip>Morocco</_tooltip> </Shape> -<Shape name="V" pixmapfile="geography/africa/nigeria.png" sound="sounds/$LOCALE/geography/africa/nigeria.ogg" x="341" y="344" position="0"> +<Shape name="V" pixmapfile="geography/africa/nigeria.png" sound="voices/$LOCALE/geography/africa/nigeria.ogg" x="341" y="344" position="0"> <_tooltip>Nigeria</_tooltip> </Shape> -<Shape name="W" pixmapfile="geography/africa/niger.png" sound="sounds/$LOCALE/geography/africa/niger.ogg" x="338" y="256" position="0"> +<Shape name="W" pixmapfile="geography/africa/niger.png" sound="voices/$LOCALE/geography/africa/niger.ogg" x="338" y="256" position="0"> <_tooltip>Niger</_tooltip> </Shape> -<Shape name="X" pixmapfile="geography/africa/rwanda.png" sound="sounds/$LOCALE/geography/africa/rwanda.ogg" x="565" y="474" position="0"> +<Shape name="X" pixmapfile="geography/africa/rwanda.png" sound="voices/$LOCALE/geography/africa/rwanda.ogg" x="565" y="474" position="0"> <_tooltip>Rwanda</_tooltip> </Shape> -<Shape name="Y" pixmapfile="geography/africa/senegal.png" sound="sounds/$LOCALE/geography/africa/senegal.ogg" x="106" y="277" position="0"> +<Shape name="Y" pixmapfile="geography/africa/senegal.png" sound="voices/$LOCALE/geography/africa/senegal.ogg" x="106" y="277" position="0"> <_tooltip>Senegal</_tooltip> </Shape> -<Shape name="Z" pixmapfile="geography/africa/sierra_leone.png" sound="sounds/$LOCALE/geography/africa/sierra_leone.ogg" x="133" y="340" position="0"> +<Shape name="Z" pixmapfile="geography/africa/sierra_leone.png" sound="voices/$LOCALE/geography/africa/sierra_leone.ogg" x="133" y="340" position="0"> <_tooltip>Sierra Leone</_tooltip> </Shape> -<Shape name="AA" pixmapfile="geography/africa/somalia.png" sound="sounds/$LOCALE/geography/africa/somalia.ogg" x="720" y="396" position="0"> +<Shape name="AA" pixmapfile="geography/africa/somalia.png" sound="voices/$LOCALE/geography/africa/somalia.ogg" x="720" y="396" position="0"> <_tooltip>Somalia</_tooltip> </Shape> -<Shape name="AB" pixmapfile="geography/africa/sudan.png" sound="sounds/$LOCALE/geography/africa/sudan.ogg" x="557" y="306" position="0"> +<Shape name="AB" pixmapfile="geography/africa/sudan.png" sound="voices/$LOCALE/geography/africa/sudan.ogg" x="557" y="306" position="0"> <_tooltip>Sudan</_tooltip> </Shape> -<Shape name="AC" pixmapfile="geography/africa/togo.png" sound="sounds/$LOCALE/geography/africa/togo.ogg" x="258" y="348" position="0"> +<Shape name="AC" pixmapfile="geography/africa/togo.png" sound="voices/$LOCALE/geography/africa/togo.ogg" x="258" y="348" position="0"> <_tooltip>Togo</_tooltip> </Shape> -<Shape name="AD" pixmapfile="geography/africa/tunisia.png" sound="sounds/$LOCALE/geography/africa/tunisia.ogg" x="367" y="92" position="0"> +<Shape name="AD" pixmapfile="geography/africa/tunisia.png" sound="voices/$LOCALE/geography/africa/tunisia.ogg" x="367" y="92" position="0"> <_tooltip>Tunisia</_tooltip> </Shape> -<Shape name="AE" pixmapfile="geography/africa/uganda.png" sound="sounds/$LOCALE/geography/africa/uganda.ogg" x="587" y="436" position="0"> +<Shape name="AE" pixmapfile="geography/africa/uganda.png" sound="voices/$LOCALE/geography/africa/uganda.ogg" x="587" y="436" position="0"> <_tooltip>Uganda</_tooltip> </Shape> -<Shape name="AF" pixmapfile="geography/africa/western_sahara.png" sound="sounds/$LOCALE/geography/africa/western_sahara.ogg" x="148" y="170" position="0"> +<Shape name="AF" pixmapfile="geography/africa/western_sahara.png" sound="voices/$LOCALE/geography/africa/western_sahara.ogg" x="148" y="170" position="0"> <_tooltip>Western Sahara</_tooltip> </Shape> diff --git a/boards/geography/board4_1.xml.in b/boards/geography/board4_1.xml.in index d98aec3..c31b4c3 100644 --- a/boards/geography/board4_1.xml.in +++ b/boards/geography/board4_1.xml.in @@ -5,83 +5,83 @@ <_name>Southern Africa</_name> </Title> -<Shape name="A" pixmapfile="geography/africa/angola.png" sound="sounds/$LOCALE/geography/africa/angola.ogg" x="327" y="210" position="0"> +<Shape name="A" pixmapfile="geography/africa/angola.png" sound="voices/$LOCALE/geography/africa/angola.ogg" x="327" y="210" position="0"> <_tooltip>Angola</_tooltip> </Shape> -<Shape name="C" pixmapfile="geography/africa/botswana.png" sound="sounds/$LOCALE/geography/africa/botswana.ogg" x="388" y="317" position="0"> +<Shape name="C" pixmapfile="geography/africa/botswana.png" sound="voices/$LOCALE/geography/africa/botswana.ogg" x="388" y="317" position="0"> <_tooltip>Botswana</_tooltip> </Shape> -<Shape name="D" pixmapfile="geography/africa/burundi.png" sound="sounds/$LOCALE/geography/africa/burundi.ogg" x="444" y="137" position="0"> +<Shape name="D" pixmapfile="geography/africa/burundi.png" sound="voices/$LOCALE/geography/africa/burundi.ogg" x="444" y="137" position="0"> <_tooltip>Burundi</_tooltip> </Shape> -<Shape name="E" pixmapfile="geography/africa/democratic_republic_of_congo.png" sound="sounds/$LOCALE/geography/africa/democratic_republic_of_congo.ogg" x="364" y="136" position="0"> +<Shape name="E" pixmapfile="geography/africa/democratic_republic_of_congo.png" sound="voices/$LOCALE/geography/africa/democratic_republic_of_congo.ogg" x="364" y="136" position="0"> <_tooltip>Democratic Republic of Congo</_tooltip> </Shape> -<Shape name="F" pixmapfile="geography/africa/equatorial_guinea.png" sound="sounds/$LOCALE/geography/africa/equatorial_guinea.ogg" x="253" y="82" position="0"> +<Shape name="F" pixmapfile="geography/africa/equatorial_guinea.png" sound="voices/$LOCALE/geography/africa/equatorial_guinea.ogg" x="253" y="82" position="0"> <_tooltip>Equatorial Guinea</_tooltip> </Shape> -<Shape name="G" pixmapfile="geography/africa/gabon.png" sound="sounds/$LOCALE/geography/africa/gabon.ogg" x="266" y="108" position="0"> +<Shape name="G" pixmapfile="geography/africa/gabon.png" sound="voices/$LOCALE/geography/africa/gabon.ogg" x="266" y="108" position="0"> <_tooltip>Gabon</_tooltip> </Shape> -<Shape name="H" pixmapfile="geography/africa/kenya.png" sound="sounds/$LOCALE/geography/africa/kenya.ogg" x="521" y="93" position="0"> +<Shape name="H" pixmapfile="geography/africa/kenya.png" sound="voices/$LOCALE/geography/africa/kenya.ogg" x="521" y="93" position="0"> <_tooltip>Kenya</_tooltip> </Shape> -<Shape name="I" pixmapfile="geography/africa/lesotho.png" sound="sounds/$LOCALE/geography/africa/lesotho.ogg" x="424" y="385" position="0"> +<Shape name="I" pixmapfile="geography/africa/lesotho.png" sound="voices/$LOCALE/geography/africa/lesotho.ogg" x="424" y="385" position="0"> <_tooltip>Lesotho</_tooltip> </Shape> -<Shape name="J" pixmapfile="geography/africa/madagascar.png" sound="sounds/$LOCALE/geography/africa/madagascar.ogg" x="596" y="287" position="0"> +<Shape name="J" pixmapfile="geography/africa/madagascar.png" sound="voices/$LOCALE/geography/africa/madagascar.ogg" x="596" y="287" position="0"> <_tooltip>Madagascar</_tooltip> </Shape> -<Shape name="K" pixmapfile="geography/africa/malawi.png" sound="sounds/$LOCALE/geography/africa/malawi.ogg" x="482" y="231" position="0"> +<Shape name="K" pixmapfile="geography/africa/malawi.png" sound="voices/$LOCALE/geography/africa/malawi.ogg" x="482" y="231" position="0"> <_tooltip>Malawi</_tooltip> </Shape> -<Shape name="L" pixmapfile="geography/africa/mozambique.png" sound="sounds/$LOCALE/geography/africa/mozambique.ogg" x="493" y="283" position="0"> +<Shape name="L" pixmapfile="geography/africa/mozambique.png" sound="voices/$LOCALE/geography/africa/mozambique.ogg" x="493" y="283" position="0"> <_tooltip>Mozambique</_tooltip> </Shape> -<Shape name="M" pixmapfile="geography/africa/namibia.png" sound="sounds/$LOCALE/geography/africa/namibia.ogg" x="328" y="319" position="0"> +<Shape name="M" pixmapfile="geography/africa/namibia.png" sound="voices/$LOCALE/geography/africa/namibia.ogg" x="328" y="319" position="0"> <_tooltip>Namibia</_tooltip> </Shape> -<Shape name="N" pixmapfile="geography/africa/republic_of_congo.png" sound="sounds/$LOCALE/geography/africa/republic_of_congo.ogg" x="296" y="100" position="0"> +<Shape name="N" pixmapfile="geography/africa/republic_of_congo.png" sound="voices/$LOCALE/geography/africa/republic_of_congo.ogg" x="296" y="100" position="0"> <_tooltip>Republic of Congo</_tooltip> </Shape> -<Shape name="O" pixmapfile="geography/africa/rwanda.png" sound="sounds/$LOCALE/geography/africa/rwanda.ogg" x="445" y="120" position="0"> +<Shape name="O" pixmapfile="geography/africa/rwanda.png" sound="voices/$LOCALE/geography/africa/rwanda.ogg" x="445" y="120" position="0"> <_tooltip>Rwanda</_tooltip> </Shape> -<Shape name="P" pixmapfile="geography/africa/south_africa.png" sound="sounds/$LOCALE/geography/africa/south_africa.ogg" x="391" y="375" position="0"> +<Shape name="P" pixmapfile="geography/africa/south_africa.png" sound="voices/$LOCALE/geography/africa/south_africa.ogg" x="391" y="375" position="0"> <_tooltip>South Africa</_tooltip> </Shape> -<Shape name="Q" pixmapfile="geography/africa/swaziland.png" sound="sounds/$LOCALE/geography/africa/swaziland.ogg" x="447" y="357" position="0"> +<Shape name="Q" pixmapfile="geography/africa/swaziland.png" sound="voices/$LOCALE/geography/africa/swaziland.ogg" x="447" y="357" position="0"> <_tooltip>Swaziland</_tooltip> </Shape> -<Shape name="R" pixmapfile="geography/africa/tanzania.png" sound="sounds/$LOCALE/geography/africa/tanzania.ogg" x="492" y="161" position="0"> +<Shape name="R" pixmapfile="geography/africa/tanzania.png" sound="voices/$LOCALE/geography/africa/tanzania.ogg" x="492" y="161" position="0"> <_tooltip>Tanzania</_tooltip> </Shape> -<Shape name="S" pixmapfile="geography/africa/uganda.png" sound="sounds/$LOCALE/geography/africa/uganda.ogg" x="465" y="83" position="0"> +<Shape name="S" pixmapfile="geography/africa/uganda.png" sound="voices/$LOCALE/geography/africa/uganda.ogg" x="465" y="83" position="0"> <_tooltip>Uganda</_tooltip> </Shape> -<Shape name="T" pixmapfile="geography/africa/zambia.png" sound="sounds/$LOCALE/geography/africa/zambia.ogg" x="420" y="227" position="0"> +<Shape name="T" pixmapfile="geography/africa/zambia.png" sound="voices/$LOCALE/geography/africa/zambia.ogg" x="420" y="227" position="0"> <_tooltip>Zambia</_tooltip> </Shape> -<Shape name="U" pixmapfile="geography/africa/zimbabwe.png" sound="sounds/$LOCALE/geography/africa/zimbabwe.ogg" x="427" y="284" position="0"> +<Shape name="U" pixmapfile="geography/africa/zimbabwe.png" sound="voices/$LOCALE/geography/africa/zimbabwe.ogg" x="427" y="284" position="0"> <_tooltip>Zimbabwe</_tooltip> </Shape> diff --git a/boards/geography/board4_2.xml.in b/boards/geography/board4_2.xml.in index 8f8ed9d..63f2dff 100644 --- a/boards/geography/board4_2.xml.in +++ b/boards/geography/board4_2.xml.in @@ -3,120 +3,120 @@ <Title y="40" x="200" justification="GTK_JUSTIFY_CENTER"> <_name>Africa</_name> </Title> -<Shape name="afrique_sud" pixmapfile="geography/afrique/south_africa.png" sound="sounds/$LOCALE/geography/south_africa.ogg" x="525" y="469" zoomx="1" zoomy="1" position="0"><_tooltip>South Africa</_tooltip> +<Shape name="afrique_sud" pixmapfile="geography/afrique/south_africa.png" sound="voices/$LOCALE/geography/south_africa.ogg" x="525" y="469" zoomx="1" zoomy="1" position="0"><_tooltip>South Africa</_tooltip> </Shape> -<Shape name="algerie" pixmapfile="geography/afrique/algeria.png" sound="sounds/$LOCALE/geography/algeria.ogg" x="386" y="72" zoomx="1" zoomy="1" position="0"> +<Shape name="algerie" pixmapfile="geography/afrique/algeria.png" sound="voices/$LOCALE/geography/algeria.ogg" x="386" y="72" zoomx="1" zoomy="1" position="0"> <_tooltip>Algeria</_tooltip> </Shape> -<Shape name="angola" pixmapfile="geography/afrique/angola.png" sound="sounds/$LOCALE/geography/angola.ogg" x="486" y="354" zoomx="1" zoomy="1" position="0"> +<Shape name="angola" pixmapfile="geography/afrique/angola.png" sound="voices/$LOCALE/geography/angola.ogg" x="486" y="354" zoomx="1" zoomy="1" position="0"> <_tooltip>Angola</_tooltip> </Shape> -<Shape name="benin" pixmapfile="geography/afrique/benin.png" sound="sounds/$LOCALE/geography/benin.ogg" x="391" y="206" zoomx="1" zoomy="1" position="0"> +<Shape name="benin" pixmapfile="geography/afrique/benin.png" sound="voices/$LOCALE/geography/benin.ogg" x="391" y="206" zoomx="1" zoomy="1" position="0"> <_tooltip>Benin</_tooltip> </Shape> -<Shape name="botswana" pixmapfile="geography/afrique/botswana.png" sound="sounds/$LOCALE/geography/botswana.ogg" x="526" y="428" zoomx="1" zoomy="1" position="0"> +<Shape name="botswana" pixmapfile="geography/afrique/botswana.png" sound="voices/$LOCALE/geography/botswana.ogg" x="526" y="428" zoomx="1" zoomy="1" position="0"> <_tooltip>Botswana</_tooltip> </Shape> -<Shape name="burkina" pixmapfile="geography/afrique/burkina.png" sound="sounds/$LOCALE/geography/burkina.ogg" x="366" y="184" zoomx="1" zoomy="1" position="0"> +<Shape name="burkina" pixmapfile="geography/afrique/burkina.png" sound="voices/$LOCALE/geography/burkina.ogg" x="366" y="184" zoomx="1" zoomy="1" position="0"> <_tooltip>Burkina Faso</_tooltip> </Shape> -<Shape name="cameroon" pixmapfile="geography/afrique/cameroon.png" sound="sounds/$LOCALE/geography/cameroon.ogg" x="455" y="223" zoomx="1" zoomy="1" position="0"> +<Shape name="cameroon" pixmapfile="geography/afrique/cameroon.png" sound="voices/$LOCALE/geography/cameroon.ogg" x="455" y="223" zoomx="1" zoomy="1" position="0"> <_tooltip>Cameroon</_tooltip> </Shape> -<Shape name="congo" pixmapfile="geography/afrique/congo.png" sound="sounds/$LOCALE/geography/congo.ogg" x="470" y="274" zoomx="1" zoomy="1" position="0"> +<Shape name="congo" pixmapfile="geography/afrique/congo.png" sound="voices/$LOCALE/geography/congo.ogg" x="470" y="274" zoomx="1" zoomy="1" position="0"> <_tooltip>Democratic Republic of Congo</_tooltip> </Shape> -<Shape name="cote_ivoire" pixmapfile="geography/afrique/ivory_coast.png" sound="sounds/$LOCALE/geography/ivory_coast.ogg" x="343" y="218" zoomx="1" zoomy="1" position="0"> +<Shape name="cote_ivoire" pixmapfile="geography/afrique/ivory_coast.png" sound="voices/$LOCALE/geography/ivory_coast.ogg" x="343" y="218" zoomx="1" zoomy="1" position="0"> <_tooltip>Ivory Coast</_tooltip> </Shape> -<Shape name="egypte" pixmapfile="geography/afrique/egypt.png" sound="sounds/$LOCALE/geography/egypt.ogg" x="558" y="84" zoomx="1" zoomy="1" position="0"> +<Shape name="egypte" pixmapfile="geography/afrique/egypt.png" sound="voices/$LOCALE/geography/egypt.ogg" x="558" y="84" zoomx="1" zoomy="1" position="0"> <_tooltip>Egypt</_tooltip> </Shape> -<Shape name="erythree" pixmapfile="geography/afrique/eritrea.png" sound="sounds/$LOCALE/geography/eritrea.ogg" x="621" y="164" zoomx="1" zoomy="1" position="0"> +<Shape name="erythree" pixmapfile="geography/afrique/eritrea.png" sound="voices/$LOCALE/geography/eritrea.ogg" x="621" y="164" zoomx="1" zoomy="1" position="0"> <_tooltip>Eritrea</_tooltip> </Shape> -<Shape name="ethiopie" pixmapfile="geography/afrique/ethiopia.png" sound="sounds/$LOCALE/geography/ethiopia.ogg" x="627" y="207" zoomx="1" zoomy="1" position="0"> +<Shape name="ethiopie" pixmapfile="geography/afrique/ethiopia.png" sound="voices/$LOCALE/geography/ethiopia.ogg" x="627" y="207" zoomx="1" zoomy="1" position="0"> <_tooltip>Ethiopia</_tooltip> </Shape> -<Shape name="gabon" pixmapfile="geography/afrique/gabon.png" sound="sounds/$LOCALE/geography/gabon.ogg" x="449" y="279" zoomx="1" zoomy="1" position="0"> +<Shape name="gabon" pixmapfile="geography/afrique/gabon.png" sound="voices/$LOCALE/geography/gabon.ogg" x="449" y="279" zoomx="1" zoomy="1" position="0"> <_tooltip>Gabon</_tooltip> </Shape> -<Shape name="ghana" pixmapfile="geography/afrique/ghana.png" sound="sounds/$LOCALE/geography/ghana.ogg" x="368" y="215" zoomx="1" zoomy="1" position="0"> +<Shape name="ghana" pixmapfile="geography/afrique/ghana.png" sound="voices/$LOCALE/geography/ghana.ogg" x="368" y="215" zoomx="1" zoomy="1" position="0"> <_tooltip>Ghana</_tooltip> </Shape> -<Shape name="guinee" pixmapfile="geography/afrique/guinea.png" sound="sounds/$LOCALE/geography/guinee.ogg" x="307" y="200" zoomx="1" zoomy="1" position="0"> +<Shape name="guinee" pixmapfile="geography/afrique/guinea.png" sound="voices/$LOCALE/geography/guinee.ogg" x="307" y="200" zoomx="1" zoomy="1" position="0"> <_tooltip>Guinea</_tooltip> </Shape> -<Shape name="kenya" pixmapfile="geography/afrique/kenya.png" sound="sounds/$LOCALE/geography/kenya.ogg" x="612" y="270" zoomx="1" zoomy="1" position="0"> +<Shape name="kenya" pixmapfile="geography/afrique/kenya.png" sound="voices/$LOCALE/geography/kenya.ogg" x="612" y="270" zoomx="1" zoomy="1" position="0"> <_tooltip>Kenya</_tooltip> </Shape> -<Shape name="liberia" pixmapfile="geography/afrique/liberia.png" sound="sounds/$LOCALE/geography/liberia.ogg" x="317" y="226" zoomx="1" zoomy="1" position="0"> +<Shape name="liberia" pixmapfile="geography/afrique/liberia.png" sound="voices/$LOCALE/geography/liberia.ogg" x="317" y="226" zoomx="1" zoomy="1" position="0"> <_tooltip>Liberia</_tooltip> </Shape> -<Shape name="libye" pixmapfile="geography/afrique/libya.png" sound="sounds/$LOCALE/geography/libya.ogg" x="481" y="85" zoomx="1" zoomy="1" position="0"> +<Shape name="libye" pixmapfile="geography/afrique/libya.png" sound="voices/$LOCALE/geography/libya.ogg" x="481" y="85" zoomx="1" zoomy="1" position="0"> <_tooltip>Libya</_tooltip> </Shape> -<Shape name="madagascar" pixmapfile="geography/afrique/madagascar.png" sound="sounds/$LOCALE/geography/madagascar.ogg" x="662" y="402" zoomx="1" zoomy="1" position="0"> +<Shape name="madagascar" pixmapfile="geography/afrique/madagascar.png" sound="voices/$LOCALE/geography/madagascar.ogg" x="662" y="402" zoomx="1" zoomy="1" position="0"> <_tooltip>Madagascar</_tooltip> </Shape> -<Shape name="malawi" pixmapfile="geography/afrique/malawi.png" sound="sounds/$LOCALE/geography/malawi.ogg" x="587" y="362" zoomx="1" zoomy="1" position="0"> +<Shape name="malawi" pixmapfile="geography/afrique/malawi.png" sound="voices/$LOCALE/geography/malawi.ogg" x="587" y="362" zoomx="1" zoomy="1" position="0"> <_tooltip>Malawi</_tooltip> </Shape> -<Shape name="mali" pixmapfile="geography/afrique/mali.png" sound="sounds/$LOCALE/geography/mali.ogg" x="352" y="145" zoomx="1" zoomy="1" position="0"> +<Shape name="mali" pixmapfile="geography/afrique/mali.png" sound="voices/$LOCALE/geography/mali.ogg" x="352" y="145" zoomx="1" zoomy="1" position="0"> <_tooltip>Mali</_tooltip> </Shape> -<Shape name="maroc" pixmapfile="geography/afrique/moroco.png" sound="sounds/$LOCALE/geography/moroco.ogg" x="321" y="69" zoomx="1" zoomy="1" position="0"> +<Shape name="maroc" pixmapfile="geography/afrique/moroco.png" sound="voices/$LOCALE/geography/moroco.ogg" x="321" y="69" zoomx="1" zoomy="1" position="0"> <_tooltip>Morocco</_tooltip> </Shape> -<Shape name="mauritanie" pixmapfile="geography/afrique/mauritania.png" sound="sounds/$LOCALE/geography/mauritania.ogg" x="309" y="124" zoomx="1" zoomy="1" position="0"> +<Shape name="mauritanie" pixmapfile="geography/afrique/mauritania.png" sound="voices/$LOCALE/geography/mauritania.ogg" x="309" y="124" zoomx="1" zoomy="1" position="0"> <_tooltip>Mauritania</_tooltip> </Shape> -<Shape name="mozambique" pixmapfile="geography/afrique/mozambique.png" sound="sounds/$LOCALE/geography/mozambique.ogg" x="594" y="403" zoomx="1" zoomy="1" position="0"> +<Shape name="mozambique" pixmapfile="geography/afrique/mozambique.png" sound="voices/$LOCALE/geography/mozambique.ogg" x="594" y="403" zoomx="1" zoomy="1" position="0"> <_tooltip>Mozambique</_tooltip> </Shape> -<Shape name="namibie" pixmapfile="geography/afrique/namibia.png" sound="sounds/$LOCALE/geography/namibia.ogg" x="487" y="432" zoomx="1" zoomy="1" position="0"> +<Shape name="namibie" pixmapfile="geography/afrique/namibia.png" sound="voices/$LOCALE/geography/namibia.ogg" x="487" y="432" zoomx="1" zoomy="1" position="0"> <_tooltip>Namibia</_tooltip> </Shape> -<Shape name="niger" pixmapfile="geography/afrique/niger.png" sound="sounds/$LOCALE/geography/niger.ogg" x="426" y="147" zoomx="1" zoomy="1" position="0"> +<Shape name="niger" pixmapfile="geography/afrique/niger.png" sound="voices/$LOCALE/geography/niger.ogg" x="426" y="147" zoomx="1" zoomy="1" position="0"> <_tooltip>Niger</_tooltip> </Shape> -<Shape name="nigeria" pixmapfile="geography/afrique/nigeria.png" sound="sounds/$LOCALE/geography/nigeria.ogg" x="431" y="207" zoomx="1" zoomy="1" position="0"> +<Shape name="nigeria" pixmapfile="geography/afrique/nigeria.png" sound="voices/$LOCALE/geography/nigeria.ogg" x="431" y="207" zoomx="1" zoomy="1" position="0"> <_tooltip>Nigeria</_tooltip> </Shape> -<Shape name="ouganda" pixmapfile="geography/afrique/uganda.png" sound="sounds/$LOCALE/geography/uganda.ogg" x="576" y="260" zoomx="1" zoomy="1" position="0"> +<Shape name="ouganda" pixmapfile="geography/afrique/uganda.png" sound="voices/$LOCALE/geography/uganda.ogg" x="576" y="260" zoomx="1" zoomy="1" position="0"> <_tooltip>Uganda</_tooltip> </Shape> -<Shape name="rep_centrafrique" pixmapfile="geography/afrique/rep_centrafrique.png" sound="sounds/$LOCALE/geography/central_african_republic.ogg" x="507" y="222" zoomx="1" zoomy="1" position="0"> +<Shape name="rep_centrafrique" pixmapfile="geography/afrique/rep_centrafrique.png" sound="voices/$LOCALE/geography/central_african_republic.ogg" x="507" y="222" zoomx="1" zoomy="1" position="0"> <_tooltip>Central African Republic</_tooltip> </Shape> -<Shape name="rep_congo" pixmapfile="geography/afrique/rep_congo.png" sound="sounds/$LOCALE/geography/democratic_republic_of_congo.ogg" x="510" y="299" zoomx="1" zoomy="1" position="0"> +<Shape name="rep_congo" pixmapfile="geography/afrique/rep_congo.png" sound="voices/$LOCALE/geography/democratic_republic_of_congo.ogg" x="510" y="299" zoomx="1" zoomy="1" position="0"> <_tooltip>Democratic Republic of Congo</_tooltip> </Shape> -<Shape name="senegal" pixmapfile="geography/afrique/senegal.png" sound="sounds/$LOCALE/geography/senegal.ogg" x="288" y="169" zoomx="1" zoomy="1" position="0"> +<Shape name="senegal" pixmapfile="geography/afrique/senegal.png" sound="voices/$LOCALE/geography/senegal.ogg" x="288" y="169" zoomx="1" zoomy="1" position="0"> <_tooltip>Senegal</_tooltip> </Shape> -<Shape name="somalie" pixmapfile="geography/afrique/somalia.png" sound="sounds/$LOCALE/geography/somalia.ogg" x="661" y="234" zoomx="1" zoomy="1" position="0"> +<Shape name="somalie" pixmapfile="geography/afrique/somalia.png" sound="voices/$LOCALE/geography/somalia.ogg" x="661" y="234" zoomx="1" zoomy="1" position="0"> <_tooltip>Somalia</_tooltip> </Shape> -<Shape name="sudan" pixmapfile="geography/afrique/soudan.png" sound="sounds/$LOCALE/geography/soudan.ogg" x="561" y="179" zoomx="1" zoomy="1" position="0"> +<Shape name="sudan" pixmapfile="geography/afrique/soudan.png" sound="voices/$LOCALE/geography/soudan.ogg" x="561" y="179" zoomx="1" zoomy="1" position="0"> <_tooltip>Sudan</_tooltip> </Shape> -<Shape name="tanzanie" pixmapfile="geography/afrique/tanzania.png" sound="sounds/$LOCALE/geography/tanzania.ogg" x="592" y="315" zoomx="1" zoomy="1" position="0"> +<Shape name="tanzanie" pixmapfile="geography/afrique/tanzania.png" sound="voices/$LOCALE/geography/tanzania.ogg" x="592" y="315" zoomx="1" zoomy="1" position="0"> <_tooltip>Tanzania</_tooltip> </Shape> -<Shape name="tchad" pixmapfile="geography/afrique/chad.png" sound="sounds/$LOCALE/geography/chad.ogg" x="492" y="162" zoomx="1" zoomy="1" position="0"> +<Shape name="tchad" pixmapfile="geography/afrique/chad.png" sound="voices/$LOCALE/geography/chad.ogg" x="492" y="162" zoomx="1" zoomy="1" position="0"> <_tooltip>Chad</_tooltip> </Shape> -<Shape name="togo" pixmapfile="geography/afrique/togo.png" sound="sounds/$LOCALE/geography/togo.ogg" x="381" y="211" zoomx="1" zoomy="1" position="0"> +<Shape name="togo" pixmapfile="geography/afrique/togo.png" sound="voices/$LOCALE/geography/togo.ogg" x="381" y="211" zoomx="1" zoomy="1" position="0"> <_tooltip>Togo</_tooltip> </Shape> -<Shape name="tunisie" pixmapfile="geography/afrique/tunisia.png" sound="sounds/$LOCALE/geography/tunisia.ogg" x="433" y="33" zoomx="1" zoomy="1" position="0"> +<Shape name="tunisie" pixmapfile="geography/afrique/tunisia.png" sound="voices/$LOCALE/geography/tunisia.ogg" x="433" y="33" zoomx="1" zoomy="1" position="0"> <_tooltip>Tunisia</_tooltip> </Shape> -<Shape name="zambie" pixmapfile="geography/afrique/zambia.png" sound="sounds/$LOCALE/geography/zambia.ogg" x="549" y="363" zoomx="1" zoomy="1" position="0"> +<Shape name="zambie" pixmapfile="geography/afrique/zambia.png" sound="voices/$LOCALE/geography/zambia.ogg" x="549" y="363" zoomx="1" zoomy="1" position="0"> <_tooltip>Zambia</_tooltip> </Shape> -<Shape name="zimbabwe" pixmapfile="geography/afrique/zimbabwe.png" sound="sounds/$LOCALE/geography/zimbabwe.ogg" x="555" y="403" zoomx="1" zoomy="1" position="0"> +<Shape name="zimbabwe" pixmapfile="geography/afrique/zimbabwe.png" sound="voices/$LOCALE/geography/zimbabwe.ogg" x="555" y="403" zoomx="1" zoomy="1" position="0"> <_tooltip>Zimbabwe</_tooltip> </Shape> <Shape name="zz" zoomx="1" zoomy="1" y="260" x="480" type="SHAPE_BACKGROUND" position="0" pixmapfile="geography/afrique/africa.png"/></ShapeGame> diff --git a/boards/geography_country.xml.in b/boards/geography_country.xml.in index d80abaa..aebbb85 100644 --- a/boards/geography_country.xml.in +++ b/boards/geography_country.xml.in @@ -5,7 +5,7 @@ type="shapegame" section="/discovery/miscelaneous" icon="boardicons/globe.svg" - mandatory_sound_file="sounds/$LOCALE/geography/peru.ogg" + mandatory_sound_file="voices/$LOCALE/geography/peru.ogg" difficulty="2" author="Jean-Philippe Ayanides (jp.ayanides@free.fr)" boarddir="geography_country"> diff --git a/boards/geography_country/board1_0.xml.in b/boards/geography_country/board1_0.xml.in index a141aa5..02156d9 100644 --- a/boards/geography_country/board1_0.xml.in +++ b/boards/geography_country/board1_0.xml.in @@ -5,70 +5,70 @@ <_name>Regions of France</_name> </Title> -<Shape name="A" pixmapfile="geography_country/france_region/alsace.png" sound="sounds/$LOCALE/france_region/alsace.ogg" x="585" y="149" zoomx="0.660000" zoomy="0.660000" position="0"> +<Shape name="A" pixmapfile="geography_country/france_region/alsace.png" sound="voices/$LOCALE/france_region/alsace.ogg" x="585" y="149" zoomx="0.660000" zoomy="0.660000" position="0"> <tooltip>Alsace</tooltip> </Shape> -<Shape name="B" pixmapfile="geography_country/france_region/aquitaine.png" sound="sounds/$LOCALE/france_region/aquitaine.ogg" x="317" y="371" zoomx="0.660000" zoomy="0.660000" position="0"> +<Shape name="B" pixmapfile="geography_country/france_region/aquitaine.png" sound="voices/$LOCALE/france_region/aquitaine.ogg" x="317" y="371" zoomx="0.660000" zoomy="0.660000" position="0"> <tooltip>Aquitaine</tooltip> </Shape> -<Shape name="C" pixmapfile="geography_country/france_region/auvergne.png" sound="sounds/$LOCALE/france_region/auvergne.ogg" x="443" y="293" zoomx="0.660000" zoomy="0.660000" position="0"> +<Shape name="C" pixmapfile="geography_country/france_region/auvergne.png" sound="voices/$LOCALE/france_region/auvergne.ogg" x="443" y="293" zoomx="0.660000" zoomy="0.660000" position="0"> <tooltip>Auvergne</tooltip> </Shape> -<Shape name="D" pixmapfile="geography_country/france_region/basse-normandie.png" sound="sounds/$LOCALE/france_region/basse-normandie.ogg" x="315" y="115" zoomx="0.660000" zoomy="0.660000" position="0"> +<Shape name="D" pixmapfile="geography_country/france_region/basse-normandie.png" sound="voices/$LOCALE/france_region/basse-normandie.ogg" x="315" y="115" zoomx="0.660000" zoomy="0.660000" position="0"> <tooltip>Basse Normandie</tooltip> </Shape> -<Shape name="E" pixmapfile="geography_country/france_region/bourgogne.png" sound="sounds/$LOCALE/france_region/bourgogne.ogg" x="473" y="207" zoomx="0.660000" zoomy="0.660000" position="0"> +<Shape name="E" pixmapfile="geography_country/france_region/bourgogne.png" sound="voices/$LOCALE/france_region/bourgogne.ogg" x="473" y="207" zoomx="0.660000" zoomy="0.660000" position="0"> <tooltip>Bourgogne</tooltip> </Shape> -<Shape name="F" pixmapfile="geography_country/france_region/bretagne.png" sound="sounds/$LOCALE/france_region/bretagne.ogg" x="226" y="158" zoomx="0.660000" zoomy="0.660000" position="0"> +<Shape name="F" pixmapfile="geography_country/france_region/bretagne.png" sound="voices/$LOCALE/france_region/bretagne.ogg" x="226" y="158" zoomx="0.660000" zoomy="0.660000" position="0"> <tooltip>Bretagne</tooltip> </Shape> -<Shape name="G" pixmapfile="geography_country/france_region/centre.png" sound="sounds/$LOCALE/france_region/centre.ogg" x="383" y="188" zoomx="0.660000" zoomy="0.660000" position="0"> +<Shape name="G" pixmapfile="geography_country/france_region/centre.png" sound="voices/$LOCALE/france_region/centre.ogg" x="383" y="188" zoomx="0.660000" zoomy="0.660000" position="0"> <tooltip>Centre</tooltip> </Shape> -<Shape name="H" pixmapfile="geography_country/france_region/champagne-ardenne.png" sound="sounds/$LOCALE/france_region/champagne-ardenne.ogg" x="487" y="120" zoomx="0.660000" zoomy="0.660000" position="0"> +<Shape name="H" pixmapfile="geography_country/france_region/champagne-ardenne.png" sound="voices/$LOCALE/france_region/champagne-ardenne.ogg" x="487" y="120" zoomx="0.660000" zoomy="0.660000" position="0"> <tooltip>Champagne Ardenne</tooltip> </Shape> -<Shape name="I" pixmapfile="geography_country/france_region/corse.png" sound="sounds/$LOCALE/france_region/corse.ogg" x="662" y="472" zoomx="0.660000" zoomy="0.660000" position="0"> +<Shape name="I" pixmapfile="geography_country/france_region/corse.png" sound="voices/$LOCALE/france_region/corse.ogg" x="662" y="472" zoomx="0.660000" zoomy="0.660000" position="0"> <tooltip>Corse</tooltip> </Shape> -<Shape name="J" pixmapfile="geography_country/france_region/franche-conte.png" sound="sounds/$LOCALE/france_region/franche-conte.ogg" x="542" y="212" zoomx="0.660000" zoomy="0.660000" position="0"> +<Shape name="J" pixmapfile="geography_country/france_region/franche-conte.png" sound="voices/$LOCALE/france_region/franche-conte.ogg" x="542" y="212" zoomx="0.660000" zoomy="0.660000" position="0"> <tooltip>Franche Comté</tooltip> </Shape> -<Shape name="K" pixmapfile="geography_country/france_region/haute-normandie.png" sound="sounds/$LOCALE/france_region/haute-normandie.ogg" x="363" y="95" zoomx="0.660000" zoomy="0.660000" position="0"> +<Shape name="K" pixmapfile="geography_country/france_region/haute-normandie.png" sound="voices/$LOCALE/france_region/haute-normandie.ogg" x="363" y="95" zoomx="0.660000" zoomy="0.660000" position="0"> <tooltip>Normandie</tooltip> </Shape> -<Shape name="L" pixmapfile="geography_country/france_region/ile-de-france.png" sound="sounds/$LOCALE/france_region/ile-de-france.ogg" x="415" y="132" zoomx="0.660000" zoomy="0.660000" position="0"> +<Shape name="L" pixmapfile="geography_country/france_region/ile-de-france.png" sound="voices/$LOCALE/france_region/ile-de-france.ogg" x="415" y="132" zoomx="0.660000" zoomy="0.660000" position="0"> <tooltip>Ile de France</tooltip> </Shape> -<Shape name="M" pixmapfile="geography_country/france_region/languedoc-roussillon.png" sound="sounds/$LOCALE/france_region/languedoc-roussillon.ogg" x="443" y="404" zoomx="0.660000" zoomy="0.660000" position="0"> +<Shape name="M" pixmapfile="geography_country/france_region/languedoc-roussillon.png" sound="voices/$LOCALE/france_region/languedoc-roussillon.ogg" x="443" y="404" zoomx="0.660000" zoomy="0.660000" position="0"> <tooltip>Languedoc Roussillon</tooltip> </Shape> -<Shape name="N" pixmapfile="geography_country/france_region/limousin.png" sound="sounds/$LOCALE/france_region/limousin.ogg" x="384" y="294" zoomx="0.660000" zoomy="0.660000" position="0"> +<Shape name="N" pixmapfile="geography_country/france_region/limousin.png" sound="voices/$LOCALE/france_region/limousin.ogg" x="384" y="294" zoomx="0.660000" zoomy="0.660000" position="0"> <tooltip>Limousin</tooltip> </Shape> -<Shape name="O" pixmapfile="geography_country/france_region/lorraine.png" sound="sounds/$LOCALE/france_region/lorraine.ogg" x="540" y="127" zoomx="0.660000" zoomy="0.660000" position="0"> +<Shape name="O" pixmapfile="geography_country/france_region/lorraine.png" sound="voices/$LOCALE/france_region/lorraine.ogg" x="540" y="127" zoomx="0.660000" zoomy="0.660000" position="0"> <tooltip>Lorraine</tooltip> </Shape> -<Shape name="P" pixmapfile="geography_country/france_region/midi-pyrenees.png" sound="sounds/$LOCALE/france_region/midi-pyrenees.ogg" x="380" y="396" zoomx="0.660000" zoomy="0.660000" position="0"> +<Shape name="P" pixmapfile="geography_country/france_region/midi-pyrenees.png" sound="voices/$LOCALE/france_region/midi-pyrenees.ogg" x="380" y="396" zoomx="0.660000" zoomy="0.660000" position="0"> <tooltip>Midi Pyrénées</tooltip> </Shape> -<Shape name="Q" pixmapfile="geography_country/france_region/nord-pas-de-calais.png" sound="sounds/$LOCALE/france_region/nord-pas-de-calais.ogg" x="427" y="33" zoomx="0.660000" zoomy="0.660000" position="0"> +<Shape name="Q" pixmapfile="geography_country/france_region/nord-pas-de-calais.png" sound="voices/$LOCALE/france_region/nord-pas-de-calais.ogg" x="427" y="33" zoomx="0.660000" zoomy="0.660000" position="0"> <tooltip>Nord Pas de Calais</tooltip> </Shape> -<Shape name="R" pixmapfile="geography_country/france_region/pays-de-la-loire.png" sound="sounds/$LOCALE/france_region/pays-de-la-loire.ogg" x="300" y="199" zoomx="0.660000" zoomy="0.660000" position="0"> +<Shape name="R" pixmapfile="geography_country/france_region/pays-de-la-loire.png" sound="voices/$LOCALE/france_region/pays-de-la-loire.ogg" x="300" y="199" zoomx="0.660000" zoomy="0.660000" position="0"> <tooltip>Pays de la Loire</tooltip> </Shape> -<Shape name="S" pixmapfile="geography_country/france_region/picardie.png" sound="sounds/$LOCALE/france_region/picardie.ogg" x="424" y="83" zoomx="0.660000" zoomy="0.660000" position="0"> +<Shape name="S" pixmapfile="geography_country/france_region/picardie.png" sound="voices/$LOCALE/france_region/picardie.ogg" x="424" y="83" zoomx="0.660000" zoomy="0.660000" position="0"> <tooltip>Picardie</tooltip> </Shape> -<Shape name="T" pixmapfile="geography_country/france_region/poitou-charentes.png" sound="sounds/$LOCALE/france_region/poitou-charentes.ogg" x="321" y="269" zoomx="0.660000" zoomy="0.660000" position="0"> +<Shape name="T" pixmapfile="geography_country/france_region/poitou-charentes.png" sound="voices/$LOCALE/france_region/poitou-charentes.ogg" x="321" y="269" zoomx="0.660000" zoomy="0.660000" position="0"> <tooltip>Poitou Charentes</tooltip> </Shape> -<Shape name="U" pixmapfile="geography_country/france_region/provence-alpes-cote_d_azur.png" sound="sounds/$LOCALE/france_region/provence-alpes-cote_d_azur.ogg" x="543" y="379" zoomx="0.660000" zoomy="0.660000" position="0"> +<Shape name="U" pixmapfile="geography_country/france_region/provence-alpes-cote_d_azur.png" sound="voices/$LOCALE/france_region/provence-alpes-cote_d_azur.ogg" x="543" y="379" zoomx="0.660000" zoomy="0.660000" position="0"> <tooltip>Provence Alpes Côte d'Azur</tooltip> </Shape> -<Shape name="V" pixmapfile="geography_country/france_region/rhone-alpes.png" sound="sounds/$LOCALE/france_region/rhone-alpes.ogg" x="520" y="312" zoomx="0.660000" zoomy="0.660000" position="0"> +<Shape name="V" pixmapfile="geography_country/france_region/rhone-alpes.png" sound="voices/$LOCALE/france_region/rhone-alpes.ogg" x="520" y="312" zoomx="0.660000" zoomy="0.660000" position="0"> <tooltip>Rhône Alpes</tooltip> </Shape> <Shape name="1" pixmapfile="geography_country/france_region/france-regions.png" type="SHAPE_BACKGROUND" x="420" y="260" zoomx="0.660000" zoomy="0.660000" position="0"/> diff --git a/create_dist_sounds b/create_dist_sounds deleted file mode 100755 index a2fec4c..0000000 --- a/create_dist_sounds +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash -# -# Copyright (C) 2002 Bruno Coudoin -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, see <http://www.gnu.org/Licenses/>. -# -####################################################################### -# -# This script creates the distribution files for the sounds. -# A package is created by locale -# The version numbering is managed using a tag file VERSION found in sounds/<locale>/VERSION -# It much be run with the list of locale sound dist to create like: -# create_dist_sounds fr en de -# A simpler way is to run: -# make dist-sounds -# - -for locale in $@ -do - if test -d boards/sounds/$locale; then - if ! test -f boards/sounds/$locale/VERSION; then - echo ERROR : VERSION File not found in boards/sounds/$locale/ - exit - fi - version=`cat boards/sounds/$locale/VERSION` - echo Creating gcompris-sounds-$locale-$version.tgz - tar czf gcompris-sounds-$locale-$version.tgz boards/sounds/$locale - fi -done
\ No newline at end of file diff --git a/src/boards/algebra.c b/src/boards/algebra.c index 59c07dd..50881e2 100644 --- a/src/boards/algebra.c +++ b/src/boards/algebra.c @@ -606,19 +606,19 @@ static GnomeCanvasItem *algebra_create_item(GnomeCanvasGroup *parent) { case PLUSSIGNFILE: expected_result = g_strdup_printf("%d", first_operand+second_operand); - audioOperand = "sounds/$LOCALE/misc/plus.ogg"; + audioOperand = "voices/$LOCALE/misc/plus.ogg"; break; case MINUSSIGNFILE: expected_result = g_strdup_printf("%d", first_operand-second_operand); - audioOperand = "sounds/$LOCALE/misc/minus.ogg"; + audioOperand = "voices/$LOCALE/misc/minus.ogg"; break; case BYSIGNFILE: expected_result = g_strdup_printf("%d", first_operand*second_operand); - audioOperand = "sounds/$LOCALE/misc/by.ogg"; + audioOperand = "voices/$LOCALE/misc/by.ogg"; break; case DIVIDESIGNFILE: expected_result = g_strdup_printf("%d", first_operand/second_operand); - audioOperand = "sounds/$LOCALE/misc/outof.ogg"; + audioOperand = "voices/$LOCALE/misc/outof.ogg"; break; default: g_error("Bad Operation"); @@ -645,10 +645,10 @@ static GnomeCanvasItem *algebra_create_item(GnomeCanvasGroup *parent) g_free(first_operand_str); g_free(second_operand_str); - first_operand_str = g_strdup_printf("sounds/$LOCALE/alphabet/%s", str1); - second_operand_str = g_strdup_printf("sounds/$LOCALE/alphabet/%s", str2); + first_operand_str = g_strdup_printf("voices/$LOCALE/alphabet/%s", str1); + second_operand_str = g_strdup_printf("voices/$LOCALE/alphabet/%s", str2); - gc_sound_play_ogg(first_operand_str, audioOperand , second_operand_str, "sounds/$LOCALE/misc/equal.ogg", NULL); + gc_sound_play_ogg(first_operand_str, audioOperand , second_operand_str, "voices/$LOCALE/misc/equal.ogg", NULL); g_free(str1); g_free(str2); diff --git a/src/boards/click_on_letter.c b/src/boards/click_on_letter.c index 3a83b92..92bdbd7 100644 --- a/src/boards/click_on_letter.c +++ b/src/boards/click_on_letter.c @@ -236,7 +236,7 @@ static void repeat () str1 = gc_sound_alphabet(right_letter); - right_letter_ogg = g_strdup_printf("sounds/$LOCALE/alphabet/%s", str1); + right_letter_ogg = g_strdup_printf("voices/$LOCALE/alphabet/%s", str1); g_free(str1); if(right_letter_ogg) { @@ -268,7 +268,7 @@ static gboolean sounds_are_fine() letter_str = gc_sound_alphabet(letter); g_free(letter); - str2 = gc_file_find_absolute("sounds/$LOCALE/alphabet/%s", letter_str); + str2 = gc_file_find_absolute("voices/$LOCALE/alphabet/%s", letter_str); if (!str2) { @@ -322,7 +322,7 @@ click_on_letter_next_level() gc_score_set(gcomprisBoard->sublevel); g_free (right_letter); /* Try the next level */ - gc_sound_play_ogg("sounds/$LOCALE/misc/click_on_letter.ogg", NULL); + gc_sound_play_ogg("voices/$LOCALE/misc/click_on_letter.ogg", NULL); click_on_letter_create_item(gnome_canvas_root(gcomprisBoard->canvas)); } /* ==================================== */ @@ -633,7 +633,7 @@ config_start(GcomprisBoard *agcomprisBoard, gchar *saved_locale_sound = g_hash_table_lookup( config, "locale_sound"); gc_board_config_combo_locales_asset( "Select sound locale", saved_locale_sound, - "sounds/$LOCALE/colors/purple.ogg"); + "voices/$LOCALE/colors/purple.ogg"); gboolean up_init = FALSE; diff --git a/src/boards/colors.c b/src/boards/colors.c index da92840..ff525cc 100644 --- a/src/boards/colors.c +++ b/src/boards/colors.c @@ -174,7 +174,7 @@ colors_config_start(GcomprisBoard *agcomprisBoard, gchar *saved_locale_sound = g_hash_table_lookup( config, "locale_sound"); gc_board_config_combo_locales_asset( _("Select sound locale"), saved_locale_sound, - "sounds/$LOCALE/colors/purple.ogg"); + "voices/$LOCALE/colors/purple.ogg"); g_hash_table_destroy(config); @@ -318,7 +318,7 @@ static void repeat (){ char *str = NULL; GcomprisProperties *properties = gc_prop_get(); - str = g_strdup_printf("sounds/$LOCALE/colors/%s.ogg", + str = g_strdup_printf("voices/$LOCALE/colors/%s.ogg", colors[GPOINTER_TO_INT(g_list_nth_data(listColors, 0))*2]); /* If we don't find a sound in our locale or the sounds are disabled */ diff --git a/src/boards/gletters.c b/src/boards/gletters.c index e16de4c..75a2e45 100644 --- a/src/boards/gletters.c +++ b/src/boards/gletters.c @@ -634,7 +634,7 @@ static GnomeCanvasItem *gletters_create_item(GnomeCanvasGroup *parent) gchar *str2 = NULL; gchar *letter_unichar_name = gc_sound_alphabet(letter); - str2 = g_strdup_printf("sounds/$LOCALE/alphabet/%s", letter_unichar_name); + str2 = g_strdup_printf("voices/$LOCALE/alphabet/%s", letter_unichar_name); gc_sound_play_ogg(str2, NULL); diff --git a/src/boards/python/admin/board_list.py b/src/boards/python/admin/board_list.py index a6d4e55..3bb40d6 100644 --- a/src/boards/python/admin/board_list.py +++ b/src/boards/python/admin/board_list.py @@ -669,7 +669,7 @@ class Board_list: gcompris.combo_locales_asset( _("Select sound locale"), conf_locales, - "sounds/$LOCALE/colors/purple.ogg" ) + "voices/$LOCALE/colors/purple.ogg" ) def ok_callback(self, dict): diff --git a/src/boards/smallnumbers.c b/src/boards/smallnumbers.c index 377c950..9500c2e 100644 --- a/src/boards/smallnumbers.c +++ b/src/boards/smallnumbers.c @@ -412,7 +412,7 @@ static void smallnumbers_create_item(GnomeCanvasGroup *parent) g_free(lettersItem); g_free(unichar_letterItem); - str2 = g_strdup_printf("sounds/$LOCALE/alphabet/%s", str1); + str2 = g_strdup_printf("voices/$LOCALE/alphabet/%s", str1); gc_sound_play_ogg(str2, NULL); @@ -608,7 +608,7 @@ smallnumber_config_start(GcomprisBoard *agcomprisBoard, GtkComboBox *sound_box = gc_board_config_combo_locales_asset( _("Select sound locale"), saved_locale_sound, - "sounds/$LOCALE/colors/purple.ogg"); + "voices/$LOCALE/colors/purple.ogg"); gtk_widget_set_sensitive(GTK_WIDGET(sound_box), with_sound); diff --git a/src/gcompris/bar.c b/src/gcompris/bar.c index c9bef0a..d407b85 100644 --- a/src/gcompris/bar.c +++ b/src/gcompris/bar.c @@ -472,7 +472,7 @@ static gint bar_play_sound (gchar *sound) gchar *str; gc_sound_policy_set(PLAY_ONLY_IF_IDLE); - str = g_strdup_printf("sounds/$LOCALE/misc/%s.ogg", sound); + str = g_strdup_printf("voices/$LOCALE/misc/%s.ogg", sound); gc_sound_play_ogg(str, NULL); @@ -551,9 +551,9 @@ item_event_bar(GnomeCanvasItem *item, GdkEvent *event, gchar *data) gchar *current_level_str = gc_sound_alphabet(number_str); g_free(number_str); - str_number = g_strdup_printf("sounds/$LOCALE/alphabet/%s", current_level_str); + str_number = g_strdup_printf("voices/$LOCALE/alphabet/%s", current_level_str); - gc_sound_play_ogg("sounds/$LOCALE/misc/level.ogg", str_number, NULL); + gc_sound_play_ogg("voices/$LOCALE/misc/level.ogg", str_number, NULL); g_free(str_number); g_free(current_level_str); diff --git a/src/gcompris/board_config.c b/src/gcompris/board_config.c index e617850..9753a39 100644 --- a/src/gcompris/board_config.c +++ b/src/gcompris/board_config.c @@ -857,7 +857,7 @@ gc_locale_reset() * * \param file: the file to search. In order to work, you need to provide a * filename that includes a $LOCALE in it like: - * sounds/$LOCALE/colors/blue.ogg + * voices/$LOCALE/colors/blue.ogg * * \return a list of locale */ diff --git a/src/gcompris/bonus.c b/src/gcompris/bonus.c index 4ce3a2c..db2f83f 100644 --- a/src/gcompris/bonus.c +++ b/src/gcompris/bonus.c @@ -44,21 +44,21 @@ static int left_door_limit = 0; // List of sounds to use for greetings static gchar *greetingsList[] = { - "sounds/$LOCALE/misc/congratulation.ogg", - "sounds/$LOCALE/misc/great.ogg", - "sounds/$LOCALE/misc/good.ogg", - "sounds/$LOCALE/misc/awesome.ogg", - "sounds/$LOCALE/misc/fantastic.ogg", - "sounds/$LOCALE/misc/waytogo.ogg", - "sounds/$LOCALE/misc/super.ogg", - "sounds/$LOCALE/misc/perfect.ogg" + "voices/$LOCALE/misc/congratulation.ogg", + "voices/$LOCALE/misc/great.ogg", + "voices/$LOCALE/misc/good.ogg", + "voices/$LOCALE/misc/awesome.ogg", + "voices/$LOCALE/misc/fantastic.ogg", + "voices/$LOCALE/misc/waytogo.ogg", + "voices/$LOCALE/misc/super.ogg", + "voices/$LOCALE/misc/perfect.ogg" }; #define NUMBER_OF_GREETINGS G_N_ELEMENTS(greetingsList) // List of sounds to use for loosing static gchar *loosingList[] = { - "sounds/$LOCALE/misc/check_answer.ogg", + "voices/$LOCALE/misc/check_answer.ogg", }; #define NUMBER_OF_LOOSING 1 diff --git a/src/gcompris/gcompris.c b/src/gcompris/gcompris.c index 581976a..bd0f292 100644 --- a/src/gcompris/gcompris.c +++ b/src/gcompris/gcompris.c @@ -1884,11 +1884,11 @@ main (int argc, char *argv[]) { gc_sound_play_ogg("music/intro.ogg", NULL); - gc_sound_play_ogg_cb("sounds/$LOCALE/misc/welcome.ogg", + gc_sound_play_ogg_cb("voices/$LOCALE/misc/welcome.ogg", start_bg_music); } else - gc_sound_play_ogg("sounds/$LOCALE/misc/welcome.ogg", NULL); + gc_sound_play_ogg("voices/$LOCALE/misc/welcome.ogg", NULL); } gtk_main (); |