Merges an updated upstream from main.

diff --combined 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
@@@ -44,8 -44,7 +44,7 @@@ $i18n_key_words = array
  'menu.create_team' => 'Luo tiimi',
  'menu.profile' => 'Profiili',
  'menu.time' => 'Tunnit',
- // TODO: translate the following:
- // 'menu.expenses' => 'Expenses',
+ 'menu.expenses' => 'Kulut',
  'menu.reports' => 'Raportit',
  'menu.charts' => 'Kaaviot',
  'menu.projects' => 'Projektit',
@@@ -57,15 -56,12 +56,12 @@@
  'menu.options' => 'Optiot',
  
  // Footer - strings on the bottom of most pages.
- // TODO: translate the following:
- // 'footer.contribute_msg' => 'You can contribute to Time Tracker in different ways.',
+ 'footer.contribute_msg' => 'Voit osallistua Time Tracker -sovelluksen tuotekehitykseen monin tavoin.',
  // 'Credits' is a bit difficult to translate, the exact literal term might be 'Ansiot' or 'Antaa tunnustus' but that's not widely used in this meaning.
  // The term that is used is something like 'We are thanking' ('Kiitämme') but that does not sound good, either. So I just let it be as it was for time being as everybody (?) understands the meaning anyway.
  'footer.credits' => 'Credits',
  'footer.license' => 'Lisenssi',
- // TODO: translate the following:
- // 'footer.improve' => 'Contribute', // Translators: this could mean "Improve", if it makes better sense in your language.
-                                      // This is a link to a webpage that describes how to contribute to the project.
+ 'footer.improve' => 'Osallistu kehitystyöhön',
  
  // Error messages.
  'error.access_denied' => 'Pääsy estetty.',
@@@ -89,8 -85,7 +85,7 @@@
  'error.no_login' => 'Tuntematon käyttäjänimi.',
  'error.no_teams' => 'Tietokanta on tyhjä. Kirjaudu ylläpitäjänä ja luo uusi tiimi.',
  'error.upload' => 'Virhe tiedoston lataus.',
- // TODO: Translate the following:
- // 'error.range_locked' => 'Date range is locked.',
+ 'error.range_locked' => 'Aikaväli on lukittu.',
  'error.mail_send' => 'Virhe postinlähetyksessä.',
  'error.no_email' => 'Käyttäjätunnukseen ei ole liitetty sähköpostiosoitetta.',
  'error.uncompleted_exists' => 'Kesken oleva syötetieto on jo olemassa. Sulje tai poista se.',
@@@ -156,9 -151,6 +151,9 @@@
  'label.cost' => 'Hinta',
  'label.week_total' => 'Viikko yhteensä',
  'label.day_total' => 'Päivä yhteensä',
 +// 'label.month_total' => 'Month total',
 +// 'label.month_left' => 'Time until quota is met',
 +// 'label.month_over' => 'Over monthly quota',
  'label.today' => 'Tänään',
  'label.total_hours' => 'Tunnit yhteensä',
  'label.total_cost' => 'Hinta yhteensä',
@@@ -189,8 -181,7 +184,7 @@@
  'label.role_manager' => '(esimies)',
  'label.role_comanager' => '(apu-esimies)',
  'label.role_admin' => '(ylläpitäjä)',
- // Translate the following string.
- // 'label.page' => 'Page',
+ 'label.page' => 'Sivu',
  // Labels for plugins (extensions to Time Tracker that provide additional features).
  'label.custom_fields' => 'Omat kentät',
  'label.type' => 'Tyyppi',
@@@ -200,13 -191,7 +194,10 @@@
  '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',
@@@ -251,7 -236,6 +242,7 @@@
  'title.add_notification' => 'Ilmoituksen lisäys',
  'title.edit_notification' => 'Ilmoituksen muokkaus',
  'title.delete_notification' => 'Ilmoituksen poisto',
 +// 'title.monthly_quota' => 'Monthly quota',
  'title.export' => 'Tiimitietojen vienti',
  'title.import' => 'Tiimitietojen tunti',
  'title.options' => 'Optiot',
