From: Anže Videnič <anze.videnic@gmail.com>
Date: Tue, 24 May 2016 06:49:13 +0000 (+0200)
Subject: Merges an updated upstream from main.
X-Git-Tag: timetracker_1.19-1~1702^2^2~3
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=11441db31dcbed7b2070e800bcb1b0e6547b86bd;p=timetracker.git

Merges an updated upstream from main.
---

11441db31dcbed7b2070e800bcb1b0e6547b86bd
diff --cc WEB-INF/resources/fi.lang.php
index be0b52d4,b0a022df..d94c3c69
--- a/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',