Merge branch 'master' of codecrew.fi:bortal

Conflicts:
	code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/MenuBean.java

code/LanBortalWeb/WebContent/foodmanager/listFoodwaves.xhtml

@@ -29,7 +29,7 @@
 						<h:outputText value="${i18n['foodWave.time']}" />
 					</f:facet>
 					<h:outputText value="#{foodwave.time.time}">
-						<f:convertDateTime pattern="hh:mm d/M/yy" />
+							<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
 					</h:outputText>
 				</p:column>
 				<p:column>

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

@@ -116,7 +116,7 @@ checkout.reject.successMessage = Payment rejected. You can retry payment from yo
 checkout.return.errorDelayed   = Error confirming delayed payment. Please contact code@codecrew.fi
 checkout.return.errorMessage   = Error confirming the successfull return message. Please report this error to code@codecrew.fi 
 checkout.return.successDelayed = Delayed payment successfull. Payment will be confirmed at a later time, usually within a hour.
-checkout.return.successMessage = Payment confirmed. Your products have been paid. You can now move to possible reservation of places.
+checkout.return.successMessage = Payment confirmed. Your products have been paid.
 
 compo.edit                = Edit compo
 compo.saveVotes           = Save votes
@@ -199,7 +199,7 @@ food = Food
 foodWave.accountevents     = Accountevents
 foodWave.billLines         = Pending Online Payments
 foodWave.description       = Description
-foodWave.list              = FoodWave Listing
+foodWave.list              = Active Foodwaves
 foodWave.name              = Foodwave
 foodWave.orders            = Amount of Orders
 foodWave.paid              = Paid

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

@@ -114,7 +114,7 @@ checkout.reject.successMessage = Maksu hyl\u00E4tty. Voit yritt\u00E4\u00E4 maks
 checkout.return.errorDelayed   = Virhe viiv\u00E4stetyn maksun vahvistuksessa. Ota yhteytt\u00E4 code@codecrew.fi
 checkout.return.errorMessage   = Virhe maksun onnistuneen maksun vahvistuksessa. Raportoi t\u00E4m\u00E4 virhe yll\u00E4pidolle: code@codecrew.fi
 checkout.return.successDelayed = Viiv\u00E4stetty maksu onnistunut. Maksu vahvistet\u00E4\u00E4n my\u00F6hemp\u00E4n\u00E4 ajankohtana, yleens\u00E4 noin tunnin sis\u00E4ll\u00E4.
-checkout.return.successMessage = Maksu vahvistettu. Tuotteet on maksettu ja voit siirty\u00E4 varmaan haluamiasi paikkoja.
+checkout.return.successMessage = Maksu vahvistettu. Tuotteet on maksettu. Voit siirty\u00E4 eteenp\u00E4in tilauksessasi.
 
 compo.edit                = Muokkaa compoa
 compo.saveVotes           = Tallenna \u00E4\u00E4net
@@ -197,13 +197,13 @@ food = Ruoka
 foodWave.accountevents     = Maksetut tilaukset
 foodWave.billLines         = Maksamattomat Verkkomaksut
 foodWave.description       = Kuvaus
-foodWave.list              = Ruokatilausten listaus
+foodWave.list              = Aktiviset ruokatilaukset
 foodWave.name              = Ruokatilaus
 foodWave.orders            = Tilausten M\u00E4\u00E4r\u00E4
 foodWave.paid              = Maksettuja
 foodWave.show              = N\u00E4yt\u00E4
-foodWave.template.name     = Template
-foodWave.template.waves    = Foodwaves
+foodWave.template.name     = Tilauspohja
+foodWave.template.waves    = Ruokatilaus
 foodWave.templatename      = Valitse tuotteet
 foodWave.time              = Aika
 foodWave.totalReserved     = Yhteens\u00E4
@@ -231,7 +231,7 @@ foodwaveTemplate.name = Nimi
 
 foodwavetemplate.actions            = Toimet
 foodwavetemplate.addproduct         = Lis\u00E4\u00E4
-foodwavetemplate.basicinfo          = Templeitti
+foodwavetemplate.basicinfo          = Tilauspohja
 foodwavetemplate.createFoodwave     = Luo ruokatilaus
 foodwavetemplate.createwave         = Luo tilauspohja
 foodwavetemplate.description        = Kuvaus