Merge branch 'lokalisointia' into 'master'

Lokalisointia

Termien käännösten korjailua

See merge request !308

code/moya-web/WebContent/eventorg/edit.xhtml

@@ -62,11 +62,11 @@
 			</h:form>
 			</h:form>
 
 
 
 
-			<h2>#{i18n['eventorg.createevent']}</h2>
+			<h2>#{i18n['eventorg.createEvent.title']}</h2>
 			<h:form id="createevent">
 			<h:form id="createevent">
 				<h:outputLabel for="createEventName" value="#{i18n['event.name']}" />
 				<h:outputLabel for="createEventName" value="#{i18n['event.name']}" />
 				<h:inputText size="50"  id="createEventName" value="#{eventorgView.eventname}" />
 				<h:inputText size="50"  id="createEventName" value="#{eventorgView.eventname}" />
-				<h:commandButton action="#{eventorgView.createEvent()}" value="#{i18n['eventorg.createEvent']}" />
+				<h:commandButton action="#{eventorgView.createEvent()}" value="#{i18n['eventorg.createEvent.submit']}" />
 			</h:form>
 			</h:form>
 
 
 			<h2>#{i18n['eventorg.events']}</h2>
 			<h2>#{i18n['eventorg.events']}</h2>

code/moya-web/WebContent/shop/editGame.xhtml

@@ -15,7 +15,7 @@
 					<h:outputLabel value="#{i18n['rfidevent.tag']}:" />
 					<h:outputLabel value="#{i18n['rfidevent.tag']}:" />
 					<h:outputText value="#{readerView.rfidevent.tag}" />
 					<h:outputText value="#{readerView.rfidevent.tag}" />
 
 
-					<h:outputLabel value="#{i18n['user.wholename']}:" />
+					<h:outputLabel value="#{i18n['user.wholeName']}:" />
 					<h:outputText value="#{readerView.rfidevent.event.printedCard.user.wholeName}" />
 					<h:outputText value="#{readerView.rfidevent.event.printedCard.user.wholeName}" />
 
 
 					<h:outputLabel value="#{i18n['user.nick']}:" />
 					<h:outputLabel value="#{i18n['user.nick']}:" />