Merge branch 'i18nfix' into 'master'

I18nfix

Recommit stuff lost in i18n conflict resolution...

See merge request !310

code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n.properties

@@ -1164,6 +1164,7 @@ svm.pending.successMessage      = Payment pending. You will receive email after
 svm.success.successMessage      = Payment was successful.
 svm.success.successMessage      = Payment was successful.
 
 
 template.keepaliveError       = Page has expired. Please refresh the page.
 template.keepaliveError       = Page has expired. Please refresh the page.
+template.keepaliveError.title = View has been expired
 template.loggedInAs           = Logged in as
 template.loggedInAs           = Logged in as
 
 
 tmp.code         = Code
 tmp.code         = Code

code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_en.properties

@@ -1431,6 +1431,7 @@ svm.success.errorMessage        = Payment could not be verified!
 svm.success.successMessage      = Payment was successful.
 svm.success.successMessage      = Payment was successful.
 
 
 template.keepaliveError       = Page has expired. Please refresh the page.
 template.keepaliveError       = Page has expired. Please refresh the page.
+template.keepaliveError.title = View has been expired
 template.loggedInAs           = Logged in as
 template.loggedInAs           = Logged in as
 
 
 tmp.code         = Code
 tmp.code         = Code

code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_fi.properties

@@ -1418,6 +1418,7 @@ svm.success.errorMessage        = Verkkomaksua ei voitu verifioida! Virheest\u00
 svm.success.successMessage      = Verkkomaksu onnistui. 
 svm.success.successMessage      = Verkkomaksu onnistui. 
 
 
 template.keepaliveError       = Sivu on vanhentunut. Ole hyv\u00E4 ja p\u00E4ivit\u00E4 sivu.
 template.keepaliveError       = Sivu on vanhentunut. Ole hyv\u00E4 ja p\u00E4ivit\u00E4 sivu.
+template.keepaliveError.title = N\u00E4kym\u00E4 on vanhentunut
 template.loggedInAs           = Kirjautunut tunnuksella
 template.loggedInAs           = Kirjautunut tunnuksella
 
 
 tmp.code         = Koodi
 tmp.code         = Koodi