Fix i18n stuff lost in mergeconflict

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

@@ -413,17 +413,17 @@ lanEventPrivateProperty.textValue             = Text value
 lanEventPrivateProperty.value                 = Private property value
 lanEventPrivateProperty.value                 = Private property value
 lanEventPrivateProperty.valueIsRawdataWarning = Raw value
 lanEventPrivateProperty.valueIsRawdataWarning = Raw value
 
 
-lanEventProperty.booleanValue          = Boolean value
-lanEventProperty.confirmDelete         = Confirm delete
-lanEventProperty.createProperty        = Create property
-lanEventProperty.defaultValue          = Default value
-lanEventProperty.deleteProperty        = Delete property
-lanEventProperty.editProperty          = Edit property
-lanEventProperty.key                   = Property key
-lanEventProperty.longValue             = Long value
-lanEventProperty.save                  = Save
-lanEventProperty.textValue             = Text value
-lanEventProperty.value                 = Property value
+lanEventProperty.booleanValue   = Boolean value
+lanEventProperty.confirmDelete  = Confirm delete
+lanEventProperty.createProperty = Create property
+lanEventProperty.defaultValue   = Default value
+lanEventProperty.deleteProperty = Delete property
+lanEventProperty.editProperty   = Edit property
+lanEventProperty.key            = Property key
+lanEventProperty.longValue      = Long value
+lanEventProperty.save           = Save
+lanEventProperty.textValue      = Text value
+lanEventProperty.value          = Property value
 
 
 layout.editBottom  = Edit bottom content
 layout.editBottom  = Edit bottom content
 layout.editContent = Edit center content
 layout.editContent = Edit center content
@@ -1163,8 +1163,9 @@ svm.pending.errorMessage        = Unknown error! If payment was successfull, an
 svm.pending.successMessage      = Payment pending. You will receive email after payment verification.
 svm.pending.successMessage      = Payment pending. You will receive email after payment verification.
 svm.success.successMessage      = Payment was successful.
 svm.success.successMessage      = Payment was successful.
 
 
-template.keepaliveError = Page has expired. Please refresh the page.
-template.loggedInAs     = Logged in as
+template.keepaliveError       = Page has expired. Please refresh the page.
+template.keepaliveError.title = View has been expired
+template.loggedInAs           = Logged in as
 
 
 tmp.code         = Code
 tmp.code         = Code
 tmp.yourpmscodes = Your PMS codes
 tmp.yourpmscodes = Your PMS codes

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

@@ -1430,8 +1430,9 @@ svm.pending.successMessage      = Payment pending. You will receive email after
 svm.success.errorMessage        = Payment could not be verified!
 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.loggedInAs     = Logged in as
+template.keepaliveError       = Page has expired. Please refresh the page.
+template.keepaliveError.title = View has been expired
+template.loggedInAs           = Logged in as
 
 
 tmp.code         = Code
 tmp.code         = Code
 tmp.yourpmscodes = Your PMS codes
 tmp.yourpmscodes = Your PMS codes

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

@@ -1417,8 +1417,9 @@ svm.pending.successMessage      = Maksukuittausta odotetaan. Kuittauksesta l\u00
 svm.success.errorMessage        = Verkkomaksua ei voitu verifioida! Virheest\u00E4 on raportoitu eteenp\u00E4in.
 svm.success.errorMessage        = Verkkomaksua ei voitu verifioida! Virheest\u00E4 on raportoitu eteenp\u00E4in.
 svm.success.successMessage      = Verkkomaksu onnistui. 
 svm.success.successMessage      = Verkkomaksu onnistui. 
 
 
-template.keepaliveError = Sivu on vanhentunut. Ole hyv\u00E4 ja p\u00E4ivit\u00E4 sivu.
-template.loggedInAs     = Kirjautunut tunnuksella
+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
 
 
 tmp.code         = Koodi
 tmp.code         = Koodi
 tmp.yourpmscodes = PMS-koodisi
 tmp.yourpmscodes = PMS-koodisi