diff options
author | Bruno Coudoin <bcoudoin@src.gnome.org> | 2006-09-14 00:13:29 (GMT) |
---|---|---|
committer | Bruno Coudoin <bcoudoin@src.gnome.org> | 2006-09-14 00:13:29 (GMT) |
commit | 0d57b7d74790767d30959cda9be3794fb58afa2d (patch) | |
tree | f373d392ac507dac469269614bedeb154cfc8828 | |
parent | 3638e46da48d6a5bf04ea5c6c2fd804c525d67d6 (diff) |
- Added Turk voices by Meltem Turhan Yöndem
- Added Turk internal geography maps (3 maps)
- Fixed reading activity, now it uses the wordlist API
- fixed desktop file category to suit freedesktop list.
215 files changed, 476 insertions, 267 deletions
@@ -1,3 +1,235 @@ +2006-09-14 Bruno coudoin <bruno.coudoin@free.fr> + + - Added Turk voices by Meltem Turhan Yöndem + - Added Turk internal geography maps (3 maps) + - Fixed reading activity, now it uses the wordlist API + - fixed desktop file category to suit freedesktop list. + + * boards/geography/Makefile.am: + * boards/sounds/tr/alphabet/10.ogg: + * boards/sounds/tr/alphabet/11.ogg: + * boards/sounds/tr/alphabet/12.ogg: + * boards/sounds/tr/alphabet/13.ogg: + * boards/sounds/tr/alphabet/14.ogg: + * boards/sounds/tr/alphabet/15.ogg: + * boards/sounds/tr/alphabet/16.ogg: + * boards/sounds/tr/alphabet/17.ogg: + * boards/sounds/tr/alphabet/18.ogg: + * boards/sounds/tr/alphabet/19.ogg: + * boards/sounds/tr/alphabet/20.ogg: + * boards/sounds/tr/alphabet/U0030.ogg: + * boards/sounds/tr/alphabet/U0031.ogg: + * boards/sounds/tr/alphabet/U0032.ogg: + * boards/sounds/tr/alphabet/U0033.ogg: + * boards/sounds/tr/alphabet/U0034.ogg: + * boards/sounds/tr/alphabet/U0035.ogg: + * boards/sounds/tr/alphabet/U0036.ogg: + * boards/sounds/tr/alphabet/U0037.ogg: + * boards/sounds/tr/alphabet/U0038.ogg: + * boards/sounds/tr/alphabet/U0039.ogg: + * boards/sounds/tr/alphabet/U0061.ogg: + * boards/sounds/tr/alphabet/U0062.ogg: + * boards/sounds/tr/alphabet/U0063.ogg: + * boards/sounds/tr/alphabet/U0064.ogg: + * boards/sounds/tr/alphabet/U0065.ogg: + * boards/sounds/tr/alphabet/U0066.ogg: + * boards/sounds/tr/alphabet/U0067.ogg: + * boards/sounds/tr/alphabet/U0068.ogg: + * boards/sounds/tr/alphabet/U0069.ogg: + * boards/sounds/tr/alphabet/U006A.ogg: + * boards/sounds/tr/alphabet/U006B.ogg: + * boards/sounds/tr/alphabet/U006C.ogg: + * boards/sounds/tr/alphabet/U006D.ogg: + * boards/sounds/tr/alphabet/U006E.ogg: + * boards/sounds/tr/alphabet/U006F.ogg: + * boards/sounds/tr/alphabet/U0070.ogg: + * boards/sounds/tr/alphabet/U0071.ogg: + * boards/sounds/tr/alphabet/U0072.ogg: + * boards/sounds/tr/alphabet/U0073.ogg: + * boards/sounds/tr/alphabet/U0074.ogg: + * boards/sounds/tr/alphabet/U0075.ogg: + * boards/sounds/tr/alphabet/U0076.ogg: + * boards/sounds/tr/alphabet/U0077.ogg: + * boards/sounds/tr/alphabet/U0078.ogg: + * boards/sounds/tr/alphabet/U0079.ogg: + * boards/sounds/tr/alphabet/U007A.ogg: + * boards/sounds/tr/colors/black.ogg: + * boards/sounds/tr/colors/blue.ogg: + * boards/sounds/tr/colors/brown.ogg: + * boards/sounds/tr/colors/green.ogg: + * boards/sounds/tr/colors/grey.ogg: + * boards/sounds/tr/colors/orange.ogg: + * boards/sounds/tr/colors/pink.ogg: + * boards/sounds/tr/colors/purple.ogg: + * boards/sounds/tr/colors/red.ogg: + * boards/sounds/tr/colors/white.ogg: + * boards/sounds/tr/colors/yellow.ogg: + * boards/sounds/tr/geography/africa.ogg: + * boards/sounds/tr/geography/alaska.ogg: + * boards/sounds/tr/geography/albania.ogg: + * boards/sounds/tr/geography/algeria.ogg: + * boards/sounds/tr/geography/america.ogg: + * boards/sounds/tr/geography/angola.ogg: + * boards/sounds/tr/geography/antartica.ogg: + * boards/sounds/tr/geography/argentina.ogg: + * boards/sounds/tr/geography/asia.ogg: + * boards/sounds/tr/geography/austria.ogg: + * boards/sounds/tr/geography/bahamas.ogg: + * boards/sounds/tr/geography/belarus.ogg: + * boards/sounds/tr/geography/belgium.ogg: + * boards/sounds/tr/geography/benin.ogg: + * boards/sounds/tr/geography/bolivia.ogg: + * boards/sounds/tr/geography/bosnia_herzegovina.ogg: + * boards/sounds/tr/geography/botswana.ogg: + * boards/sounds/tr/geography/brazil.ogg: + * boards/sounds/tr/geography/bulgaria.ogg: + * boards/sounds/tr/geography/burkina.ogg: + * boards/sounds/tr/geography/burundi.ogg: + * boards/sounds/tr/geography/cameroon.ogg: + * boards/sounds/tr/geography/canada.ogg: + * boards/sounds/tr/geography/central_african_republic.ogg: + * boards/sounds/tr/geography/chad.ogg: + * boards/sounds/tr/geography/chile.ogg: + * boards/sounds/tr/geography/colombia.ogg: + * boards/sounds/tr/geography/congo.ogg: + * boards/sounds/tr/geography/costa_rica.ogg: + * boards/sounds/tr/geography/croatia.ogg: + * boards/sounds/tr/geography/cuba.ogg: + * boards/sounds/tr/geography/cyprus.ogg: + * boards/sounds/tr/geography/czech.ogg: + * boards/sounds/tr/geography/denmark.ogg: + * boards/sounds/tr/geography/djibouti.ogg: + * boards/sounds/tr/geography/dominican_republic.ogg: + * boards/sounds/tr/geography/ecuador.ogg: + * boards/sounds/tr/geography/egypt.ogg: + * boards/sounds/tr/geography/equatorial_guinea.ogg: + * boards/sounds/tr/geography/eritrea.ogg: + * boards/sounds/tr/geography/estonia.ogg: + * boards/sounds/tr/geography/ethiopia.ogg: + * boards/sounds/tr/geography/europe.ogg: + * boards/sounds/tr/geography/finland.ogg: + * boards/sounds/tr/geography/france.ogg: + * boards/sounds/tr/geography/french_guiana.ogg: + * boards/sounds/tr/geography/gabon.ogg: + * boards/sounds/tr/geography/gambia.ogg: + * boards/sounds/tr/geography/germany.ogg: + * boards/sounds/tr/geography/ghana.ogg: + * boards/sounds/tr/geography/greece.ogg: + * boards/sounds/tr/geography/greenland.ogg: + * boards/sounds/tr/geography/guatemala.ogg: + * boards/sounds/tr/geography/guinea.ogg: + * boards/sounds/tr/geography/guinea_bissau.ogg: + * boards/sounds/tr/geography/guyana.ogg: + * boards/sounds/tr/geography/haiti.ogg: + * boards/sounds/tr/geography/honduras.ogg: + * boards/sounds/tr/geography/hungary.ogg: + * boards/sounds/tr/geography/iceland.ogg: + * boards/sounds/tr/geography/ireland.ogg: + * boards/sounds/tr/geography/italy.ogg: + * boards/sounds/tr/geography/ivory_coast.ogg: + * boards/sounds/tr/geography/jamaica.ogg: + * boards/sounds/tr/geography/kenya.ogg: + * boards/sounds/tr/geography/latvia.ogg: + * boards/sounds/tr/geography/lesotho.ogg: + * boards/sounds/tr/geography/liberia.ogg: + * boards/sounds/tr/geography/libya.ogg: + * boards/sounds/tr/geography/lithuania.ogg: + * boards/sounds/tr/geography/luxembourg.ogg: + * boards/sounds/tr/geography/macedonia.ogg: + * boards/sounds/tr/geography/madagascar.ogg: + * boards/sounds/tr/geography/malawi.ogg: + * boards/sounds/tr/geography/mali.ogg: + * boards/sounds/tr/geography/mauritania.ogg: + * boards/sounds/tr/geography/mexico.ogg: + * boards/sounds/tr/geography/moldova.ogg: + * boards/sounds/tr/geography/moroco.ogg: + * boards/sounds/tr/geography/mozambique.ogg: + * boards/sounds/tr/geography/namibia.ogg: + * boards/sounds/tr/geography/netherland.ogg: + * boards/sounds/tr/geography/nicaragua.ogg: + * boards/sounds/tr/geography/niger.ogg: + * boards/sounds/tr/geography/nigeria.ogg: + * boards/sounds/tr/geography/north_america.ogg: + * boards/sounds/tr/geography/norway.ogg: + * boards/sounds/tr/geography/oceania.ogg: + * boards/sounds/tr/geography/panama.ogg: + * boards/sounds/tr/geography/paraguay.ogg: + * boards/sounds/tr/geography/peru.ogg: + * boards/sounds/tr/geography/poland.ogg: + * boards/sounds/tr/geography/portugal.ogg: + * boards/sounds/tr/geography/republic_of_congo.ogg: + * boards/sounds/tr/geography/romania.ogg: + * boards/sounds/tr/geography/russia.ogg: + * boards/sounds/tr/geography/rwanda.ogg: + * boards/sounds/tr/geography/salvador.ogg: + * boards/sounds/tr/geography/senegal.ogg: + * boards/sounds/tr/geography/serbia_montenegro.ogg: + * boards/sounds/tr/geography/sierra_leone.ogg: + * boards/sounds/tr/geography/slovakia.ogg: + * boards/sounds/tr/geography/slovenia.ogg: + * boards/sounds/tr/geography/somalia.ogg: + * boards/sounds/tr/geography/soudan.ogg: + * boards/sounds/tr/geography/south_africa.ogg: + * boards/sounds/tr/geography/south_america.ogg: + * boards/sounds/tr/geography/spain.ogg: + * boards/sounds/tr/geography/suriname.ogg: + * boards/sounds/tr/geography/swaziland.ogg: + * boards/sounds/tr/geography/sweden.ogg: + * boards/sounds/tr/geography/switz.ogg: + * boards/sounds/tr/geography/tanzania.ogg: + * boards/sounds/tr/geography/togo.ogg: + * boards/sounds/tr/geography/tunisia.ogg: + * boards/sounds/tr/geography/turkey.ogg: + * boards/sounds/tr/geography/uganda.ogg: + * boards/sounds/tr/geography/ukraine.ogg: + * boards/sounds/tr/geography/united_kingdom.ogg: + * boards/sounds/tr/geography/uruguay.ogg: + * boards/sounds/tr/geography/usa.ogg: + * boards/sounds/tr/geography/venezuela.ogg: + * boards/sounds/tr/geography/welcome.ogg: + * boards/sounds/tr/geography/zambia.ogg: + * boards/sounds/tr/geography/zimbabwe.ogg: + * boards/sounds/tr/misc/awesome.ogg: + * boards/sounds/tr/misc/back.ogg: + * boards/sounds/tr/misc/by.ogg: + * boards/sounds/tr/misc/click_on_letter.ogg: + * boards/sounds/tr/misc/congratulation.ogg: + * boards/sounds/tr/misc/equal.ogg: + * boards/sounds/tr/misc/fantastic.ogg: + * boards/sounds/tr/misc/good.ogg: + * boards/sounds/tr/misc/great.ogg: + * boards/sounds/tr/misc/help.ogg: + * boards/sounds/tr/misc/level.ogg: + * boards/sounds/tr/misc/minus.ogg: + * boards/sounds/tr/misc/ok.ogg: + * boards/sounds/tr/misc/outof.ogg: + * boards/sounds/tr/misc/perfect.ogg: + * boards/sounds/tr/misc/plus.ogg: + * boards/sounds/tr/misc/quit.ogg: + * boards/sounds/tr/misc/super.ogg: + * boards/sounds/tr/misc/waytogo.ogg: + * boards/sounds/tr/misc/welcome.ogg: + * configure.in: + * gcompris-edit.desktop.in: + * gcompris.desktop.in: + * gcompris.spec.in: + * src/boards/reading.c: (start_board), (end_board), + (reading_next_level), (reading_destroy_all_items), + (display_what_to_do), (reading_create_item), (ask_ready), + (get_random_word), (save_table), (conf_ok), (reading_config_start): + * src/boards/wordsgame.c: (start_board), (key_press), + (wordsgame_next_level), (wordsgame_move_item), + (wordsgame_move_items), (wordsgame_destroy_item), + (wordsgame_destroy_items), (wordsgame_destroy_all_items), + (wordsgame_create_item), (wordsgame_add_new_item), + (wordsgame_drop_items), (player_win): + * src/gcompris/bar.c: (gc_bar_start), (gc_bar_set_level), + (item_event_bar): + * src/gcompris/gcompris.c: (gc_locale_set): + * src/gcompris/wordlist.c: (gc_wordlist_get_from_file), + (gc_wordlist_random_word_get), (gc_wordlist_free): + * tools/check_missing_voices.pl: + 2006-09-13 Bruno coudoin <bruno.coudoin@free.fr> * Makefile.am: added again gnome2-macros diff --git a/boards/geography/Makefile.am b/boards/geography/Makefile.am index 31d7579..c360bd8 100644 --- a/boards/geography/Makefile.am +++ b/boards/geography/Makefile.am @@ -13,7 +13,10 @@ xml_in_files = \ board5_0.xml.in \ board6_0.xml.in \ board7_0.xml.in \ - board8_0.xml.in + board8_0.xml.in \ + board9_0.xml.in \ + board9_1.xml.in \ + board9_2.xml.in xml_DATA = $(xml_in_files:.xml.in=.xml) diff --git a/boards/sounds/tr/alphabet/10.ogg b/boards/sounds/tr/alphabet/10.ogg Binary files differnew file mode 100644 index 0000000..475102d --- /dev/null +++ b/boards/sounds/tr/alphabet/10.ogg diff --git a/boards/sounds/tr/alphabet/11.ogg b/boards/sounds/tr/alphabet/11.ogg Binary files differnew file mode 100644 index 0000000..558910e --- /dev/null +++ b/boards/sounds/tr/alphabet/11.ogg diff --git a/boards/sounds/tr/alphabet/12.ogg b/boards/sounds/tr/alphabet/12.ogg Binary files differnew file mode 100644 index 0000000..3ccb98a --- /dev/null +++ b/boards/sounds/tr/alphabet/12.ogg diff --git a/boards/sounds/tr/alphabet/13.ogg b/boards/sounds/tr/alphabet/13.ogg Binary files differnew file mode 100644 index 0000000..6166855 --- /dev/null +++ b/boards/sounds/tr/alphabet/13.ogg diff --git a/boards/sounds/tr/alphabet/14.ogg b/boards/sounds/tr/alphabet/14.ogg Binary files differnew file mode 100644 index 0000000..fece569 --- /dev/null +++ b/boards/sounds/tr/alphabet/14.ogg diff --git a/boards/sounds/tr/alphabet/15.ogg b/boards/sounds/tr/alphabet/15.ogg Binary files differnew file mode 100644 index 0000000..880112f --- /dev/null +++ b/boards/sounds/tr/alphabet/15.ogg diff --git a/boards/sounds/tr/alphabet/16.ogg b/boards/sounds/tr/alphabet/16.ogg Binary files differnew file mode 100644 index 0000000..a19b90f --- /dev/null +++ b/boards/sounds/tr/alphabet/16.ogg diff --git a/boards/sounds/tr/alphabet/17.ogg b/boards/sounds/tr/alphabet/17.ogg Binary files differnew file mode 100644 index 0000000..e86eff7 --- /dev/null +++ b/boards/sounds/tr/alphabet/17.ogg diff --git a/boards/sounds/tr/alphabet/18.ogg b/boards/sounds/tr/alphabet/18.ogg Binary files differnew file mode 100644 index 0000000..220ef41 --- /dev/null +++ b/boards/sounds/tr/alphabet/18.ogg diff --git a/boards/sounds/tr/alphabet/19.ogg b/boards/sounds/tr/alphabet/19.ogg Binary files differnew file mode 100644 index 0000000..f1936c7 --- /dev/null +++ b/boards/sounds/tr/alphabet/19.ogg diff --git a/boards/sounds/tr/alphabet/20.ogg b/boards/sounds/tr/alphabet/20.ogg Binary files differnew file mode 100644 index 0000000..b18ef7e --- /dev/null +++ b/boards/sounds/tr/alphabet/20.ogg diff --git a/boards/sounds/tr/alphabet/U0030.ogg b/boards/sounds/tr/alphabet/U0030.ogg Binary files differnew file mode 100644 index 0000000..e3e0903 --- /dev/null +++ b/boards/sounds/tr/alphabet/U0030.ogg diff --git a/boards/sounds/tr/alphabet/U0031.ogg b/boards/sounds/tr/alphabet/U0031.ogg Binary files differnew file mode 100644 index 0000000..2696e61 --- /dev/null +++ b/boards/sounds/tr/alphabet/U0031.ogg diff --git a/boards/sounds/tr/alphabet/U0032.ogg b/boards/sounds/tr/alphabet/U0032.ogg Binary files differnew file mode 100644 index 0000000..58668b2 --- /dev/null +++ b/boards/sounds/tr/alphabet/U0032.ogg diff --git a/boards/sounds/tr/alphabet/U0033.ogg b/boards/sounds/tr/alphabet/U0033.ogg Binary files differnew file mode 100644 index 0000000..f06da71 --- /dev/null +++ b/boards/sounds/tr/alphabet/U0033.ogg diff --git a/boards/sounds/tr/alphabet/U0034.ogg b/boards/sounds/tr/alphabet/U0034.ogg Binary files differnew file mode 100644 index 0000000..0467cef --- /dev/null +++ b/boards/sounds/tr/alphabet/U0034.ogg diff --git a/boards/sounds/tr/alphabet/U0035.ogg b/boards/sounds/tr/alphabet/U0035.ogg Binary files differnew file mode 100644 index 0000000..461bb53 --- /dev/null +++ b/boards/sounds/tr/alphabet/U0035.ogg diff --git a/boards/sounds/tr/alphabet/U0036.ogg b/boards/sounds/tr/alphabet/U0036.ogg Binary files differnew file mode 100644 index 0000000..eb8ab56 --- /dev/null +++ b/boards/sounds/tr/alphabet/U0036.ogg diff --git a/boards/sounds/tr/alphabet/U0037.ogg b/boards/sounds/tr/alphabet/U0037.ogg Binary files differnew file mode 100644 index 0000000..836881b --- /dev/null +++ b/boards/sounds/tr/alphabet/U0037.ogg diff --git a/boards/sounds/tr/alphabet/U0038.ogg b/boards/sounds/tr/alphabet/U0038.ogg Binary files differnew file mode 100644 index 0000000..6138ddb --- /dev/null +++ b/boards/sounds/tr/alphabet/U0038.ogg diff --git a/boards/sounds/tr/alphabet/U0039.ogg b/boards/sounds/tr/alphabet/U0039.ogg Binary files differnew file mode 100644 index 0000000..ae64c96 --- /dev/null +++ b/boards/sounds/tr/alphabet/U0039.ogg diff --git a/boards/sounds/tr/alphabet/U0061.ogg b/boards/sounds/tr/alphabet/U0061.ogg Binary files differnew file mode 100644 index 0000000..9b27cee --- /dev/null +++ b/boards/sounds/tr/alphabet/U0061.ogg diff --git a/boards/sounds/tr/alphabet/U0062.ogg b/boards/sounds/tr/alphabet/U0062.ogg Binary files differnew file mode 100644 index 0000000..7e4a84d --- /dev/null +++ b/boards/sounds/tr/alphabet/U0062.ogg diff --git a/boards/sounds/tr/alphabet/U0063.ogg b/boards/sounds/tr/alphabet/U0063.ogg Binary files differnew file mode 100644 index 0000000..6b133af --- /dev/null +++ b/boards/sounds/tr/alphabet/U0063.ogg diff --git a/boards/sounds/tr/alphabet/U0064.ogg b/boards/sounds/tr/alphabet/U0064.ogg Binary files differnew file mode 100644 index 0000000..384dc25 --- /dev/null +++ b/boards/sounds/tr/alphabet/U0064.ogg diff --git a/boards/sounds/tr/alphabet/U0065.ogg b/boards/sounds/tr/alphabet/U0065.ogg Binary files differnew file mode 100644 index 0000000..15b3d92 --- /dev/null +++ b/boards/sounds/tr/alphabet/U0065.ogg diff --git a/boards/sounds/tr/alphabet/U0066.ogg b/boards/sounds/tr/alphabet/U0066.ogg Binary files differnew file mode 100644 index 0000000..68d2992 --- /dev/null +++ b/boards/sounds/tr/alphabet/U0066.ogg diff --git a/boards/sounds/tr/alphabet/U0067.ogg b/boards/sounds/tr/alphabet/U0067.ogg Binary files differnew file mode 100644 index 0000000..fcfa94b --- /dev/null +++ b/boards/sounds/tr/alphabet/U0067.ogg diff --git a/boards/sounds/tr/alphabet/U0068.ogg b/boards/sounds/tr/alphabet/U0068.ogg Binary files differnew file mode 100644 index 0000000..291b3c4 --- /dev/null +++ b/boards/sounds/tr/alphabet/U0068.ogg diff --git a/boards/sounds/tr/alphabet/U0069.ogg b/boards/sounds/tr/alphabet/U0069.ogg Binary files differnew file mode 100644 index 0000000..f2e27f6 --- /dev/null +++ b/boards/sounds/tr/alphabet/U0069.ogg diff --git a/boards/sounds/tr/alphabet/U006A.ogg b/boards/sounds/tr/alphabet/U006A.ogg Binary files differnew file mode 100644 index 0000000..7d51983 --- /dev/null +++ b/boards/sounds/tr/alphabet/U006A.ogg diff --git a/boards/sounds/tr/alphabet/U006B.ogg b/boards/sounds/tr/alphabet/U006B.ogg Binary files differnew file mode 100644 index 0000000..9f73096 --- /dev/null +++ b/boards/sounds/tr/alphabet/U006B.ogg diff --git a/boards/sounds/tr/alphabet/U006C.ogg b/boards/sounds/tr/alphabet/U006C.ogg Binary files differnew file mode 100644 index 0000000..d180f6f --- /dev/null +++ b/boards/sounds/tr/alphabet/U006C.ogg diff --git a/boards/sounds/tr/alphabet/U006D.ogg b/boards/sounds/tr/alphabet/U006D.ogg Binary files differnew file mode 100644 index 0000000..3bf8099 --- /dev/null +++ b/boards/sounds/tr/alphabet/U006D.ogg diff --git a/boards/sounds/tr/alphabet/U006E.ogg b/boards/sounds/tr/alphabet/U006E.ogg Binary files differnew file mode 100644 index 0000000..96f4843 --- /dev/null +++ b/boards/sounds/tr/alphabet/U006E.ogg diff --git a/boards/sounds/tr/alphabet/U006F.ogg b/boards/sounds/tr/alphabet/U006F.ogg Binary files differnew file mode 100644 index 0000000..1f06caa --- /dev/null +++ b/boards/sounds/tr/alphabet/U006F.ogg diff --git a/boards/sounds/tr/alphabet/U0070.ogg b/boards/sounds/tr/alphabet/U0070.ogg Binary files differnew file mode 100644 index 0000000..95a4988 --- /dev/null +++ b/boards/sounds/tr/alphabet/U0070.ogg diff --git a/boards/sounds/tr/alphabet/U0071.ogg b/boards/sounds/tr/alphabet/U0071.ogg Binary files differnew file mode 100644 index 0000000..f1bff0c --- /dev/null +++ b/boards/sounds/tr/alphabet/U0071.ogg diff --git a/boards/sounds/tr/alphabet/U0072.ogg b/boards/sounds/tr/alphabet/U0072.ogg Binary files differnew file mode 100644 index 0000000..df609ee --- /dev/null +++ b/boards/sounds/tr/alphabet/U0072.ogg diff --git a/boards/sounds/tr/alphabet/U0073.ogg b/boards/sounds/tr/alphabet/U0073.ogg Binary files differnew file mode 100644 index 0000000..200e164 --- /dev/null +++ b/boards/sounds/tr/alphabet/U0073.ogg diff --git a/boards/sounds/tr/alphabet/U0074.ogg b/boards/sounds/tr/alphabet/U0074.ogg Binary files differnew file mode 100644 index 0000000..faf137f --- /dev/null +++ b/boards/sounds/tr/alphabet/U0074.ogg diff --git a/boards/sounds/tr/alphabet/U0075.ogg b/boards/sounds/tr/alphabet/U0075.ogg Binary files differnew file mode 100644 index 0000000..aaa52e0 --- /dev/null +++ b/boards/sounds/tr/alphabet/U0075.ogg diff --git a/boards/sounds/tr/alphabet/U0076.ogg b/boards/sounds/tr/alphabet/U0076.ogg Binary files differnew file mode 100644 index 0000000..4c8943a --- /dev/null +++ b/boards/sounds/tr/alphabet/U0076.ogg diff --git a/boards/sounds/tr/alphabet/U0077.ogg b/boards/sounds/tr/alphabet/U0077.ogg Binary files differnew file mode 100644 index 0000000..a72e29b --- /dev/null +++ b/boards/sounds/tr/alphabet/U0077.ogg diff --git a/boards/sounds/tr/alphabet/U0078.ogg b/boards/sounds/tr/alphabet/U0078.ogg Binary files differnew file mode 100644 index 0000000..1bba239 --- /dev/null +++ b/boards/sounds/tr/alphabet/U0078.ogg diff --git a/boards/sounds/tr/alphabet/U0079.ogg b/boards/sounds/tr/alphabet/U0079.ogg Binary files differnew file mode 100644 index 0000000..1508d21 --- /dev/null +++ b/boards/sounds/tr/alphabet/U0079.ogg diff --git a/boards/sounds/tr/alphabet/U007A.ogg b/boards/sounds/tr/alphabet/U007A.ogg Binary files differnew file mode 100644 index 0000000..0fdac62 --- /dev/null +++ b/boards/sounds/tr/alphabet/U007A.ogg diff --git a/boards/sounds/tr/colors/black.ogg b/boards/sounds/tr/colors/black.ogg Binary files differnew file mode 100644 index 0000000..3ca515e --- /dev/null +++ b/boards/sounds/tr/colors/black.ogg diff --git a/boards/sounds/tr/colors/blue.ogg b/boards/sounds/tr/colors/blue.ogg Binary files differnew file mode 100644 index 0000000..a41d6e4 --- /dev/null +++ b/boards/sounds/tr/colors/blue.ogg diff --git a/boards/sounds/tr/colors/brown.ogg b/boards/sounds/tr/colors/brown.ogg Binary files differnew file mode 100644 index 0000000..7333a5e --- /dev/null +++ b/boards/sounds/tr/colors/brown.ogg diff --git a/boards/sounds/tr/colors/green.ogg b/boards/sounds/tr/colors/green.ogg Binary files differnew file mode 100644 index 0000000..34b6f54 --- /dev/null +++ b/boards/sounds/tr/colors/green.ogg diff --git a/boards/sounds/tr/colors/grey.ogg b/boards/sounds/tr/colors/grey.ogg Binary files differnew file mode 100644 index 0000000..76b0eee --- /dev/null +++ b/boards/sounds/tr/colors/grey.ogg diff --git a/boards/sounds/tr/colors/orange.ogg b/boards/sounds/tr/colors/orange.ogg Binary files differnew file mode 100644 index 0000000..3aa2b6a --- /dev/null +++ b/boards/sounds/tr/colors/orange.ogg diff --git a/boards/sounds/tr/colors/pink.ogg b/boards/sounds/tr/colors/pink.ogg Binary files differnew file mode 100644 index 0000000..5d2403c --- /dev/null +++ b/boards/sounds/tr/colors/pink.ogg diff --git a/boards/sounds/tr/colors/purple.ogg b/boards/sounds/tr/colors/purple.ogg Binary files differnew file mode 100644 index 0000000..7ba68dc --- /dev/null +++ b/boards/sounds/tr/colors/purple.ogg diff --git a/boards/sounds/tr/colors/red.ogg b/boards/sounds/tr/colors/red.ogg Binary files differnew file mode 100644 index 0000000..e623448 --- /dev/null +++ b/boards/sounds/tr/colors/red.ogg diff --git a/boards/sounds/tr/colors/white.ogg b/boards/sounds/tr/colors/white.ogg Binary files differnew file mode 100644 index 0000000..fa5ab89 --- /dev/null +++ b/boards/sounds/tr/colors/white.ogg diff --git a/boards/sounds/tr/colors/yellow.ogg b/boards/sounds/tr/colors/yellow.ogg Binary files differnew file mode 100644 index 0000000..400ba40 --- /dev/null +++ b/boards/sounds/tr/colors/yellow.ogg diff --git a/boards/sounds/tr/geography/africa.ogg b/boards/sounds/tr/geography/africa.ogg Binary files differnew file mode 100644 index 0000000..b629e2c --- /dev/null +++ b/boards/sounds/tr/geography/africa.ogg diff --git a/boards/sounds/tr/geography/alaska.ogg b/boards/sounds/tr/geography/alaska.ogg Binary files differnew file mode 100644 index 0000000..1eea4fa --- /dev/null +++ b/boards/sounds/tr/geography/alaska.ogg diff --git a/boards/sounds/tr/geography/albania.ogg b/boards/sounds/tr/geography/albania.ogg Binary files differnew file mode 100644 index 0000000..78a7a8b --- /dev/null +++ b/boards/sounds/tr/geography/albania.ogg diff --git a/boards/sounds/tr/geography/algeria.ogg b/boards/sounds/tr/geography/algeria.ogg Binary files differnew file mode 100644 index 0000000..34ad4c4 --- /dev/null +++ b/boards/sounds/tr/geography/algeria.ogg diff --git a/boards/sounds/tr/geography/america.ogg b/boards/sounds/tr/geography/america.ogg Binary files differnew file mode 100644 index 0000000..cc7c3ef --- /dev/null +++ b/boards/sounds/tr/geography/america.ogg diff --git a/boards/sounds/tr/geography/angola.ogg b/boards/sounds/tr/geography/angola.ogg Binary files differnew file mode 100644 index 0000000..eaa11dd --- /dev/null +++ b/boards/sounds/tr/geography/angola.ogg diff --git a/boards/sounds/tr/geography/antartica.ogg b/boards/sounds/tr/geography/antartica.ogg Binary files differnew file mode 100644 index 0000000..125822a --- /dev/null +++ b/boards/sounds/tr/geography/antartica.ogg diff --git a/boards/sounds/tr/geography/argentina.ogg b/boards/sounds/tr/geography/argentina.ogg Binary files differnew file mode 100644 index 0000000..8ff7d4e --- /dev/null +++ b/boards/sounds/tr/geography/argentina.ogg diff --git a/boards/sounds/tr/geography/asia.ogg b/boards/sounds/tr/geography/asia.ogg Binary files differnew file mode 100644 index 0000000..6e39907 --- /dev/null +++ b/boards/sounds/tr/geography/asia.ogg diff --git a/boards/sounds/tr/geography/austria.ogg b/boards/sounds/tr/geography/austria.ogg Binary files differnew file mode 100644 index 0000000..6c52e7a --- /dev/null +++ b/boards/sounds/tr/geography/austria.ogg diff --git a/boards/sounds/tr/geography/bahamas.ogg b/boards/sounds/tr/geography/bahamas.ogg Binary files differnew file mode 100644 index 0000000..8e9ef76 --- /dev/null +++ b/boards/sounds/tr/geography/bahamas.ogg diff --git a/boards/sounds/tr/geography/belarus.ogg b/boards/sounds/tr/geography/belarus.ogg Binary files differnew file mode 100644 index 0000000..6318209 --- /dev/null +++ b/boards/sounds/tr/geography/belarus.ogg diff --git a/boards/sounds/tr/geography/belgium.ogg b/boards/sounds/tr/geography/belgium.ogg Binary files differnew file mode 100644 index 0000000..c4db409 --- /dev/null +++ b/boards/sounds/tr/geography/belgium.ogg diff --git a/boards/sounds/tr/geography/benin.ogg b/boards/sounds/tr/geography/benin.ogg Binary files differnew file mode 100644 index 0000000..6a7610f --- /dev/null +++ b/boards/sounds/tr/geography/benin.ogg diff --git a/boards/sounds/tr/geography/bolivia.ogg b/boards/sounds/tr/geography/bolivia.ogg Binary files differnew file mode 100644 index 0000000..ac639ae --- /dev/null +++ b/boards/sounds/tr/geography/bolivia.ogg diff --git a/boards/sounds/tr/geography/bosnia_herzegovina.ogg b/boards/sounds/tr/geography/bosnia_herzegovina.ogg Binary files differnew file mode 100644 index 0000000..86339c2 --- /dev/null +++ b/boards/sounds/tr/geography/bosnia_herzegovina.ogg diff --git a/boards/sounds/tr/geography/botswana.ogg b/boards/sounds/tr/geography/botswana.ogg Binary files differnew file mode 100644 index 0000000..04f1533 --- /dev/null +++ b/boards/sounds/tr/geography/botswana.ogg diff --git a/boards/sounds/tr/geography/brazil.ogg b/boards/sounds/tr/geography/brazil.ogg Binary files differnew file mode 100644 index 0000000..d5c1906 --- /dev/null +++ b/boards/sounds/tr/geography/brazil.ogg diff --git a/boards/sounds/tr/geography/bulgaria.ogg b/boards/sounds/tr/geography/bulgaria.ogg Binary files differnew file mode 100644 index 0000000..0639b18 --- /dev/null +++ b/boards/sounds/tr/geography/bulgaria.ogg diff --git a/boards/sounds/tr/geography/burkina.ogg b/boards/sounds/tr/geography/burkina.ogg Binary files differnew file mode 100644 index 0000000..0738075 --- /dev/null +++ b/boards/sounds/tr/geography/burkina.ogg diff --git a/boards/sounds/tr/geography/burundi.ogg b/boards/sounds/tr/geography/burundi.ogg Binary files differnew file mode 100644 index 0000000..8e41909 --- /dev/null +++ b/boards/sounds/tr/geography/burundi.ogg diff --git a/boards/sounds/tr/geography/cameroon.ogg b/boards/sounds/tr/geography/cameroon.ogg Binary files differnew file mode 100644 index 0000000..34ef0c9 --- /dev/null +++ b/boards/sounds/tr/geography/cameroon.ogg diff --git a/boards/sounds/tr/geography/canada.ogg b/boards/sounds/tr/geography/canada.ogg Binary files differnew file mode 100644 index 0000000..d27067d --- /dev/null +++ b/boards/sounds/tr/geography/canada.ogg diff --git a/boards/sounds/tr/geography/central_african_republic.ogg b/boards/sounds/tr/geography/central_african_republic.ogg Binary files differnew file mode 100644 index 0000000..45e35e4 --- /dev/null +++ b/boards/sounds/tr/geography/central_african_republic.ogg diff --git a/boards/sounds/tr/geography/chad.ogg b/boards/sounds/tr/geography/chad.ogg Binary files differnew file mode 100644 index 0000000..a9dcc86 --- /dev/null +++ b/boards/sounds/tr/geography/chad.ogg diff --git a/boards/sounds/tr/geography/chile.ogg b/boards/sounds/tr/geography/chile.ogg Binary files differnew file mode 100644 index 0000000..2a86174 --- /dev/null +++ b/boards/sounds/tr/geography/chile.ogg diff --git a/boards/sounds/tr/geography/colombia.ogg b/boards/sounds/tr/geography/colombia.ogg Binary files differnew file mode 100644 index 0000000..d750ab7 --- /dev/null +++ b/boards/sounds/tr/geography/colombia.ogg diff --git a/boards/sounds/tr/geography/congo.ogg b/boards/sounds/tr/geography/congo.ogg Binary files differnew file mode 100644 index 0000000..17744a3 --- /dev/null +++ b/boards/sounds/tr/geography/congo.ogg diff --git a/boards/sounds/tr/geography/costa_rica.ogg b/boards/sounds/tr/geography/costa_rica.ogg Binary files differnew file mode 100644 index 0000000..14ae3ff --- /dev/null +++ b/boards/sounds/tr/geography/costa_rica.ogg diff --git a/boards/sounds/tr/geography/croatia.ogg b/boards/sounds/tr/geography/croatia.ogg Binary files differnew file mode 100644 index 0000000..5c5eddb --- /dev/null +++ b/boards/sounds/tr/geography/croatia.ogg diff --git a/boards/sounds/tr/geography/cuba.ogg b/boards/sounds/tr/geography/cuba.ogg Binary files differnew file mode 100644 index 0000000..65e38ba --- /dev/null +++ b/boards/sounds/tr/geography/cuba.ogg diff --git a/boards/sounds/tr/geography/cyprus.ogg b/boards/sounds/tr/geography/cyprus.ogg Binary files differnew file mode 100644 index 0000000..b2779ac --- /dev/null +++ b/boards/sounds/tr/geography/cyprus.ogg diff --git a/boards/sounds/tr/geography/czech.ogg b/boards/sounds/tr/geography/czech.ogg Binary files differnew file mode 100644 index 0000000..28250a3 --- /dev/null +++ b/boards/sounds/tr/geography/czech.ogg diff --git a/boards/sounds/tr/geography/denmark.ogg b/boards/sounds/tr/geography/denmark.ogg Binary files differnew file mode 100644 index 0000000..66bee82 --- /dev/null +++ b/boards/sounds/tr/geography/denmark.ogg diff --git a/boards/sounds/tr/geography/djibouti.ogg b/boards/sounds/tr/geography/djibouti.ogg Binary files differnew file mode 100644 index 0000000..7f1e6f2 --- /dev/null +++ b/boards/sounds/tr/geography/djibouti.ogg diff --git a/boards/sounds/tr/geography/dominican_republic.ogg b/boards/sounds/tr/geography/dominican_republic.ogg Binary files differnew file mode 100644 index 0000000..e3e5f94 --- /dev/null +++ b/boards/sounds/tr/geography/dominican_republic.ogg diff --git a/boards/sounds/tr/geography/ecuador.ogg b/boards/sounds/tr/geography/ecuador.ogg Binary files differnew file mode 100644 index 0000000..bfbfc59 --- /dev/null +++ b/boards/sounds/tr/geography/ecuador.ogg diff --git a/boards/sounds/tr/geography/egypt.ogg b/boards/sounds/tr/geography/egypt.ogg Binary files differnew file mode 100644 index 0000000..e25174f --- /dev/null +++ b/boards/sounds/tr/geography/egypt.ogg diff --git a/boards/sounds/tr/geography/equatorial_guinea.ogg b/boards/sounds/tr/geography/equatorial_guinea.ogg Binary files differnew file mode 100644 index 0000000..e7f8448 --- /dev/null +++ b/boards/sounds/tr/geography/equatorial_guinea.ogg diff --git a/boards/sounds/tr/geography/eritrea.ogg b/boards/sounds/tr/geography/eritrea.ogg Binary files differnew file mode 100644 index 0000000..e773025 --- /dev/null +++ b/boards/sounds/tr/geography/eritrea.ogg diff --git a/boards/sounds/tr/geography/estonia.ogg b/boards/sounds/tr/geography/estonia.ogg Binary files differnew file mode 100644 index 0000000..d1a4849 --- /dev/null +++ b/boards/sounds/tr/geography/estonia.ogg diff --git a/boards/sounds/tr/geography/ethiopia.ogg b/boards/sounds/tr/geography/ethiopia.ogg Binary files differnew file mode 100644 index 0000000..de64d68 --- /dev/null +++ b/boards/sounds/tr/geography/ethiopia.ogg diff --git a/boards/sounds/tr/geography/europe.ogg b/boards/sounds/tr/geography/europe.ogg Binary files differnew file mode 100644 index 0000000..2fe9b71 --- /dev/null +++ b/boards/sounds/tr/geography/europe.ogg diff --git a/boards/sounds/tr/geography/finland.ogg b/boards/sounds/tr/geography/finland.ogg Binary files differnew file mode 100644 index 0000000..9d7e3fa --- /dev/null +++ b/boards/sounds/tr/geography/finland.ogg diff --git a/boards/sounds/tr/geography/france.ogg b/boards/sounds/tr/geography/france.ogg Binary files differnew file mode 100644 index 0000000..35705b3 --- /dev/null +++ b/boards/sounds/tr/geography/france.ogg diff --git a/boards/sounds/tr/geography/french_guiana.ogg b/boards/sounds/tr/geography/french_guiana.ogg Binary files differnew file mode 100644 index 0000000..a2e1e8e --- /dev/null +++ b/boards/sounds/tr/geography/french_guiana.ogg diff --git a/boards/sounds/tr/geography/gabon.ogg b/boards/sounds/tr/geography/gabon.ogg Binary files differnew file mode 100644 index 0000000..803310b --- /dev/null +++ b/boards/sounds/tr/geography/gabon.ogg diff --git a/boards/sounds/tr/geography/gambia.ogg b/boards/sounds/tr/geography/gambia.ogg Binary files differnew file mode 100644 index 0000000..9e409a4 --- /dev/null +++ b/boards/sounds/tr/geography/gambia.ogg diff --git a/boards/sounds/tr/geography/germany.ogg b/boards/sounds/tr/geography/germany.ogg Binary files differnew file mode 100644 index 0000000..5e43b9f --- /dev/null +++ b/boards/sounds/tr/geography/germany.ogg diff --git a/boards/sounds/tr/geography/ghana.ogg b/boards/sounds/tr/geography/ghana.ogg Binary files differnew file mode 100644 index 0000000..b4489b8 --- /dev/null +++ b/boards/sounds/tr/geography/ghana.ogg diff --git a/boards/sounds/tr/geography/greece.ogg b/boards/sounds/tr/geography/greece.ogg Binary files differnew file mode 100644 index 0000000..a251fad --- /dev/null +++ b/boards/sounds/tr/geography/greece.ogg diff --git a/boards/sounds/tr/geography/greenland.ogg b/boards/sounds/tr/geography/greenland.ogg Binary files differnew file mode 100644 index 0000000..a0742a2 --- /dev/null +++ b/boards/sounds/tr/geography/greenland.ogg diff --git a/boards/sounds/tr/geography/guatemala.ogg b/boards/sounds/tr/geography/guatemala.ogg Binary files differnew file mode 100644 index 0000000..4b460e7 --- /dev/null +++ b/boards/sounds/tr/geography/guatemala.ogg diff --git a/boards/sounds/tr/geography/guinea.ogg b/boards/sounds/tr/geography/guinea.ogg Binary files differnew file mode 100644 index 0000000..49d7b55 --- /dev/null +++ b/boards/sounds/tr/geography/guinea.ogg diff --git a/boards/sounds/tr/geography/guinea_bissau.ogg b/boards/sounds/tr/geography/guinea_bissau.ogg Binary files differnew file mode 100644 index 0000000..bbf4d41 --- /dev/null +++ b/boards/sounds/tr/geography/guinea_bissau.ogg diff --git a/boards/sounds/tr/geography/guyana.ogg b/boards/sounds/tr/geography/guyana.ogg Binary files differnew file mode 100644 index 0000000..3026c43 --- /dev/null +++ b/boards/sounds/tr/geography/guyana.ogg diff --git a/boards/sounds/tr/geography/haiti.ogg b/boards/sounds/tr/geography/haiti.ogg Binary files differnew file mode 100644 index 0000000..2d732f0 --- /dev/null +++ b/boards/sounds/tr/geography/haiti.ogg diff --git a/boards/sounds/tr/geography/honduras.ogg b/boards/sounds/tr/geography/honduras.ogg Binary files differnew file mode 100644 index 0000000..afe9282 --- /dev/null +++ b/boards/sounds/tr/geography/honduras.ogg diff --git a/boards/sounds/tr/geography/hungary.ogg b/boards/sounds/tr/geography/hungary.ogg Binary files differnew file mode 100644 index 0000000..7594c4b --- /dev/null +++ b/boards/sounds/tr/geography/hungary.ogg diff --git a/boards/sounds/tr/geography/iceland.ogg b/boards/sounds/tr/geography/iceland.ogg Binary files differnew file mode 100644 index 0000000..35509b5 --- /dev/null +++ b/boards/sounds/tr/geography/iceland.ogg diff --git a/boards/sounds/tr/geography/ireland.ogg b/boards/sounds/tr/geography/ireland.ogg Binary files differnew file mode 100644 index 0000000..7d34223 --- /dev/null +++ b/boards/sounds/tr/geography/ireland.ogg diff --git a/boards/sounds/tr/geography/italy.ogg b/boards/sounds/tr/geography/italy.ogg Binary files differnew file mode 100644 index 0000000..d4e9f2f --- /dev/null +++ b/boards/sounds/tr/geography/italy.ogg diff --git a/boards/sounds/tr/geography/ivory_coast.ogg b/boards/sounds/tr/geography/ivory_coast.ogg Binary files differnew file mode 100644 index 0000000..f65b318 --- /dev/null +++ b/boards/sounds/tr/geography/ivory_coast.ogg diff --git a/boards/sounds/tr/geography/jamaica.ogg b/boards/sounds/tr/geography/jamaica.ogg Binary files differnew file mode 100644 index 0000000..5590d38 --- /dev/null +++ b/boards/sounds/tr/geography/jamaica.ogg diff --git a/boards/sounds/tr/geography/kenya.ogg b/boards/sounds/tr/geography/kenya.ogg Binary files differnew file mode 100644 index 0000000..44e7693 --- /dev/null +++ b/boards/sounds/tr/geography/kenya.ogg diff --git a/boards/sounds/tr/geography/latvia.ogg b/boards/sounds/tr/geography/latvia.ogg Binary files differnew file mode 100644 index 0000000..b9a439c --- /dev/null +++ b/boards/sounds/tr/geography/latvia.ogg diff --git a/boards/sounds/tr/geography/lesotho.ogg b/boards/sounds/tr/geography/lesotho.ogg Binary files differnew file mode 100644 index 0000000..2d4379b --- /dev/null +++ b/boards/sounds/tr/geography/lesotho.ogg diff --git a/boards/sounds/tr/geography/liberia.ogg b/boards/sounds/tr/geography/liberia.ogg Binary files differnew file mode 100644 index 0000000..dd60e7a --- /dev/null +++ b/boards/sounds/tr/geography/liberia.ogg diff --git a/boards/sounds/tr/geography/libya.ogg b/boards/sounds/tr/geography/libya.ogg Binary files differnew file mode 100644 index 0000000..60ba502 --- /dev/null +++ b/boards/sounds/tr/geography/libya.ogg diff --git a/boards/sounds/tr/geography/lithuania.ogg b/boards/sounds/tr/geography/lithuania.ogg Binary files differnew file mode 100644 index 0000000..2ff39db --- /dev/null +++ b/boards/sounds/tr/geography/lithuania.ogg diff --git a/boards/sounds/tr/geography/luxembourg.ogg b/boards/sounds/tr/geography/luxembourg.ogg Binary files differnew file mode 100644 index 0000000..2cd45bb --- /dev/null +++ b/boards/sounds/tr/geography/luxembourg.ogg diff --git a/boards/sounds/tr/geography/macedonia.ogg b/boards/sounds/tr/geography/macedonia.ogg Binary files differnew file mode 100644 index 0000000..da4eea1 --- /dev/null +++ b/boards/sounds/tr/geography/macedonia.ogg diff --git a/boards/sounds/tr/geography/madagascar.ogg b/boards/sounds/tr/geography/madagascar.ogg Binary files differnew file mode 100644 index 0000000..e5ffd9b --- /dev/null +++ b/boards/sounds/tr/geography/madagascar.ogg diff --git a/boards/sounds/tr/geography/malawi.ogg b/boards/sounds/tr/geography/malawi.ogg Binary files differnew file mode 100644 index 0000000..ab7e7a7 --- /dev/null +++ b/boards/sounds/tr/geography/malawi.ogg diff --git a/boards/sounds/tr/geography/mali.ogg b/boards/sounds/tr/geography/mali.ogg Binary files differnew file mode 100644 index 0000000..cd70c9d --- /dev/null +++ b/boards/sounds/tr/geography/mali.ogg diff --git a/boards/sounds/tr/geography/mauritania.ogg b/boards/sounds/tr/geography/mauritania.ogg Binary files differnew file mode 100644 index 0000000..380ab4e --- /dev/null +++ b/boards/sounds/tr/geography/mauritania.ogg diff --git a/boards/sounds/tr/geography/mexico.ogg b/boards/sounds/tr/geography/mexico.ogg Binary files differnew file mode 100644 index 0000000..ac75f95 --- /dev/null +++ b/boards/sounds/tr/geography/mexico.ogg diff --git a/boards/sounds/tr/geography/moldova.ogg b/boards/sounds/tr/geography/moldova.ogg Binary files differnew file mode 100644 index 0000000..aadabb3 --- /dev/null +++ b/boards/sounds/tr/geography/moldova.ogg diff --git a/boards/sounds/tr/geography/moroco.ogg b/boards/sounds/tr/geography/moroco.ogg Binary files differnew file mode 100644 index 0000000..50853be --- /dev/null +++ b/boards/sounds/tr/geography/moroco.ogg diff --git a/boards/sounds/tr/geography/mozambique.ogg b/boards/sounds/tr/geography/mozambique.ogg Binary files differnew file mode 100644 index 0000000..aec6204 --- /dev/null +++ b/boards/sounds/tr/geography/mozambique.ogg diff --git a/boards/sounds/tr/geography/namibia.ogg b/boards/sounds/tr/geography/namibia.ogg Binary files differnew file mode 100644 index 0000000..4e2f013 --- /dev/null +++ b/boards/sounds/tr/geography/namibia.ogg diff --git a/boards/sounds/tr/geography/netherland.ogg b/boards/sounds/tr/geography/netherland.ogg Binary files differnew file mode 100644 index 0000000..67fc7e8 --- /dev/null +++ b/boards/sounds/tr/geography/netherland.ogg diff --git a/boards/sounds/tr/geography/nicaragua.ogg b/boards/sounds/tr/geography/nicaragua.ogg Binary files differnew file mode 100644 index 0000000..9646c99 --- /dev/null +++ b/boards/sounds/tr/geography/nicaragua.ogg diff --git a/boards/sounds/tr/geography/niger.ogg b/boards/sounds/tr/geography/niger.ogg Binary files differnew file mode 100644 index 0000000..33e5f63 --- /dev/null +++ b/boards/sounds/tr/geography/niger.ogg diff --git a/boards/sounds/tr/geography/nigeria.ogg b/boards/sounds/tr/geography/nigeria.ogg Binary files differnew file mode 100644 index 0000000..1675779 --- /dev/null +++ b/boards/sounds/tr/geography/nigeria.ogg diff --git a/boards/sounds/tr/geography/north_america.ogg b/boards/sounds/tr/geography/north_america.ogg Binary files differnew file mode 100644 index 0000000..2a5afe5 --- /dev/null +++ b/boards/sounds/tr/geography/north_america.ogg diff --git a/boards/sounds/tr/geography/norway.ogg b/boards/sounds/tr/geography/norway.ogg Binary files differnew file mode 100644 index 0000000..33e14e1 --- /dev/null +++ b/boards/sounds/tr/geography/norway.ogg diff --git a/boards/sounds/tr/geography/oceania.ogg b/boards/sounds/tr/geography/oceania.ogg Binary files differnew file mode 100644 index 0000000..81ec8b3 --- /dev/null +++ b/boards/sounds/tr/geography/oceania.ogg diff --git a/boards/sounds/tr/geography/panama.ogg b/boards/sounds/tr/geography/panama.ogg Binary files differnew file mode 100644 index 0000000..1384afb --- /dev/null +++ b/boards/sounds/tr/geography/panama.ogg diff --git a/boards/sounds/tr/geography/paraguay.ogg b/boards/sounds/tr/geography/paraguay.ogg Binary files differnew file mode 100644 index 0000000..8976e5c --- /dev/null +++ b/boards/sounds/tr/geography/paraguay.ogg diff --git a/boards/sounds/tr/geography/peru.ogg b/boards/sounds/tr/geography/peru.ogg Binary files differnew file mode 100644 index 0000000..bfb82ff --- /dev/null +++ b/boards/sounds/tr/geography/peru.ogg diff --git a/boards/sounds/tr/geography/poland.ogg b/boards/sounds/tr/geography/poland.ogg Binary files differnew file mode 100644 index 0000000..e079413 --- /dev/null +++ b/boards/sounds/tr/geography/poland.ogg diff --git a/boards/sounds/tr/geography/portugal.ogg b/boards/sounds/tr/geography/portugal.ogg Binary files differnew file mode 100644 index 0000000..0a307f3 --- /dev/null +++ b/boards/sounds/tr/geography/portugal.ogg diff --git a/boards/sounds/tr/geography/republic_of_congo.ogg b/boards/sounds/tr/geography/republic_of_congo.ogg Binary files differnew file mode 100644 index 0000000..d9736a8 --- /dev/null +++ b/boards/sounds/tr/geography/republic_of_congo.ogg diff --git a/boards/sounds/tr/geography/romania.ogg b/boards/sounds/tr/geography/romania.ogg Binary files differnew file mode 100644 index 0000000..00e6168 --- /dev/null +++ b/boards/sounds/tr/geography/romania.ogg diff --git a/boards/sounds/tr/geography/russia.ogg b/boards/sounds/tr/geography/russia.ogg Binary files differnew file mode 100644 index 0000000..cadb51e --- /dev/null +++ b/boards/sounds/tr/geography/russia.ogg diff --git a/boards/sounds/tr/geography/rwanda.ogg b/boards/sounds/tr/geography/rwanda.ogg Binary files differnew file mode 100644 index 0000000..6dbcacf --- /dev/null +++ b/boards/sounds/tr/geography/rwanda.ogg diff --git a/boards/sounds/tr/geography/salvador.ogg b/boards/sounds/tr/geography/salvador.ogg Binary files differnew file mode 100644 index 0000000..52670a5 --- /dev/null +++ b/boards/sounds/tr/geography/salvador.ogg diff --git a/boards/sounds/tr/geography/senegal.ogg b/boards/sounds/tr/geography/senegal.ogg Binary files differnew file mode 100644 index 0000000..bb10189 --- /dev/null +++ b/boards/sounds/tr/geography/senegal.ogg diff --git a/boards/sounds/tr/geography/serbia_montenegro.ogg b/boards/sounds/tr/geography/serbia_montenegro.ogg Binary files differnew file mode 100644 index 0000000..d383133 --- /dev/null +++ b/boards/sounds/tr/geography/serbia_montenegro.ogg diff --git a/boards/sounds/tr/geography/sierra_leone.ogg b/boards/sounds/tr/geography/sierra_leone.ogg Binary files differnew file mode 100644 index 0000000..ab9ad94 --- /dev/null +++ b/boards/sounds/tr/geography/sierra_leone.ogg diff --git a/boards/sounds/tr/geography/slovakia.ogg b/boards/sounds/tr/geography/slovakia.ogg Binary files differnew file mode 100644 index 0000000..db66d68 --- /dev/null +++ b/boards/sounds/tr/geography/slovakia.ogg diff --git a/boards/sounds/tr/geography/slovenia.ogg b/boards/sounds/tr/geography/slovenia.ogg Binary files differnew file mode 100644 index 0000000..3bfded7 --- /dev/null +++ b/boards/sounds/tr/geography/slovenia.ogg diff --git a/boards/sounds/tr/geography/somalia.ogg b/boards/sounds/tr/geography/somalia.ogg Binary files differnew file mode 100644 index 0000000..11da17b --- /dev/null +++ b/boards/sounds/tr/geography/somalia.ogg diff --git a/boards/sounds/tr/geography/soudan.ogg b/boards/sounds/tr/geography/soudan.ogg Binary files differnew file mode 100644 index 0000000..12f46c9 --- /dev/null +++ b/boards/sounds/tr/geography/soudan.ogg diff --git a/boards/sounds/tr/geography/south_africa.ogg b/boards/sounds/tr/geography/south_africa.ogg Binary files differnew file mode 100644 index 0000000..725f3e5 --- /dev/null +++ b/boards/sounds/tr/geography/south_africa.ogg diff --git a/boards/sounds/tr/geography/south_america.ogg b/boards/sounds/tr/geography/south_america.ogg Binary files differnew file mode 100644 index 0000000..05bdbaf --- /dev/null +++ b/boards/sounds/tr/geography/south_america.ogg diff --git a/boards/sounds/tr/geography/spain.ogg b/boards/sounds/tr/geography/spain.ogg Binary files differnew file mode 100644 index 0000000..81f2778 --- /dev/null +++ b/boards/sounds/tr/geography/spain.ogg diff --git a/boards/sounds/tr/geography/suriname.ogg b/boards/sounds/tr/geography/suriname.ogg Binary files differnew file mode 100644 index 0000000..0c5be2c --- /dev/null +++ b/boards/sounds/tr/geography/suriname.ogg diff --git a/boards/sounds/tr/geography/swaziland.ogg b/boards/sounds/tr/geography/swaziland.ogg Binary files differnew file mode 100644 index 0000000..5b4d214 --- /dev/null +++ b/boards/sounds/tr/geography/swaziland.ogg diff --git a/boards/sounds/tr/geography/sweden.ogg b/boards/sounds/tr/geography/sweden.ogg Binary files differnew file mode 100644 index 0000000..e078c8a --- /dev/null +++ b/boards/sounds/tr/geography/sweden.ogg diff --git a/boards/sounds/tr/geography/switz.ogg b/boards/sounds/tr/geography/switz.ogg Binary files differnew file mode 100644 index 0000000..fb93d8a --- /dev/null +++ b/boards/sounds/tr/geography/switz.ogg diff --git a/boards/sounds/tr/geography/tanzania.ogg b/boards/sounds/tr/geography/tanzania.ogg Binary files differnew file mode 100644 index 0000000..2b640d5 --- /dev/null +++ b/boards/sounds/tr/geography/tanzania.ogg diff --git a/boards/sounds/tr/geography/togo.ogg b/boards/sounds/tr/geography/togo.ogg Binary files differnew file mode 100644 index 0000000..ee839a3 --- /dev/null +++ b/boards/sounds/tr/geography/togo.ogg diff --git a/boards/sounds/tr/geography/tunisia.ogg b/boards/sounds/tr/geography/tunisia.ogg Binary files differnew file mode 100644 index 0000000..82afe6f --- /dev/null +++ b/boards/sounds/tr/geography/tunisia.ogg diff --git a/boards/sounds/tr/geography/turkey.ogg b/boards/sounds/tr/geography/turkey.ogg Binary files differnew file mode 100644 index 0000000..1e6f038 --- /dev/null +++ b/boards/sounds/tr/geography/turkey.ogg diff --git a/boards/sounds/tr/geography/uganda.ogg b/boards/sounds/tr/geography/uganda.ogg Binary files differnew file mode 100644 index 0000000..85f8c21 --- /dev/null +++ b/boards/sounds/tr/geography/uganda.ogg diff --git a/boards/sounds/tr/geography/ukraine.ogg b/boards/sounds/tr/geography/ukraine.ogg Binary files differnew file mode 100644 index 0000000..81b7e5a --- /dev/null +++ b/boards/sounds/tr/geography/ukraine.ogg diff --git a/boards/sounds/tr/geography/united_kingdom.ogg b/boards/sounds/tr/geography/united_kingdom.ogg Binary files differnew file mode 100644 index 0000000..20c4595 --- /dev/null +++ b/boards/sounds/tr/geography/united_kingdom.ogg diff --git a/boards/sounds/tr/geography/uruguay.ogg b/boards/sounds/tr/geography/uruguay.ogg Binary files differnew file mode 100644 index 0000000..2bd62ea --- /dev/null +++ b/boards/sounds/tr/geography/uruguay.ogg diff --git a/boards/sounds/tr/geography/usa.ogg b/boards/sounds/tr/geography/usa.ogg Binary files differnew file mode 100644 index 0000000..58d3817 --- /dev/null +++ b/boards/sounds/tr/geography/usa.ogg diff --git a/boards/sounds/tr/geography/venezuela.ogg b/boards/sounds/tr/geography/venezuela.ogg Binary files differnew file mode 100644 index 0000000..8bb5d92 --- /dev/null +++ b/boards/sounds/tr/geography/venezuela.ogg diff --git a/boards/sounds/tr/geography/welcome.ogg b/boards/sounds/tr/geography/welcome.ogg Binary files differnew file mode 100644 index 0000000..0899cb8 --- /dev/null +++ b/boards/sounds/tr/geography/welcome.ogg diff --git a/boards/sounds/tr/geography/zambia.ogg b/boards/sounds/tr/geography/zambia.ogg Binary files differnew file mode 100644 index 0000000..8607742 --- /dev/null +++ b/boards/sounds/tr/geography/zambia.ogg diff --git a/boards/sounds/tr/geography/zimbabwe.ogg b/boards/sounds/tr/geography/zimbabwe.ogg Binary files differnew file mode 100644 index 0000000..9022728 --- /dev/null +++ b/boards/sounds/tr/geography/zimbabwe.ogg diff --git a/boards/sounds/tr/misc/awesome.ogg b/boards/sounds/tr/misc/awesome.ogg Binary files differnew file mode 100644 index 0000000..2eef2df --- /dev/null +++ b/boards/sounds/tr/misc/awesome.ogg diff --git a/boards/sounds/tr/misc/back.ogg b/boards/sounds/tr/misc/back.ogg Binary files differnew file mode 100644 index 0000000..ddb8b88 --- /dev/null +++ b/boards/sounds/tr/misc/back.ogg diff --git a/boards/sounds/tr/misc/by.ogg b/boards/sounds/tr/misc/by.ogg Binary files differnew file mode 100644 index 0000000..32a30d5 --- /dev/null +++ b/boards/sounds/tr/misc/by.ogg diff --git a/boards/sounds/tr/misc/click_on_letter.ogg b/boards/sounds/tr/misc/click_on_letter.ogg Binary files differnew file mode 100644 index 0000000..745e62e --- /dev/null +++ b/boards/sounds/tr/misc/click_on_letter.ogg diff --git a/boards/sounds/tr/misc/congratulation.ogg b/boards/sounds/tr/misc/congratulation.ogg Binary files differnew file mode 100644 index 0000000..2b124e2 --- /dev/null +++ b/boards/sounds/tr/misc/congratulation.ogg diff --git a/boards/sounds/tr/misc/equal.ogg b/boards/sounds/tr/misc/equal.ogg Binary files differnew file mode 100644 index 0000000..e7d0880 --- /dev/null +++ b/boards/sounds/tr/misc/equal.ogg diff --git a/boards/sounds/tr/misc/fantastic.ogg b/boards/sounds/tr/misc/fantastic.ogg Binary files differnew file mode 100644 index 0000000..eb06ffd --- /dev/null +++ b/boards/sounds/tr/misc/fantastic.ogg diff --git a/boards/sounds/tr/misc/good.ogg b/boards/sounds/tr/misc/good.ogg Binary files differnew file mode 100644 index 0000000..2eef2df --- /dev/null +++ b/boards/sounds/tr/misc/good.ogg diff --git a/boards/sounds/tr/misc/great.ogg b/boards/sounds/tr/misc/great.ogg Binary files differnew file mode 100644 index 0000000..4c7ecc6 --- /dev/null +++ b/boards/sounds/tr/misc/great.ogg diff --git a/boards/sounds/tr/misc/help.ogg b/boards/sounds/tr/misc/help.ogg Binary files differnew file mode 100644 index 0000000..29d94cc --- /dev/null +++ b/boards/sounds/tr/misc/help.ogg diff --git a/boards/sounds/tr/misc/level.ogg b/boards/sounds/tr/misc/level.ogg Binary files differnew file mode 100644 index 0000000..8ad1fa4 --- /dev/null +++ b/boards/sounds/tr/misc/level.ogg diff --git a/boards/sounds/tr/misc/minus.ogg b/boards/sounds/tr/misc/minus.ogg Binary files differnew file mode 100644 index 0000000..40920cc --- /dev/null +++ b/boards/sounds/tr/misc/minus.ogg diff --git a/boards/sounds/tr/misc/ok.ogg b/boards/sounds/tr/misc/ok.ogg Binary files differnew file mode 100644 index 0000000..5049f1c --- /dev/null +++ b/boards/sounds/tr/misc/ok.ogg diff --git a/boards/sounds/tr/misc/outof.ogg b/boards/sounds/tr/misc/outof.ogg Binary files differnew file mode 100644 index 0000000..ab6ac40 --- /dev/null +++ b/boards/sounds/tr/misc/outof.ogg diff --git a/boards/sounds/tr/misc/perfect.ogg b/boards/sounds/tr/misc/perfect.ogg Binary files differnew file mode 100644 index 0000000..3b1dbb2 --- /dev/null +++ b/boards/sounds/tr/misc/perfect.ogg diff --git a/boards/sounds/tr/misc/plus.ogg b/boards/sounds/tr/misc/plus.ogg Binary files differnew file mode 100644 index 0000000..2fc2ffc --- /dev/null +++ b/boards/sounds/tr/misc/plus.ogg diff --git a/boards/sounds/tr/misc/quit.ogg b/boards/sounds/tr/misc/quit.ogg Binary files differnew file mode 100644 index 0000000..7932fb9 --- /dev/null +++ b/boards/sounds/tr/misc/quit.ogg diff --git a/boards/sounds/tr/misc/super.ogg b/boards/sounds/tr/misc/super.ogg Binary files differnew file mode 100644 index 0000000..c85bceb --- /dev/null +++ b/boards/sounds/tr/misc/super.ogg diff --git a/boards/sounds/tr/misc/waytogo.ogg b/boards/sounds/tr/misc/waytogo.ogg Binary files differnew file mode 100644 index 0000000..e17b722 --- /dev/null +++ b/boards/sounds/tr/misc/waytogo.ogg diff --git a/boards/sounds/tr/misc/welcome.ogg b/boards/sounds/tr/misc/welcome.ogg Binary files differnew file mode 100644 index 0000000..77725ad --- /dev/null +++ b/boards/sounds/tr/misc/welcome.ogg diff --git a/configure.in b/configure.in index 3dcc094..48ae133 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(src/gcompris/gcompris.c) AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE(gcompris, 8.0BETA4) +AM_INIT_AUTOMAKE(gcompris, 8.0BETA5) AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE @@ -21,7 +21,7 @@ LIBGCOMPRIS_MAJOR_VERSION=1 LIBGCOMPRIS_MINOR_VERSION=0 LIBGCOMPRIS_MICRO_VERSION=0 LIBGCOMPRIS_INTERFACE_AGE=0 -# If you need a modifier for the version number. +# If you need a modifier for the version number. # Normally empty, but can be used to make "fixup" releases. LIBGCOMPRIS_EXTRAVERSION= @@ -320,7 +320,7 @@ else dnl Set this variable for the .spec.in file REQUIRE_PYTHON="python gnome-python gnome-python-canvas pygtk2.0" - dnl with gnome-python >= 2.10 gnome.canvas is obsolete. use gnomecanvas + dnl with gnome-python >= 2.10 gnome.canvas is obsolete. use gnomecanvas dnl gnomecanvas not supported yet in gcompris dnl dnl AM_CHECK_PYMOD(gnome.canvas,,test_gnomecanvas="no",test_gnomevanvas="yes") @@ -351,7 +351,7 @@ AC_SUBST(SQLITE3_LIBS) AC_SUBST(REQUIRE_PYTHON) -dnl PYCAIRO SUPPORT +dnl PYCAIRO SUPPORT dnl Check for pycairo AC_ARG_ENABLE(cairo, AC_HELP_STRING( @@ -365,7 +365,7 @@ if test x$with_cairo = xyes; then if test x$py_build_only = xno; then if test x$build_python_plugin = xyes; then PKG_CHECK_MODULES(PYCAIRO, pycairo >= 0.5.0,, AC_MSG_ERROR([*** pycairo not found! get it at http://cairographics.org/ if you want --enable-cairo ])) - AM_CHECK_PYMOD(cairo,,,AC_MSG_ERROR([*** pycairo installed but not visible from python ])) + AM_CHECK_PYMOD(cairo,,,AC_MSG_ERROR([*** pycairo installed but not visible from python ])) use_cairo=yes AC_DEFINE([USE_CAIRO],[],[use Cairo graphic library]) else @@ -448,6 +448,10 @@ AC_SUBST(VERSION_VOICES_RU) VERSION_VOICES_SV=1.0 AC_SUBST(VERSION_VOICES_SV) +# TR +VERSION_VOICES_TR=1.0 +AC_SUBST(VERSION_VOICES_TR) + AC_SUBST(CFLAGS) dnl Autoconf output diff --git a/gcompris-edit.desktop.in b/gcompris-edit.desktop.in index c202b9b..737052f 100644 --- a/gcompris-edit.desktop.in +++ b/gcompris-edit.desktop.in @@ -4,9 +4,9 @@ Name=GCompris Administration _Comment=Administration for gcompris Exec=gcompris -a Icon=gcompris-edit.png -Terminal=0 +Terminal=false Type=Application -Categories=GNOME;Application;Education; +Categories=GTK;Teaching; StartupNotify=true X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gcompris diff --git a/gcompris.desktop.in b/gcompris.desktop.in index c9224c1..c94c48d 100644 --- a/gcompris.desktop.in +++ b/gcompris.desktop.in @@ -7,7 +7,7 @@ Exec=gcompris Icon=gcompris.png Terminal=false Type=Application -Categories=GNOME;Application;Education; +Categories=GTK;KidsGame; StartupNotify=true X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gcompris diff --git a/gcompris.spec.in b/gcompris.spec.in index 97db72d..9d74deb 100644 --- a/gcompris.spec.in +++ b/gcompris.spec.in @@ -16,9 +16,9 @@ Source: ftp://gcompris.sourceforge.net/gcompris-%{PACKAGE_VERSION}.tar.gz BuildRoot: %_tmppath/%name-%version-buildroot Buildrequires: gnuchess gnucap Buildrequires: libxml2-devel libgnomeui2-devel libsqlite3_0-devel -Buildrequires: texinfo +Buildrequires: texinfo # (misc) needed for python support -Buildrequires: gnome-python python-devel pygtk2.0-devel +Buildrequires: gnome-python python-devel pygtk2.0-devel Requires: gnome-libs libxml2 gdk-pixbuf %canvaspackage %canvaslib Requires: gnuchess >= 5.02 Requires: @REQUIRE_PYTHON@ @@ -46,7 +46,7 @@ The Game is included in the Main desktop menu in 'Games'. You should install it only if you have children using this computer. %description -l fr -GCompris / J'ai Compris est un logiciel éducatif pour les enfants +GCompris / J'ai Compris est un logiciel éducatif pour les enfants à partir de 2 ans. Plus de 100 activités sont proposées : @@ -73,149 +73,158 @@ Version: %version %description devel Development package for gcompris -%package -n assetml-voices-cs +%package -n gcompris-voices-cs Summary: GCompris Czech voices Group: Amusements/Games Version: @VERSION_VOICES_CS@ -%description -n assetml-voices-cs +%description -n gcompris-voices-cs Czech voices for the GCompris game -%package -n assetml-voices-da +%package -n gcompris-voices-da Summary: GCompris Danish voices Group: Amusements/Games Version: @VERSION_VOICES_DA@ -%description -n assetml-voices-da +%description -n gcompris-voices-da Danish voices for the GCompris game -%package -n assetml-voices-de +%package -n gcompris-voices-de Summary: GCompris voices in German Group: Amusements/Games Version: @VERSION_VOICES_DE@ -%description -n assetml-voices-de +%description -n gcompris-voices-de Alphabet voices in German -%package -n assetml-voices-en +%package -n gcompris-voices-en Summary: GCompris voices in English Group: Amusements/Games Version: @VERSION_VOICES_EN@ -%description -n assetml-voices-en +%description -n gcompris-voices-en English voices for the GCompris game -%package -n assetml-voices-es +%package -n gcompris-voices-es Summary: GCompris voices in Spanish Group: Amusements/Games Version: @VERSION_VOICES_ES@ -%description -n assetml-voices-es +%description -n gcompris-voices-es Spanish voices for the GCompris game -%package -n assetml-voices-eu +%package -n gcompris-voices-eu Summary: GCompris voices in Basque Group: Amusements/Games Version: @VERSION_VOICES_EU@ -%description -n assetml-voices-eu +%description -n gcompris-voices-eu Basque voices for the GCompris game -%package -n assetml-voices-fi +%package -n gcompris-voices-fi Summary: GCompris voices in Finish Group: Amusements/Games Version: @VERSION_VOICES_FI@ -%description -n assetml-voices-fi +%description -n gcompris-voices-fi Finish voices for the GCompris game -%package -n assetml-voices-fr +%package -n gcompris-voices-fr Summary: GCompris voices in French Group: Amusements/Games Version: @VERSION_VOICES_FR@ -%description -n assetml-voices-fr +%description -n gcompris-voices-fr French voices for the GCompris game -%package -n assetml-voices-hu +%package -n gcompris-voices-hu Summary: GCompris voices in Hungarian Group: Amusements/Games Version: @VERSION_VOICES_HU@ -%description -n assetml-voices-hu +%description -n gcompris-voices-hu Hungarian voices for the GCompris game -%package -n assetml-voices-it +%package -n gcompris-voices-it Summary: GCompris voices in Italian Group: Amusements/Games Version: @VERSION_VOICES_IT@ -%description -n assetml-voices-it +%description -n gcompris-voices-it Italian voices for the GCompris game -%package -n assetml-voices-nl +%package -n gcompris-voices-nl Summary: GCompris voices in Dutch Group: Amusements/Games Version: @VERSION_VOICES_NL@ -%description -n assetml-voices-nl +%description -n gcompris-voices-nl Dutch voices for the GCompris game -%package -n assetml-voices-mr +%package -n gcompris-voices-mr Summary: GCompris voices in Marathi Group: Amusements/Games Version: @VERSION_VOICES_MR@ -%description -n assetml-voices-mr +%description -n gcompris-voices-mr Marathi voices for the GCompris game -%package -n assetml-voices-pt +%package -n gcompris-voices-pt Summary: GCompris voices in Portuguese Group: Amusements/Games Version: @VERSION_VOICES_PT@ -%description -n assetml-voices-pt +%description -n gcompris-voices-pt Portuguese voices for the GCompris game -%package -n assetml-voices-pt-br +%package -n gcompris-voices-pt-br Summary: GCompris voices in Brasilian Group: Amusements/Games Version: @VERSION_VOICES_PT_BR@ -%description -n assetml-voices-pt-br +%description -n gcompris-voices-pt-br Brasilian voices for the GCompris game -%package -n assetml-voices-ru +%package -n gcompris-voices-ru Summary: GCompris voices in Russian Group: Amusements/Games Version: @VERSION_VOICES_RU@ -%description -n assetml-voices-ru +%description -n gcompris-voices-ru Russian voices for the GCompris game -%package -n assetml-voices-sv +%package -n gcompris-voices-sv Summary: Alphabet voices in Swedish Group: Amusements/Games Version: @VERSION_VOICES_SV@ -%description -n assetml-voices-sv +%description -n gcompris-voices-sv Alphabet voices in Swedish + +%package -n gcompris-voices-tr +Summary: Alphabet voices in Turkish +Group: Amusements/Games +Version: @VERSION_VOICES_TR@ + +%description -n gcompris-voices-tr +Alphabet voices in Turkish + %prep %setup -q @@ -223,7 +232,7 @@ Alphabet voices in Swedish %ifarch alpha MYARCH_FLAGS="--host=alpha-redhat-linux" %endif -%configure +%configure %make @@ -236,13 +245,13 @@ rm -rf $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT -%post +%post %update_menus %_install_info %{name}.info -%postun +%postun %clean_menus @@ -291,66 +300,70 @@ rm -rf $RPM_BUILD_ROOT %_libdir/libgcompris-1.so %_libdir/pkgconfig/libgcompris-1.0.pc -%files -n assetml-voices-cs +%files -n gcompris-voices-cs %defattr(-, root, root) %{prefix}/share/gcompris/boards/sounds/cs -%files -n assetml-voices-da +%files -n gcompris-voices-da %defattr(-, root, root) %{prefix}/share/gcompris/boards/sounds/da -%files -n assetml-voices-de +%files -n gcompris-voices-de %defattr(-, root, root) %{prefix}/share/gcompris/boards/sounds/de -%files -n assetml-voices-en +%files -n gcompris-voices-en %defattr(-, root, root) %{prefix}/share/gcompris/boards/sounds/en -%files -n assetml-voices-es +%files -n gcompris-voices-es %defattr(-, root, root) %{prefix}/share/gcompris/boards/sounds/es -%files -n assetml-voices-eu +%files -n gcompris-voices-eu %defattr(-, root, root) %{prefix}/share/gcompris/boards/sounds/eu -%files -n assetml-voices-fi +%files -n gcompris-voices-fi %defattr(-, root, root) %{prefix}/share/gcompris/boards/sounds/fi -%files -n assetml-voices-fr +%files -n gcompris-voices-fr %defattr(-, root, root) %{prefix}/share/gcompris/boards/sounds/fr -%files -n assetml-voices-hu +%files -n gcompris-voices-hu %defattr(-, root, root) %{prefix}/share/gcompris/boards/sounds/hu -%files -n assetml-voices-it +%files -n gcompris-voices-it %defattr(-, root, root) %{prefix}/share/gcompris/boards/sounds/it -%files -n assetml-voices-mr +%files -n gcompris-voices-mr %defattr(-, root, root) %{prefix}/share/gcompris/boards/sounds/mr -%files -n assetml-voices-nl +%files -n gcompris-voices-nl %defattr(-, root, root) %{prefix}/share/gcompris/boards/sounds/nl -%files -n assetml-voices-pt +%files -n gcompris-voices-pt %defattr(-, root, root) %{prefix}/share/gcompris/boards/sounds/pt -%files -n assetml-voices-pt-br +%files -n gcompris-voices-pt-br %defattr(-, root, root) %{prefix}/share/gcompris/boards/sounds/pt_BR -%files -n assetml-voices-ru +%files -n gcompris-voices-ru %defattr(-, root, root) %{prefix}/share/gcompris/boards/sounds/ru -%files -n assetml-voices-sv +%files -n gcompris-voices-sv %defattr(-, root, root) %{prefix}/share/gcompris/boards/sounds/sv + +%files -n gcompris-voices-tr +%defattr(-, root, root) +%{prefix}/share/gcompris/boards/sounds/tr diff --git a/src/boards/reading.c b/src/boards/reading.c index 5c08b9e..8873b79 100644 --- a/src/boards/reading.c +++ b/src/boards/reading.c @@ -33,7 +33,7 @@ #define MAX_WORDS 100 -static GPtrArray *words=NULL; +static GcomprisWordlist *gc_wordlist = NULL; static GcomprisBoard *gcomprisBoard = NULL; @@ -97,8 +97,7 @@ static void reading_config_stop(void); static void player_win(void); static void player_loose(void); -static gchar *get_random_word(gboolean); -static gboolean read_wordfile(); +static gchar *get_random_word(const gchar *except); static GnomeCanvasItem *display_what_to_do(GnomeCanvasGroup *parent); static void ask_ready(gboolean status); static void ask_yes_no(void); @@ -215,6 +214,21 @@ static void start_board (GcomprisBoard *agcomprisBoard) if(gcomprisBoard->mode && g_strcasecmp(gcomprisBoard->mode, "horizontal")==0) currentMode=MODE_HORIZONTAL; + gc_wordlist = gc_wordlist_get_from_file("wordsgame/default-$LOCALE.xml"); + + if(!gc_wordlist) + { + /* Fallback to english */ + gc_wordlist = gc_wordlist_get_from_file("wordsgame/default-en.xml"); + + if(!gc_wordlist) + { + gcomprisBoard = NULL; + gc_dialog(_("Error: We can't find\na list of words to play this game.\n"), gc_board_end); + return; + } + } + reading_next_level(); } } @@ -229,6 +243,11 @@ end_board () reading_destroy_all_items(); } + if (gc_wordlist != NULL){ + gc_wordlist_free(gc_wordlist); + gc_wordlist = NULL; + } + gc_locale_reset(); gcomprisBoard = NULL; @@ -303,7 +322,6 @@ static gint reading_next_level() gcomprisBoard->number_of_sublevel=1; gcomprisBoard->sublevel=1; - read_wordfile(); display_what_to_do(boardRootItem); ask_ready(TRUE); return (FALSE); @@ -318,7 +336,7 @@ static void reading_destroy_all_items() drop_items_id = 0; } - if (next_level_timer) { + if (next_level_timer) { gtk_timeout_remove (next_level_timer); drop_items_id = 0; } @@ -330,18 +348,11 @@ static void reading_destroy_all_items() previousFocus.rootItem = NULL; toDeleteFocus.rootItem = NULL; - if (textToFind!=NULL) + if (textToFind!=NULL) { g_free(textToFind); textToFind=NULL; } - - if (words!=NULL) - { - g_ptr_array_free (words, TRUE); - words=NULL; - } - } static GnomeCanvasItem *display_what_to_do(GnomeCanvasGroup *parent) @@ -352,8 +363,8 @@ static GnomeCanvasItem *display_what_to_do(GnomeCanvasGroup *parent) gint i; /* Load the text to find */ - - textToFind = get_random_word(TRUE); + + textToFind = get_random_word(NULL); assert(textToFind != NULL); @@ -427,14 +438,14 @@ static gboolean reading_create_item(GnomeCanvasGroup *parent) return FALSE; } - + if(textToFindIndex!=0) { - word = get_random_word(FALSE); + word = get_random_word(textToFind); } else { - word = textToFind; + word = g_strdup(textToFind); } assert(word!=NULL); @@ -463,9 +474,12 @@ static gboolean reading_create_item(GnomeCanvasGroup *parent) "fill_color", "black", NULL); + gchar *oldword = g_strdup_printf("<span foreground=\"black\" background=\"black\">%s</span>", word); - previousFocus.overwriteItem = \ + g_free(word); + + previousFocus.overwriteItem = \ gnome_canvas_item_new (GNOME_CANVAS_GROUP(previousFocus.rootItem), gnome_canvas_text_get_type (), "markup", oldword, @@ -546,7 +560,7 @@ static void ask_ready(gboolean status) button_pixmap = gc_skin_pixmap_load("button_large2.png"); item1 = gnome_canvas_item_new (boardRootItem, gnome_canvas_pixbuf_get_type (), - "pixbuf", button_pixmap, + "pixbuf", button_pixmap, "x", x_offset, "y", y_offset, NULL); @@ -724,88 +738,28 @@ item_event_valid(GnomeCanvasItem *item, GdkEvent *event, gpointer data) } - - -static FILE *get_wordfile(const char *locale) +/** Return a random word from a set of text file depending on + * the current level and language + * + * \param except: if non NULL, never return this value + * + * \return a random word from. must be freed by the caller + */ +static gchar * +get_random_word(const gchar* except) { - GcomprisProperties *properties = gc_prop_get(); - gchar *filename; - FILE *wordsfd = NULL; - - /* First Try to find a file matching the level and the locale */ - filename = g_strdup_printf("%s%s%d.%.2s", - properties->package_data_dir, "/wordsgame/wordslevel", - gcomprisBoard->level, locale); - wordsfd = fopen (filename, "r"); - - if(wordsfd==NULL) - { - GcomprisProperties *properties = gc_prop_get(); - g_free(filename); - /* Second Try to find a file matching the 'max' and the locale */ - filename = g_strdup_printf("%s%s%.2s", - properties->package_data_dir, "/wordsgame/wordslevelmax.", - locale); - - wordsfd = fopen (filename, "r"); - } - - g_free(filename); - - return wordsfd; -} - - - + gchar *word; -static gboolean read_wordfile() -{ - FILE *wordsfd; - gchar *buf; - int len; + word = gc_wordlist_random_word_get(gc_wordlist, gcomprisBoard->level); - wordsfd = get_wordfile(gc_locale_get()); - - if(wordsfd==NULL) - { - /* Try to open the english locale by default */ - wordsfd = get_wordfile("en"); - - /* Too bad, even english is not there. Check your Install */ - if(wordsfd==NULL) { - gc_dialog(_("Cannot open file of words for your locale"), gc_board_end); - return FALSE; + if(except) + while(strcmp(except, word)==0) + { + g_free(word); + word = gc_wordlist_random_word_get(gc_wordlist, gcomprisBoard->level); } - } - - words=g_ptr_array_new (); - while ((buf=fgets(g_new(gchar,MAXWORDSLENGTH), MAXWORDSLENGTH, wordsfd))) { - assert(g_utf8_validate(buf,-1,NULL)); - - //remove \n from end of line - len = strlen(buf); - if((0 < len)&&('\n'==buf[len-1])) - buf[len-1] = '\0'; - - g_ptr_array_add(words,buf); - } - fclose(wordsfd); - return TRUE; -} -/* - * Return a random word from a set of text file depending on - * the current level and language - */ - - -static gchar *get_random_word(gboolean remove) -{ - int i=rand()%words->len; - if (remove) - return g_ptr_array_remove_index(words,i); - else - return g_ptr_array_index(words,i); + return(word); } @@ -827,7 +781,7 @@ static void save_table (gpointer key, { gc_db_set_board_conf ( profile_conf, board_conf, - (gchar *) key, + (gchar *) key, (gchar *) value); } @@ -845,22 +799,22 @@ static void conf_ok(GHashTable *table) gc_locale_reset(); GHashTable *config; - + if (profile_conf) config = gc_db_get_board_conf(); else config = table; - + gc_locale_set(g_hash_table_lookup( config, "locale")); - + if (profile_conf) g_hash_table_destroy(config); reading_next_level(); - + pause_board(FALSE); } - + board_conf = NULL; profile_conf = NULL; @@ -877,10 +831,10 @@ reading_config_start(GcomprisBoard *agcomprisBoard, pause_board(TRUE); gchar *label = g_strdup_printf("<b>%s</b> configuration\n for profile <b>%s</b>", - agcomprisBoard->name, + agcomprisBoard->name, aProfile? aProfile->name: ""); - gc_board_config_window_display( label, + gc_board_config_window_display( label, (GcomprisConfCallback )conf_ok); g_free(label); @@ -889,16 +843,16 @@ reading_config_start(GcomprisBoard *agcomprisBoard, GHashTable *config = gc_db_get_conf( profile_conf, board_conf); gchar *locale = g_hash_table_lookup( config, "locale"); - + gc_board_config_combo_locales( locale); } - + /* ======================= */ /* = config_stop = */ /* ======================= */ -static void +static void reading_config_stop() { } diff --git a/src/boards/wordsgame.c b/src/boards/wordsgame.c index b6a19bc..b03adb0 100644 --- a/src/boards/wordsgame.c +++ b/src/boards/wordsgame.c @@ -3,7 +3,7 @@ * Time-stamp: <2006/08/22 02:23:24 bruno> * * Copyright (C) 2000 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 2 of the License, or @@ -36,7 +36,7 @@ GStaticRWLock items2del_lock = G_STATIC_RW_LOCK_INIT; /* word - word to type - overword - part of word allready typed + overword - part of word allready typed count - number of allready typed letters in word pos - pointer to current position in word letter - current expected letter to type @@ -52,7 +52,7 @@ typedef struct { } LettersItem; /* - items - array of displayed items + items - array of displayed items items2del - array of items where moved offscreen item_on_focus - item on focus in array items. NULL - not set. */ @@ -204,7 +204,7 @@ static void start_board (GcomprisBoard *agcomprisBoard) if(!gc_wordlist) { gcomprisBoard = NULL; - gc_dialog(_("Error: We don't find\na list of words to play this game.\n"), gc_board_end); + gc_dialog(_("Error: We can't find\na list of words to play this game.\n"), gc_board_end); return; } } @@ -251,7 +251,7 @@ set_level (guint level) static gint key_press(guint keyval, gchar *commit_str, gchar *preedit_str) { - gchar *letter; + gchar *letter; gint i; LettersItem *item; gchar *str; @@ -276,7 +276,7 @@ static gint key_press(guint keyval, gchar *commit_str, gchar *preedit_str) &text, &attrs, &cursor_pos); - + if (!preedit_text) preedit_text = \ gnome_canvas_item_new (gnome_canvas_root(gcomprisBoard->canvas), @@ -287,57 +287,57 @@ static gint key_press(guint keyval, gchar *commit_str, gchar *preedit_str) "anchor", GTK_ANCHOR_N, //"fill_color_rgba", 0xba00ffff, NULL); - - + + gnome_canvas_item_set (preedit_text, "text", text, "attributes", attrs, NULL); - + return TRUE; - + } /* commit str */ g_warning("commit_str %s", commit_str); str = commit_str; - - for (i=0; i < g_utf8_strlen(commit_str,-1); i++){ + + for (i=0; i < g_utf8_strlen(commit_str,-1); i++){ unichar_letter = g_utf8_get_char(str); str = g_utf8_next_char(str); if(!g_unichar_isalnum (unichar_letter)){ player_loose(); return FALSE; } - + letter = g_new0(gchar,6); g_unichar_to_utf8 (unichar_letter, letter); - - if(item_on_focus==NULL) + + if(item_on_focus==NULL) { g_static_rw_lock_reader_lock (&items_lock); gint count=items->len; g_static_rw_lock_reader_unlock (&items_lock); - + for (i=0;i<count;i++) - { + { g_static_rw_lock_reader_lock (&items_lock); item=g_ptr_array_index(items,i); g_static_rw_lock_reader_unlock (&items_lock); assert (item!=NULL); - if (strcmp(item->letter,letter)==0) + if (strcmp(item->letter,letter)==0) { item_on_focus=item; - break; + break; } } } - - - if(item_on_focus!=NULL) + + + if(item_on_focus!=NULL) { - + if(strcmp(item_on_focus->letter, letter)==0) { item_on_focus->count++; @@ -346,8 +346,8 @@ static gint key_press(guint keyval, gchar *commit_str, gchar *preedit_str) gnome_canvas_item_set (item_on_focus->overwriteItem, "text", item_on_focus->overword, NULL); - - + + if (item_on_focus->count<g_utf8_strlen(item_on_focus->word,-1)) { g_free(item_on_focus->letter); @@ -368,9 +368,9 @@ static gint key_press(guint keyval, gchar *commit_str, gchar *preedit_str) item_on_focus->count=0; g_free(item_on_focus->letter); item_on_focus->letter=g_utf8_strndup(item_on_focus->word,1); - + item_on_focus->pos=g_utf8_find_next_char(item_on_focus->word,NULL); - + gnome_canvas_item_set (item_on_focus->overwriteItem, "text", item_on_focus->overword, NULL); @@ -378,7 +378,7 @@ static gint key_press(guint keyval, gchar *commit_str, gchar *preedit_str) g_free(letter); player_loose(); break; - } + } } else { @@ -416,32 +416,32 @@ is_our_board (GcomprisBoard *gcomprisBoard) /*-------------------------------------------------------------------------------*/ /* set initial values for the next level */ -static void wordsgame_next_level() +static void wordsgame_next_level() { - gcomprisBoard->number_of_sublevel = 10 + + gcomprisBoard->number_of_sublevel = 10 + ((gcomprisBoard->level-1) * 5); - gc_score_start(SCORESTYLE_NOTE, - gcomprisBoard->width - 220, - gcomprisBoard->height - 50, + gc_score_start(SCORESTYLE_NOTE, + gcomprisBoard->width - 220, + gcomprisBoard->height - 50, gcomprisBoard->number_of_sublevel); - + gc_bar_set_level(gcomprisBoard); gc_score_set(gcomprisBoard->sublevel); wordsgame_destroy_all_items(); - + if (preedit_text){ gtk_object_destroy(GTK_OBJECT(preedit_text)); preedit_text=NULL; } gc_im_reset(); - + items=g_ptr_array_new(); items2del=g_ptr_array_new(); - + /* Increase speed only after 5 levels */ if(gcomprisBoard->level>5) { @@ -465,10 +465,10 @@ static void wordsgame_move_item(LettersItem *item) &y1, &x2, &y2); - + if(y1>gcomprisBoard->height) { - if (item == item_on_focus) + if (item == item_on_focus) item_on_focus = NULL; g_static_rw_lock_writer_lock (&items_lock); @@ -494,10 +494,10 @@ static gint wordsgame_move_items (GtkWidget *widget, gpointer data) assert (items!=NULL); gint i; LettersItem *item; - + for (i=items->len-1;i>=0;i--) { - + g_static_rw_lock_reader_lock (&items_lock); item=g_ptr_array_index(items,i); g_static_rw_lock_reader_unlock (&items_lock); @@ -511,7 +511,7 @@ static gint wordsgame_move_items (GtkWidget *widget, gpointer data) static void wordsgame_destroy_item(LettersItem *item) { - + /* The items are freed by player_win */ gtk_object_destroy (GTK_OBJECT(item->rootitem)); g_free(item->word); @@ -526,12 +526,12 @@ static gboolean wordsgame_destroy_items(GPtrArray *item_list) LettersItem *item; assert(item_list!=NULL); - + if (item_list==items) { g_static_rw_lock_writer_lock (&items_lock); - while (item_list->len>0) + while (item_list->len>0) { item = g_ptr_array_index(item_list,0); g_ptr_array_remove_index_fast(item_list,0); @@ -542,7 +542,7 @@ static gboolean wordsgame_destroy_items(GPtrArray *item_list) if (item_list==items2del) { g_static_rw_lock_writer_lock (&items2del_lock); - while (item_list->len>0) + while (item_list->len>0) { item = g_ptr_array_index(item_list,0); g_ptr_array_remove_index_fast(item_list,0); @@ -557,7 +557,7 @@ static gboolean wordsgame_destroy_items(GPtrArray *item_list) /* Destroy all the items */ static void wordsgame_destroy_all_items() { - + if (items!=NULL){ if(items->len > 0) { wordsgame_destroy_items(items); @@ -573,13 +573,13 @@ static void wordsgame_destroy_all_items() g_ptr_array_free (items2del, TRUE); items2del=NULL; } - + } static GnomeCanvasItem *wordsgame_create_item(GnomeCanvasGroup *parent) { - + GnomeCanvasItem *item2; LettersItem *item; gchar *word = gc_wordlist_random_word_get(gc_wordlist, gcomprisBoard->level); @@ -595,7 +595,7 @@ static GnomeCanvasItem *wordsgame_create_item(GnomeCanvasGroup *parent) item->count=0; item->letter=g_utf8_strndup(item->word,1); item->pos=g_utf8_find_next_char(item->word,NULL); - + item->rootitem = \ gnome_canvas_item_new (parent, gnome_canvas_group_get_type (), @@ -604,7 +604,7 @@ static GnomeCanvasItem *wordsgame_create_item(GnomeCanvasGroup *parent) NULL); /* To 'erase' words, I create 2 times the text item. One is empty now */ - /* It will be filled each time the user enters the right key */ + /* It will be filled each time the user enters the right key */ item2 = \ gnome_canvas_item_new (GNOME_CANVAS_GROUP(item->rootitem), gnome_canvas_text_get_type (), @@ -626,18 +626,18 @@ static GnomeCanvasItem *wordsgame_create_item(GnomeCanvasGroup *parent) "anchor", GTK_ANCHOR_NW, "fill_color", "blue", NULL); - + /*set right x position */ double x1, y1, x2, y2; - - + + gnome_canvas_item_get_bounds (item->rootitem, &x1, &y1, &x2, &y2); - + gnome_canvas_item_move (item->rootitem,(double) (rand()%(gcomprisBoard->width-(gint)(x2))),(double) 0); @@ -648,10 +648,10 @@ static GnomeCanvasItem *wordsgame_create_item(GnomeCanvasGroup *parent) return (item->rootitem); } -static void wordsgame_add_new_item() +static void wordsgame_add_new_item() { - assert(gcomprisBoard->canvas!=NULL); + assert(gcomprisBoard->canvas!=NULL); wordsgame_create_item(gnome_canvas_root(gcomprisBoard->canvas)); } @@ -665,7 +665,7 @@ static gint wordsgame_drop_items (GtkWidget *widget, gpointer data) wordsgame_add_new_item(); g_source_remove(drop_items_id); drop_items_id = g_timeout_add (fallSpeed,(GtkFunction) wordsgame_drop_items, NULL); - + return (FALSE); } @@ -692,7 +692,7 @@ static void player_win(LettersItem *item) g_timeout_add (500,(GtkFunction) wordsgame_destroy_items, items2del); - if(gcomprisBoard->sublevel > gcomprisBoard->number_of_sublevel) + if(gcomprisBoard->sublevel > gcomprisBoard->number_of_sublevel) { /* Try the next level */ @@ -707,31 +707,31 @@ static void player_win(LettersItem *item) } else { - + /* Drop a new item now to speed up the game */ g_static_rw_lock_reader_lock (&items_lock); gint count=items->len; g_static_rw_lock_reader_unlock (&items_lock); - + if(count==0) { if ((fallSpeed-=INCREMENT_FALLSPEED) < MIN_FALLSPEED) fallSpeed+=INCREMENT_FALLSPEED; if ((speed-=INCREMENT_SPEED) < MIN_SPEED) speed+=INCREMENT_SPEED; - + if (drop_items_id) { /* Remove pending new item creation to sync the falls */ g_source_remove (drop_items_id); drop_items_id = 0; } - + if(!drop_items_id) { drop_items_id = g_timeout_add (0, (GtkFunction) wordsgame_drop_items, NULL); } - + } } diff --git a/src/gcompris/bar.c b/src/gcompris/bar.c index ba5e114..659c735 100644 --- a/src/gcompris/bar.c +++ b/src/gcompris/bar.c @@ -58,7 +58,7 @@ static gint sound_play_id = 0; static void confirm_quit(gboolean answer); /* - * Main entry point + * Main entry point * ---------------- * */ @@ -90,7 +90,7 @@ void gc_bar_start (GnomeCanvas *theCanvas) pixmap = gc_skin_pixmap_load("bar_bg.jpg"); bar_item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_pixbuf_get_type (), - "pixbuf", pixmap, + "pixbuf", pixmap, "x", (double) 0, "y", (double) 0, NULL); @@ -103,7 +103,7 @@ void gc_bar_start (GnomeCanvas *theCanvas) zoom = (double)(height-BAR_GAP)/(double)gdk_pixbuf_get_height(pixmap); exit_item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_pixbuf_get_type (), - "pixbuf", pixmap, + "pixbuf", pixmap, "x", (double) (width/NUMBER_OF_ITEMS) * 1 - gdk_pixbuf_get_width(pixmap)/2, "y", (double) (height-gdk_pixbuf_get_height(pixmap)*zoom)/2, @@ -118,14 +118,14 @@ void gc_bar_start (GnomeCanvas *theCanvas) (GtkSignalFunc) gc_item_focus_event, NULL); } - + // HOME pixmap = gc_skin_pixmap_load("home.png"); zoom = (double)(height-BAR_GAP)/(double)gdk_pixbuf_get_height(pixmap); home_item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_pixbuf_get_type (), - "pixbuf", pixmap, - "x", (double) (width/NUMBER_OF_ITEMS) * 9 - + "pixbuf", pixmap, + "x", (double) (width/NUMBER_OF_ITEMS) * 9 - gdk_pixbuf_get_width(pixmap)/2, "y", (double) (height-gdk_pixbuf_get_height(pixmap)*zoom)/2, NULL); @@ -145,7 +145,7 @@ void gc_bar_start (GnomeCanvas *theCanvas) zoom = (double)(height-BAR_GAP)/(double)gdk_pixbuf_get_height(pixmap); ok_item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_pixbuf_get_type (), - "pixbuf", pixmap, + "pixbuf", pixmap, "x", (double) (width/NUMBER_OF_ITEMS) * 7 - gdk_pixbuf_get_width(pixmap)/2, "y", (double) (height-gdk_pixbuf_get_height(pixmap)*zoom)/2, @@ -166,7 +166,7 @@ void gc_bar_start (GnomeCanvas *theCanvas) zoom = (double)(height-BAR_GAP)/(double)gdk_pixbuf_get_height(pixmap); level_item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_pixbuf_get_type (), - "pixbuf", pixmap, + "pixbuf", pixmap, "x", (double) (width/NUMBER_OF_ITEMS) * 5 - gdk_pixbuf_get_width(pixmap)/2, "y", (double) (height-gdk_pixbuf_get_height(pixmap)*zoom)/2, @@ -187,13 +187,13 @@ void gc_bar_start (GnomeCanvas *theCanvas) zoom = (double)(height-BAR_GAP)/(double)gdk_pixbuf_get_height(pixmap); repeat_item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_pixbuf_get_type (), - "pixbuf", pixmap, + "pixbuf", pixmap, "x", (double) (width/NUMBER_OF_ITEMS) * 6 - gdk_pixbuf_get_width(pixmap)/2, "y", (double) (height-gdk_pixbuf_get_height(pixmap)*zoom)/2, NULL); gdk_pixbuf_unref(pixmap); - + gtk_signal_connect(GTK_OBJECT(repeat_item), "event", (GtkSignalFunc) item_event_bar, "repeat"); @@ -207,7 +207,7 @@ void gc_bar_start (GnomeCanvas *theCanvas) zoom = (double)(height-BAR_GAP)/(double)gdk_pixbuf_get_height(pixmap); help_item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_pixbuf_get_type (), - "pixbuf", pixmap, + "pixbuf", pixmap, "x", (double) (width/NUMBER_OF_ITEMS) * 4 - gdk_pixbuf_get_width(pixmap)/2, "y", (double) (height-gdk_pixbuf_get_height(pixmap)*zoom)/2, @@ -229,7 +229,7 @@ void gc_bar_start (GnomeCanvas *theCanvas) zoom = (double)(height-BAR_GAP)/(double)gdk_pixbuf_get_height(pixmap); config_item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_pixbuf_get_type (), - "pixbuf", pixmap, + "pixbuf", pixmap, "x", (double) (width/NUMBER_OF_ITEMS) * 3 - gdk_pixbuf_get_width(pixmap)/2, "y", (double) (height-gdk_pixbuf_get_height(pixmap)*zoom)/2, @@ -250,7 +250,7 @@ void gc_bar_start (GnomeCanvas *theCanvas) zoom = (double)(height-BAR_GAP)/(double)gdk_pixbuf_get_height(pixmap); about_item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_pixbuf_get_type (), - "pixbuf", pixmap, + "pixbuf", pixmap, "x", (double) (width/NUMBER_OF_ITEMS) * 2 - gdk_pixbuf_get_width(pixmap)/2, "y", (double) (height-gdk_pixbuf_get_height(pixmap)*zoom)/2, @@ -294,7 +294,7 @@ void gc_bar_set_level(GcomprisBoard *gcomprisBoard) str = g_strdup_printf("level%d.png", gcomprisBoard->level); pixmap = gc_skin_pixmap_load(str); - + g_free(str); /* Warning changing the image needs to update pixbuf_ref for the focus usage */ g_object_set_data (G_OBJECT (level_item), "pixbuf_ref", pixmap); @@ -303,7 +303,7 @@ void gc_bar_set_level(GcomprisBoard *gcomprisBoard) NULL); gdk_pixbuf_unref(pixmap); } - + current_level=gcomprisBoard->level; } @@ -386,7 +386,7 @@ gc_bar_set (const GComprisBarFlags flags) } -/* Hide all icons in the control bar +/* Hide all icons in the control bar * or retore the icons to the previous value */ void @@ -565,13 +565,13 @@ item_event_bar(GnomeCanvasItem *item, GdkEvent *event, gchar *data) else if(!strcmp((char *)data, "quit")) { gc_confirm_box( _("GCompris confirmation"), - _("Sure you want to quit ?"), - _("Yes, I am sure !"), + _("Are you sure you want to quit?"), + _("Yes, I am sure!"), _("No, I want to keep going"), (ConfirmCallBack) confirm_quit); } break; - + default: break; } diff --git a/src/gcompris/gcompris.c b/src/gcompris/gcompris.c index 82f656f..3aa2ef2 100644 --- a/src/gcompris/gcompris.c +++ b/src/gcompris/gcompris.c @@ -1103,6 +1103,9 @@ void gc_locale_set(gchar *locale) { + if(!locale) + return; + g_message("gc_locale_set '%s'\n", locale); if(gc_locale != NULL) g_free(gc_locale); diff --git a/src/gcompris/wordlist.c b/src/gcompris/wordlist.c index 161c9bf..1c69800 100644 --- a/src/gcompris/wordlist.c +++ b/src/gcompris/wordlist.c @@ -44,7 +44,7 @@ * </level> * </Wordlist> * </GCompris> - * + * * * \param format: the xml file to load (ex: wordsgame/default-fr.xml) * If format contains $LOCALE, it will be first replaced by the current long locale @@ -69,7 +69,7 @@ GcomprisWordlist GcomprisWordlist *wordlist; xmlChar *text; - gchar **wordsArray; + gchar **wordsArray; GSList *words = NULL; if (!format) @@ -92,7 +92,7 @@ GcomprisWordlist g_warning("Wordlist found %s\n", xmlfilename); xmldoc = xmlParseFile(xmlfilename); - g_free(xmlfilename); + g_free(xmlfilename); if(!xmldoc){ g_warning("Couldn't parse file %s !", xmlfilename); @@ -121,7 +121,7 @@ GcomprisWordlist xmlFreeDoc(xmldoc); return NULL; } - + /* ok, we can process the wordlist */ wordlist = g_malloc0(sizeof(GcomprisWordlist)); @@ -176,13 +176,13 @@ GcomprisWordlist } text = xmlNodeGetContent ( wordsNode); - + wordsArray = g_strsplit_set ((const gchar *) text, (const gchar *) " \n\t", 0); g_warning("Wordlist read : %s", text); - + xmlFree (text); i=0; @@ -191,7 +191,7 @@ GcomprisWordlist words = g_slist_append( words, g_strdup( wordsArray[i])); i++; } - + g_strfreev ( wordsArray); @@ -210,7 +210,7 @@ GcomprisWordlist level_words->words = words; wordlist->levels_words = g_slist_append( wordlist->levels_words, level_words); - + node = node->next; } @@ -240,7 +240,7 @@ gc_wordlist_random_word_get(GcomprisWordlist *wordlist, guint level) if(level > wordlist->number_of_level) level = wordlist->number_of_level; - for (list = lev_list; list != NULL; list = list->next) + for (list = lev_list; list != NULL; list = list->next) { LevelWordlist *lw = list->data; @@ -248,12 +248,12 @@ gc_wordlist_random_word_get(GcomprisWordlist *wordlist, guint level) { gchar *word; g_warning("Level : %d", lw->level); - + /* We got the proper level, find a random word */ word = (gchar *)g_slist_nth_data(lw->words, - RAND(0, g_slist_length(lw->words)) + RAND(0, g_slist_length(lw->words)-1) ); - g_warning("returning random word '%s'", (gchar *)word); + g_warning("returning random word '%s'", word); return(g_strdup(word)); } } @@ -278,7 +278,7 @@ gc_wordlist_free(GcomprisWordlist *wordlist) g_free ( wordlist->description); g_free ( wordlist->locale); g_free ( wordlist->name); - + for ( list = wordlist->levels_words; list !=NULL; list=list->next){ LevelWordlist *lw = (LevelWordlist *)list->data; for ( words = lw->words; words !=NULL; words = words->next) diff --git a/tools/check_missing_voices.pl b/tools/check_missing_voices.pl index 06d4317..b10b1fc 100755 --- a/tools/check_missing_voices.pl +++ b/tools/check_missing_voices.pl @@ -51,7 +51,7 @@ foreach my $locale (@LOCALES) { if (! opendir DIR, "$BASEDIR/$locale/$subdir") { - print "cannot open dir $BASEDIR/$locale/$subdir: $!"; + print "cannot open dir $BASEDIR/$locale/$subdir: $!\n"; next; } |