diff --git a/po/Makefile.in b/po/Makefile.in index fc60de2f..82ca89a3 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -39,7 +39,7 @@ MKINSTALLDIRS = $(top_srcdir)/./mkinstalldirs CC = gcc GENCAT = @GENCAT@ -GMSGFMT = /usr/bin/gmsgfmt +GMSGFMT = /usr/bin/msgfmt MSGFMT = /usr/bin/msgfmt MSGFMT_OPTS = -c XGETTEXT = /usr/bin/xgettext diff --git a/support_files/bygfoot.conf b/support_files/bygfoot.conf index 2c03f81a..62731436 100644 --- a/support_files/bygfoot.conf +++ b/support_files/bygfoot.conf @@ -1,10 +1,10 @@ -int_opt_confirm_quit 0 -int_opt_confirm_unfit 0 +int_opt_confirm_quit 1 +int_opt_confirm_unfit 1 int_opt_save_will_overwrite 0 int_opt_maximize_main_window 1 -int_opt_prefer_messages 0 -int_opt_progressbar_pics 0 -int_opt_skip 1 +int_opt_prefer_messages 1 +int_opt_progressbar_pics 1 +int_opt_skip 0 int_opt_autosave 1 int_opt_autosave_interval 5 int_opt_autosave_files 5 @@ -19,9 +19,8 @@ string_opt_language_code int_opt_calodds 0 int_opt_load_defs 1 int_opt_randomise_teams 0 - int_opt_news_create_user 1 int_opt_news_create_cup 1 int_opt_news_create_league 1 int_opt_news_show_recent 0 -int_opt_news_popup 0 +int_opt_news_popup 1 diff --git a/support_files/definitions/north_america/mexico/league_mexico1.xml b/support_files/definitions/north_america/mexico/league_mexico1.xml index 1427d909..79303ec8 100644 --- a/support_files/definitions/north_america/mexico/league_mexico1.xml +++ b/support_files/definitions/north_america/mexico/league_mexico1.xml @@ -7,7 +7,7 @@ 1 1 1 - 7700 + 7400 3 2 latinoamerica diff --git a/support_files/definitions/north_america/mexico/league_mexico2.xml b/support_files/definitions/north_america/mexico/league_mexico2.xml index 987ca84d..ecc31a9c 100644 --- a/support_files/definitions/north_america/mexico/league_mexico2.xml +++ b/support_files/definitions/north_america/mexico/league_mexico2.xml @@ -7,7 +7,7 @@ 2 1 1 - 7000 + 6700 3 2 latinoamerica diff --git a/support_files/definitions/north_america/mexico/league_mexico3-1.xml b/support_files/definitions/north_america/mexico/league_mexico3-1.xml index b6303d72..1e9148f7 100644 --- a/support_files/definitions/north_america/mexico/league_mexico3-1.xml +++ b/support_files/definitions/north_america/mexico/league_mexico3-1.xml @@ -7,7 +7,7 @@ 3 3 1 - 6200 + 6000 3 2 latinoamerica diff --git a/support_files/definitions/north_america/mexico/league_mexico3-2.xml b/support_files/definitions/north_america/mexico/league_mexico3-2.xml index 293de44d..897df52d 100644 --- a/support_files/definitions/north_america/mexico/league_mexico3-2.xml +++ b/support_files/definitions/north_america/mexico/league_mexico3-2.xml @@ -7,7 +7,7 @@ 3 5 1 - 6200 + 6000 3 2 latinoamerica diff --git a/support_files/definitions/north_america/mexico/league_mexico3-3.xml b/support_files/definitions/north_america/mexico/league_mexico3-3.xml index 94246b96..143b0c24 100644 --- a/support_files/definitions/north_america/mexico/league_mexico3-3.xml +++ b/support_files/definitions/north_america/mexico/league_mexico3-3.xml @@ -7,7 +7,7 @@ 3 1 1 - 6200 + 6000 3 2 latinoamerica diff --git a/support_files/definitions/north_america/mexico/league_mexico3-4.xml b/support_files/definitions/north_america/mexico/league_mexico3-4.xml index e20e883d..a0a6fc64 100644 --- a/support_files/definitions/north_america/mexico/league_mexico3-4.xml +++ b/support_files/definitions/north_america/mexico/league_mexico3-4.xml @@ -7,7 +7,7 @@ 3 3 1 - 6200 + 6000 3 2 latinoamerica diff --git a/support_files/definitions/north_america/mexico/league_mexico3-5.xml b/support_files/definitions/north_america/mexico/league_mexico3-5.xml index 866db1c1..0e2499e8 100644 --- a/support_files/definitions/north_america/mexico/league_mexico3-5.xml +++ b/support_files/definitions/north_america/mexico/league_mexico3-5.xml @@ -7,7 +7,7 @@ 3 5 1 - 6200 + 6000 3 2 latinoamerica diff --git a/support_files/definitions/north_america/usa/league_usa_econf.xml b/support_files/definitions/north_america/usa/league_usa_econf.xml index 0cc749c3..ea4cff69 100644 --- a/support_files/definitions/north_america/usa/league_usa_econf.xml +++ b/support_files/definitions/north_america/usa/league_usa_econf.xml @@ -6,7 +6,7 @@ flag_usa.png 1 1 - 8700 + 7600 1 4 5 diff --git a/support_files/definitions/north_america/usa/league_usa_first.xml b/support_files/definitions/north_america/usa/league_usa_first.xml index 1921918b..c0530b8e 100644 --- a/support_files/definitions/north_america/usa/league_usa_first.xml +++ b/support_files/definitions/north_america/usa/league_usa_first.xml @@ -6,7 +6,7 @@ flag_usa.png 3 1 - 7900 + 6800 2 2 7 diff --git a/support_files/definitions/north_america/usa/league_usa_mls.xml b/support_files/definitions/north_america/usa/league_usa_mls.xml index daa6e489..71c91a8b 100644 --- a/support_files/definitions/north_america/usa/league_usa_mls.xml +++ b/support_files/definitions/north_america/usa/league_usa_mls.xml @@ -6,7 +6,7 @@ flag_usa.png 1 1 - 8700 + 7600 1 3 7 diff --git a/support_files/definitions/north_america/usa/league_usa_pdl_gl.xml b/support_files/definitions/north_america/usa/league_usa_pdl_gl.xml index 21ba649d..4f5e73a4 100644 --- a/support_files/definitions/north_america/usa/league_usa_pdl_gl.xml +++ b/support_files/definitions/north_america/usa/league_usa_pdl_gl.xml @@ -6,7 +6,7 @@ flag_usa.png 7 1 - 5550 + 6100 4 2 11 diff --git a/support_files/definitions/north_america/usa/league_usa_pdl_hl.xml b/support_files/definitions/north_america/usa/league_usa_pdl_hl.xml index 00c82d47..dc58b7ad 100644 --- a/support_files/definitions/north_america/usa/league_usa_pdl_hl.xml +++ b/support_files/definitions/north_america/usa/league_usa_pdl_hl.xml @@ -6,7 +6,7 @@ flag_usa.png 7 1 - 5550 + 6100 4 2 11 diff --git a/support_files/definitions/north_america/usa/league_usa_pdl_ma.xml b/support_files/definitions/north_america/usa/league_usa_pdl_ma.xml index 6e3e21bc..12b9703b 100644 --- a/support_files/definitions/north_america/usa/league_usa_pdl_ma.xml +++ b/support_files/definitions/north_america/usa/league_usa_pdl_ma.xml @@ -6,7 +6,7 @@ flag_usa.png 7 1 - 5550 + 6100 4 2 5 diff --git a/support_files/definitions/north_america/usa/league_usa_pdl_ms.xml b/support_files/definitions/north_america/usa/league_usa_pdl_ms.xml index d532271a..7f456198 100644 --- a/support_files/definitions/north_america/usa/league_usa_pdl_ms.xml +++ b/support_files/definitions/north_america/usa/league_usa_pdl_ms.xml @@ -6,7 +6,7 @@ flag_usa.png 7 1 - 5550 + 6100 4 2 11 diff --git a/support_files/definitions/north_america/usa/league_usa_pdl_ne.xml b/support_files/definitions/north_america/usa/league_usa_pdl_ne.xml index ffe99138..62cdc275 100644 --- a/support_files/definitions/north_america/usa/league_usa_pdl_ne.xml +++ b/support_files/definitions/north_america/usa/league_usa_pdl_ne.xml @@ -6,7 +6,7 @@ flag_usa.png 7 1 - 5550 + 6100 4 3 5 diff --git a/support_files/definitions/north_america/usa/league_usa_pdl_no.xml b/support_files/definitions/north_america/usa/league_usa_pdl_no.xml index b9fd2d10..53307435 100644 --- a/support_files/definitions/north_america/usa/league_usa_pdl_no.xml +++ b/support_files/definitions/north_america/usa/league_usa_pdl_no.xml @@ -6,7 +6,7 @@ flag_usa.png 7 1 - 5550 + 6100 4 2 10 diff --git a/support_files/definitions/north_america/usa/league_usa_pdl_nw.xml b/support_files/definitions/north_america/usa/league_usa_pdl_nw.xml index 427827df..c17b9708 100644 --- a/support_files/definitions/north_america/usa/league_usa_pdl_nw.xml +++ b/support_files/definitions/north_america/usa/league_usa_pdl_nw.xml @@ -6,7 +6,7 @@ flag_usa.png 7 1 - 5550 + 6100 4 2 11 diff --git a/support_files/definitions/north_america/usa/league_usa_pdl_sa.xml b/support_files/definitions/north_america/usa/league_usa_pdl_sa.xml index 7a61fd3a..0563a1f7 100644 --- a/support_files/definitions/north_america/usa/league_usa_pdl_sa.xml +++ b/support_files/definitions/north_america/usa/league_usa_pdl_sa.xml @@ -6,7 +6,7 @@ flag_usa.png 7 1 - 5550 + 6100 4 3 5 diff --git a/support_files/definitions/north_america/usa/league_usa_pdl_se.xml b/support_files/definitions/north_america/usa/league_usa_pdl_se.xml index fef26dd5..e06b70d1 100644 --- a/support_files/definitions/north_america/usa/league_usa_pdl_se.xml +++ b/support_files/definitions/north_america/usa/league_usa_pdl_se.xml @@ -6,7 +6,7 @@ flag_usa.png 7 1 - 5550 + 6100 4 2 10 diff --git a/support_files/definitions/north_america/usa/league_usa_pdl_sw.xml b/support_files/definitions/north_america/usa/league_usa_pdl_sw.xml index 26252c7d..ebebc3c6 100644 --- a/support_files/definitions/north_america/usa/league_usa_pdl_sw.xml +++ b/support_files/definitions/north_america/usa/league_usa_pdl_sw.xml @@ -6,7 +6,7 @@ flag_usa.png 7 1 - 5550 + 6100 4 2 5 diff --git a/support_files/definitions/north_america/usa/league_usa_second.xml b/support_files/definitions/north_america/usa/league_usa_second.xml index e47e9894..451330bd 100644 --- a/support_files/definitions/north_america/usa/league_usa_second.xml +++ b/support_files/definitions/north_america/usa/league_usa_second.xml @@ -6,7 +6,7 @@ flag_usa.png 3 1 - 6600 + 6500 3 2 13 diff --git a/support_files/definitions/north_america/usa/league_usa_wconf.xml b/support_files/definitions/north_america/usa/league_usa_wconf.xml index b6b7b0d7..591a7e20 100644 --- a/support_files/definitions/north_america/usa/league_usa_wconf.xml +++ b/support_files/definitions/north_america/usa/league_usa_wconf.xml @@ -6,7 +6,7 @@ flag_usa.png 1 1 - 8700 + 7600 1 6 27 diff --git a/support_files/news/news_en.xml b/support_files/news/news_en.xml index ae3a4fcd..9ed70e12 100644 --- a/support_files/news/news_en.xml +++ b/support_files/news/news_en.xml @@ -91,7 +91,7 @@ _TL_ remain luckless in league games _TW_ seem invincible in league matches Since _WON_TWN__ matches, _TW_ hammer every opponent. - _TW_ just too strong for _TL_, wins _REW_. + _TW_ just too strong for _TL_, win _REW_. _AT_ spectators watch their team win at home. _AT_ spectators celebrate the win against _TL_. _AT_ spectators commiserate with _TL_. @@ -400,7 +400,7 @@ _CUPMATCHWINNER_ through to the next round _CUPMATCHWINNER_ advances _CUPMATCHLOSER_ eliminated - _CUPMATCHLOSER_ is out + _CUPMATCHLOSER_ are out _TW_ [beat|overcome|defeat] _TL_ in extra time _TW_ victorious in extra time _TW_ [beat|overcome|defeat] _TL_ _REW_ in penalties @@ -431,7 +431,7 @@ _CUPMATCHWINNER_ should give _SCORERS_CUPMATCHWINNERN__ a medal for shooting them into the next round. _SCORERS_CUPMATCHWINNERN__ score as _CUPMATCHWINNER_ squeezes by _CUPMATCHLOSER_. _CUPMATCHWINNER_ didn't face a real challenge in this match-up and deserve to advance. - _CUPMATCHLOSER_ didn't stand a chance overall and is out. + _CUPMATCHLOSER_ didn't stand a chance overall and are out. _CUPMATCHWINNER_ dominated this match-up and are still a contender for the title. @@ -442,7 +442,7 @@ _CUPMATCHWINNER_ through to the next round _CUPMATCHWINNER_ advances _CUPMATCHLOSER_ eliminated - _CUPMATCHLOSER_ is out + _CUPMATCHLOSER_ are out _TW_ [beat|overcome|defeat] _TL_ in extra time _TW_ victorious in extra time _TW_ [beat|overcome|defeat] _TL_ _REW_ in penalties @@ -465,7 +465,7 @@ _CUPMATCHWINNER_ should give _SCORERS_CUPMATCHWINNERN__ a medal for shooting them into the next round. _SCORERS_CUPMATCHWINNERN__ score as _CUPMATCHWINNER_ squeeze by _CUPMATCHLOSER_. _CUPMATCHWINNER_ didn't face a real challenge in this match-up and deserves to advance. - _CUPMATCHLOSER_ didn't stand a chance in this game and is out. + _CUPMATCHLOSER_ didn't stand a chance in this game and are out. _CUPMATCHWINNER_ dominated this match-up and are still a contender for the title.