Merges an updated upstream from main.

diff --cc WEB-INF/resources/fi.lang.php
index be0b52d,b0a022d..d94c3c6
--- 1/WEB-INF/resources/fi.lang.php
--- 2/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@@ -200,13 -191,7 +194,10 @@@ $i18n_key_words = array
  'label.fav_report' => 'Raporttipohja',
  'label.cron_schedule' => 'Cron-ajoitus',
  'label.what_is_it' => 'Mikä se on?',
 +// 'label.year' => 'Year',
 +// 'label.month' => 'Month',
 +// 'label.quota' => 'Quota',
  
- // TODO? missing?
- 'label.page' => 'Sivu',
- 
  // Form titles.
  'title.login' => 'Kirjautuminen',
  'title.teams' => 'Tiimit',

diff --cc WEB-INF/resources/nl.lang.php
Simple merge