Merge branch 'master' into next

langs/en/cgi-bin/en.pl

@@ -572,6 +572,7 @@
 'date' => 'Date',
 'date not in logs' => 'No (or only partial) logs exist for the day queried',
 'day' => 'Day',
+'day-graph' => 'Day',
 'day after' => 'Day after',
 'day before' => 'Day before',
 'days' => 'days.',
@@ -929,6 +930,7 @@
 'hosts config added' => 'Hosts config added',
 'hosts config changed' => 'Hosts config changed',
 'hour' => 'Hour',
+'hour-graph' => 'Hour',
 'hours' => 'hours',
 'hours2' => 'Hours',
 'ibod for dual isdn only' => 'iBOD can only be used with Dual ISDN.',
@@ -1207,6 +1209,7 @@
 'modulation' => 'Modulation',
 'monday' => 'Monday',
 'month' => 'Month',
+'month-graph' => 'Month',
 'monthly firewallhits' => 'monthly firewallhits',
 'monthly start day bad' => 'Monthly start day is not correct',
 'monthly traffic bad' => 'Monthly volume is not correct',
@@ -2150,6 +2153,7 @@
 'website' => 'Website',
 'wednesday' => 'Wednesday',
 'week' => 'Week',
+'week-graph' => 'Week',
 'weekly firewallhits' => 'weekly firewallhits',
 'weeks' => 'weeks',
 'wildcards' => 'Wildcards',
@@ -2185,6 +2189,7 @@
 'xtaccess all error' => 'You cannot set an external access to ALL, that is done in the port forwarding record.',
 'xtaccess bad transfert' => 'If you specify a port destination range, the source range must be identical !',
 'year' => 'Year',
+'year-graph' => 'Year',
 'yearly firewallhits' => 'yearly firewallhits',
 'yes' => 'Yes',
 'you can only define one roadwarrior connection when using pre-shared key authentication' => 'You can only define one Roadwarrior connection when using pre-shared key authentication.<br />Either you already have a Roadwarrior connection with pre-shared key authentication, or you\'re trying to add one now.',