Skip to content

Riina Antikainen / Moya

Go to a project
Commit 8fe675c2 by Tuomas Riihimäki
Options

Fix i18n stuff lost in mergeconflict

1 parent b655de64
Inline Side-by-side
Showing with 3 additions and 0 deletions
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 ...@@ -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! ...@@ -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 ...@@ -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
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!