@@@ -264,10 -248,7 +255,7 @@@
  'title.cf_add_dropdown_option' => 'Vaihtoehdon lisäys',
  'title.cf_edit_dropdown_option' => 'Vaihtoehdon muokkaus',
  'title.cf_delete_dropdown_option' => 'Vaihtoehdon poisto',
- // NOTE TO TRANSLATORS: Locking is a feature to lock records from modifications (ex: weekly on Mondays we lock all previous weeks).
- // It is also a name for the Locking plugin on the Team profile page.
- // TODO: Translate the following:
- // 'title.locking' => 'Locking',
+ 'title.locking' => 'Lukitus',
  
  // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
  // Strings that are used in a single form must go to the specific form section.
@@@ -296,7 -277,7 +284,7 @@@
  // Strings that are used on multiple unrelated forms should be placed in shared sections such as label.<stringname>, etc.
  
  // Login form. See example at https://timetracker.anuko.com/login.php.
- 'form.login.forgot_password' => 'Salasana hukassa?',
+ 'form.login.forgot_password' => 'Salasana unohtunut?',
  'form.login.about' =>'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> on yksinkertainen ja helppokäyttöinen vapaan koodin tuntiseurantaohjelmisto.',
  
  // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.

diff --combined WEB-INF/resources/nl.lang.php
index e3862ad,e2a9dd0..167bb29
--- 1/WEB-INF/resources/nl.lang.php
--- 2/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@@ -86,8 -86,7 +86,7 @@@ $i18n_key_words = array
  'error.no_login' => 'Een medewerker met deze inlognaam bestaat niet.',
  'error.no_teams' => 'Uw database is leeg. Meld je aan als admin en maak een nieuw team.',
  'error.upload' => 'Fout bij het uploaden van het bestand.',
- // TODO: Translate the following:
- // 'error.range_locked' => 'Date range is locked.',
+ 'error.range_locked' => 'Datums zijn geblokkeerd.',
  'error.mail_send' => 'Fout bij het versturen van een e-mailbericht.',
  'error.no_email' => 'Geen e-mailadres bekend voor dit account.',
  'error.uncompleted_exists' => 'Niet afgeronde invoer bestaat al. Sluit of verwijder deze.',
@@@ -153,9 -152,6 +152,9 @@@
  'label.cost' => 'Kosten',
  'label.week_total' => 'Week totaal',
  'label.day_total' => 'Dag totaal',
 +// 'label.month_total' => 'Month total',
 +// 'label.month_left' => 'Time until quota is met',
 +// 'label.month_over' => 'Over monthly quota',
  'label.today' => 'Vandaag',
  'label.total_hours' => 'Uren totaal',
  'label.total_cost' => 'Totale kosten',
@@@ -196,9 -192,6 +195,9 @@@
  'label.fav_report' => 'Standaard rapport',
  'label.cron_schedule' => 'Cron schema',
  'label.what_is_it' => 'Wat betekent dit?',
 +// 'label.year' => 'Year',
 +// 'label.month' => 'Month',
 +// 'label.quota' => 'Quota',
  
  // Form titles.
  'title.login' => 'Aanmelden',
@@@ -244,7 -237,6 +243,7 @@@
  'title.add_notification' => 'Notificatie toevoegen',
  'title.edit_notification' => 'Notificatie bewerken',
  'title.delete_notification' => 'Notificatie verwijderen',
 +// 'title.monthly_quota' => 'Monthly quota',
  'title.export' => 'Exporteer teamgegevens',
  'title.import' => 'Importeer teamgegevens',
  'title.options' => 'Opties',
@@@ -257,10 -249,7 +256,7 @@@
  'title.cf_add_dropdown_option' => 'Uitvouwmogelijkheid toevoegen',
  'title.cf_edit_dropdown_option' => 'Uitvouwmogelijkheid bewerken',
  'title.cf_delete_dropdown_option' => 'Uitvouwmogelijkheid verwijderen',
- // NOTE TO TRANSLATORS: Locking is a feature to lock records from modifications (ex: weekly on Mondays we lock all previous weeks).
- // It is also a name for the Locking plugin on the Team profile page.
- // TODO: Translate the following:
- // 'title.locking' => 'Locking',
+ 'title.locking' => 'Blokkeren',
  
  // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here.
  // Strings that are used in a single form must go to the specific form section.