Merge branch 'master' of codecrew.fi:bortal

Conflicts:
	code/LanBortalWeb/WebContent/foodadmin/createTemplate.xhtml

code/LanBortalWeb/WebContent/foodadmin/createTemplate.xhtml

@@ -94,7 +94,7 @@
 									</f:facet>
 									</f:facet>
 								</p:cellEditor>
 								</p:cellEditor>
 							</p:column>
 							</p:column>
-							<p:column headerText="#{i18n['foodwavetemplate.edit']}" style="width:50px">
+							<p:column headerText="#{i18n['foodwavetemplate.editRow']}" style="width:20px">
 								<p:rowEditor />
 								<p:rowEditor />
 							</p:column>
 							</p:column>
 							<p:column headerText="#{i18n['foodwavetemplate.actions']}" style="width:20px;">
 							<p:column headerText="#{i18n['foodwavetemplate.actions']}" style="width:20px;">

code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_en.properties

@@ -190,6 +190,22 @@ foodWave.time          = Time
 foodshop.buyFromCounter  = Pay at info
 foodshop.buyFromCounter  = Pay at info
 foodshop.buyFromInternet = Pay at Internet
 foodshop.buyFromInternet = Pay at Internet
 
 
+foodwave.template.basicinfo         = Template Information
+foodwave.template.edit.title        = Foodwave Template Editor
+foodwave.template.selectproducts    = Products
+
+foodwavetemplate.actions            = Actions
+foodwavetemplate.addproduct         = Add
+foodwavetemplate.basicinfo          = Template
+foodwavetemplate.description        = Description
+foodwavetemplate.editRow            = Edit
+foodwavetemplate.name               = Name
+foodwavetemplate.price              = Price
+foodwavetemplate.productdescription = Description
+foodwavetemplate.productname        = Name
+foodwavetemplate.removeFromList     = Remove
+foodwavetemplate.selectproducts     = Products
+
 game.gamepoints = Game points
 game.gamepoints = Game points
 
 
 gamepoints = Gamepoints
 gamepoints = Gamepoints

code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_fi.properties

@@ -188,6 +188,22 @@ foodWave.time          = Aika
 foodshop.buyFromCounter  = Maksa infossa
 foodshop.buyFromCounter  = Maksa infossa
 foodshop.buyFromInternet = Maksa Internetiss\u00E4
 foodshop.buyFromInternet = Maksa Internetiss\u00E4
 
 
+foodwave.template.basicinfo         = Template Infot
+foodwave.template.edit.title        = Foodwave Template Editori
+foodwave.template.selectproducts    = Tuotteet
+
+foodwavetemplate.actions            = Toimet
+foodwavetemplate.addproduct         = Lis\u00E4\u00E4
+foodwavetemplate.basicinfo          = Templeitti
+foodwavetemplate.description        = Kuvaus
+foodwavetemplate.editRow            = Muokkaa
+foodwavetemplate.name               = Nimi
+foodwavetemplate.price              = Hinta
+foodwavetemplate.productdescription = Kuvaus
+foodwavetemplate.productname        = Nimi\r\n
+foodwavetemplate.removeFromList     = Poista
+foodwavetemplate.selectproducts     = Tuotteet
+
 game.gamepoints = Insomnia Game pisteet:
 game.gamepoints = Insomnia Game pisteet:
 
 
 gamepoints = Pelipisteit\u00E4
 gamepoints = Pelipisteit\u00E4