Merge remote-tracking branch 'football/master'

# Conflicts:
#	acp/matches_module.php
#	adm/style/acp_football_leagues.html
#	adm/style/acp_football_matches.html
#	block/all_bets.php
#	block/rank_matchday.php
#	block/ranks_total.php
#	config/services.yml
#	controller/main.php
#	event/main_listener.php
#	includes/constants.php
#	includes/functions.php
#	language/de/football.php
#	language/de/info_acp_leagues.php
#	language/de/info_acp_matches.php
#	styles/prosilver/template/all_bets.html
#	styles/prosilver/template/results.html
#	styles/prosilver/template/table.html
#	styles/prosilver/theme/football.css

language/en/email/footb_board_remember.txt

@@ -1,10 +1,10 @@
-
-Hallo {SITENAME},
-the following users have received a reminder e-mail:
-
-{REMEMBER_LIST}
-
-
-Link to {SITENAME}: {U_BOARD}.
-
-{EMAIL_SIG}
+
+Hallo {SITENAME},
+the following users have received a reminder e-mail:
+
+{REMEMBER_LIST}
+
+
+Link to {SITENAME}: {U_BOARD}.
+
+{EMAIL_SIG}

language/en/email/footb_send_remember.txt

@@ -1,10 +1,10 @@
-
-Hallo {USERNAME},
-you have not yet bet {MATCHDAY}. matchday.
-Please bet until {LEAGUE} delivery {DELIVERY}.
-
- 
-Link to {SITENAME}: {U_BOARD}.
-
-
-{EMAIL_SIG}
+
+Hallo {USERNAME},
+you have not yet bet {MATCHDAY}. matchday.
+Please bet until {LEAGUE} delivery {DELIVERY}.
+
+ 
+Link to {SITENAME}: {U_BOARD}.
+
+
+{EMAIL_SIG}

language/en/football.php

@@ -43,8 +43,6 @@ $lang = array_merge($lang, array(
 	'FOOTB_REM_F_EXPLAIN'			=> 'Send reminder to your first email address, if you should not have bet?',
 	'FOOTB_REM_S'					=> 'Send Prediction League reminder to second email adress',
 	'FOOTB_REM_S_EXPLAIN'			=> 'Send reminder to your second email address, if you should not have bet?',
-	'YES'							=> 'Ja',
-	'NO'							=> 'Nein',
 
 	'ADD_NEW_TEAM'						=> 'The team was added to the WebTip. ',
 	'ALL_BETS'							=> 'All bets',
@@ -225,6 +223,7 @@ $lang = array_merge($lang, array(
 	'NO_BETS_SAVED'						=> 'No bets saved!',
 	'NO_CHANGES'						=> 'No changes',
 	'NO_DATA'							=> 'No data available!',
+	'NO_GUEST_VIEW'						=> 'Guests are not allowed to view the prediction league. ',
 	'NO_GUESTTEAM'						=> 'The guest team chosen by you does not exist. ',
 	'NO_HIST'							=> 'No previous comparisons exist for these two teams in the database. ',
 	'NO_HOMEMATCHES_TEAM'				=> 'This team has not played at home this season yet. ',
@@ -330,6 +329,8 @@ $lang = array_merge($lang, array(
 	'RULES_EXPLAIN'						=> 'Here are only the technical basic conditions of this WebTip listed. ',
 	'SAMESAVED'							=> 'Your %d Granny-bets were saved successfully! A bet was automatically modified. ',
 	'SAVE'								=> 'Save',
+	'SAVE_PREDICTION'					=> 'Save prediction',
+	'SAVE_RESULTS'						=> 'Save results',
 	'SCORED'							=> 'Scored',
 	'SEASON'							=> 'Season',
 	'SEC_LEG_ERROR'						=> 'Second leg does not exist',

language/en/info_acp_update.php

@@ -81,6 +81,7 @@ $lang = array_merge($lang, array(
 	'INSERT_TEAMS'							=> 'Insert new teams',
 	'LEAGUE_SHORTCUT'						=> 'League shortcut',
 	'LOAD'									=> 'load',
+	'LOG_FOOTB_UPDATE'						=> '<strong>Football Prediction League fixure list update</strong><br />» %s',
 	'MAP_TEAMS'								=> 'Map teams',
 	'MATCH_OF_GROUP'						=> 'Match on group',
 	'MATCHES'								=> 'Matches',