Merge branch 'master' of codecrew.fi:bortal

.gitignore

@@ -5,3 +5,5 @@
 /code/LanBortalDatabase/src/fi/insomnia/bortal/model/*_.java
 /code/LanBortalDatabase/src/fi/insomnia/bortal/model/*/*_.java
 *~
+.metadata
+code/LanBortal/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/FoodWaveBean.java

@@ -7,7 +7,9 @@ import javax.annotation.security.RolesAllowed;
 import javax.ejb.EJB;
 import javax.ejb.Stateless;
 
+import sun.reflect.generics.reflectiveObjects.NotImplementedException;
 import fi.insomnia.bortal.enums.apps.ShopPermission;
+import fi.insomnia.bortal.facade.FoodWaveFacade;
 import fi.insomnia.bortal.facade.FoodWaveTemplateFacade;
 import fi.insomnia.bortal.model.FoodWave;
 import fi.insomnia.bortal.model.FoodWaveTemplate;
@@ -22,6 +24,9 @@ public class FoodWaveBean implements FoodWaveBeanLocal {
 	@EJB
 	private FoodWaveTemplateFacade fwtFacade;
 
+	@EJB
+	private FoodWaveFacade foodWaveFacade;
+
 	@Override
 	@RolesAllowed(ShopPermission.S_MANAGE_PRODUCTS)
 	public List<FoodWaveTemplate> getTemplates() {
@@ -31,20 +36,44 @@ public class FoodWaveBean implements FoodWaveBeanLocal {
 	@Override
 	@RolesAllowed(ShopPermission.S_MANAGE_PRODUCTS)
 	public FoodWaveTemplate saveOrCreateTemplate(FoodWaveTemplate template) {
-		// TODO Auto-generated method stub
-		return null;
+		if (template.getId() == null)
+		{
+			fwtFacade.create(template);
+		} else {
+			template = fwtFacade.merge(template);
+		}
+		return template;
 	}
 
 	@Override
 	public List<FoodWave> findShoppableFoodwaves() {
-		// TODO Auto-generated method stub
-		return null;
+		throw new NotImplementedException();
 	}
 
 	@Override
+	@RolesAllowed("SHOP/READ")
+	public List<FoodWave> getOpenFoodWaves() {
+		return foodWaveFacade.getOpenFoodWaves();
+	}
+
 	public FoodWave findFoodwave(Integer foodwaveId) {
-		// TODO Auto-generated method stub
-		return null;
+		return foodWaveFacade.find(foodwaveId);
+	}
+
+	@Override
+	public FoodWaveTemplate saveTemplate(FoodWaveTemplate waveTemplate) {
+		throw new UnsupportedOperationException("would you mind to implement this method?");
+
+	}
+
+	@Override
+	public FoodWave merge(FoodWave foodWave) {
+		return foodWaveFacade.merge(foodWave);
+	}
+
+	@Override
+	public FoodWaveTemplate findTemplate(Integer templateId) {
+		return fwtFacade.find(templateId);
 	}
 
 }

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

@@ -109,6 +109,10 @@ public class MenuBean implements MenuBeanLocal {
 		shopTopmenu.addPage(menuitemfacade.findOrCreate("/checkout/delayed"), null).setVisible(false);
 		shopTopmenu.addPage(menuitemfacade.findOrCreate("/checkout/reject"), null).setVisible(false);
 		shopTopmenu.addPage(menuitemfacade.findOrCreate("/checkout/return"), null).setVisible(false);
+		
+		MenuNavigation foodwaveTopmenu = usernavi.addPage(null, null);
+		foodwaveTopmenu.setKey("topnavi.foodwave");
+		foodwaveTopmenu.addPage(menuitemfacade.findOrCreate("/foodwave/list"), BillPermission.VIEW_OWN);
 
 		MenuNavigation pollTopmenu = usernavi.addPage(null, null);
 		pollTopmenu.setKey("topnavi.poll");

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/FoodWaveFacade.java

 package fi.insomnia.bortal.facade;
 
+import java.util.Calendar;
+import java.util.List;
+
+import javax.ejb.EJB;
 import javax.ejb.LocalBean;
 import javax.ejb.Stateless;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Root;
 
+import fi.insomnia.bortal.beans.EventBeanLocal;
 import fi.insomnia.bortal.model.FoodWave;
+import fi.insomnia.bortal.model.FoodWaveTemplate_;
+import fi.insomnia.bortal.model.FoodWave_;
+import fi.insomnia.bortal.model.OrgRole_;
 
 @Stateless
 @LocalBean
 public class FoodWaveFacade extends IntegerPkGenericFacade<FoodWave> {
-
+	@EJB
+	EventBeanLocal eventBean;
+	
+	
 	public FoodWaveFacade() {
-
 		super(FoodWave.class);
 	}
+	
+	
+	public List<FoodWave> getOpenFoodWaves() {
+		
+		CriteriaBuilder cb = getEm().getCriteriaBuilder();
+		CriteriaQuery<FoodWave> cq = cb.createQuery(FoodWave.class);
+		Root<FoodWave> root = cq.from(FoodWave.class);
+		cq.where(cb.greaterThan(root.get(FoodWave_.time), Calendar.getInstance()),
+				cb.isFalse(root.get(FoodWave_.closed)),
+				cb.equal(root.get(FoodWave_.template).get(FoodWaveTemplate_.event), eventBean.getCurrentEvent())
+				);
+		
+		
+		return getEm().createQuery(cq).getResultList();
+	}
 
 }

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/FoodWaveTemplateFacade.java

@@ -25,12 +25,25 @@ public class FoodWaveTemplateFacade extends IntegerPkGenericFacade<FoodWaveTempl
 		super(FoodWaveTemplate.class);
 	}
 
-	public List<FoodWaveTemplate> findAllTemplates() {
+	public List<FoodWaveTemplate> findAllTemplates() {	
 		CriteriaBuilder cb = getEm().getCriteriaBuilder();
 		CriteriaQuery<FoodWaveTemplate> cq = cb.createQuery(FoodWaveTemplate.class);
 		Root<FoodWaveTemplate> root = cq.from(FoodWaveTemplate.class);
-		cb.equal(root.get(FoodWaveTemplate_.event), eventbean.getCurrentEvent());
+		cq.where(cb.equal(root.get(FoodWaveTemplate_.event), eventbean.getCurrentEvent()));
 		return getEm().createQuery(cq).getResultList();
 	}
 
+	@Override
+	public FoodWaveTemplate find(Integer id)
+	{
+		CriteriaBuilder cb = getEm().getCriteriaBuilder();
+		CriteriaQuery<FoodWaveTemplate> cq = cb.createQuery(FoodWaveTemplate.class);
+		Root<FoodWaveTemplate> root = cq.from(FoodWaveTemplate.class);
+		cq.where(cb.equal(root.get(FoodWaveTemplate_.event), eventbean.getCurrentEvent()),
+				cb.equal(root.get(FoodWaveTemplate_.id), id)
+				);
+		return super.getSingleNullableResult(getEm().createQuery(cq));
+
+	}
+
 }

code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/FoodWaveBeanLocal.java

@@ -16,6 +16,13 @@ public interface FoodWaveBeanLocal {
 
 	List<FoodWave> findShoppableFoodwaves();
 
-	FoodWave findFoodwave(Integer foodwaveId);
+    FoodWaveTemplate saveTemplate(FoodWaveTemplate waveTemplate);
+    
+    List<FoodWave> getOpenFoodWaves();
 
+	FoodWaveTemplate findTemplate(Integer templateId);
+
+    public FoodWave findFoodwave(Integer foodwaveId);
+
+	public FoodWave merge(FoodWave foodWave);
 }

code/LanBortalDatabase/src/fi/insomnia/bortal/model/AccountEvent.java

@@ -60,6 +60,9 @@ public class AccountEvent extends GenericEntity {
     @Temporal(TemporalType.TIMESTAMP)
     private Calendar delivered;
 
+    @Column(name = "delivered_count", nullable = false, precision = 24, scale = 4)
+    private BigDecimal deliveredCount;
+
     /**
      * If this AccountEvent is a product in foodwace, this field is a reference
      * to that foodwave.
@@ -219,4 +222,12 @@ public class AccountEvent extends GenericEntity {
         this.description = description;
     }
 
+    public BigDecimal getDeliveredCount() {
+        return deliveredCount;
+    }
+
+    public void setDeliveredCount(BigDecimal deliveredCount) {
+        this.deliveredCount = deliveredCount;
+    }
+
 }

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Bill.java

@@ -336,6 +336,10 @@ public class Bill extends GenericEntity {
     }
 
     public void addProduct(Product product, BigDecimal count) {
+        this.addProduct(product, count, null);
+    }
+    
+    public void addProduct(Product product, BigDecimal count, FoodWave foodwave) {
         // If bill number > 0 bill has been sent and extra privileges are needed
         // to modify.
         // if (!iscurrent || billnr != null) {
@@ -346,7 +350,7 @@ public class Bill extends GenericEntity {
         if (this.billLines == null) {
             billLines = new ArrayList<BillLine>();
         }
-        this.getBillLines().add(new BillLine(this, product, count));
+        this.getBillLines().add(new BillLine(this, product, count, foodwave));
 
         for (Discount disc : product.getActiveDiscounts(count, sentDate)) {
 

code/LanBortalDatabase/src/fi/insomnia/bortal/model/BillLine.java

@@ -13,7 +13,6 @@ import javax.persistence.Entity;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToOne;
-import javax.persistence.OrderBy;
 import javax.persistence.Table;
 
 import org.eclipse.persistence.annotations.OptimisticLocking;
@@ -70,9 +69,12 @@ public class BillLine extends GenericEntity {
 
     @JoinColumn(name = "lineProduct_id", referencedColumnName = "id", nullable = true, updatable = false)
     @OneToOne
-    @OrderBy("id")
     private Product lineProduct;
 
+    @OneToOne
+    @JoinColumn(name = "foodwave_id", referencedColumnName = "id", nullable = true, updatable = false)
+    private FoodWave foodwave;
+
     /**
      * Calculate the total price for the items on this line
      * 
@@ -100,7 +102,12 @@ public class BillLine extends GenericEntity {
         super();
     }
 
+    
     public BillLine(Bill bill2, Product product, BigDecimal count) {
+        this(bill2, product, count, null);
+    }
+    
+    public BillLine(Bill bill2, Product product, BigDecimal count, FoodWave foodwave) {      
         super();
         this.bill = bill2;
         this.lineProduct = product;
@@ -109,8 +116,20 @@ public class BillLine extends GenericEntity {
         this.setQuantity(count);
         this.setUnitPrice(product.getPrice().abs());
         this.setVat(product.getVat());
+        this.setFoodwave(foodwave);
     }
 
+    
+    /** 
+     * Discounttia luotaessa lasketaan productin hinnasta jokin kiva miinuspuolinen rivi discountin mukaan?
+     * 
+     * Kommentteja plz!
+     * 
+     * @param bill2
+     * @param product
+     * @param disc
+     * @param count
+     */
     public BillLine(Bill bill2, Product product, Discount disc, BigDecimal count) {
         super();
         this.bill = bill2;
@@ -179,4 +198,12 @@ public class BillLine extends GenericEntity {
         return lineProduct;
     }
 
+    public FoodWave getFoodwave() {
+        return foodwave;
+    }
+
+    public void setFoodwave(FoodWave foodwave) {
+        this.foodwave = foodwave;
+    }
+
 }

code/LanBortalWeb/WebContent/WEB-INF/web.xml

@@ -27,6 +27,10 @@
 		<welcome-file>index.jsp</welcome-file>
 		<welcome-file>index.wtf</welcome-file>
 	</welcome-file-list>
+	<error-page>
+		<exception-type>java.lang.Exception</exception-type>
+		<location>/error.jsf</location>
+	</error-page>
 	<servlet>
 		<servlet-name>Faces Servlet</servlet-name>
 		<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>

code/LanBortalWeb/WebContent/error.xhtml

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
+	xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:c="http://java.sun.com/jsp/jstl/core">
+<h:head>
+	<title></title>
+</h:head>
+<h:body>
+	<br/>
+	<center>
+	<img src="#{request.contextPath}/resources/media/error.jpg" />
+	<h1>LOL, ERROR!</h1>
+	<br/>
+	<c:if test="#{sessionHandler.isInDevelopmentMode() eq false}"> 
+		<h:outputText escape="false" style="color: red;" value="ERR##{errorPageView.time}" />
+	</c:if>
+	<br/><br/>
+	</center>
+	<c:when test="#{sessionHandler.isInDevelopmentMode()}">
+		<h:outputText escape="false" value="#{errorPageView.stackTrace}" />
+	</c:when>
+	
+</h:body>
+</html>
\ No newline at end of file

code/LanBortalWeb/WebContent/foodadmin/createTemplate.xhtml

+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:products="http://java.sun.com/jsf/composite/cditools/products" xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
+<h:body>
+	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+		<f:metadata>
+			<f:event type="preRenderView" listener="#{foodWaveView.initCreateTemplate()}" />
+		</f:metadata>
+
+		<ui:define name="title">
+			<h1>#{i18n['foodwave.template.edit.title']}</h1>
+		</ui:define>
+
+		<ui:define name="content">
+			<h:form>
+				<h:panelGrid columns="3">
+					<h:outputLabel for="name" value="#{i18n['foodwavetemplate.name']}" />
+					<h:inputText id="name" value="#{foodWaveView.template.name}" />
+					<h:message for="name" />
+				</h:panelGrid>
+				<h:commandButton action="#{foodWaveView.saveTemplate()}" value="#{i18n['foowavetemplate.create']}" />
+			</h:form>
+				
+
+
+		</ui:define>
+	</ui:composition>
+</h:body>
+</html>
\ No newline at end of file

code/LanBortalWeb/WebContent/foodadmin/edit.xhtml → code/LanBortalWeb/WebContent/foodadmin/editTemplate.xhtml

@@ -7,6 +7,8 @@
 	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{foodWaveView.initEditTemplate()}" />
+			<f:viewParam name="id" value="#{userView.templateId}" />
+
 		</f:metadata>
 
 		<ui:define name="title">
@@ -19,15 +21,18 @@
 					<h:outputLabel for="name" value="#{i18n['foodwavetemplate.name']}" />
 					<h:inputText id="name" value="#{foodWaveView.template.name}" />
 					<h:message for="name" />
-
 				</h:panelGrid>
-				<h:inputTextarea value="#{foodWaveView.template.description}" />
-				<h:commanButton action="#{foodWaveView.saveTemplate()}" value="#{i18n['foowavetemplate.save']}" />
+				<div>
+					<h:inputTextarea value="#{foodWaveView.template.description}" />
+				</div>
+				<h:commandButton action="#{foodWaveView.saveTemplate()}" value="#{i18n['foowavetemplate.save']}" />
 				<h:commandButton action="#{foodWaveView.createFoodwave()}" value="#{i18n['foodwavetemplate.createFoodwave']}" />
-			</h:form>
-			<ui:fragment  >
 				
 
+			</h:form>
+			<ui:fragment>
+
+
 			</ui:fragment>
 
 		</ui:define>

code/LanBortalWeb/WebContent/foodadmin/list.xhtml → code/LanBortalWeb/WebContent/foodadmin/listTemplates.xhtml

@@ -7,6 +7,7 @@
 	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{foodWaveView.initTemplateList()}" />
+			<f:viewParam name="id" value="#{foodWaveView.templateId}" />
 		</f:metadata>
 
 		<ui:define name="title">

code/LanBortalWeb/WebContent/foodwave/ThanksForOrderingFromCounter.xhtml

+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:foodwave="http://java.sun.com/jsf/composite/cditools/foodwave"
+	xmlns:users="http://java.sun.com/jsf/composite/cditools/user"
+	xmlns:c="http://java.sun.com/jsp/jstl/core">
+<h:body>
+	<ui:composition
+		template="/layout/#{sessionHandler.layout}/template.xhtml">
+		<f:metadata>
+			<f:viewParam name="userid" value="#{userView.userid}" />
+			<f:event type="preRenderView"
+				listener="#{foodWaveView.initTemplateList}" />
+		</f:metadata>
+
+		<ui:define name="title">
+			<h1>#{i18n['user.shop.title']}</h1>
+			<users:usertabs tabId="foodwave" />
+		</ui:define>
+		<ui:define name="content">
+Kiitoksia tilauksesta, muista käydä maksamassa tilaukset tiskillä.
+
+Maksamattomia tilauksia ei pistetä etiäpäin.
+
+		</ui:define>
+
+
+	</ui:composition>
+</h:body>
+</html>
\ No newline at end of file

code/LanBortalWeb/WebContent/foodwave/list.xhtml

+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:foodwave="http://java.sun.com/jsf/composite/cditools/foodwave"
+	xmlns:users="http://java.sun.com/jsf/composite/cditools/user"
+	xmlns:c="http://java.sun.com/jsp/jstl/core">
+<h:body>
+	<ui:composition
+		template="/layout/#{sessionHandler.layout}/template.xhtml">
+		<f:metadata>
+			<f:viewParam name="userid" value="#{userView.userid}" />
+			<f:event type="preRenderView"
+				listener="#{foodWaveView.initTemplateList}" />
+		</f:metadata>
+
+		<ui:define name="title">
+			<h1>#{i18n['user.shop.title']}</h1>
+			<users:usertabs tabId="foodwave" />
+		</ui:define>
+		<ui:define name="content">
+
+			<h:dataTable columnClasses="nowrap,numalign,numalign,nowrap,numalign"
+				styleClass="bordertable" value="#{foodWaveView.foodWaves}"
+				var="foodwave">
+				<h:column>
+					<f:facet name="header">
+						<h:outputLabel id="name" value="${i18n['foodWave.name']}" />
+					</f:facet>
+
+					<h:link outcome="/foodwave/listProducts" value="#{foodwave.name}">
+						<f:param name="foodwaveid" value="#{foodwave.id}" />
+					</h:link>
+				</h:column>
+				<h:column>
+					<f:facet name="header">
+						<h:outputText value="${i18n['foodWave.template.name']}" />
+					</f:facet>
+					<h:link outcome="/foodwave/listProducts"
+						value="#{foodwave.template.name}">
+						<f:param name="foodwaveid" value="#{foodwave.id}" />
+					</h:link>
+				</h:column>
+				<h:column>
+					<f:facet name="header">
+						<h:outputText value="${i18n['foodWave.description']}" />
+					</f:facet>
+					<h:outputText id="description"
+						value="#{foodwave.template.description}" />
+				</h:column>
+				<h:column>
+					<f:facet name="header">
+						<h:outputText value="${i18n['foodWave.time']}" />
+					</f:facet>
+					<h:link outcome="/foodwave/listProducts"
+						value="#{foodwave.time.time}">
+						<f:param name="foodwaveid" value="#{foodwave.id}" />
+					</h:link>
+				</h:column>
+			</h:dataTable>
+
+		</ui:define>
+
+
+	</ui:composition>
+</h:body>
+</html>
\ No newline at end of file

code/LanBortalWeb/WebContent/foodwave/listProducts.xhtml

+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:foodwave="http://java.sun.com/jsf/composite/cditools/foodwave"
+	xmlns:products="http://java.sun.com/jsf/composite/cditools/products" 
+	xmlns:users="http://java.sun.com/jsf/composite/cditools/user"
+	xmlns:c="http://java.sun.com/jsp/jstl/core">
+<h:body>
+	<ui:composition
+		template="/layout/#{sessionHandler.layout}/template.xhtml">
+		<f:metadata>
+			<f:viewParam name="userid" value="#{userView.userid}" />
+			<f:viewParam name="foodwaveid" value="#{foodWaveFoodView.foodwaveid}" />
+			<f:event type="preRenderView" listener="#{foodWaveFoodView.initFoodWaveFoods}" />
+		</f:metadata>
+
+		<ui:define name="title">
+			<h1>#{i18n['user.foodwave.products.title']}</h1>
+			<users:usertabs tabId="foodwave" />
+		</ui:define>
+		<ui:define name="content">
+
+<!--   products:shop commitaction="#{foodWaveFoodView.commitShoppingCart()}" items="#{foodWaveFoodView.shoppingcart}" commitValue="#{i18n['productshop.commit']}" /-->
+			<foodwave:listFoods selectaction="#{foodWaveFoodView.commitShoppingCart()}"
+				items="#{foodWaveFoodView.shoppingcart}" commitValue="#{i18n['productshop.commit']}"/>
+
+		</ui:define>
+
+
+	</ui:composition>
+</h:body>
+</html>
\ No newline at end of file

code/LanBortalWeb/WebContent/foodwave/listTemplates.xhtml

+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:foodwave="http://java.sun.com/jsf/composite/cditools/foodwave" xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
+<h:body>
+	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+		<f:metadata>
+ 			<f:viewParam name="userid" value="#{userView.userid}" />
+ 			<f:event type="preRenderView" listener="#{foodWaveView.initTemplateList}" />
+		</f:metadata>
+
+		<ui:define name="title">
+			<h1>#{i18n['user.shop.title']}</h1>
+			<users:usertabs tabId="foodwave" />
+		</ui:define>
+		<ui:define name="content">
+		
+			<foodwave:listTemplates selectaction="#{foodWaveView.selectTemplate}" items="#{foodWaveView.templates}"
+					commitValue="#{i18n['food']}"
+				/>
+		
+		</ui:define>
+
+
+	</ui:composition>
+</h:body>
+</html>
\ No newline at end of file

code/LanBortalWeb/WebContent/resources/cditools/foodwave/list.xhtml

 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:composite="http://java.sun.com/jsf/composite"
-	xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:tools="http://java.sun.com/jsf/composite/tools">
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:composite="http://java.sun.com/jsf/composite"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+	xmlns:c="http://java.sun.com/jsp/jstl/core"
+	xmlns:tools="http://java.sun.com/jsf/composite/tools">
 
 
 <composite:interface>
 	<composite:attribute name="items" required="true" />
-<!-- 	<composite:attribute name="selectValue" required="true" /> -->
-	<composite:attribute name="selectaction" method-signature="java.lang.String action()" required="true" />
+	<!-- 	<composite:attribute name="selectValue" required="true" /> -->
+	<composite:attribute name="selectaction"
+		method-signature="java.lang.String action()" required="true" />
 </composite:interface>
 
 <composite:implementation>
 	<!-- 	<h:outputScript target="head" library="script" name="jquery.min.js" /> -->
 	<!-- 	<h:outputScript target="head" library="script" name="shopscript.js" /> -->
 	<h:outputScript library="primefaces" name="jquery/jquery.js" />
-	<div style="margin-top: 5px;">
-		<h:commandButton action="#{cc.attrs.selectaction}" id="selectbutton-top" value="#{cc.attrs.selectValue}" />
-	</div>
-	
-	<h:dataTable columnClasses="nowrap,numalign,numalign,nowrap,numalign" styleClass="bordertable" id="billcart" value="#{cc.attrs.items}" var="foodwave">
-		<h:column>
-			<f:facet name="header">
-				<h:outputText id="name" value="${i18n['foodWave.name']}" />
-			</f:facet>
-			<h:outputText value="#{foodwave.template.name}" />
-		</h:column>
-		<h:column >
-			<f:facet name="header">
-				<h:outputText value="${i18n['foodWave.description']}" />
-			</f:facet>
-			<h:outputText id="description" value="#{foodwave.template.description}" />
-		</h:column>
-		<h:commandButton action="#{cc.attrs.selectaction}" id="selectbutton-botton" value="#{cc.attrs.selectValue}" />
-	</h:dataTable>
 
 
+	<h:form>
+		<h:dataTable columnClasses="nowrap,numalign,numalign,nowrap,numalign"
+			styleClass="bordertable" value="#{cc.attrs.items}" var="foodwave">
+			<h:column>
+				<f:facet name="header">
+					<h:outputLabel id="name" value="${i18n['foodWave.name']}" />
+				</f:facet>
+				<h:commandLink action="#{cc.attrs.selectaction}" value="#{foodwave.name}" />
+			</h:column>
+			<h:column>
+				<f:facet name="header">
+					<h:outputText value="${i18n['foodWave.template.name']}" />
+				</f:facet>
+				<h:commandLink action="#{cc.attrs.selectaction}" id="template_name" value="#{foodwave.template.name}" />
+			</h:column>
+			<h:column>
+				<f:facet name="header">
+					<h:outputText value="${i18n['foodWave.description']}" />
+				</f:facet>
+				<h:outputText id="description"
+					value="#{foodwave.template.description}" />
+			</h:column>
+			<h:column>
+				<f:facet name="header">
+					<h:outputText value="${i18n['foodWave.time']}" />
+				</f:facet>
+				<h:commandLink action="#{cc.attrs.selectaction}" id="time" value="#{foodwave.time.time}" />
+			</h:column>
+
+			<h:commandButton action="#{cc.attrs.selectaction}"
+				id="selectbutton-botton" value="Valitte" />
+		</h:dataTable>
+
+	</h:form>
 
 </composite:implementation>
 </html>

code/LanBortalWeb/WebContent/resources/cditools/foodwave/listFoods.xhtml

+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:composite="http://java.sun.com/jsf/composite"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+	xmlns:c="http://java.sun.com/jsp/jstl/core"
+	xmlns:tools="http://java.sun.com/jsf/composite/tools">
+
+
+<composite:interface>
+	<composite:attribute name="items" required="true" />
+	<!-- 	<composite:attribute name="selectValue" required="true" /> -->
+	<composite:attribute name="selectaction"
+		method-signature="java.lang.String action()" required="true" />
+</composite:interface>
+
+<composite:implementation>
+	<!-- 	<h:outputScript target="head" library="script" name="jquery.min.js" /> -->
+	<!-- 	<h:outputScript target="head" library="script" name="shopscript.js" /> -->
+	<h:outputScript library="primefaces" name="jquery/jquery.js" />
+
+
+	<h:form>
+		<h:dataTable columnClasses="nowrap,numalign,numalign,nowrap,numalign"
+			styleClass="bordertable" value="#{cc.attrs.items}" var="cart">
+			<!--   h:column>
+				<f:facet name="header">
+					<h:outputLabel id="name" value="${i18n['product.name']}" />
+				</f:facet>
+				<h:commandLink action="#{cc.attrs.selectaction}" value="#{cart.product.name}" />
+			</h:column>
+			<h:column>
+				<f:facet name="header">
+					<h:outputText value="${i18n['product.price']}" />
+				</f:facet>
+				<h:commandLink action="#{cc.attrs.selectaction}" id="template_name" value="#{cart.product.price}" />
+			</h:column>
+
+			<h:commandButton action="#{cc.attrs.selectaction}"
+				id="selectbutton-botton" value="Valitte" /-->
+
+
+			<h:column>
+				<f:facet name="header">
+					<h:outputText id="name" value="${i18n['product.name']}" />
+				</f:facet>
+				<h:outputText value="#{cart.product.name}" />
+			</h:column>
+			<h:column>
+				<f:facet name="header">
+					<h:outputText value="${i18n['product.price']}" />
+				</f:facet>
+				<h:outputText id="price" value="#{cart.product.price.abs()}">
+					<f:convertNumber maxFractionDigits="2" minFractionDigits="2" />
+				</h:outputText>
+			</h:column>
+			<h:column>
+				<f:facet name="header">
+					<h:outputText value="${i18n['product.totalPrice']}" />
+				</f:facet>
+				<h:outputText id="total" value="#{cart.price}">
+					<f:convertNumber maxFractionDigits="2" minFractionDigits="2" />
+				</h:outputText>
+			</h:column>
+			<h:column>
+				<f:facet name="header">
+					<h:outputText id="count" value="${i18n['product.cart.count']}" />
+				</f:facet>
+				
+				<h:commandButton action="#{foodWaveFoodView.addMinusOne}"
+					value="#{i18n['productshop.minusOne']}">
+					<f:ajax render="@form" />
+				</h:commandButton>
+				<h:inputText size="4" id="cartcount" value="#{cart.count}">
+					<f:convertNumber maxIntegerDigits="2" minFractionDigits="0" />
+				</h:inputText>
+				<h:commandButton action="#{foodWaveFoodView.addOne}"
+					value="#{i18n['productshop.plusOne']}">
+					<f:ajax render="@form" />
+				</h:commandButton>
+			</h:column>
+
+		</h:dataTable>
+		
+		<h:commandButton action="#{foodWaveFoodView.buyFromCounter}" value="#{i18n['foodshop.buyFromCounter']}"  >
+		
+		</h:commandButton>
+		
+		<h:commandButton action="#{foodWaveFoodView.buyFromInternet}" value="#{i18n['foodshop.buyFromInternet']}"  >
+		
+		</h:commandButton>
+
+	</h:form>
+
+
+
+
+</composite:implementation>
+
+
+</html>
+

code/LanBortalWeb/WebContent/resources/cditools/foodwave/listTemplates.xhtml

+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:composite="http://java.sun.com/jsf/composite"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+	xmlns:c="http://java.sun.com/jsp/jstl/core"
+	xmlns:tools="http://java.sun.com/jsf/composite/tools">
+
+
+<composite:interface>
+	<composite:attribute name="items" required="true" />
+	<composite:attribute name="selectaction"
+		method-signature="java.lang.String action()" required="true" />
+</composite:interface>
+
+<composite:implementation>
+	<!-- 	<h:outputScript target="head" library="script" name="jquery.min.js" /> -->
+	<!-- 	<h:outputScript target="head" library="script" name="shopscript.js" /> -->
+	<h:outputScript library="primefaces" name="jquery/jquery.js" />
+
+	<h:form>
+
+		<h:dataTable columnClasses="nowrap,numalign,numalign,nowrap,numalign"
+			styleClass="bordertable" id="billcart" value="#{cc.attrs.items}"
+			var="template">
+			<h:column>
+				<f:facet name="header">
+					<h:outputText id="name" value="${i18n['foodWave.name']}" />
+				</f:facet>
+				<h:commandLink action="#{cc.attrs.selectaction}"
+					value="#{template.name}" />
+			</h:column>
+			<h:column>
+				<f:facet name="header">
+					<h:outputText value="${i18n['foodWave.description']}" />
+				</f:facet>
+				<h:outputText id="description" value="#{template.description}" />
+			</h:column>
+
+		</h:dataTable>
+
+
+	</h:form>
+</composite:implementation>
+</html>
+

code/LanBortalWeb/WebContent/useradmin/list.xhtml

@@ -16,49 +16,45 @@
 
 		<ui:define name="content">
 			<h:outputScript library="primefaces" name="jquery/jquery.js" target="head" />
-		
+
 			<h1>#{i18n['userlist.header']}</h1>
-			
+
 			<h:form>
-			<h:panelGrid columns="2">
-				<h:panelGroup>
-				<a onclick="$('#advancedSearch').show(); $(this).hide();" ><h:outputText value="#{i18n['userlist.showAdvancedSearch']}" /></a>
-					<span id="advancedSearch" style="display:none;">
-				
-	
-						<h:selectBooleanCheckbox id="placeassoc" value="#{userSearchView.searchQuery.placeAssoc}" />
-						<h:outputLabel for="placeassoc" value="#{i18n['userlist.placeassoc']}" />
+				<h:panelGrid columns="2">
+					<h:panelGroup>
+						<a onclick="$('#advancedSearch').show(); $(this).hide();"><h:outputText value="#{i18n['userlist.showAdvancedSearch']}" /></a>
+						<span id="advancedSearch" style="display: none;"> <h:selectBooleanCheckbox id="placeassoc" value="#{userSearchView.searchQuery.placeAssoc}" /> <h:outputLabel for="placeassoc"
+								value="#{i18n['userlist.placeassoc']}" /> <br /> <h:outputLabel for="saldofilter" value="#{i18n['userlist.saldofilter']}" /> <h:selectOneMenu
+								value="#{userSearchView.searchQuery.accountSaldoCompare}">
+								<f:selectItems value="#{userSearchView.searchQuery.accountCompareValues}" />
+							</h:selectOneMenu> <h:inputText value="#{userSearchView.searchQuery.accountSaldo}">
+								<f:convertNumber minFractionDigits="0" maxFractionDigits="2" />
+							</h:inputText> <br /> <h:outputLabel for="rolefilter" value="#{i18n['userlist.rolefilter']}" /> <h:selectManyCheckbox layout="pageDirection" styleClass="nowrap" id="rolefilter"
+								value="#{userSearchView.searchQuery.filterRoles}" converter="#{roleConverter}">
+								<f:selectItems value="#{roleDataView.roles}" var="r" itemLabel="#{r.name}" />
+							</h:selectManyCheckbox>
+
+
+						</span>
 						<br />
-						<h:outputLabel for="saldofilter" value="#{i18n['userlist.saldofilter']}" />
-						<h:selectOneMenu value="#{userSearchView.searchQuery.accountSaldoCompare}">
-							<f:selectItems value="#{userSearchView.searchQuery.accountCompareValues}" />
-						</h:selectOneMenu>
-						<h:inputText value="#{userSearchView.searchQuery.accountSaldo}">
-							<f:convertNumber minFractionDigits="0" maxFractionDigits="2" />
-						</h:inputText>
+
+						<h:selectBooleanCheckbox id="onlythisevent" value="#{userSearchView.searchQuery.onlyThisEvent}" />
+						<h:outputLabel for="onlythisevent" value="#{i18n['userlist.onlythisevent']}" />
 						<br />
-						<h:outputLabel for="rolefilter" value="#{i18n['userlist.rolefilter']}" />
-						<h:selectManyCheckbox layout="pageDirection" styleClass="nowrap" id="rolefilter" value="#{userSearchView.searchQuery.filterRoles}" converter="#{roleConverter}">
-							<f:selectItems value="#{roleDataView.roles}" var="r" itemLabel="#{r.name}" />
-						</h:selectManyCheckbox>
-	
-						
-					</span>
-					<br />
-					
-					<h:selectBooleanCheckbox id="onlythisevent" value="#{userSearchView.searchQuery.onlyThisEvent}" />
-					<h:outputLabel for="onlythisevent" value="#{i18n['userlist.onlythisevent']}" />
-					<br />
-					<h:inputText value="#{userSearchView.search}" />
-					<h:commandButton value="#{i18n['userlist.search']}" action="#{userSearchView.newSearch()}" />	
-				</h:panelGroup>	
-				<h:panelGroup>
-					<h:outputText value="i18n['usercart.cartsize']" /> <h:outputText value="#{userCartView.userCartSize}" />
-					<br/>
-					<h:commandButton actionListener="#{userSearchView.addToCart}" value="#{i18n['usercart.addSearcherUsers']}" />
-					<h:commandButton action="#{userCartView.traverse}" value="#{i18n['usercart.traverse']}"/>
-				</h:panelGroup>
-			</h:panelGrid>
+						<h:inputText value="#{userSearchView.search}" />
+						<h:commandButton value="#{i18n['userlist.search']}" action="#{userSearchView.newSearch()}" />
+					</h:panelGroup>
+					<h:panelGroup>
+						<a style="display: #{((userCartView.isEmpty())?'block':'none')};" onclick="$('#usercart').show(); $(this).hide();"><h:outputText value="#{i18n['userlist.showAdvancedSearch']}" /></a>
+						<div id="usercart" style="display: #{((userCartView.isEmpty())?'none':'block')};">
+							<h:outputText value="#{i18n['usercart.cartsize']}" />
+							<h:outputText value=" #{userCartView.userCartSize}" />
+							<br />
+							<h:commandButton actionListener="#{userSearchView.addToCart}" value="#{i18n['usercart.addSearcherUsers']}" />
+							<h:commandButton action="#{userCartView.traverse}" value="#{i18n['usercart.traverse']}" />
+						</div>
+					</h:panelGroup>
+				</h:panelGrid>
 
 			</h:form>
 			<p>

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

-
-bortalApplication.BILL                      = Creating, and managing bills
-bortalApplication.COMPO                     = Managing compos
-bortalApplication.CONTENT                   = Product & shop management
-bortalApplication.LAYOUT                    = Laout management
-bortalApplication.MAP                       = Map management
-bortalApplication.POLL                      = Polling stuff
-bortalApplication.SALESPOINT                = Managing salespoint
-bortalApplication.SHOP                      = Product % shop management
-bortalApplication.TERMINAL                  = Sales and self help terminal roles
-bortalApplication.USER                      = User management related
-bortalApplication.bill.CREATE_BILL          = Create bills for self
-bortalApplication.bill.READ_ALL             = "Read all bills"
-bortalApplication.bill.VIEW_OWN             = View own bills
-bortalApplication.bill.WRITE_ALL            = Modify all bills
-bortalApplication.compo.MANAGE              = Manage compos
-bortalApplication.compo.SUBMIT_ENTRY        = Submit entry
-bortalApplication.compo.VIEW_COMPOS         = View compos
-bortalApplication.compo.VOTE                = Vote
-bortalApplication.content.MANAGE_ACTIONLOG  = Manage actionlog
-bortalApplication.content.MANAGE_MENU       = Manage menus
-bortalApplication.content.MANAGE_NEWS       = Manage newsgroups
-bortalApplication.content.MANAGE_PAGES      = Manage pages
-bortalApplication.map.BUY_PLACES            = Reserve and buy places from map
-bortalApplication.map.MANAGE_MAPS           = Create and modify maps
-bortalApplication.map.MANAGE_OTHERS         = Manage other users reservations in map
-bortalApplication.map.VIEW                  = View maps
-bortalApplication.poll.ANSWER               = Can answer and view availabe polls
-bortalApplication.poll.CREATE               = Create and manage polls
-bortalApplication.poll.VIEW_RESULTS         = View anonymized poll results
-bortalApplication.salespoint.MODIFY         = Modify salespoints
-bortalApplication.salespoint.VIEW           = View salespoints
-bortalApplication.shop.LIST_ALL_PRODUCTS    = List all products in shop
-bortalApplication.shop.LIST_USERPRODUCTS    = List products for users in shop
-bortalApplication.shop.MANAGE_PRODUCTS      = Create and modify products
-bortalApplication.shop.SHOP_PRODUCTS        = Shop products to self
-bortalApplication.shop.SHOP_TO_OTHERS       = Shop to other users
-bortalApplication.terminal.CASHIER          = Access cashier terminal functions
-bortalApplication.terminal.CUSTOMER         = Access client terminal functions
-bortalApplication.terminal.SELFHELP         = Self help terminal
-bortalApplication.user.ANYUSER              = All users have this anyways
-bortalApplication.user.CREATE_NEW           = Create new user
-bortalApplication.user.INVITE_USERS         = Invite users
-bortalApplication.user.LOGIN                = Can login
-bortalApplication.user.LOGOUT               = Can logout
-bortalApplication.user.MANAGE_HTTP_SESSION  = Manage http sessions
-bortalApplication.user.MODIFY               = Modify users
-bortalApplication.user.MODIFY_ACCOUNTEVENTS = Modify Account events
-bortalApplication.user.READ_ORGROLES        = View organization roles
-bortalApplication.user.READ_ROLES           = View all roles.
-bortalApplication.user.VIEW_ACCOUNTEVENTS   = Show other users account events
-bortalApplication.user.VIEW_ALL             = View all users
-bortalApplication.user.VIEW_SELF            = Can view self
-bortalApplication.user.WRITE_ORGROLES       = Modify organization roles 
-bortalApplication.user.WRITE_ROLES          = Modify roles
-
-cardTemplate.emptyCardTemplate = ----
-
-global.copyright   = Verkkopeliyhdistys Insomnia ry
-global.productname = Omnia
-
-httpsession.creationTime = Luotu
-
-#Bill number
-# Validationmessages
-map.id = #
-
-navi.auth.login      = frontpage
-navi.auth.loginerror = frontpage
-navi.auth.logout     = frontpage
-
-pagegroup.auth.login = frontpage
-
-placegroupview.toptext = \ 
-
-poll.edit = edit
-
-product.providedRole      = Tuote tarjoaa roolin
-product.returnProductEdit = Palaa tuotteeseen: 
-product.saved             = Tuote tallennettu
-
-productshop.minusOne = -1
-productshop.minusTen = -10
-productshop.plusOne  = +1
-productshop.plusTen  = +10
-
-user.unauthenticated      = Kirjautumaton
+
+actionlog.create.header           = Create new actionmessage
+actionlog.create.message          = Message
+actionlog.create.role             = Target role
+actionlog.create.submitbutton     = Send
+actionlog.create.taskradio        = Task
+actionlog.crew                    = Crew
+actionlog.message                 = Event
+actionlog.messagelist.description = You can follow and create new action messages in this view
+actionlog.messagelist.header      = Messagelist
+actionlog.state                   = State
+actionlog.task                    = Task
+actionlog.tasklist.header         = Tasklist
+actionlog.time                    = Time
+actionlog.user                    = User
+
+bortalApplication.BILL                      = Creating, and managing bills
+bortalApplication.COMPO                     = Managing compos
+bortalApplication.CONTENT                   = Product & shop management
+bortalApplication.LAYOUT                    = Laout management
+bortalApplication.MAP                       = Map management
+bortalApplication.POLL                      = Polling stuff
+bortalApplication.SALESPOINT                = Managing salespoint
+bortalApplication.SHOP                      = Product % shop management
+bortalApplication.TERMINAL                  = Sales and self help terminal roles
+bortalApplication.USER                      = User management related
+bortalApplication.bill.CREATE_BILL          = Create bills for self
+bortalApplication.bill.READ_ALL             = "Read all bills"
+bortalApplication.bill.VIEW_OWN             = View own bills
+bortalApplication.bill.WRITE_ALL            = Modify all bills
+bortalApplication.compo.MANAGE              = Manage compos
+bortalApplication.compo.SUBMIT_ENTRY        = Submit entry
+bortalApplication.compo.VIEW_COMPOS         = View compos
+bortalApplication.compo.VOTE                = Vote
+bortalApplication.content.MANAGE_ACTIONLOG  = Manage actionlog
+bortalApplication.content.MANAGE_MENU       = Manage menus
+bortalApplication.content.MANAGE_NEWS       = Manage newsgroups
+bortalApplication.content.MANAGE_PAGES      = Manage pages
+bortalApplication.map.BUY_PLACES            = Reserve and buy places from map
+bortalApplication.map.MANAGE_MAPS           = Create and modify maps
+bortalApplication.map.MANAGE_OTHERS         = Manage other users reservations in map
+bortalApplication.map.VIEW                  = View maps
+bortalApplication.poll.ANSWER               = Can answer and view availabe polls
+bortalApplication.poll.CREATE               = Create and manage polls
+bortalApplication.poll.VIEW_RESULTS         = View anonymized poll results
+bortalApplication.salespoint.MODIFY         = Modify salespoints
+bortalApplication.salespoint.VIEW           = View salespoints
+bortalApplication.shop.LIST_ALL_PRODUCTS    = List all products in shop
+bortalApplication.shop.LIST_USERPRODUCTS    = List products for users in shop
+bortalApplication.shop.MANAGE_PRODUCTS      = Create and modify products
+bortalApplication.shop.SHOP_PRODUCTS        = Shop products to self
+bortalApplication.shop.SHOP_TO_OTHERS       = Shop to other users
+bortalApplication.terminal.CASHIER          = Access cashier terminal functions
+bortalApplication.terminal.CUSTOMER         = Access client terminal functions
+bortalApplication.terminal.SELFHELP         = Self help terminal
+bortalApplication.user.ANYUSER              = All users have this anyways
+bortalApplication.user.CREATE_NEW           = Create new user
+bortalApplication.user.INVITE_USERS         = Invite users
+bortalApplication.user.LOGIN                = Can login
+bortalApplication.user.LOGOUT               = Can logout
+bortalApplication.user.MANAGE_HTTP_SESSION  = Manage http sessions
+bortalApplication.user.MODIFY               = Modify users
+bortalApplication.user.MODIFY_ACCOUNTEVENTS = Modify Account events
+bortalApplication.user.READ_ORGROLES        = View organization roles
+bortalApplication.user.READ_ROLES           = View all roles.
+bortalApplication.user.VIEW_ACCOUNTEVENTS   = Show other users account events
+bortalApplication.user.VIEW_ALL             = View all users
+bortalApplication.user.VIEW_SELF            = Can view self
+bortalApplication.user.WRITE_ORGROLES       = Modify organization roles 
+bortalApplication.user.WRITE_ROLES          = Modify roles
+
+cardTemplate.emptyCardTemplate = ----
+
+eventorg.create = Create
+
+global.cancel               = Cancel
+global.copyright            = Codecrew Ry
+global.notAuthorizedExecute = You are not authorized to do that!!
+global.notauthorized        = You don't have enough rights to enter this site.
+global.save                 = Save
+
+httpsession.creationTime = Created
+
+login.login              = Login
+login.logout             = Logout
+login.logoutmessage      = You have logged out of the system
+login.password           = Password
+login.submit             = Login
+login.username           = Username
+
+loginerror.header        = Login failed
+loginerror.message       = Username of password incorrect.
+loginerror.resetpassword = Reset password
+
+#Bill number
+# Validationmessages
+map.id = #
+
+navi.auth.login      = frontpage
+navi.auth.loginerror = frontpage
+navi.auth.logout     = frontpage
+
+pagegroup.auth.login = frontpage
+
+passwordChanged.body   = You can now login with the new password.
+passwordChanged.header = Password changed successfully.
+
+passwordReset.errorChanging = Unexpected error whilst password reset. Contact your administrator.
+passwordReset.hashNotFound  = Password change token has expired. Please send the query again.
+
+permissiondenied.alreadyLoggedIn = You don't have enough rights
+permissiondenied.header          = Access denied
+permissiondenied.notLoggedIn     = You don't have enough rights to enter this site.
+
+placegroupview.toptext = \ 
+
+poll.edit = edit
+
+product.providedRole      = Tuote tarjoaa roolin
+product.returnProductEdit = Palaa tuotteeseen: 
+product.saved             = Tuote tallennettu
+
+productshop.minusOne = -1
+productshop.minusTen = -10
+productshop.plusOne  = +1
+productshop.plusTen  = +10
+
+resetMail.body     = You can change a forgotten password by inserting your username to the field below. A link where you can change the password will be sent to the email address associated to that.
+resetMail.header   = Reset lost password
+resetMail.send     = Send email
+resetMail.username = Username
+
+resetmailSent.body   = Email has been sent containing a link where you can change the password.
+resetmailSent.header = Email sent
+
+user.unauthenticated = Kirjautumaton

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

-
-accountEvent.commit      = Save
-accountEvent.delivered   = Delivered
-accountEvent.edit        = Edit
-accountEvent.eventTime   = Time
-accountEvent.productname = Product
-accountEvent.quantity    = Count
-accountEvent.seller      = Sold by
-accountEvent.total       = Total
-accountEvent.unitPrice   = Unit price
-
-actionlog.create.header           = Create new actionmessage
-actionlog.create.message          = Message
-actionlog.create.role             = Target role
-actionlog.create.submitbutton     = Send
-actionlog.create.taskradio        = Task
-actionlog.crew                    = Crew
-actionlog.message                 = Event
-actionlog.messagelist.description = You can follow and create new action messages in this view
-actionlog.messagelist.header      = ActionLog
-actionlog.messagestate.DONE       = Done
-actionlog.messagestate.NEW        = New
-actionlog.messagestate.PENDING    = Pending
-actionlog.state                   = State
-actionlog.task                    = Task
-actionlog.tasklist.header         = Messagelist
-actionlog.time                    = Time
-actionlog.user                    = User
-
-applicationPermission.description = description
-applicationPermission.name        = Rightsgroup
-
-bill.addr1                = Address 1
-bill.addr2                = Address 2
-bill.addr3                = Address 3
-bill.addr4                = Address 4
-bill.addr5                = Address 5
-bill.address              = Payers address
-bill.billAmount           = Bill amount
-bill.billIsPaid           = Bill is paid
-bill.billLines            = Products
-bill.billNumber           = Bill number
-bill.billPaidDate         = Paid date
-bill.deliveryTerms        = Delivery terms
-bill.edit                 = edit
-bill.isPaid               = Paid
-bill.markPaid             = Mark paid
-bill.markedPaid           = Bill marked paid
-bill.notes                = Notes
-bill.noticetime           = Notice time
-bill.ourReference         = Our reference
-bill.paidDate             = Paid date
-bill.payer                = Payer
-bill.paymentTime          = Payment time
-bill.paymentTime.now      = Now
-bill.printBill            = Print bill
-bill.receiverAddress      = Receiver address
-bill.referenceNumberBase  = Reference number base
-bill.referencenumber      = Reference nr.
-bill.sentDate             = Sent date
-bill.show                 = Show
-bill.theirReference       = Clients reference
-bill.totalPrice           = Total
-
-billedit.billnotfound = Bill not found. Select again.
-
-billine.linePrice         = Total
-billine.name              = Product
-billine.quantity          = Quantity
-billine.referencedProduct = Referenced product
-billine.save              = Save
-billine.unitName          = Unit
-billine.unitPrice         = Unit price
-billine.vat               = VAT
-
-bills.noBills = No bills
-
-cardTemplate.create      = Create
-cardTemplate.edit        = Edit
-cardTemplate.id          = Id
-cardTemplate.imageheader = Current Template
-cardTemplate.name        = Card template
-cardTemplate.power       = Card power
-cardTemplate.roles       = Associated roles
-cardTemplate.save        = Save
-cardTemplate.sendImage   = Upload Image
-
-checkout.cancel.errorMessage   = Error confirming the cancel\u2026 Please report this to code@codecrew.fi
-checkout.cancel.successMessage = You can retry payment at your own bills.
-checkout.reject.errorMessage   = Error while processing rejected payment. Please report this error to code@codecrew.fi
-checkout.reject.successMessage = Payment rejected. You can retry payment from your own bills.
-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.
-
-compo.edit                = Edit compo
-compo.saveVotes           = Save votes
-compo.votesSaved          = Votes saved
-
-compofile.download        = Download
-compofile.download.header = Download file
-compofile.upload          = Upload file
-
-discount.active     = Active
-discount.amountMax  = Max amount
-discount.amountMin  = Min amount
-discount.code       = Discount code
-discount.create     = Create new
-discount.details    = Details
-discount.edit       = Edit
-discount.maxNum     = Max nr of discounts
-discount.perUser    = Discounts per user
-discount.percentage = Discount percent
-discount.products   = Products
-discount.role       = Role discount
-discount.save       = Save
-discount.shortdesc  = Description
-discount.validFrom  = Valid from
-discount.validTo    = Valid to
-
-editplace.header      = Edit place
-
-editplacegroup.header = Placegroup information
-
-entry.edit = Edit entry
-
-event.defaultRole         = Default user role
-event.edit                = Edit
-event.endTime             = End time
-event.name                = Event name
-event.nextBillNumber      = Initial bill number
-event.referenceNumberBase = Reference number base
-event.save                = Save
-event.startTime           = Start time
-
-eventdomain.domainname = Domain
-eventdomain.remove     = Remove
-
-eventmap.active          = Active
-eventmap.buyable.like    = Place name match
-eventmap.buyable.lock    = Lock places
-eventmap.buyable.release = Release places
-eventmap.name            = Map name
-eventmap.notes           = Notes
-eventmap.save            = Save
-
-eventorg.bankName1     = Bank name 2
-eventorg.bankName2     = Bank name 2
-eventorg.bankNumber1   = Bank account nr. 1
-eventorg.bankNumber2   = Bank account nr. 2
-eventorg.billAddress1  = Billing address 1
-eventorg.billAddress2  = Billing address 2
-eventorg.billAddress3  = Billing address 3
-eventorg.billAddress4  = Billing address 4
-eventorg.bundleCountry = Country bundle
-eventorg.createEvent   = Create event
-eventorg.createevent   = Create new event
-eventorg.edit          = Edit
-eventorg.events        = Event of the organisation
-eventorg.organisation  = Organisation name
-eventorg.save          = Save
-
-eventorgView.eventname = Name of event
-
-eventorganiser.name = Eventorganiser
-
-game.gamepoints = Game points
-
-global.cancel        = Cancel
-global.copyright     = Insomnia Ry, Stream Ry
-global.notauthorized = You don't have enough rights to enter this site.
-global.productname   = Intra
-global.save          = Save
-
-imagefile.description = Description
-imagefile.file        = Imagefile
-
-invite.emailexists           = User with that email address already exists in the system.
-invite.notFound              = Invite invalid or already used
-invite.successfull           = Invite sent successfully
-invite.userCreateSuccessfull = User successfully created. You can now login.
-
-javax.validation.constraints.AssertFalse.message = must be false
-javax.validation.constraints.AssertTrue.message  = must be true
-javax.validation.constraints.DecimalMax.message  = must be less than or equal to {value}
-javax.validation.constraints.DecimalMin.message  = must be greater than or equal to {value}
-javax.validation.constraints.Digits.message      = numeric value out of bounds (<{integer} digits>.<{fraction} digits> expected)
-javax.validation.constraints.Future.message      = must be in the future
-javax.validation.constraints.Max.message         = must be less than or equal to {value}
-javax.validation.constraints.Min.message         = must be greater than or equal to {value}
-javax.validation.constraints.NotNull.message     = may not be null
-javax.validation.constraints.Null.message        = must be null
-javax.validation.constraints.Past.message        = must be in the past
-javax.validation.constraints.Pattern.message     = must match "{regexp}"
-javax.validation.constraints.Size.message        = size must be between {min} and {max}
-
-layout.editBottom  = Edit bottom content
-layout.editContent = Edit center
-layout.editTop     = Edit topcontent
-
-login.login              = Login
-login.logout             = Logout
-login.logoutmessage      = You have logged out of the system
-login.password           = Password
-login.submit             = Login
-login.username           = Username
-
-loginerror.header        = Login failed
-loginerror.message       = Username of password incorrect.
-loginerror.resetpassword = Reset password
-
-map.edit                          = Edit
-map.generate                      = Generate places
-map.height                        = Place height (px)
-map.name                          = Name
-map.namebase                      = Semicolon separated table prefixes
-map.oneRowTable                   = One row tables
-map.placesInRow                   = Places in row
-map.product                       = Place product
-map.startX                        = Place start X-coordinate
-map.startY                        = Place start Y-coordinate\n
-map.submitMap                     = Send map image
-map.tableCount                    = Place count
-map.tableXdiff                    = Table X difference 
-map.tableYdiff                    = Table Y difference
-map.tablesHorizontal              = Generate horizontal tables
-map.width                         = Place width (px)
-
-mapEdit.removePlaces = Remove ALL places
-
-mapManage.lockedPlaces   = Locked {0} places.
-mapManage.releasedPlaces = Released {0} places 
-
-mapView.buyPlaces                 = Lock selected places
-mapView.errorWhenReleasingPlace   = Error when releasing place
-mapView.errorWhenReservingPlace   = Error when reserving place!
-mapView.errorWhileBuyingPlaces    = Error when buying places. Please try again. If error reoccurs please contact organizers.
-mapView.notEnoughCreditsToReserve = You don't have enough credits to reserve this place.
-
-nasty.user = Go away!
-
-org.hibernate.validator.constraints.Email.message    = not a well-formed email address
-org.hibernate.validator.constraints.Length.message   = length must be between {min} and {max}
-org.hibernate.validator.constraints.NotEmpty.message = may not be empty
-org.hibernate.validator.constraints.Range.message    = must be between {min} and {max}
-
-orgrole.create  = Create
-orgrole.name    = Name
-orgrole.parents = Parent
-
-page.account.edit.header                 = Edit account events
-page.account.list.header                 = Account events
-page.admin.sendimage.header              = Send image
-page.auth.login.header                   = Login error
-page.auth.login.loginerror.header        = Kirjautumisvirhe
-page.auth.login.loginerror.pagegroup     = frontpage
-page.auth.login.logout.header            = Uloskirjautuminen
-page.auth.login.logout.pagegroup         = frontpage
-page.auth.login.pagegroup                = frontpage
-page.auth.login.title                    = Login error
-page.auth.loginerror.header              = Login failed
-page.auth.loginerror.pagegroup           = frontpage
-page.auth.logout.pagegroup               = frontpage
-page.auth.notauthorized.pagegroup        = frontpage
-page.auth.resetPassword.header           = Reset password
-page.bill.billSummary.header             = Summary of bills
-page.bill.edit.header                    = Edit bill
-page.bill.listAll.header                 = Bills
-page.bill.placemap.header                = Place map
-page.bill.show.header                    = Bill info
-page.checkout.cancel.header              = Payment cancelled!
-page.checkout.delayed.header             = Delayed payment
-page.checkout.reject.header              = Payment rejected!
-page.checkout.return.header              = Payment confirmed
-page.game.list.header                    = Insomnia Game
-page.game.start.header                   = Insomnia Game
-page.index.header                        = Frontpage
-page.index.pagegroup                     = frontpage
-page.permissionDenied.header             = Access denied
-page.place.edit.header                   = Edit place
-page.place.insertToken.header            = Insert place token
-page.place.mygroups.header               = My places
-page.place.placemap.header               = Reserve place
-page.poll.answer.header                  = Poll
-page.poll.answered.header                = Thank you for your answer
-page.poll.start.header                   = Poll
-page.product.create.pagegroup            = admin
-page.product.createBill.header           = Buy products
-page.product.createBill.pagegroup        = shop
-page.product.edit.pagegroup              = admin
-page.product.list.pagegroup              = admin
-page.product.validateBillProducts.header = Bill created
-page.role.create.pagegroup               = admin
-page.role.edit.pagegroup                 = admin
-page.role.list.pagegroup                 = admin
-page.shop.readerevents.header            = RFID shop
-page.svm.failure.header                  = Payment error
-page.svm.pending.header                  = Payment pending
-page.svm.success.header                  = Payment successfull
-page.tests.placemap.pagegroup            = shop
-page.user.create.header                  = New user
-page.user.create.pagegroup               = user
-page.user.edit.header                    = Edit user
-page.user.edit.pagegroup                 = user
-page.user.editself.header                = My preferences
-page.user.editself.pagegroup             = user
-page.user.list.header                    = Users
-page.user.list.pagegroup                 = user
-page.user.mygroups.header                = My places
-page.viewexpired                         = frontpage
-
-pagination.firstpage    = First
-pagination.lastpage     = Last
-pagination.nextpage     = Next
-pagination.pages        = Pages
-pagination.previouspage = Previous
-pagination.results      = Results
-
-passwordChanged.body   = You can now login with the new password.
-passwordChanged.header = Password changed successfully.
-
-passwordReset.hashNotFound = Password change token has expired. Please send the query again.
-
-passwordreset.mailBody     = You can change your password in address: {0}\n\nIf you have not requested password reset, ignore this message.\n\nStream intranet\nwww.streamparty.org\ninfo@streamparty.org
-passwordreset.mailSubject  = [STREAM] Password reset
-passwordreset.usernotfound = Username not found. Please note that username is case sensitive.
-
-permissiondenied.alreadyLoggedIn = You don't have enough rights
-permissiondenied.header          = Access denied
-permissiondenied.notLoggedIn     = You don't have enough rights to enter this site.
-
-place.buyable                     = Buyable
-place.code                        = Placecode
-place.commit                      = Save
-place.description                 = Description
-place.details                     = Details
-place.edit                        = Edit
-place.height                      = Height
-place.mapX                        = X
-place.mapY                        = Y
-place.membership                  = Associated user
-place.name                        = Name
-place.product                     = Product
-place.releasetime                 = Releasetime
-place.width                       = Width
-
-placeSelect.legend.blue      = My selected place
-placeSelect.legend.green     = My reserved place
-placeSelect.legend.grey      = Released if needed
-placeSelect.legend.red       = Reserved place
-placeSelect.legend.white     = Empty place
-placeSelect.placeName        = Place
-placeSelect.placePrice       = Price
-placeSelect.placeProductName = Place type
-placeSelect.placesleft       = Places left
-placeSelect.reservationPrice = Reservation price
-placeSelect.reservedPlaces   = Reserved places
-placeSelect.totalPlaces      = Places in total
-
-placegroup.created                = Created
-placegroup.creator                = Reserver
-placegroup.details                = Details
-placegroup.edit                   = Show
-placegroup.edited                 = Edited
-placegroup.name                   = Name
-placegroup.placename              = Place
-placegroup.places                 = Places
-placegroup.printPdf               = Print placecodes
-
-placegroupview.groupCreator       = Reserver
-placegroupview.header             = My places
-placegroupview.noMemberships      = No places
-placegroupview.placeReleaseFailed = Releasing of place failed!
-placegroupview.placeReleased      = Place {0} released 
-placegroupview.releasePlace       = Release
-placegroupview.reservationName    = Place
-placegroupview.reservationProduct = Product
-placegroupview.token              = Placecode / user
-
-placetoken.commit        = Associate token
-placetoken.pageHeader    = Add token
-placetoken.placelist     = My places
-placetoken.token         = Token
-placetoken.tokenNotFound = Token not found! Check token
-placetoken.topText       = You can associate a ticket bought by someone else to your account by inserting a token to the field below
-
-poll.answer      = Answer to poll
-poll.begin       = Open poll
-poll.description = Description
-poll.end         = Close poll
-poll.name        = Poll name
-poll.save        = Send answers
-
-product.barcode           = Barcode
-product.billed            = Billed
-product.boughtTotal       = Products billed
-product.cart.count        = To shoppingcart
-product.cashed            = Cashpaid
-product.color             = Color in UI
-product.create            = Create product
-product.createDiscount    = Add volumediscount
-product.edit              = edit
-product.name              = Name of product
-product.paid              = Paid
-product.prepaid           = Prepaid
-product.prepaidInstant    = Created when prepaid is paid
-product.price             = Price of product
-product.save              = Save
-product.shopInstant       = Create automatic cashpayment
-product.sort              = Sort nr
-product.totalPrice        = Total
-product.unitName          = Unit name
-product.vat               = VAT
-
-products.save             = Save
-
-productshop.billCreated   = Bill created
-productshop.commit        = Buy
-productshop.limits        = Available
-productshop.noItemsInCart = There are no products in shopping cart
-productshop.total         = Total
-
-reader.assocToCard          = Associate to card
-reader.description          = Description
-reader.name                 = Reader name
-reader.select               = Select reader
-reader.tag                  = Tag
-reader.user                 = User
-
-readerView.searchforuser = Search user
-
-readerevent.associateToUser = Associate to user
-readerevent.seenSince       = Last seen
-readerevent.shopToUser      = Buy to user
-readerevent.tagname         = Tag
-
-readerview.cards = Card ( printcount )
-
-resetMail.body     = You can change a forgotten password by inserting your username to the field below. A link where you can change the password will be sent to the email address associated to that.
-resetMail.header   = Reset lost password
-resetMail.send     = Send email
-resetMail.username = Username
-
-resetmailSent.body   = Email has been sent containing a link where you can change the password.
-resetmailSent.header = Email sent
-
-role.cardtemplate     = Cardtemplate
-role.create           = Create role
-role.description      = Description
-role.edit             = Edit
-role.edit.save        = Save
-role.execute          = (X)
-role.name             = Name
-role.parents          = Parents
-role.permissionheader = Role permissions
-role.read             = (R)
-role.write            = (W)
-
-sendPicture.header = S
-
-shop.accountBalance = Account balance
-shop.cash           = Cash deposit
-shop.totalPrice     = Price of products
-shop.user           = Selling to
-
-sidebar.bill.list           = My bills
-sidebar.bill.listAll        = All bills
-sidebar.bill.summary        = Summary of bills
-sidebar.bills               = Bills
-sidebar.cardTemplate.create = New card template
-sidebar.cardTemplate.list   = Show card templates
-sidebar.createuser          = Register a new account
-sidebar.eventorg.list       = My organisations
-sidebar.map.list            = Maps
-sidebar.map.placemap        = Placemap
-sidebar.maps                = Maps
-sidebar.other               = Other
-sidebar.product.create      = New product
-sidebar.product.createBill  = Create bill
-sidebar.product.list        = Products
-sidebar.products            = Products
-sidebar.role.create         = New role
-sidebar.role.list           = Roles
-sidebar.roles               = Roles
-sidebar.shop.readerEvents   = Reader events
-sidebar.shop.readerlist     = Show readers
-sidebar.user.create         = New user
-sidebar.user.editself       = My preferences
-sidebar.user.list           = Users
-sidebar.users               = Users
-sidebar.utils.flushCache    = Flush Cache
-sidebar.utils.testdata      = Testdata
-
-sitepage.addContent = Add content block
-sitepage.create     = Create
-sitepage.edit       = Edit
-sitepage.name       = Page name
-sitepage.roles      = Visible for roles
-sitepage.save       = Save
-
-sitepagelist.header = Site pages
-
-submenu.auth.login                   = Login
-submenu.auth.logoutResponse          = Logout successfull
-submenu.auth.sendResetMail           = Password reset
-submenu.bill.billSummary             = Bill summary
-submenu.bill.list                    = My bills
-submenu.bill.listAll                 = All bills
-submenu.index                        = Frontpage
-submenu.map.create                   = Create map
-submenu.map.list                     = List maps
-submenu.orgrole.create               = Create organisationrole
-submenu.orgrole.list                 = Organisation roles
-submenu.pages.create                 = Create content
-submenu.pages.list                   = List pages
-submenu.place.insertToken            = Insert placecode
-submenu.place.myGroups               = Place reservations
-submenu.place.placemap               = Placemap
-submenu.poll.index                   = Polls
-submenu.product.create               = Create product
-submenu.product.list                 = List products
-submenu.role.create                  = Create role
-submenu.role.list                    = Roles
-submenu.shop.createBill              = Shop
-submenu.shop.listReaders             = List readers
-submenu.shop.showReaderEvents        = Reader events
-submenu.user.accountEvents           = Account events
-submenu.user.changePassword          = Change password
-submenu.user.create                  = Create new user
-submenu.user.edit                    = User information
-submenu.user.invite                  = Invite friends
-submenu.user.manageuserlinks         = Manage users
-submenu.user.rolelinks               = Manage roles
-submenu.user.sendPicture             = Send picture
-submenu.user.shop                    = Shop
-submenu.user.userlinks               = User information
-submenu.useradmin.create             = Create user
-submenu.useradmin.createCardTemplate = Create cardtemplate
-submenu.useradmin.list               = List users
-submenu.useradmin.listCardTemplates  = Card templates
-submenu.useradmin.validateUser       = Validate user
-submenu.voting.compolist             = Compos
-submenu.voting.create                = Create new compo
-submenu.voting.myEntries             = My entries
-
-supernavi.admin = Adminview
-supernavi.user  = Userview
-
-svm.failure.errorMessage   = Payment error.
-svm.failure.successMessage = Payment error successfull\u2026 ( Possibly already marked paid )
-svm.pending.errorMessage   = Unknown error! If payment was successfull email will be sent after verification.
-svm.pending.successMessage = Payment pending. You will receive email after payment verification.
-svm.success.errorMessage   = Payment could not be verified!
-svm.success.successMessage = Payment was successfull. You can now your credits in the system.
-
-template.loggedInAs = Logged in as:
-
-topnavi.adminshop = Adminshop
-topnavi.billing   = Billing
-topnavi.compos    = Compos
-topnavi.contents  = Site contents
-topnavi.frontpage = Front page
-topnavi.maps      = Maps
-topnavi.placemap  = Map
-topnavi.poll      = Polls
-topnavi.products  = Products
-topnavi.shop      = Shop
-topnavi.user      = My properties
-topnavi.userinit  = User auth
-topnavi.usermgmt  = Users
-
-user.accountBalance             = Account balance
-user.accountEventHeader         = Account events
-user.accountevents              = Account events
-user.address                    = Address
-user.bank                       = Bank
-user.bankaccount                = Bank number
-user.birthday                   = Birthday
-user.cardPower                  = Usertype
-user.changePassword             = Change password
-user.changepassword.forUser     = For user
-user.changepassword.title       = Change password
-user.create                     = Create user
-user.createdmessage             = User has been created successfully. You can now login.
-user.defaultImage               = Default picture
-user.edit                       = Edit
-user.edit.title                 = My information
-user.email                      = Email
-user.firstNames                 = Firstname
-user.hasImage                   = Image
-user.image                      = Image
-user.imagelist                  = Saved images
-user.imagesubmit                = Send image
-user.insertToken                = Insert token
-user.invalidLoginCredentials    = Invalid user credentials
-user.invite                     = Invite
-user.invite.header              = Accept invitation
-user.invitemail                 = Email address
-user.lastName                   = Lastname
-user.login                      = Login
-user.myGroups                   = My place reservations
-user.nick                       = Nick
-user.noAccountevents            = No account events
-user.noCurrentImage             = No image
-user.noImage                    = No image
-user.oldPassword                = Current password
-user.page.invite                = Invite friends
-user.password                   = Password
-user.passwordcheck              = Password ( again )
-user.passwordlengthMessage      = Password is too short! 
-user.phone                      = Tel
-user.realname                   = Name
-user.roles                      = Roles
-user.rolesave                   = Save roles
-user.save                       = Save
-user.saveFailed                 = Save failed, Not enough permissions!
-user.saveSuccessfull            = Changes saved successfully
-user.sendPicture                = Send image
-user.sex                        = Sex
-user.sex.FEMALE                 = Female
-user.sex.MALE                   = Male
-user.sex.UNDEFINED              = Undefined
-user.shop                       = Buy
-user.shop.title                 = Shop to user
-user.successfullySaved          = Changes saved successfully
-user.superadmin                 = Superadmin
-user.thisIsCurrentImage         = Current image
-user.town                       = City
-user.uploadimage                = Send image
-user.username                   = Username
-user.validate.notUniqueUsername = Username already exists. Please select another.
-user.validateUser.commit        = Send
-user.validateUser.header        = Please insert credentials
-user.wholeName                  = Name
-user.zipCode                    = Postal nr.
-
-userimage.webcam = Take picture with webcam
-
-userlist.header        = Users
-userlist.onlythisevent = Limit to users of this event 
-userlist.placeassoc    = Assigned to place
-userlist.rolefilter    = Assigned roles
-userlist.saldofilter   = Saldo
-userlist.search        = Search
-
-usertitle.managingUser = Shop
-
-userview.header             = Users
-userview.invalidEmail       = Invalid email address
-userview.loginstringFaulty  = Username has to be atleast 2 characters long!
-userview.oldPasswordError   = Invalid password!
-userview.passwordTooShort   = Password has to be atleast 5 characters long!
-userview.passwordsChanged   = Password changed
-userview.passwordsDontMatch = Passwords do not match! Please try again!
-userview.userExists         = Username already exists! please select another.
-
-viewexpired.body  = Please login again.
-viewexpired.title = Login expired. Please login again.
-
-voting.allcompos.curEntries        = # of entries
-voting.allcompos.descri            = Description
-voting.allcompos.description       = List of all compos and theirs information.
-voting.allcompos.endTime           = End time
-voting.allcompos.header            = All compos
-voting.allcompos.maxParts          = Max participants
-voting.allcompos.name              = Name
-voting.allcompos.startTime         = Start time
-voting.allcompos.submitEnd         = Submit end
-voting.allcompos.submitEntry       = Submit entry
-voting.allcompos.submitStart       = Submit start
-voting.allcompos.voteEnd           = Vote end
-voting.allcompos.voteStart         = Vote start
-voting.compo.submit                = Submit entry
-voting.compo.vote                  = Vote
-voting.compoentryadd.button        = Send
-voting.compoentryadd.description   = Add new entry to compo
-voting.compoentryadd.entryname     = Name
-voting.compoentryadd.file          = File
-voting.compoentryadd.notes         = Notes
-voting.compoentryadd.screenmessage = Screenmessage
-voting.compoentryadd.title         = Add entry
-voting.compoentryadd.uploadedFile  = File to 
-voting.compoentrysave.button       = Save
-voting.create.compoEnd             = End time
-voting.create.compoStart           = Start time
-voting.create.createButton         = Create
-voting.create.dateValidatorEndDate = End time before start time.
-voting.create.description          = Description
-voting.create.header               = Create compo
-voting.create.maxParticipants      = Max participants
-voting.create.name                 = Name
-voting.create.submitEnd            = Submit close
-voting.create.submitStart          = Submit start
-voting.create.voteEnd              = Voting close
-voting.create.voteStart            = Voting start
+
+accountEvent.commit      = Save
+accountEvent.delivered   = Delivered
+accountEvent.edit        = Edit
+accountEvent.eventTime   = Time
+accountEvent.productname = Product
+accountEvent.quantity    = Count
+accountEvent.seller      = Sold by
+accountEvent.total       = Total
+accountEvent.unitPrice   = Unit price
+
+actionlog.create.header           = Create new actionmessage
+actionlog.create.message          = Message
+actionlog.create.role             = Target role
+actionlog.create.submitbutton     = Send
+actionlog.create.taskradio        = Task
+actionlog.crew                    = Crew
+actionlog.message                 = Event
+actionlog.messagelist.description = You can follow and create new action messages in this view
+actionlog.messagelist.header      = Messagelist
+actionlog.messagestate.DONE       = Done
+actionlog.messagestate.NEW        = New
+actionlog.messagestate.PENDING    = Pending
+actionlog.state                   = State
+actionlog.task                    = Task
+actionlog.tasklist.header         = Tasklist
+actionlog.time                    = Time
+actionlog.user                    = User
+
+applicationPermission.description = description
+applicationPermission.name        = Rightsgroup
+
+bill.addr1                = Address 1
+bill.addr2                = Address 2
+bill.addr3                = Address 3
+bill.addr4                = Address 4
+bill.addr5                = Address 5
+bill.address              = Payers address
+bill.billAmount           = Bill amount
+bill.billIsPaid           = Bill is paid
+bill.billLines            = Products
+bill.billNumber           = Bill number
+bill.billPaidDate         = Paid date
+bill.deliveryTerms        = Delivery terms
+bill.edit                 = edit
+bill.isPaid               = Paid
+bill.markPaid             = Mark paid
+bill.markedPaid           = Bill marked paid
+bill.notes                = Notes
+bill.noticetime           = Notice time
+bill.ourReference         = Our reference
+bill.paidDate             = Paid date
+bill.payer                = Payer
+bill.paymentTime          = Payment time
+bill.paymentTime.now      = Now
+bill.printBill            = Print bill
+bill.receiverAddress      = Receiver address
+bill.referenceNumberBase  = Reference number base
+bill.referencenumber      = Reference nr.
+bill.sentDate             = Sent date
+bill.show                 = Show
+bill.theirReference       = Clients reference
+bill.totalPrice           = Total
+
+billedit.billnotfound = Bill not found. Select again.
+
+billine.linePrice         = Total
+billine.name              = Product
+billine.quantity          = Quantity
+billine.referencedProduct = Referenced product
+billine.save              = Save
+billine.unitName          = Unit
+billine.unitPrice         = Unit price
+billine.vat               = VAT
+
+bills.noBills = No bills
+
+cardTemplate.create      = Create
+cardTemplate.edit        = Edit
+cardTemplate.id          = Id
+cardTemplate.imageheader = Current Template
+cardTemplate.name        = Card template
+cardTemplate.power       = Card power
+cardTemplate.roles       = Associated roles
+cardTemplate.save        = Save
+cardTemplate.sendImage   = Upload Image
+
+checkout.cancel.errorMessage   = Error confirming the cancel\u2026 Please report this to code@codecrew.fi
+checkout.cancel.successMessage = You can retry payment at your own bills.
+checkout.reject.errorMessage   = Error while processing rejected payment. Please report this error to code@codecrew.fi
+checkout.reject.successMessage = Payment rejected. You can retry payment from your own bills.
+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.
+
+compo.edit                = Edit compo
+compo.saveVotes           = Save votes
+compo.votesSaved          = Votes saved
+
+compofile.download        = Download
+compofile.download.header = Download file
+compofile.upload          = Upload file
+
+discount.active     = Active
+discount.amountMax  = Max amount
+discount.amountMin  = Min amount
+discount.code       = Discount code
+discount.create     = Create new
+discount.details    = Details
+discount.edit       = Edit
+discount.maxNum     = Max nr of discounts
+discount.perUser    = Discounts per user
+discount.percentage = Discount percent
+discount.products   = Products
+discount.role       = Role discount
+discount.save       = Save
+discount.shortdesc  = Description
+discount.validFrom  = Valid from
+discount.validTo    = Valid to
+
+editplace.header      = Edit place
+
+editplacegroup.header = Placegroup information
+
+entry.edit = Edit entry
+
+event.defaultRole         = Default user role
+event.edit                = Edit
+event.endTime             = End time
+event.name                = Event name
+event.nextBillNumber      = Initial bill number
+event.referenceNumberBase = Reference number base
+event.save                = Save
+event.startTime           = Start time
+
+eventdomain.domainname = Domain
+eventdomain.remove     = Remove
+
+eventmap.active          = Active
+eventmap.buyable.like    = Place name match
+eventmap.buyable.lock    = Lock places
+eventmap.buyable.release = Release places
+eventmap.name            = Map name
+eventmap.notes           = Notes
+eventmap.save            = Save
+
+eventorg.bankName1     = Bank name 2
+eventorg.bankName2     = Bank name 2
+eventorg.bankNumber1   = Bank account nr. 1
+eventorg.bankNumber2   = Bank account nr. 2
+eventorg.billAddress1  = Billing address 1
+eventorg.billAddress2  = Billing address 2
+eventorg.billAddress3  = Billing address 3
+eventorg.billAddress4  = Billing address 4
+eventorg.bundleCountry = Country bundle
+eventorg.create        = Create
+eventorg.createEvent   = Create event
+eventorg.createevent   = Create new event
+eventorg.edit          = Edit
+eventorg.events        = Event of the organisation
+eventorg.organisation  = Organisation name
+eventorg.save          = Save
+
+eventorgView.eventname = Name of event
+
+eventorganiser.name = Eventorganiser
+
+game.gamepoints = Game points
+
+global.cancel               = Cancel
+global.copyright            = Codecrew Ry
+global.notAuthorizedExecute = You are not authorized to do that!!
+global.notauthorized        = You don't have enough rights to enter this site.
+global.save                 = Save
+
+httpsession.creationTime = Created
+httpsession.invalidate   = Invalidate
+
+imagefile.description = Description
+imagefile.file        = Imagefile
+
+invite.emailexists           = User with that email address already exists in the system.
+invite.notFound              = Invite invalid or already used
+invite.successfull           = Invite sent successfully
+invite.userCreateSuccessfull = User successfully created. You can now login.
+
+javax.validation.constraints.AssertFalse.message = must be false
+javax.validation.constraints.AssertTrue.message  = must be true
+javax.validation.constraints.DecimalMax.message  = must be less than or equal to {value}
+javax.validation.constraints.DecimalMin.message  = must be greater than or equal to {value}
+javax.validation.constraints.Digits.message      = numeric value out of bounds (<{integer} digits>.<{fraction} digits> expected)
+javax.validation.constraints.Future.message      = must be in the future
+javax.validation.constraints.Max.message         = must be less than or equal to {value}
+javax.validation.constraints.Min.message         = must be greater than or equal to {value}
+javax.validation.constraints.NotNull.message     = may not be null
+javax.validation.constraints.Null.message        = must be null
+javax.validation.constraints.Past.message        = must be in the past
+javax.validation.constraints.Pattern.message     = must match "{regexp}"
+javax.validation.constraints.Size.message        = size must be between {min} and {max}
+
+layout.editBottom  = Edit bottom content
+layout.editContent = Edit center
+layout.editTop     = Edit topcontent
+
+login.login              = Login
+login.logout             = Logout
+login.logoutmessage      = You have logged out of the system
+login.password           = Password
+login.submit             = Login
+login.username           = Username
+
+loginerror.header        = Login failed
+loginerror.message       = Username of password incorrect.
+loginerror.resetpassword = Reset password
+
+map.edit                          = Edit
+map.generate                      = Generate places
+map.height                        = Place height (px)
+map.name                          = Name
+map.namebase                      = Semicolon separated table prefixes
+map.oneRowTable                   = One row tables
+map.placesInRow                   = Places in row
+map.product                       = Place product
+map.startX                        = Place start X-coordinate
+map.startY                        = Place start Y-coordinate\n
+map.submitMap                     = Send map image
+map.tableCount                    = Place count
+map.tableXdiff                    = Table X difference 
+map.tableYdiff                    = Table Y difference
+map.tablesHorizontal              = Generate horizontal tables
+map.width                         = Place width (px)
+
+mapEdit.removePlaces = Remove ALL places
+
+mapManage.lockedPlaces   = Locked {0} places.
+mapManage.releasedPlaces = Released {0} places 
+
+mapView.buyPlaces                 = Lock selected places
+mapView.errorWhenReleasingPlace   = Error when releasing place
+mapView.errorWhenReservingPlace   = Error when reserving place!
+mapView.errorWhileBuyingPlaces    = Error when buying places. Please try again. If error reoccurs please contact organizers.
+mapView.notEnoughCreditsToReserve = You don't have enough credits to reserve this place.
+
+nasty.user = Go away!
+
+org.hibernate.validator.constraints.Email.message    = not a well-formed email address
+org.hibernate.validator.constraints.Length.message   = length must be between {min} and {max}
+org.hibernate.validator.constraints.NotEmpty.message = may not be empty
+org.hibernate.validator.constraints.Range.message    = must be between {min} and {max}
+
+orgrole.create  = Create
+orgrole.name    = Name
+orgrole.parents = Parent
+
+page.account.edit.header                 = Edit account events
+page.account.list.header                 = Account events
+page.admin.sendimage.header              = Send image
+page.auth.login.header                   = Login error
+page.auth.login.loginerror.header        = Kirjautumisvirhe
+page.auth.login.loginerror.pagegroup     = frontpage
+page.auth.login.logout.header            = Uloskirjautuminen
+page.auth.login.logout.pagegroup         = frontpage
+page.auth.login.pagegroup                = frontpage
+page.auth.login.title                    = Login error
+page.auth.loginerror.header              = Login failed
+page.auth.loginerror.pagegroup           = frontpage
+page.auth.logout.pagegroup               = frontpage
+page.auth.notauthorized.pagegroup        = frontpage
+page.auth.resetPassword.header           = Reset password
+page.bill.billSummary.header             = Summary of bills
+page.bill.edit.header                    = Edit bill
+page.bill.listAll.header                 = Bills
+page.bill.placemap.header                = Place map
+page.bill.show.header                    = Bill info
+page.checkout.cancel.header              = Payment cancelled!
+page.checkout.delayed.header             = Delayed payment
+page.checkout.reject.header              = Payment rejected!
+page.checkout.return.header              = Payment confirmed
+page.game.list.header                    = Insomnia Game
+page.game.start.header                   = Insomnia Game
+page.index.header                        = Frontpage
+page.index.pagegroup                     = frontpage
+page.permissionDenied.header             = Access denied
+page.place.edit.header                   = Edit place
+page.place.insertToken.header            = Insert place token
+page.place.mygroups.header               = My places
+page.place.placemap.header               = Reserve place
+page.poll.answer.header                  = Poll
+page.poll.answered.header                = Thank you for your answer
+page.poll.start.header                   = Poll
+page.product.create.pagegroup            = admin
+page.product.createBill.header           = Buy products
+page.product.createBill.pagegroup        = shop
+page.product.edit.pagegroup              = admin
+page.product.list.pagegroup              = admin
+page.product.validateBillProducts.header = Bill created
+page.role.create.pagegroup               = admin
+page.role.edit.pagegroup                 = admin
+page.role.list.pagegroup                 = admin
+page.shop.readerevents.header            = RFID shop
+page.svm.failure.header                  = Payment error
+page.svm.pending.header                  = Payment pending
+page.svm.success.header                  = Payment successfull
+page.tests.placemap.pagegroup            = shop
+page.user.create.header                  = New user
+page.user.create.pagegroup               = user
+page.user.edit.header                    = Edit user
+page.user.edit.pagegroup                 = user
+page.user.editself.header                = My preferences
+page.user.editself.pagegroup             = user
+page.user.list.header                    = Users
+page.user.list.pagegroup                 = user
+page.user.mygroups.header                = My places
+page.viewexpired                         = frontpage
+
+pagination.firstpage    = First
+pagination.lastpage     = Last
+pagination.nextpage     = Next
+pagination.pages        = Pages
+pagination.previouspage = Previous
+pagination.results      = Results
+
+passwordChanged.body   = You can now login with the new password.
+passwordChanged.header = Password changed successfully.
+
+passwordReset.errorChanging = Unexpected error whilst password reset. Contact your administrator.
+passwordReset.hashNotFound  = Password change token has expired. Please send the query again.
+
+passwordreset.mailBody     = You can change your password in address: {0}\n\nIf you have not requested password reset, ignore this message.\n\nStream intranet\nwww.streamparty.org\ninfo@streamparty.org
+passwordreset.mailSubject  = [STREAM] Password reset
+passwordreset.usernotfound = Username not found. Please note that username is case sensitive.
+
+permissiondenied.alreadyLoggedIn = You don't have enough rights
+permissiondenied.header          = Access denied
+permissiondenied.notLoggedIn     = You don't have enough rights to enter this site.
+
+place.buyable                     = Buyable
+place.code                        = Placecode
+place.commit                      = Save
+place.description                 = Description
+place.details                     = Details
+place.edit                        = Edit
+place.height                      = Height
+place.mapX                        = X
+place.mapY                        = Y
+place.membership                  = Associated user
+place.name                        = Name
+place.product                     = Product
+place.releasetime                 = Releasetime
+place.width                       = Width
+
+placeSelect.legend.blue      = My selected place
+placeSelect.legend.green     = My reserved place
+placeSelect.legend.grey      = Released if needed
+placeSelect.legend.red       = Reserved place
+placeSelect.legend.white     = Empty place
+placeSelect.placeName        = Place
+placeSelect.placePrice       = Price
+placeSelect.placeProductName = Place type
+placeSelect.placesleft       = Places left
+placeSelect.reservationPrice = Reservation price
+placeSelect.reservedPlaces   = Reserved places
+placeSelect.totalPlaces      = Places in total
+
+placegroup.created                = Created
+placegroup.creator                = Reserver
+placegroup.details                = Details
+placegroup.edit                   = Show
+placegroup.edited                 = Edited
+placegroup.name                   = Name
+placegroup.placename              = Place
+placegroup.places                 = Places
+placegroup.printPdf               = Print placecodes
+
+placegroupview.groupCreator       = Reserver
+placegroupview.header             = My places
+placegroupview.noMemberships      = No places
+placegroupview.placeReleaseFailed = Releasing of place failed!
+placegroupview.placeReleased      = Place {0} released 
+placegroupview.releasePlace       = Release
+placegroupview.reservationName    = Place
+placegroupview.reservationProduct = Product
+placegroupview.token              = Placecode / user
+
+placetoken.commit        = Associate token
+placetoken.pageHeader    = Add token
+placetoken.placelist     = My places
+placetoken.token         = Token
+placetoken.tokenNotFound = Token not found! Check token
+placetoken.topText       = You can associate a ticket bought by someone else to your account by inserting a token to the field below
+
+poll.answer      = Answer to poll
+poll.begin       = Open poll
+poll.description = Description
+poll.end         = Close poll
+poll.name        = Poll name
+poll.save        = Send answers
+
+product.barcode           = Barcode
+product.billed            = Billed
+product.boughtTotal       = Products billed
+product.cart.count        = To shoppingcart
+product.cashed            = Cashpaid
+product.color             = Color in UI
+product.create            = Create product
+product.createDiscount    = Add volumediscount
+product.edit              = edit
+product.name              = Name of product
+product.paid              = Paid
+product.prepaid           = Prepaid
+product.prepaidInstant    = Created when prepaid is paid
+product.price             = Price of product
+product.save              = Save
+product.shopInstant       = Create automatic cashpayment
+product.sort              = Sort nr
+product.totalPrice        = Total
+product.unitName          = Unit name
+product.vat               = VAT
+
+products.save             = Save
+
+productshop.billCreated   = Bill created
+productshop.commit        = Buy
+productshop.limits        = Available
+productshop.noItemsInCart = There are no products in shopping cart
+productshop.total         = Total
+
+reader.assocToCard          = Associate to card
+reader.description          = Description
+reader.name                 = Reader name
+reader.select               = Select reader
+reader.tag                  = Tag
+reader.user                 = User
+
+readerView.searchforuser = Search user
+
+readerevent.associateToUser = Associate to user
+readerevent.seenSince       = Last seen
+readerevent.shopToUser      = Buy to user
+readerevent.tagname         = Tag
+
+readerview.cards = Card ( printcount )
+
+resetMail.body     = You can change a forgotten password by inserting your username to the field below. A link where you can change the password will be sent to the email address associated to that.
+resetMail.header   = Reset lost password
+resetMail.send     = Send email
+resetMail.username = Username
+
+resetmailSent.body   = Email has been sent containing a link where you can change the password.
+resetmailSent.header = Email sent
+
+role.cardtemplate     = Cardtemplate
+role.create           = Create role
+role.description      = Description
+role.edit             = Edit
+role.edit.save        = Save
+role.execute          = (X)
+role.name             = Name
+role.parents          = Parents
+role.permissionheader = Role permissions
+role.read             = (R)
+role.write            = (W)
+
+sendPicture.header = S
+
+shop.accountBalance = Account balance
+shop.cash           = Cash deposit
+shop.totalPrice     = Price of products
+shop.user           = Selling to
+
+sidebar.bill.list           = My bills
+sidebar.bill.listAll        = All bills
+sidebar.bill.summary        = Summary of bills
+sidebar.bills               = Bills
+sidebar.cardTemplate.create = New card template
+sidebar.cardTemplate.list   = Show card templates
+sidebar.createuser          = Register a new account
+sidebar.eventorg.list       = My organisations
+sidebar.map.list            = Maps
+sidebar.map.placemap        = Placemap
+sidebar.maps                = Maps
+sidebar.other               = Other
+sidebar.product.create      = New product
+sidebar.product.createBill  = Create bill
+sidebar.product.list        = Products
+sidebar.products            = Products
+sidebar.role.create         = New role
+sidebar.role.list           = Roles
+sidebar.roles               = Roles
+sidebar.shop.readerEvents   = Reader events
+sidebar.shop.readerlist     = Show readers
+sidebar.user.create         = New user
+sidebar.user.editself       = My preferences
+sidebar.user.list           = Users
+sidebar.users               = Users
+sidebar.utils.flushCache    = Flush Cache
+sidebar.utils.testdata      = Testdata
+
+sitepage.addContent = Add content block
+sitepage.create     = Create
+sitepage.edit       = Edit
+sitepage.name       = Page name
+sitepage.roles      = Visible for roles
+sitepage.save       = Save
+
+sitepagelist.header = Site pages
+
+submenu.auth.login                   = Login
+submenu.auth.logoutResponse          = Logout successfull
+submenu.auth.sendResetMail           = Password reset
+submenu.bill.billSummary             = Bill summary
+submenu.bill.list                    = My bills
+submenu.bill.listAll                 = All bills
+submenu.index                        = Frontpage
+submenu.map.create                   = Create map
+submenu.map.list                     = List maps
+submenu.orgrole.create               = Create organisationrole
+submenu.orgrole.list                 = Organisation roles
+submenu.pages.create                 = Create content
+submenu.pages.list                   = List pages
+submenu.place.insertToken            = Insert placecode
+submenu.place.myGroups               = Place reservations
+submenu.place.placemap               = Placemap
+submenu.poll.index                   = Polls
+submenu.product.create               = Create product
+submenu.product.list                 = List products
+submenu.role.create                  = Create role
+submenu.role.list                    = Roles
+submenu.shop.createBill              = Shop
+submenu.shop.listReaders             = List readers
+submenu.shop.showReaderEvents        = Reader events
+submenu.user.accountEvents           = Account events
+submenu.user.changePassword          = Change password
+submenu.user.create                  = Create new user
+submenu.user.edit                    = User information
+submenu.user.invite                  = Invite friends
+submenu.user.manageuserlinks         = Manage users
+submenu.user.rolelinks               = Manage roles
+submenu.user.sendPicture             = Send picture
+submenu.user.shop                    = Shop
+submenu.user.userlinks               = User information
+submenu.useradmin.create             = Create user
+submenu.useradmin.createCardTemplate = Create cardtemplate
+submenu.useradmin.list               = List users
+submenu.useradmin.listCardTemplates  = Card templates
+submenu.useradmin.validateUser       = Validate user
+submenu.voting.compolist             = Compos
+submenu.voting.create                = Create new compo
+submenu.voting.myEntries             = My entries
+
+supernavi.admin = Adminview
+supernavi.user  = Userview
+
+svm.failure.errorMessage   = Payment error.
+svm.failure.successMessage = Payment error successfull\u2026 ( Possibly already marked paid )
+svm.pending.errorMessage   = Unknown error! If payment was successfull email will be sent after verification.
+svm.pending.successMessage = Payment pending. You will receive email after payment verification.
+svm.success.errorMessage   = Payment could not be verified!
+svm.success.successMessage = Payment was successfull. You can now your credits in the system.
+
+template.loggedInAs = Logged in as:
+
+topnavi.adminshop = Adminshop
+topnavi.billing   = Billing
+topnavi.compos    = Compos
+topnavi.contents  = Site contents
+topnavi.frontpage = Front page
+topnavi.maps      = Maps
+topnavi.placemap  = Map
+topnavi.poll      = Polls
+topnavi.products  = Products
+topnavi.shop      = Shop
+topnavi.user      = My properties
+topnavi.userinit  = User auth
+topnavi.usermgmt  = Users
+
+user.accountBalance             = Account balance
+user.accountEventHeader         = Account events
+user.accountevents              = Account events
+user.address                    = Address
+user.bank                       = Bank
+user.bankaccount                = Bank number
+user.birthday                   = Birthday
+user.cardPower                  = Usertype
+user.changePassword             = Change password
+user.changepassword.forUser     = For user
+user.changepassword.title       = Change password
+user.create                     = Create user
+user.createdmessage             = User has been created successfully. You can now login.
+user.defaultImage               = Default picture
+user.edit                       = Edit
+user.edit.title                 = My information
+user.email                      = Email
+user.firstNames                 = Firstname
+user.hasImage                   = Image
+user.image                      = Image
+user.imagelist                  = Saved images
+user.imagesubmit                = Send image
+user.insertToken                = Insert token
+user.invalidLoginCredentials    = Invalid user credentials
+user.invite                     = Invite
+user.invite.header              = Accept invitation
+user.invitemail                 = Email address
+user.lastName                   = Lastname
+user.login                      = Login
+user.myGroups                   = My place reservations
+user.nick                       = Nick
+user.noAccountevents            = No account events
+user.noCurrentImage             = No image
+user.noImage                    = No image
+user.oldPassword                = Current password
+user.page.invite                = Invite friends
+user.password                   = Password
+user.passwordcheck              = Password ( again )
+user.passwordlengthMessage      = Password is too short! 
+user.phone                      = Tel
+user.realname                   = Name
+user.roles                      = Roles
+user.rolesave                   = Save roles
+user.save                       = Save
+user.saveFailed                 = Save failed, Not enough permissions!
+user.saveSuccessfull            = Changes saved successfully
+user.sendPicture                = Send image
+user.sex                        = Sex
+user.sex.FEMALE                 = Female
+user.sex.MALE                   = Male
+user.sex.UNDEFINED              = Undefined
+user.shop                       = Buy
+user.shop.title                 = Shop to user
+user.successfullySaved          = Changes saved successfully
+user.superadmin                 = Superadmin
+user.thisIsCurrentImage         = Current image
+user.town                       = City
+user.uploadimage                = Send image
+user.username                   = Username
+user.validate.notUniqueUsername = Username already exists. Please select another.
+user.validateUser.commit        = Send
+user.validateUser.header        = Please insert credentials
+user.wholeName                  = Name
+user.zipCode                    = Postal nr.
+
+userimage.webcam = Take picture with webcam
+
+userlist.header        = Users
+userlist.onlythisevent = Limit to users of this event 
+userlist.placeassoc    = Assigned to place
+userlist.rolefilter    = Assigned roles
+userlist.saldofilter   = Saldo
+userlist.search        = Search
+
+usertitle.managingUser = Shop
+
+userview.header             = Users
+userview.invalidEmail       = Invalid email address
+userview.loginstringFaulty  = Username has to be atleast 2 characters long!
+userview.oldPasswordError   = Invalid password!
+userview.passwordTooShort   = Password has to be atleast 5 characters long!
+userview.passwordsChanged   = Password changed
+userview.passwordsDontMatch = Passwords do not match! Please try again!
+userview.userExists         = Username already exists! please select another.
+
+viewexpired.body  = Please login again.
+viewexpired.title = Login expired. Please login again.
+
+voting.allcompos.curEntries        = # of entries
+voting.allcompos.descri            = Description
+voting.allcompos.description       = List of all compos and theirs information.
+voting.allcompos.endTime           = End time
+voting.allcompos.header            = All compos
+voting.allcompos.maxParts          = Max participants
+voting.allcompos.name              = Name
+voting.allcompos.startTime         = Start time
+voting.allcompos.submitEnd         = Submit end
+voting.allcompos.submitEntry       = Submit entry
+voting.allcompos.submitStart       = Submit start
+voting.allcompos.voteEnd           = Vote end
+voting.allcompos.voteStart         = Vote start
+voting.compo.submit                = Submit entry
+voting.compo.vote                  = Vote
+voting.compoentryadd.button        = Send
+voting.compoentryadd.description   = Add new entry to compo
+voting.compoentryadd.entryname     = Name
+voting.compoentryadd.file          = File
+voting.compoentryadd.notes         = Notes
+voting.compoentryadd.screenmessage = Screenmessage
+voting.compoentryadd.title         = Add entry
+voting.compoentryadd.uploadedFile  = File to 
+voting.compoentrysave.button       = Save
+voting.create.compoEnd             = End time
+voting.create.compoStart           = Start time
+voting.create.createButton         = Create
+voting.create.dateValidatorEndDate = End time before start time.
+voting.create.description          = Description
+voting.create.header               = Create compo
+voting.create.maxParticipants      = Max participants
+voting.create.name                 = Name
+voting.create.submitEnd            = Submit close
+voting.create.submitStart          = Submit start
+voting.create.voteEnd              = Voting close
+voting.create.voteStart            = Voting start

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

-#Generated by ResourceBundle Editor (http://eclipse-rbe.sourceforge.net)
-#Bill number
-# Validationmessages
-
-bill.billMarkedPaidMail.message = Your deposit number {0} has been marked as paid.
-bill.billMarkedPaidMail.subject = [Streamparty] Your credits have been updated
-
-global.infomail = info@streamparty.org
-global.webpage  = http://www.streamparty.org
+#Generated by ResourceBundle Editor (http://eclipse-rbe.sourceforge.net)
+#Bill number
+# Validationmessages
+
+actionlog.create.header           = Create new actionmessage
+actionlog.create.message          = Message
+actionlog.create.role             = Target role
+actionlog.create.submitbutton     = Send
+actionlog.create.taskradio        = Task
+actionlog.crew                    = Crew
+actionlog.message                 = Event
+actionlog.messagelist.description = You can follow and create new action messages in this view
+actionlog.messagelist.header      = Messagelist
+actionlog.state                   = State
+actionlog.task                    = Task
+actionlog.tasklist.header         = Tasklist
+actionlog.time                    = Time
+actionlog.user                    = User
+
+bill.billMarkedPaidMail.message = Your deposit number {0} has been marked as paid.
+bill.billMarkedPaidMail.subject = [Streamparty] Your credits have been updated
+
+eventorg.create = Create
+
+global.cancel               = Cancel
+global.copyright            = Codecrew Ry
+global.infomail             = info@streamparty.org
+global.notAuthorizedExecute = You are not authorized to execute that!!
+global.notauthorized        = You don't have enough rights to enter this site.
+global.save                 = Save
+global.webpage              = http://www.streamparty.org
+
+httpsession.creationTime = Created
+
+login.login              = Login
+login.logout             = Logout
+login.logoutmessage      = You have logged out of the system
+login.password           = Password
+login.submit             = Login
+login.username           = Username
+
+loginerror.header        = Login failed
+loginerror.message       = Username of password incorrect.
+loginerror.resetpassword = Reset password
+
+passwordChanged.body   = You can now login with the new password.
+passwordChanged.header = Password changed successfully.
+
+passwordReset.errorChanging = Unexpected error whilst password reset. Contact your administrator.
+passwordReset.hashNotFound  = Password change token has expired. Please send the query again.
+
+permissiondenied.alreadyLoggedIn = You don't have enough rights
+permissiondenied.header          = Access denied
+permissiondenied.notLoggedIn     = You don't have enough rights to enter this site.
+
+resetMail.body     = You can change a forgotten password by inserting your username to the field below. A link where you can change the password will be sent to the email address associated to that.
+resetMail.header   = Reset lost password
+resetMail.send     = Send email
+resetMail.username = Username
+
+resetmailSent.body   = Email has been sent containing a link where you can change the password.
+resetmailSent.header = Email sent

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

-
-accountEvent.commit      = Tallenna
-accountEvent.delivered   = Toimitettu
-accountEvent.edit        = Muokkaa
-accountEvent.eventTime   = Aika
-accountEvent.productname = Tuote
-accountEvent.quantity    = Lkm
-accountEvent.seller      = Myyj\u00E4
-accountEvent.total       = Yhteens\u00E4
-accountEvent.unitPrice   = Yksikk\u00F6hinta
-
-actionlog.create.header           = Luo uusi ActionMessage
-actionlog.create.message          = Viesti
-actionlog.create.role             = Kohderooli
-actionlog.create.submitbutton     = L\u00E4het\u00E4
-actionlog.create.taskradio        = Teht\u00E4v\u00E4
-actionlog.crew                    = Crew
-actionlog.message                 = Tapahtuma
-actionlog.messagelist.description = Voit seurata sek\u00E4 luoda uusia ActionMessageja t\u00E4ss\u00E4 n\u00E4kym\u00E4ss\u00E4.
-actionlog.messagelist.header      = ActionLog
-actionlog.messagestate.DONE       = Tehty
-actionlog.messagestate.NEW        = Uusi
-actionlog.messagestate.PENDING    = Ty\u00F6n alla
-actionlog.state                   = Tila
-actionlog.task                    = Taski
-actionlog.tasklist.header         = Viestilista
-actionlog.time                    = Aika
-actionlog.user                    = Tekij\u00E4
-
-applicationPermission.description = kuvaus
-applicationPermission.name        = Oikeusryhm\u00E4
-
-bill.addr1                = Osoite 1
-bill.addr2                = Osoite 2
-bill.addr3                = Osoite 3
-bill.addr4                = Osoite 4
-bill.addr5                = Osoite 5
-bill.address              = Maksajan osoite
-bill.billAmount           = Laskun summa
-bill.billIsPaid           = Lasku on maksettu
-bill.billLines            = Tuotteet
-bill.billNumber           = Laskun numero
-bill.billPaidDate         = Maksup\u00E4iv\u00E4
-bill.deliveryTerms        = Toimitusehdot
-bill.edit                 = Muokkaa
-bill.isPaid               = Maksettu
-bill.markPaid             = Maksettu
-bill.markedPaid           = Lasku merkitty maksetuksi.
-bill.notes                = Huomioita
-bill.noticetime           = Huomautusaika
-bill.ourReference         = Myyj\u00E4n viite
-bill.paidDate             = Maksup\u00E4iv\u00E4
-bill.payer                = Maksaja
-bill.paymentTime          = Maksuehdot
-bill.paymentTime.now      = Heti
-bill.printBill            = Tulosta lasku
-bill.receiverAddress      = Kauppiaan osoite
-bill.referenceNumberBase  = Viitenumeropohja
-bill.referencenumber      = Viitenumero
-bill.sentDate             = P\u00E4iv\u00E4ys
-bill.show                 = N\u00E4yt\u00E4
-bill.theirReference       = Asiakkaan viite
-bill.totalPrice           = Laskun summa
-
-billine.linePrice         = Yhteens\u00E4
-billine.name              = Tuote
-billine.quantity          = Lukum\u00E4\u00E4r\u00E4
-billine.referencedProduct = Tuoteviittaus
-billine.save              = Tallenna
-billine.unitName          = Yksikk\u00F6
-billine.unitPrice         = Yksikk\u00F6hinta
-billine.vat               = ALV
-
-bills.noBills = Ei laskuja
-
-cardTemplate.create      = Luo
-cardTemplate.edit        = Muokkaa
-cardTemplate.id          = Id
-cardTemplate.imageheader = Nykyinen pohja
-cardTemplate.name        = Korttipohja
-cardTemplate.power       = Teho
-cardTemplate.roles       = Yhdistetyt roolit
-cardTemplate.save        = Tallenna
-cardTemplate.sendImage   = Lataa kuva
-
-checkout.cancel.errorMessage   = Virhe peruutuksen vahvistuksessa\u2026 Ilmoita t\u00E4st\u00E4 osoitteeseen code@codecrew.fi
-checkout.cancel.successMessage = Voit yritt\u00E4\u00E4 maksua uudelleen omista laskuistasi.
-checkout.reject.errorMessage   = Virhe hyl\u00E4tyn maksun k\u00E4sittelyss\u00E4. Raportoi t\u00E4m\u00E4 virhe osoitteeseen: code@codecrew.fi
-checkout.reject.successMessage = Maksu hyl\u00E4tty. Voit yritt\u00E4\u00E4 maksua uudelleen omista laskuistasi.
-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.
-
-compo.edit                = Muokkaa compoa
-compo.saveVotes           = Tallenna \u00E4\u00E4net
-compo.votesSaved          = \u00C4\u00E4net tallennettu
-
-compofile.download        = lataa
-compofile.download.header = Lataa tiedosto
-compofile.upload          = L\u00E4het\u00E4 tiedosto
-
-discount.active     = Aktiivinen
-discount.amountMax  = Enimm\u00E4ism\u00E4\u00E4r\u00E4
-discount.amountMin  = V\u00E4himm\u00E4ism\u00E4\u00E4r\u00E4
-discount.code       = Alennuskoodi
-discount.create     = Luo uusi
-discount.details    = Tiedot
-discount.edit       = Muokkaa
-discount.maxNum     = Alennusten enimm\u00E4islkm
-discount.perUser    = Alennuksia per k\u00E4ytt\u00E4j\u00E4
-discount.percentage = Alennusprosentti
-discount.products   = Tuotteet
-discount.role       = Roolialennus
-discount.save       = Tallenna
-discount.shortdesc  = Kuvaus
-discount.validFrom  = Voimassa alkaen
-discount.validTo    = Voimassa asti
-
-editplace.header      = Muokkaa paikkaa
-
-editplacegroup.header = Paikkaryhm\u00E4n tiedot
-
-entry.edit = Muokkaa
-
-event.defaultRole         = K\u00E4ytt\u00E4jien oletusrooli
-event.edit                = Muokkaa
-event.endTime             = Lopetusp\u00E4iv\u00E4
-event.name                = Tapahtuman nimi
-event.nextBillNumber      = Seuraavan laskun numero
-event.referenceNumberBase = Viitenumeron pohja
-event.save                = Tallenna
-event.startTime           = Aloitusp\u00E4iv\u00E4
-
-eventdomain.domainname = Domain
-eventdomain.remove     = Poista
-
-eventmap.active          = Aktiivinen\u0009
-eventmap.buyable.like    = Paikat
-eventmap.buyable.lock    = Lukitse paikat
-eventmap.buyable.release = Vapauta paikat
-eventmap.name            = Kartan nimi
-eventmap.notes           = Lis\u00E4tiedot
-eventmap.save            = Tallenna
-
-eventorg.bankName1     = Pankin nimi 1
-eventorg.bankName2     = Pankin nimi 2
-eventorg.bankNumber1   = Tilinumero 1
-eventorg.bankNumber2   = Tilinumero 2
-eventorg.billAddress1  = Laskutusosoite 1
-eventorg.billAddress2  = Laskutusosoite 2
-eventorg.billAddress3  = Laskutusosoite 3
-eventorg.billAddress4  = Laskutusosoite 4
-eventorg.bundleCountry = Kieli-bundle
-eventorg.createEvent   = Luo tapahtuma
-eventorg.createevent   = Luo uusi tapahtuma
-eventorg.events        = Organisaation tapahtumat
-eventorg.organisation  = Organisaation nimi
-eventorg.save          = Tallenna
-
-eventorgView.eventname = Tapahtuman nimi
-
-eventorganiser.name = Tapahtumaj\u00E4rjest\u00E4j\u00E4
-
-game.gamepoints = Insomnia Game pisteet:
-
-global.cancel               = Peruuta
-global.notAuthorizedExecute = Sinulla ei ole riitt\u00E4v\u00E4sti oikeuksia suorittaa t\u00E4t\u00E4 toimenpidett\u00E4!
-global.notauthorized        = Sinulla ei ole riitt\u00E4vi\u00E4 oikeuksia t\u00E4lle sivulle.
-global.save                 = Tallenna
-
-httpsession.id                    = ID
-httpsession.invalidate            = Mit\uFFFDt\uFFFDi
-httpsession.invalidateSuccessfull = Sessio onnistuneesti mit\uFFFDt\uFFFDity
-httpsession.isSessionNew          = Uusi sessio
-httpsession.lastAccessedTime      = Viimeksi n\uFFFDhty
-httpsession.maxInactiveInterval   = Aikakatkaisu (s)
-httpsession.sessionHasExisted     = Ollut elossa (s)
-httpsession.user                  = Tunnus
-
-imagefile.description = Kuvaus
-imagefile.file        = Kuvatiedosto
-
-index.title = Etusivu
-
-invite.emailexists           = J\u00E4rjestelm\u00E4ss\u00E4 on jo k\u00E4ytt\u00E4j\u00E4tunnus samalla s\u00E4hk\u00F6postiosoitteella.
-invite.notFound              = Kutsu virheellinen tai jo k\u00E4ytetty.
-invite.successfull           = Kutsu l\u00E4hetetty
-invite.userCreateSuccessfull = K\u00E4ytt\u00E4j\u00E4tunnus luotu onnistuneesti. Voit nyt kirjautua sis\u00E4\u00E4n j\u00E4rjeselm\u00E4\u00E4n.
-
-javax.validation.constraints.AssertFalse.message = must be false
-javax.validation.constraints.AssertTrue.message  = must be true
-javax.validation.constraints.DecimalMax.message  = must be less than or equal to {value}
-javax.validation.constraints.DecimalMin.message  = must be greater than or equal to {value}
-javax.validation.constraints.Digits.message      = numeric value out of bounds (<{integer} digits>.<{fraction} digits> expected)
-javax.validation.constraints.Future.message      = must be in the future
-javax.validation.constraints.Max.message         = must be less than or equal to {value}
-javax.validation.constraints.Min.message         = must be greater than or equal to {value}
-javax.validation.constraints.NotNull.message     = may not be null
-javax.validation.constraints.Null.message        = must be null
-javax.validation.constraints.Past.message        = must be in the past
-javax.validation.constraints.Pattern.message     = must match "{regexp}"
-javax.validation.constraints.Size.message        = size must be between {min} and {max}
-
-layout.editBottom  = Muokkaa alasis\u00E4lt\u00F6\u00E4
-layout.editContent = Muokkaa sis\u00E4lt\u00F6\u00E4
-layout.editTop     = Muokkaa yl\u00E4sis\u00E4lt\u00F6\u00E4
-
-login.login              = Kirjaudu sis\u00E4\u00E4n
-login.logout             = Kirjaudu ulos
-login.logoutmessage      = Olet kirjautunut ulos j\u00E4rjestelm\u00E4st\u00E4.
-login.password           = Salasana
-login.submit             = Kirjaudu sis\u00E4\u00E4n
-login.username           = K\u00E4ytt\u00E4j\u00E4tunnus
-
-loginerror.header        = Kirjautuminen ep\u00E4onnistui
-loginerror.message       = K\u00E4ytt\u00E4j\u00E4tunnus tai salasana ei ollut oikein.
-loginerror.resetpassword = Salasana unohtunut?
-
-map.edit                          = Muokkaa
-map.generate                      = Generoi paikat
-map.height                        = Paikan korkeus (px)
-map.name                          = Nimi
-map.namebase                      = Puolipisteell\u00E4 erotetut p\u00F6yt\u00E4-etuliitteet
-map.oneRowTable                   = Yhden rivin p\u00F6yd\u00E4t
-map.placesInRow                   = Paikkoja riviss\u00E4
-map.product                       = Paikkatuote
-map.startX                        = P\u00F6yd\u00E4n X-aloituskoord. 
-map.startY                        = P\u00F6yd\u00E4n Y-aloituskoord. 
-map.submitMap                     = L\u00E4het\u00E4 karttapohja
-map.tableCount                    = P\u00F6ytien lukum\u00E4\u00E4r\u00E4
-map.tableXdiff                    = P\u00F6ytien v\u00E4li ( X )
-map.tableYdiff                    = P\u00F6ytien v\u00E4li ( Y )
-map.tablesHorizontal              = P\u00F6yd\u00E4t vaakatasossa
-map.width                         = Leveys (px)
-
-mapEdit.removePlaces = Poista kaikki paikat
-
-mapManage.lockedPlaces   = Lukittu kartasta {0} paikkaa.
-mapManage.releasedPlaces = Vapautettu kartasta {0} paikkaa 
-
-mapView.buyPlaces                 = Lukitse valitut paikat
-mapView.errorWhenReleasingPlace   = Paikkaa vapauttassa tapahtui virhe.
-mapView.errorWhenReservingPlace   = Paikkaa varatessa tapahtui virhe.
-mapView.errorWhileBuyingPlaces    = Virhe paikkojen ostossa. Ole hyv\u00E4 ja yrit\u00E4 uudelleen. Jos virhe toistuu ota yhteytt\u00E4 j\u00E4rjest\u00E4jiin.
-mapView.notEnoughCreditsToReserve = Sinulla ei ole riitt\u00E4v\u00E4sti suoritettuja konepaikkamaksuja t\u00E4m\u00E4n paikan varaamiseen.
-
-menu.index           = Etusivu
-menu.place.placemap  = Paikkakartta
-menu.poll.index      = Kyselyt
-menu.shop.createBill = Kauppa
-menu.user.edit       = Omat tiedot
-
-news.abstract        = Lyhennelm\u00E4
-news.expire          = Lopeta julkaisu
-news.publish         = Julkaise
-news.save            = Tallenna
-news.title           = Otsikko
-
-newsgroup.edit       = Muokkaa
-newsgroup.name       = Uutisryhm\u00E4n nimi
-newsgroup.priority   = J\u00E4rjestysnumero
-newsgroup.readerRole = Lukijoiden roolit
-newsgroup.writerRole = Kirjoittajaryhm\u00E4
-
-newslist.header = Uutisryhm\u00E4t
-
-org.hibernate.validator.constraints.Email.message    = not a well-formed email address
-org.hibernate.validator.constraints.Length.message   = length must be between {min} and {max}
-org.hibernate.validator.constraints.NotEmpty.message = may not be empty
-org.hibernate.validator.constraints.Range.message    = must be between {min} and {max}
-
-orgrole.create  = Luo
-orgrole.name    = Nimi
-orgrole.parents = Periytyy
-
-page.account.list.header                 = Tilitapahtumat
-page.auth.loginerror.header              = kirjautuminen ep\u00E4onnistui
-page.auth.logout.header                  = Uloskirjautuminen
-page.auth.logoutsuccess.header           = Logout
-page.auth.resetPassword.header           = Nollaa salasana
-page.bill.billSummary.header             = Laskujen yhteenveto
-page.bill.list.header                    = Laskut
-page.bill.show.header                    = Laskun tiedot
-page.checkout.cancel.header              = Maksu peruutettu.
-page.checkout.delayed.header             = Viiv\u00E4stetty maksu
-page.checkout.reject.header              = Maksu hyl\u00E4tty!
-page.checkout.return.header              = Maksu vahvistettu
-page.place.insertToken.header            = Sy\u00F6t\u00E4 paikkakoodi
-page.place.mygroups.header               = Paikkaryhm\u00E4t
-page.place.placemap.header               = Paikkakartta
-page.product.createBill.header           = Osta tuotteita
-page.product.validateBillProducts.header = Lasku luotu
-page.svm.failure.header                  = Verkkomaksuvirhe
-page.svm.pending.header                  = Maksukuittausta odotetaan
-page.svm.success.header                  = Verkkomaksu onnistui
-page.user.create.header                  = Luo uusi k\u00E4ytt\u00E4j\u00E4
-
-pagination.firstpage    = Ensimm\u00E4inen
-pagination.lastpage     = Viimeinen
-pagination.nextpage     = Seuraava
-pagination.pages        = Sivuja
-pagination.previouspage = Edellinen
-pagination.results      = Tuloksia
-
-passwordChanged.body   = Voit nyt kirjautua k\u00E4ytt\u00E4j\u00E4tunnuksella ja uudella salasanalla sis\u00E4\u00E4n j\u00E4rjestelm\u00E4\u00E4n.
-passwordChanged.header = Salasana vaihdettu onnistuneesti
-
-passwordReset.errorChanging = Odotamaton virhe. Ota yhteytt\u00E4 yll\u00E4pitoon.
-passwordReset.hashNotFound  = Salasanan vaihto on vanhentunut. Jos haluat vaihtaa salasanan l\u00E4het\u00E4 vaihtopyynt\u00F6 uudelleen.
-
-passwordreset.mailBody     = Voit vaihtaa salasanasi osoitteessa {0}\n\nJos et ole pyyt\u00E4nyt unohtuneen salasanan vaihtamista, ei t\u00E4h\u00E4n viestiin tarvitse reagoida.\n\nTerveisin,\nInsomnia lippupalvelu\nwww.insomnia.fi
-passwordreset.mailSubject  = [INSOMNIA] Salasanan vaihtaminen
-passwordreset.usernotfound = Annettua k\u00E4ytt\u00E4j\u00E4tunnusta ei l\u00F6ydy. Huomioi ett\u00E4 isot ja pienet kirjaimet ovat merkitsevi\u00E4.
-
-permissiondenied.alreadyLoggedIn = Sinulla ei ole riitt\u00E4v\u00E4sti oikeuksia!
-permissiondenied.header          = P\u00E4\u00E4sy kielletty
-permissiondenied.notLoggedIn     = Sinulla ei ole riitt\u00E4v\u00E4sti oikeuksia t\u00E4lle sivulle. 
-
-place.buyable                     = Ostettavissa
-place.code                        = Paikkakoodi
-place.commit                      = Tallenna
-place.description                 = Kuvaus
-place.details                     = Tiedot
-place.edit                        = Muokkaa
-place.groupremove                 = Poista paikka paikkaryhm\u00E4st\u00E4
-place.height                      = Korkeus
-place.mapX                        = X
-place.mapY                        = Y
-place.membership                  = Yhdistetty k\u00E4ytt\u00E4j\u00E4
-place.name                        = Nimi
-place.noReserver                  = Ei liitetty k\u00E4ytt\u00E4j\u00E4\u00E4n
-place.product                     = Tuote
-place.releasetime                 = Vapautusaika
-place.width                       = Leveys
-
-placeSelect.legend.blue      = Oma valittu paikka
-placeSelect.legend.green     = Oma ostettu paikka
-placeSelect.legend.grey      = Vapautetaan tarvittaessa
-placeSelect.legend.red       = Varattu paikka
-placeSelect.legend.white     = Vapaa paikka
-placeSelect.placeName        = Paikka
-placeSelect.placePrice       = Paikan hinta
-placeSelect.placeProductName = Paikan tyyppi
-placeSelect.placesleft       = Paikkoja j\u00E4ljell\u00E4
-placeSelect.reservationPrice = Tilauksen hinta
-placeSelect.reservedPlaces   = Valitut paikat
-placeSelect.totalPlaces      = Paikkoja yhteens\u00E4
-
-placegroup.created                = Luotu
-placegroup.creator                = Varaaja
-placegroup.details                = Tiedot
-placegroup.edit                   = N\u00E4yt\u00E4
-placegroup.edited                 = Muokattu
-placegroup.name                   = Nimi
-placegroup.placename              = Paikka
-placegroup.places                 = Paikat
-placegroup.printPdf               = Tulosta paikkakoodit
-
-placegroupview.groupCreator       = Varaaja
-placegroupview.header             = Omat paikat
-placegroupview.noMemberships      = Ei omia paikkoja
-placegroupview.placeReleaseFailed = Paikan vapauttaminen ep\u00E4onnistui!
-placegroupview.placeReleased      = Paikka {0} vapautettu 
-placegroupview.releasePlace       = Vapauta
-placegroupview.reservationName    = Paikka
-placegroupview.reservationProduct = Tuote
-placegroupview.token              = Paikkakoodi / k\u00E4ytt\u00E4j\u00E4
-
-placetoken.commit        = Liit\u00E4
-placetoken.pageHeader    = Lis\u00E4\u00E4 konepaikkakoodi
-placetoken.placelist     = Omat paikat
-placetoken.token         = Paikkakoodi
-placetoken.tokenNotFound = Paikkakoodia ei l\u00F6ytynyt! Tarkista koodi.
-placetoken.topText       = Voit yhdist\u00E4\u00E4 paikan omaan k\u00E4ytt\u00E4j\u00E4tunnukseesi sy\u00F6tt\u00E4m\u00E4ll\u00E4 paikkakoodin allaolevaan kentt\u00E4\u00E4n.
-
-poll.answer      = Vastaa kyselyyn
-poll.begin       = Avaa kysely
-poll.description = Kuvaus
-poll.end         = Sulje kysely
-poll.name        = Kyselyn nimi
-poll.save        = L\u00E4het\u00E4 vastauksesi
-
-product.barcode           = Viivakoodi
-product.billed            = Laskutettu
-product.boughtTotal       = Tuotteita laskutettu
-product.cart.count        = Ostoskoriin
-product.cashed            = Ostettu k\u00E4teisell\u00E4
-product.color             = V\u00E4ri k\u00E4ytt\u00F6liittym\u00E4ss\u00E4
-product.create            = Luo tuote
-product.createDiscount    = Lis\u00E4\u00E4 m\u00E4\u00E4r\u00E4alennus
-product.edit              = Muokkaa
-product.name              = Tuotteen nimi
-product.paid              = Maksettu
-product.prepaid           = Prepaid
-product.prepaidInstant    = Luodaan kun prepaid maksetaan
-product.price             = Tuotteen hinta
-product.save              = Tallenna
-product.shopInstant       = Luo k\u00E4teismaksu tuotteille
-product.sort              = J\u00E4rjestys luku
-product.totalPrice        = Summa
-product.unitName          = Tuoteyksikk\u00F6
-product.vat               = ALV
-
-products.save             = Tallenna
-
-productshop.billCreated   = Lasku luotu
-productshop.commit        = Osta
-productshop.limits        = Vapaana
-productshop.noItemsInCart = Ostoskorissa ei ole tuotteita
-productshop.total         = Yhteens\u00E4
-
-reader.assocToCard          = Yhdist\u00E4 korttiin
-reader.description          = Kuvaus
-reader.name                 = Lukijan nimi
-reader.select               = Valitse lukija
-reader.tag                  = Tag
-reader.user                 = K\u00E4ytt\u00E4j\u00E4
-
-readerView.searchforuser = Etsi k\u00E4ytt\u00E4j\u00E4\u00E4
-
-readerevent.associateToUser = Yhdist\u00E4 k\u00E4ytt\u00E4j\u00E4\u00E4n
-readerevent.seenSince       = N\u00E4hty viimeksi
-readerevent.shopToUser      = Osta k\u00E4ytt\u00E4j\u00E4lle
-readerevent.tagname         = Tagi
-
-readerview.cards = Kortit ( tulostuslkm )
-
-resetMail.body     = Voit vaihtaa unohtuneen salasanan sy\u00F6tt\u00E4m\u00E4ll\u00E4 k\u00E4ytt\u00E4j\u00E4tunnuksesi allaolevaan kentt\u00E4\u00E4n. Tunnukseen liitettyyn s\u00E4hk\u00F6postiosoitteeseen l\u00E4hetet\u00E4\u00E4n kertak\u00E4ytt\u00F6inen osoite jossa voit vaihtaa sy\u00F6tt\u00E4m\u00E4si k\u00E4ytt\u00E4j\u00E4tunnuksen salasanan.
-resetMail.header   = Unohtuneen salasanan vaihto
-resetMail.send     = L\u00E4het\u00E4 s\u00E4hk\u00F6posti
-resetMail.username = K\u00E4ytt\u00E4j\u00E4tunnus
-
-resetmailSent.body   = Antamasi k\u00E4ytt\u00E4j\u00E4tunnuksen s\u00E4hk\u00F6postiosoitteeseen on l\u00E4hetetty osoite jossa voit vaihtaa tunnuksen salasanan.
-resetmailSent.header = S\u00E4hk\u00F6posti l\u00E4hetetty
-
-role.cardtemplate    = Korttipohja
-role.create          = Luo rooli
-role.description     = Kuvaus
-role.edit            = Muokkaa
-role.edit.save       = Tallenna
-role.name            = Nimi
-role.parents         = Periytyy
-role.savePermissions = Tallenna oikeudet
-
-sendPicture.header = L\u00E4het\u00E4 kuva
-
-shop.accountBalance = Tilin saldo
-shop.cash           = K\u00E4teispano
-shop.totalPrice     = Tuotteiden hinta
-shop.user           = Myyd\u00E4\u00E4n
-
-sidebar.bill.list           = Omat laskut
-sidebar.bill.listAll        = Kaikki laskut
-sidebar.bill.summary        = Laskujen yhteenveto
-sidebar.bills               = Laskut
-sidebar.cardTemplate.create = Uusi korttipohja
-sidebar.cardTemplate.list   = N\u00E4yt\u00E4 korttipohjat
-sidebar.createuser          = Rekister\u00F6idy uudeksi k\u00E4ytt\u00E4j\u00E4ksi
-sidebar.eventorg.list       = Omat organisaatiot
-sidebar.map.list            = Kartat
-sidebar.map.placemap        = Paikkakartta
-sidebar.maps                = Kartat
-sidebar.other               = Muuta
-sidebar.product.create      = Uusi tuote
-sidebar.product.createBill  = Luo lasku
-sidebar.product.list        = Tuotteet
-sidebar.products            = Tuotteet
-sidebar.role.create         = Uusi rooli
-sidebar.role.list           = Roolit
-sidebar.roles               = Roolit
-sidebar.shop.readerEvents   = Lukijan tapahtumat
-sidebar.shop.readerlist     = N\u00E4yt\u00E4 lukijat
-sidebar.user.create         = Uusi k\u00E4ytt\u00E4j\u00E4
-sidebar.user.list           = K\u00E4ytt\u00E4j\u00E4t
-sidebar.users               = K\u00E4ytt\u00E4j\u00E4t
-sidebar.utils.flushCache    = Flush Cache
-sidebar.utils.testdata      = Testdata
-
-sitepage.create     = Luo uusi
-sitepage.edit       = Muokkaa
-sitepage.name       = Sivun nimi
-sitepage.roles      = N\u00E4ytet\u00E4\u00E4n rooleille
-sitepage.save       = Tallenna
-
-sitepagelist.header = Sivuston sis\u00E4ll\u00F6t
-
-submenu.auth.login                   = Kirjaudu
-submenu.auth.logoutResponse          = Uloskirjautuminen onnistui
-submenu.auth.sendResetMail           = Salasanan palautus
-submenu.bill.billSummary             = Laskujen yhteenveto
-submenu.bill.list                    = N\u00E4yt\u00E4 omat laskut
-submenu.bill.listAll                 = Kaikki laskut
-submenu.index                        = Etusivu
-submenu.map.create                   = Uusi kartta
-submenu.map.list                     = N\u00E4yt\u00E4 kartat
-submenu.orgrole.create               = Luo j\u00E4rjest\u00E4j\u00E4rooli
-submenu.orgrole.list                 = J\u00E4rjest\u00E4j\u00E4roolit
-submenu.pages.create                 = Luo sis\u00E4lt\u00F6\u00E4
-submenu.pages.list                   = N\u00E4yt\u00E4 sis\u00E4ll\u00F6t
-submenu.place.insertToken            = Sy\u00F6t\u00E4 paikkakoodi
-submenu.place.myGroups               = Omat paikkavaraukset
-submenu.place.placemap               = Paikkakartta
-submenu.poll.index                   = Kyselyt
-submenu.product.create               = Uusi tuote
-submenu.product.list                 = Listaa tuotteet
-submenu.role.create                  = Luo rooli
-submenu.role.list                    = Roolit
-submenu.shop.createBill              = Luo lasku
-submenu.shop.listReaders             = N\u00E4yt\u00E4 lukijat
-submenu.shop.showReaderEvents        = Lukijan tapahtumat
-submenu.user.accountEvents           = Tilitapahtumat
-submenu.user.changePassword          = Vaihda salasana
-submenu.user.create                  = Luo k\u00E4ytt\u00E4j\u00E4
-submenu.user.createCardTemplate      = Luo korttiryhm\u00E4
-submenu.user.edit                    = K\u00E4ytt\u00E4j\u00E4n tiedot
-submenu.user.invite                  = Kutsu yst\u00E4vi\u00E4
-submenu.user.list                    = Kaikki k\u00E4ytt\u00E4j\u00E4t
-submenu.user.listCardTemplates       = Korttiryhm\u00E4t
-submenu.user.manageuserlinks         = Hallitse k\u00E4ytt\u00E4ji\u00E4
-submenu.user.rolelinks               = Hallitse rooleja
-submenu.user.sendPicture             = L\u00E4het\u00E4 kuva
-submenu.user.shop                    = Kauppaan
-submenu.user.userlinks               = Muokkaa tietoja
-submenu.useradmin.create             = Luo uusi k\u00E4ytt\u00E4j\u00E4
-submenu.useradmin.createCardTemplate = Luo uusi korttipohja
-submenu.useradmin.list               = Listaa k\u00E4ytt\u00E4j\u00E4t
-submenu.useradmin.listCardTemplates  = Listaa korttipohjat
-submenu.useradmin.validateUser       = Validoi k\u00E4ytt\u00E4j\u00E4
-submenu.voting.compolist             = Kilpailut
-submenu.voting.create                = Uusi kilpailu
-submenu.voting.myEntries             = Omat entryt
-
-supernavi.admin = Yll\u00E4piton\u00E4kym\u00E4
-supernavi.user  = K\u00E4ytt\u00E4j\u00E4n\u00E4kym\u00E4
-
-svm.failure.errorMessage   = Verkkomaksuvirhe.
-svm.failure.successMessage = Maksuvirhe onnistunut. ( Maksu mahdollisesti merkitty jo maksetuksi )
-svm.pending.errorMessage   = Maksukuittausta odotetaan. Kuittauksesta l\u00E4hetet\u00E4\u00E4n ilmoitus s\u00E4hk\u00F6postitse.
-svm.pending.successMessage = Maksukuittausta odotetaan. Kuittauksesta l\u00E4hetet\u00E4\u00E4n ilmoitus s\u00E4hk\u00F6postitse.
-svm.success.errorMessage   = Verkkomaksua ei voitu verifioida! Virheest\u00E4 on raportoitu eteenp\u00E4in.
-svm.success.successMessage = Verkkomaksu onnistui. 
-
-template.loggedInAs = Kirjautunut tunnuksella:
-
-topnavi.adminshop = Kauppa
-topnavi.billing   = Laskutus
-topnavi.compos    = Kilpailut
-topnavi.contents  = Sivuston sis\u00E4lt\u00F6
-topnavi.frontpage = Etusivu
-topnavi.maps      = Kartat
-topnavi.placemap  = Paikkakartta
-topnavi.poll      = Kyselyt
-topnavi.products  = Tuotteet
-topnavi.shop      = Kauppa
-topnavi.user      = Omat tiedot
-topnavi.userinit  = K\u00E4ytt\u00E4j\u00E4n tunnistus
-topnavi.usermgmt  = K\u00E4ytt\u00E4j\u00E4t
-
-user.accountBalance             = Tilin saldo
-user.accountEventHeader         = Tilitapahtumat
-user.accountevents              = Tilitapahtumat
-user.address                    = Osoite
-user.bank                       = Pankki
-user.bankaccount                = Pankkitili
-user.birthday                   = Syntym\u00E4p\u00E4iv\u00E4
-user.cardPower                  = K\u00E4ytt\u00E4j\u00E4tyyppi
-user.changePassword             = Vaihda salasana
-user.changepassword.forUser     = K\u00E4ytt\u00E4j\u00E4lle
-user.changepassword.title       = Vaihda salasana
-user.create                     = Luo k\u00E4ytt\u00E4j\u00E4
-user.createdmessage             = K\u00E4ytt\u00E4j\u00E4tunnus on luotu onnistuneesti. Voit nyt kirjautua sis\u00E4\u00E4n.
-user.defaultImage               = Oletukuva
-user.edit                       = Muokkaa
-user.edit.title                 = Omat tiedot
-user.email                      = S\u00E4hk\u00F6posti
-user.firstNames                 = Etunimi
-user.hasImage                   = Kuva
-user.imageUploaded              = Kuva l\u00E4hetetty.
-user.imagelist                  = Tallennetut kuvat
-user.imagesubmit                = L\u00E4het\u00E4 kuva
-user.insert                     = Sy\u00F6t\u00E4 arvo
-user.invalidLoginCredentials    = K\u00E4ytt\u00E4j\u00E4tunnus tai salasana v\u00E4\u00E4rin.
-user.invite                     = Kutsu
-user.invite.header              = Luo k\u00E4ytt\u00E4j\u00E4 kutsusta
-user.invitemail                 = S\u00E4hk\u00F6postiosoite
-user.lastName                   = Sukunimi
-user.login                      = K\u00E4ytt\u00E4j\u00E4tunnus
-user.nick                       = Nick
-user.noAccountevents            = Ei tilitapahtumia
-user.noCurrentImage             = Ei kuvaa
-user.noImage                    = EI kuvaa
-user.oldPassword                = Nykyinen salasana
-user.page.invite                = Kutsu yst\u00E4vi\u00E4
-user.password                   = Salasana
-user.passwordcheck              = Salasana ( uudelleen )
-user.passwordlengthMessage      = Salasana liian lyhyt 
-user.phone                      = Puhelin
-user.placegroups                = Omat paikkaryhm\u00E4t
-user.realname                   = Nimi
-user.roles                      = Roolit
-user.rolesave                   = Tallenna roolit
-user.save                       = Tallenna
-user.sendPicture                = Kuvan l\u00E4hetys
-user.sex                        = Sukupuoli
-user.sex.FEMALE                 = Nainen
-user.sex.MALE                   = Mies
-user.sex.UNDEFINED              = M\u00E4\u00E4rittelem\u00E4tt\u00E4
-user.shop                       = Osta
-user.shop.title                 = Osta k\u00E4ytt\u00E4j\u00E4lle
-user.successfullySaved          = Tiedot tallennettu onnistuneesti
-user.superadmin                 = Superadmin
-user.thisIsCurrentImage         = Nykyinen kuva
-user.town                       = Kaupunki
-user.uploadimage                = L\u00E4het\u00E4 kuva
-user.username                   = K\u00E4ytt\u00E4j\u00E4tunnus
-user.validate.notUniqueUsername = K\u00E4ytt\u00E4j\u00E4tunnus on jo olemassa. Ole hyv\u00E4 ja valitse toinen tunnus
-user.validateUser.commit        = L\u00E4het\u00E4
-user.validateUser.header        = Ole hyv\u00E4 ja sy\u00F6t\u00E4 kirjautumistiedot
-user.wholeName                  = Nimi
-user.zipCode                    = Postinumero
-
-userimage.webcam = Ota kuva webkameralla
-
-userlist.header        = Etsi k\u00E4ytt\u00E4ji\u00E4
-userlist.onlythisevent = Vain t\u00E4m\u00E4n tapahtuman k\u00E4ytt\u00E4j\u00E4t
-userlist.placeassoc    = Liitetty paikkaan
-userlist.rolefilter    = Annetut roolit
-userlist.saldofilter   = Tilin saldo
-userlist.search        = Etsi
-
-usertitle.managingUser = Kauppa
-
-userview.invalidEmail       = Virheeliinen s\u00E4hk\u00F6postiosoite
-userview.loginstringFaulty  = K\u00E4ytt\u00E4j\u00E4tunnus virheellinen. Pit\u00E4\u00E4 olla v\u00E4hint\u00E4\u00E4n kaksi merkki\u00E4 pitk\u00E4.
-userview.oldPasswordError   = V\u00E4\u00E4r\u00E4 salasana!
-userview.passwordTooShort   = Salasana liian lyhyt. Pit\u00E4\u00E4 olla v\u00E4hint\u00E4\u00E4n {0} merkki\u00E4 pitk\u00E4.
-userview.passwordsChanged   = Salasana vaihdettu
-userview.passwordsDontMatch = Salasanat eiv\u00E4t ole samat! Ole hyv\u00E4 ja sy\u00F6t\u00E4 salasanat uudelleen.
-userview.userExists         = K\u00E4ytt\u00E4j\u00E4tunnus on jo olemassa. Ole hyv\u00E4 ja valitse toinen tunnus.
-
-viewexpired.body  = Ole hyv\u00E4 ja kirjaudu sis\u00E4\u00E4n uudelleen.
-viewexpired.title = N\u00E4kym\u00E4 on vanhentunut
-
-voting.allcompos.curEntries        = Entryja
-voting.allcompos.descri            = Kuvaus
-voting.allcompos.description       = Compojen informaatiot.
-voting.allcompos.endTime           = Lopetusaika
-voting.allcompos.header            = Kaikki compot
-voting.allcompos.maxParts          = Max osallistujam\u00E4\u00E4r\u00E4
-voting.allcompos.name              = Nimi
-voting.allcompos.startTime         = Aloitusaika
-voting.allcompos.submitEnd         = Lis\u00E4ys kiinni
-voting.allcompos.submitEntry       = L\u00E4het\u00E4 entry
-voting.allcompos.submitStart       = Lis\u00E4ys auki
-voting.allcompos.voteEnd           = \u00C4\u00E4nestys kiinni
-voting.allcompos.voteStart         = \u00C4\u00E4nestys auki
-voting.compo.submit                = L\u00E4het\u00E4 kappale
-voting.compo.vote                  = \u00C4\u00E4nest\u00E4
-voting.compoentryadd.button        = L\u00E4het\u00E4
-voting.compoentryadd.description   = Lis\u00E4\u00E4 uusi entry compoon
-voting.compoentryadd.entryname     = Nimi
-voting.compoentryadd.file          = Tiedosto
-voting.compoentryadd.notes         = Huomatuksia
-voting.compoentryadd.screenmessage = Screenmessage
-voting.compoentryadd.title         = Lis\u00E4\u00E4 entry
-voting.compoentryadd.uploadedFile  = asdsda
-voting.compoentrysave.button       = Tallenna
-voting.create.compoEnd             = Lopetusaika
-voting.create.compoStart           = Aloitusaika
-voting.create.createButton         = Luo
-voting.create.dateValidatorEndDate = Loppumisaika ennen alkua.
-voting.create.description          = Kuvaus
-voting.create.header               = Compon luonti
-voting.create.maxParticipants      = Max osallistujat
-voting.create.name                 = Nimi
-voting.create.submitEnd            = Submit kiinni
-voting.create.submitStart          = Submit auki
-voting.create.voteEnd              = \u00C4\u00E4nestys kiinni
-voting.create.voteStart            = \u00C4\u00E4nestys auki
+
+accountEvent.commit      = Tallenna
+accountEvent.delivered   = Toimitettu
+accountEvent.edit        = Muokkaa
+accountEvent.eventTime   = Aika
+accountEvent.productname = Tuote
+accountEvent.quantity    = Lkm
+accountEvent.seller      = Myyj\u00E4
+accountEvent.total       = Yhteens\u00E4
+accountEvent.unitPrice   = Yksikk\u00F6hinta
+
+actionlog.create.header           = Luo uusi ActionMessage
+actionlog.create.message          = Viesti
+actionlog.create.role             = Kohderooli
+actionlog.create.submitbutton     = L\u00E4het\u00E4
+actionlog.create.taskradio        = Teht\u00E4v\u00E4
+actionlog.crew                    = Crew
+actionlog.message                 = Tapahtuma
+actionlog.messagelist.description = Voit seurata sek\u00E4 luoda uusia ActionMessageja t\u00E4ss\u00E4 n\u00E4kym\u00E4ss\u00E4.
+actionlog.messagelist.header      = Viestilista
+actionlog.messagestate.DONE       = Tehty
+actionlog.messagestate.NEW        = Uusi
+actionlog.messagestate.PENDING    = Ty\u00F6n alla
+actionlog.state                   = Tila
+actionlog.task                    = Teht\u00E4v\u00E4
+actionlog.tasklist.header         = Teht\u00E4v\u00E4lista
+actionlog.time                    = Aika
+actionlog.user                    = Tekij\u00E4
+
+applicationPermission.description = kuvaus
+applicationPermission.name        = Oikeusryhm\u00E4
+
+bill.addr1                = Osoite 1
+bill.addr2                = Osoite 2
+bill.addr3                = Osoite 3
+bill.addr4                = Osoite 4
+bill.addr5                = Osoite 5
+bill.address              = Maksajan osoite
+bill.billAmount           = Laskun summa
+bill.billIsPaid           = Lasku on maksettu
+bill.billLines            = Tuotteet
+bill.billNumber           = Laskun numero
+bill.billPaidDate         = Maksup\u00E4iv\u00E4
+bill.deliveryTerms        = Toimitusehdot
+bill.edit                 = Muokkaa
+bill.isPaid               = Maksettu
+bill.markPaid             = Maksettu
+bill.markedPaid           = Lasku merkitty maksetuksi.
+bill.notes                = Huomioita
+bill.noticetime           = Huomautusaika
+bill.ourReference         = Myyj\u00E4n viite
+bill.paidDate             = Maksup\u00E4iv\u00E4
+bill.payer                = Maksaja
+bill.paymentTime          = Maksuehdot
+bill.paymentTime.now      = Heti
+bill.printBill            = Tulosta lasku
+bill.receiverAddress      = Kauppiaan osoite
+bill.referenceNumberBase  = Viitenumeropohja
+bill.referencenumber      = Viitenumero
+bill.sentDate             = P\u00E4iv\u00E4ys
+bill.show                 = N\u00E4yt\u00E4
+bill.theirReference       = Asiakkaan viite
+bill.totalPrice           = Laskun summa
+
+billine.linePrice         = Yhteens\u00E4
+billine.name              = Tuote
+billine.quantity          = Lukum\u00E4\u00E4r\u00E4
+billine.referencedProduct = Tuoteviittaus
+billine.save              = Tallenna
+billine.unitName          = Yksikk\u00F6
+billine.unitPrice         = Yksikk\u00F6hinta
+billine.vat               = ALV
+
+bills.noBills = Ei laskuja
+
+cardTemplate.create      = Luo
+cardTemplate.edit        = Muokkaa
+cardTemplate.id          = Id
+cardTemplate.imageheader = Nykyinen pohja
+cardTemplate.name        = Korttipohja
+cardTemplate.power       = Teho
+cardTemplate.roles       = Yhdistetyt roolit
+cardTemplate.save        = Tallenna
+cardTemplate.sendImage   = Lataa kuva
+
+checkout.cancel.errorMessage   = Virhe peruutuksen vahvistuksessa\u2026 Ilmoita t\u00E4st\u00E4 osoitteeseen code@codecrew.fi
+checkout.cancel.successMessage = Voit yritt\u00E4\u00E4 maksua uudelleen omista laskuistasi.
+checkout.reject.errorMessage   = Virhe hyl\u00E4tyn maksun k\u00E4sittelyss\u00E4. Raportoi t\u00E4m\u00E4 virhe osoitteeseen: code@codecrew.fi
+checkout.reject.successMessage = Maksu hyl\u00E4tty. Voit yritt\u00E4\u00E4 maksua uudelleen omista laskuistasi.
+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.
+
+compo.edit                = Muokkaa compoa
+compo.saveVotes           = Tallenna \u00E4\u00E4net
+compo.votesSaved          = \u00C4\u00E4net tallennettu
+
+compofile.download        = lataa
+compofile.download.header = Lataa tiedosto
+compofile.upload          = L\u00E4het\u00E4 tiedosto
+
+discount.active     = Aktiivinen
+discount.amountMax  = Enimm\u00E4ism\u00E4\u00E4r\u00E4
+discount.amountMin  = V\u00E4himm\u00E4ism\u00E4\u00E4r\u00E4
+discount.code       = Alennuskoodi
+discount.create     = Luo uusi
+discount.details    = Tiedot
+discount.edit       = Muokkaa
+discount.maxNum     = Alennusten enimm\u00E4islkm
+discount.perUser    = Alennuksia per k\u00E4ytt\u00E4j\u00E4
+discount.percentage = Alennusprosentti
+discount.products   = Tuotteet
+discount.role       = Roolialennus
+discount.save       = Tallenna
+discount.shortdesc  = Kuvaus
+discount.validFrom  = Voimassa alkaen
+discount.validTo    = Voimassa asti
+
+editplace.header      = Muokkaa paikkaa
+
+editplacegroup.header = Paikkaryhm\u00E4n tiedot
+
+entry.edit = Muokkaa
+
+event.defaultRole         = K\u00E4ytt\u00E4jien oletusrooli
+event.edit                = Muokkaa
+event.endTime             = Lopetusp\u00E4iv\u00E4
+event.name                = Tapahtuman nimi
+event.nextBillNumber      = Seuraavan laskun numero
+event.referenceNumberBase = Viitenumeron pohja
+event.save                = Tallenna
+event.startTime           = Aloitusp\u00E4iv\u00E4
+
+eventdomain.domainname = Domain
+eventdomain.remove     = Poista
+
+eventmap.active          = Aktiivinen\u0009
+eventmap.buyable.like    = Paikat
+eventmap.buyable.lock    = Lukitse paikat
+eventmap.buyable.release = Vapauta paikat
+eventmap.name            = Kartan nimi
+eventmap.notes           = Lis\u00E4tiedot
+eventmap.save            = Tallenna
+
+eventorg.bankName1     = Pankin nimi 1
+eventorg.bankName2     = Pankin nimi 2
+eventorg.bankNumber1   = Tilinumero 1
+eventorg.bankNumber2   = Tilinumero 2
+eventorg.billAddress1  = Laskutusosoite 1
+eventorg.billAddress2  = Laskutusosoite 2
+eventorg.billAddress3  = Laskutusosoite 3
+eventorg.billAddress4  = Laskutusosoite 4
+eventorg.bundleCountry = Kieli-bundle
+eventorg.create        = Luo
+eventorg.createEvent   = Luo tapahtuma
+eventorg.createevent   = Luo uusi tapahtuma
+eventorg.events        = Organisaation tapahtumat
+eventorg.organisation  = Organisaation nimi
+eventorg.save          = Tallenna
+
+eventorgView.eventname = Tapahtuman nimi
+
+eventorganiser.name = Tapahtumaj\u00E4rjest\u00E4j\u00E4
+
+game.gamepoints = Insomnia Game pisteet:
+
+global.cancel               = Peruuta
+global.copyright            = Codecrew Ry
+global.notAuthorizedExecute = Sinulla ei ole riitt\u00E4v\u00E4sti oikeuksia suorittaa t\u00E4t\u00E4 toimenpidett\u00E4!
+global.notauthorized        = Sinulla ei ole riitt\u00E4vi\u00E4 oikeuksia t\u00E4lle sivulle.
+global.save                 = Tallenna
+
+httpsession.creationTime          = Luotu
+httpsession.id                    = ID
+httpsession.invalidate            = Mit\u00E4t\u00F6i
+httpsession.invalidateSuccessfull = Sessio onnistuneesti mit\uFFFDt\uFFFDity
+httpsession.isSessionNew          = Uusi sessio
+httpsession.lastAccessedTime      = Viimeksi n\uFFFDhty
+httpsession.maxInactiveInterval   = Aikakatkaisu (s)
+httpsession.sessionHasExisted     = Ollut elossa (s)
+httpsession.user                  = Tunnus
+
+imagefile.description = Kuvaus
+imagefile.file        = Kuvatiedosto
+
+index.title = Etusivu
+
+invite.emailexists           = J\u00E4rjestelm\u00E4ss\u00E4 on jo k\u00E4ytt\u00E4j\u00E4tunnus samalla s\u00E4hk\u00F6postiosoitteella.
+invite.notFound              = Kutsu virheellinen tai jo k\u00E4ytetty.
+invite.successfull           = Kutsu l\u00E4hetetty
+invite.userCreateSuccessfull = K\u00E4ytt\u00E4j\u00E4tunnus luotu onnistuneesti. Voit nyt kirjautua sis\u00E4\u00E4n j\u00E4rjeselm\u00E4\u00E4n.
+
+javax.validation.constraints.AssertFalse.message = must be false
+javax.validation.constraints.AssertTrue.message  = must be true
+javax.validation.constraints.DecimalMax.message  = must be less than or equal to {value}
+javax.validation.constraints.DecimalMin.message  = must be greater than or equal to {value}
+javax.validation.constraints.Digits.message      = numeric value out of bounds (<{integer} digits>.<{fraction} digits> expected)
+javax.validation.constraints.Future.message      = must be in the future
+javax.validation.constraints.Max.message         = must be less than or equal to {value}
+javax.validation.constraints.Min.message         = must be greater than or equal to {value}
+javax.validation.constraints.NotNull.message     = may not be null
+javax.validation.constraints.Null.message        = must be null
+javax.validation.constraints.Past.message        = must be in the past
+javax.validation.constraints.Pattern.message     = must match "{regexp}"
+javax.validation.constraints.Size.message        = size must be between {min} and {max}
+
+layout.editBottom  = Muokkaa alasis\u00E4lt\u00F6\u00E4
+layout.editContent = Muokkaa sis\u00E4lt\u00F6\u00E4
+layout.editTop     = Muokkaa yl\u00E4sis\u00E4lt\u00F6\u00E4
+
+login.login              = Kirjaudu sis\u00E4\u00E4n
+login.logout             = Kirjaudu ulos
+login.logoutmessage      = Olet kirjautunut ulos j\u00E4rjestelm\u00E4st\u00E4.
+login.password           = Salasana
+login.submit             = Kirjaudu sis\u00E4\u00E4n
+login.username           = K\u00E4ytt\u00E4j\u00E4tunnus
+
+loginerror.header        = Kirjautuminen ep\u00E4onnistui
+loginerror.message       = K\u00E4ytt\u00E4j\u00E4tunnus tai salasana ei ollut oikein.
+loginerror.resetpassword = Salasana unohtunut?
+
+map.edit                          = Muokkaa
+map.generate                      = Generoi paikat
+map.height                        = Paikan korkeus (px)
+map.name                          = Nimi
+map.namebase                      = Puolipisteell\u00E4 erotetut p\u00F6yt\u00E4-etuliitteet
+map.oneRowTable                   = Yhden rivin p\u00F6yd\u00E4t
+map.placesInRow                   = Paikkoja riviss\u00E4
+map.product                       = Paikkatuote
+map.startX                        = P\u00F6yd\u00E4n X-aloituskoord. 
+map.startY                        = P\u00F6yd\u00E4n Y-aloituskoord. 
+map.submitMap                     = L\u00E4het\u00E4 karttapohja
+map.tableCount                    = P\u00F6ytien lukum\u00E4\u00E4r\u00E4
+map.tableXdiff                    = P\u00F6ytien v\u00E4li ( X )
+map.tableYdiff                    = P\u00F6ytien v\u00E4li ( Y )
+map.tablesHorizontal              = P\u00F6yd\u00E4t vaakatasossa
+map.width                         = Leveys (px)
+
+mapEdit.removePlaces = Poista kaikki paikat
+
+mapManage.lockedPlaces   = Lukittu kartasta {0} paikkaa.
+mapManage.releasedPlaces = Vapautettu kartasta {0} paikkaa 
+
+mapView.buyPlaces                 = Lukitse valitut paikat
+mapView.errorWhenReleasingPlace   = Paikkaa vapauttassa tapahtui virhe.
+mapView.errorWhenReservingPlace   = Paikkaa varatessa tapahtui virhe.
+mapView.errorWhileBuyingPlaces    = Virhe paikkojen ostossa. Ole hyv\u00E4 ja yrit\u00E4 uudelleen. Jos virhe toistuu ota yhteytt\u00E4 j\u00E4rjest\u00E4jiin.
+mapView.notEnoughCreditsToReserve = Sinulla ei ole riitt\u00E4v\u00E4sti suoritettuja konepaikkamaksuja t\u00E4m\u00E4n paikan varaamiseen.
+
+menu.index           = Etusivu
+menu.place.placemap  = Paikkakartta
+menu.poll.index      = Kyselyt
+menu.shop.createBill = Kauppa
+menu.user.edit       = Omat tiedot
+
+news.abstract        = Lyhennelm\u00E4
+news.expire          = Lopeta julkaisu
+news.publish         = Julkaise
+news.save            = Tallenna
+news.title           = Otsikko
+
+newsgroup.edit       = Muokkaa
+newsgroup.name       = Uutisryhm\u00E4n nimi
+newsgroup.priority   = J\u00E4rjestysnumero
+newsgroup.readerRole = Lukijoiden roolit
+newsgroup.writerRole = Kirjoittajaryhm\u00E4
+
+newslist.header = Uutisryhm\u00E4t
+
+org.hibernate.validator.constraints.Email.message    = not a well-formed email address
+org.hibernate.validator.constraints.Length.message   = length must be between {min} and {max}
+org.hibernate.validator.constraints.NotEmpty.message = may not be empty
+org.hibernate.validator.constraints.Range.message    = must be between {min} and {max}
+
+orgrole.create  = Luo
+orgrole.name    = Nimi
+orgrole.parents = Periytyy
+
+page.account.list.header                 = Tilitapahtumat
+page.auth.loginerror.header              = kirjautuminen ep\u00E4onnistui
+page.auth.logout.header                  = Uloskirjautuminen
+page.auth.logoutsuccess.header           = Logout
+page.auth.resetPassword.header           = Nollaa salasana
+page.bill.billSummary.header             = Laskujen yhteenveto
+page.bill.list.header                    = Laskut
+page.bill.show.header                    = Laskun tiedot
+page.checkout.cancel.header              = Maksu peruutettu.
+page.checkout.delayed.header             = Viiv\u00E4stetty maksu
+page.checkout.reject.header              = Maksu hyl\u00E4tty!
+page.checkout.return.header              = Maksu vahvistettu
+page.place.insertToken.header            = Sy\u00F6t\u00E4 paikkakoodi
+page.place.mygroups.header               = Paikkaryhm\u00E4t
+page.place.placemap.header               = Paikkakartta
+page.product.createBill.header           = Osta tuotteita
+page.product.validateBillProducts.header = Lasku luotu
+page.svm.failure.header                  = Verkkomaksuvirhe
+page.svm.pending.header                  = Maksukuittausta odotetaan
+page.svm.success.header                  = Verkkomaksu onnistui
+page.user.create.header                  = Luo uusi k\u00E4ytt\u00E4j\u00E4
+
+pagination.firstpage    = Ensimm\u00E4inen
+pagination.lastpage     = Viimeinen
+pagination.nextpage     = Seuraava
+pagination.pages        = Sivuja
+pagination.previouspage = Edellinen
+pagination.results      = Tuloksia
+
+passwordChanged.body   = Voit nyt kirjautua k\u00E4ytt\u00E4j\u00E4tunnuksella ja uudella salasanalla sis\u00E4\u00E4n j\u00E4rjestelm\u00E4\u00E4n.
+passwordChanged.header = Salasana vaihdettu onnistuneesti
+
+passwordReset.errorChanging = Odotamaton virhe. Ota yhteytt\u00E4 yll\u00E4pitoon.
+passwordReset.hashNotFound  = Salasanan vaihto on vanhentunut. Jos haluat vaihtaa salasanan l\u00E4het\u00E4 vaihtopyynt\u00F6 uudelleen.
+
+passwordreset.mailBody     = Voit vaihtaa salasanasi osoitteessa {0}\n\nJos et ole pyyt\u00E4nyt unohtuneen salasanan vaihtamista, ei t\u00E4h\u00E4n viestiin tarvitse reagoida.\n\nTerveisin,\nInsomnia lippupalvelu\nwww.insomnia.fi
+passwordreset.mailSubject  = [INSOMNIA] Salasanan vaihtaminen
+passwordreset.usernotfound = Annettua k\u00E4ytt\u00E4j\u00E4tunnusta ei l\u00F6ydy. Huomioi ett\u00E4 isot ja pienet kirjaimet ovat merkitsevi\u00E4.
+
+permissiondenied.alreadyLoggedIn = Sinulla ei ole riitt\u00E4v\u00E4sti oikeuksia!
+permissiondenied.header          = P\u00E4\u00E4sy kielletty
+permissiondenied.notLoggedIn     = Sinulla ei ole riitt\u00E4v\u00E4sti oikeuksia t\u00E4lle sivulle. 
+
+place.buyable                     = Ostettavissa
+place.code                        = Paikkakoodi
+place.commit                      = Tallenna
+place.description                 = Kuvaus
+place.details                     = Tiedot
+place.edit                        = Muokkaa
+place.groupremove                 = Poista paikka paikkaryhm\u00E4st\u00E4
+place.height                      = Korkeus
+place.mapX                        = X
+place.mapY                        = Y
+place.membership                  = Yhdistetty k\u00E4ytt\u00E4j\u00E4
+place.name                        = Nimi
+place.noReserver                  = Ei liitetty k\u00E4ytt\u00E4j\u00E4\u00E4n
+place.product                     = Tuote
+place.releasetime                 = Vapautusaika
+place.width                       = Leveys
+
+placeSelect.legend.blue      = Oma valittu paikka
+placeSelect.legend.green     = Oma ostettu paikka
+placeSelect.legend.grey      = Vapautetaan tarvittaessa
+placeSelect.legend.red       = Varattu paikka
+placeSelect.legend.white     = Vapaa paikka
+placeSelect.placeName        = Paikka
+placeSelect.placePrice       = Paikan hinta
+placeSelect.placeProductName = Paikan tyyppi
+placeSelect.placesleft       = Paikkoja j\u00E4ljell\u00E4
+placeSelect.reservationPrice = Tilauksen hinta
+placeSelect.reservedPlaces   = Valitut paikat
+placeSelect.totalPlaces      = Paikkoja yhteens\u00E4
+
+placegroup.created                = Luotu
+placegroup.creator                = Varaaja
+placegroup.details                = Tiedot
+placegroup.edit                   = N\u00E4yt\u00E4
+placegroup.edited                 = Muokattu
+placegroup.name                   = Nimi
+placegroup.placename              = Paikka
+placegroup.places                 = Paikat
+placegroup.printPdf               = Tulosta paikkakoodit
+
+placegroupview.groupCreator       = Varaaja
+placegroupview.header             = Omat paikat
+placegroupview.noMemberships      = Ei omia paikkoja
+placegroupview.placeReleaseFailed = Paikan vapauttaminen ep\u00E4onnistui!
+placegroupview.placeReleased      = Paikka {0} vapautettu 
+placegroupview.releasePlace       = Vapauta
+placegroupview.reservationName    = Paikka
+placegroupview.reservationProduct = Tuote
+placegroupview.token              = Paikkakoodi / k\u00E4ytt\u00E4j\u00E4
+
+placetoken.commit        = Liit\u00E4
+placetoken.pageHeader    = Lis\u00E4\u00E4 konepaikkakoodi
+placetoken.placelist     = Omat paikat
+placetoken.token         = Paikkakoodi
+placetoken.tokenNotFound = Paikkakoodia ei l\u00F6ytynyt! Tarkista koodi.
+placetoken.topText       = Voit yhdist\u00E4\u00E4 paikan omaan k\u00E4ytt\u00E4j\u00E4tunnukseesi sy\u00F6tt\u00E4m\u00E4ll\u00E4 paikkakoodin allaolevaan kentt\u00E4\u00E4n.
+
+poll.answer      = Vastaa kyselyyn
+poll.begin       = Avaa kysely
+poll.description = Kuvaus
+poll.end         = Sulje kysely
+poll.name        = Kyselyn nimi
+poll.save        = L\u00E4het\u00E4 vastauksesi
+
+product.barcode           = Viivakoodi
+product.billed            = Laskutettu
+product.boughtTotal       = Tuotteita laskutettu
+product.cart.count        = Ostoskoriin
+product.cashed            = Ostettu k\u00E4teisell\u00E4
+product.color             = V\u00E4ri k\u00E4ytt\u00F6liittym\u00E4ss\u00E4
+product.create            = Luo tuote
+product.createDiscount    = Lis\u00E4\u00E4 m\u00E4\u00E4r\u00E4alennus
+product.edit              = Muokkaa
+product.name              = Tuotteen nimi
+product.paid              = Maksettu
+product.prepaid           = Prepaid
+product.prepaidInstant    = Luodaan kun prepaid maksetaan
+product.price             = Tuotteen hinta
+product.save              = Tallenna
+product.shopInstant       = Luo k\u00E4teismaksu tuotteille
+product.sort              = J\u00E4rjestys luku
+product.totalPrice        = Summa
+product.unitName          = Tuoteyksikk\u00F6
+product.vat               = ALV
+
+products.save             = Tallenna
+
+productshop.billCreated   = Lasku luotu
+productshop.commit        = Osta
+productshop.limits        = Vapaana
+productshop.noItemsInCart = Ostoskorissa ei ole tuotteita
+productshop.total         = Yhteens\u00E4
+
+reader.assocToCard          = Yhdist\u00E4 korttiin
+reader.description          = Kuvaus
+reader.name                 = Lukijan nimi
+reader.select               = Valitse lukija
+reader.tag                  = Tag
+reader.user                 = K\u00E4ytt\u00E4j\u00E4
+
+readerView.searchforuser = Etsi k\u00E4ytt\u00E4j\u00E4\u00E4
+
+readerevent.associateToUser = Yhdist\u00E4 k\u00E4ytt\u00E4j\u00E4\u00E4n
+readerevent.seenSince       = N\u00E4hty viimeksi
+readerevent.shopToUser      = Osta k\u00E4ytt\u00E4j\u00E4lle
+readerevent.tagname         = Tagi
+
+readerview.cards = Kortit ( tulostuslkm )
+
+resetMail.body     = Voit vaihtaa unohtuneen salasanan sy\u00F6tt\u00E4m\u00E4ll\u00E4 k\u00E4ytt\u00E4j\u00E4tunnuksesi allaolevaan kentt\u00E4\u00E4n. Tunnukseen liitettyyn s\u00E4hk\u00F6postiosoitteeseen l\u00E4hetet\u00E4\u00E4n kertak\u00E4ytt\u00F6inen osoite jossa voit vaihtaa sy\u00F6tt\u00E4m\u00E4si k\u00E4ytt\u00E4j\u00E4tunnuksen salasanan.
+resetMail.header   = Salasana unohtunut?
+resetMail.send     = L\u00E4het\u00E4 s\u00E4hk\u00F6posti
+resetMail.username = K\u00E4ytt\u00E4j\u00E4tunnus
+
+resetmailSent.body   = Antamasi k\u00E4ytt\u00E4j\u00E4tunnuksen s\u00E4hk\u00F6postiosoitteeseen on l\u00E4hetetty osoite jossa voit vaihtaa tunnuksen salasanan.
+resetmailSent.header = S\u00E4hk\u00F6posti l\u00E4hetetty
+
+role.cardtemplate    = Korttipohja
+role.create          = Luo rooli
+role.description     = Kuvaus
+role.edit            = Muokkaa
+role.edit.save       = Tallenna
+role.name            = Nimi
+role.parents         = Periytyy
+role.savePermissions = Tallenna oikeudet
+
+sendPicture.header = L\u00E4het\u00E4 kuva
+
+shop.accountBalance = Tilin saldo
+shop.cash           = K\u00E4teispano
+shop.totalPrice     = Tuotteiden hinta
+shop.user           = Myyd\u00E4\u00E4n
+
+sidebar.bill.list           = Omat laskut
+sidebar.bill.listAll        = Kaikki laskut
+sidebar.bill.summary        = Laskujen yhteenveto
+sidebar.bills               = Laskut
+sidebar.cardTemplate.create = Uusi korttipohja
+sidebar.cardTemplate.list   = N\u00E4yt\u00E4 korttipohjat
+sidebar.createuser          = Rekister\u00F6idy uudeksi k\u00E4ytt\u00E4j\u00E4ksi
+sidebar.eventorg.list       = Omat organisaatiot
+sidebar.map.list            = Kartat
+sidebar.map.placemap        = Paikkakartta
+sidebar.maps                = Kartat
+sidebar.other               = Muuta
+sidebar.product.create      = Uusi tuote
+sidebar.product.createBill  = Luo lasku
+sidebar.product.list        = Tuotteet
+sidebar.products            = Tuotteet
+sidebar.role.create         = Uusi rooli
+sidebar.role.list           = Roolit
+sidebar.roles               = Roolit
+sidebar.shop.readerEvents   = Lukijan tapahtumat
+sidebar.shop.readerlist     = N\u00E4yt\u00E4 lukijat
+sidebar.user.create         = Uusi k\u00E4ytt\u00E4j\u00E4
+sidebar.user.list           = K\u00E4ytt\u00E4j\u00E4t
+sidebar.users               = K\u00E4ytt\u00E4j\u00E4t
+sidebar.utils.flushCache    = Flush Cache
+sidebar.utils.testdata      = Testdata
+
+sitepage.create     = Luo uusi
+sitepage.edit       = Muokkaa
+sitepage.name       = Sivun nimi
+sitepage.roles      = N\u00E4ytet\u00E4\u00E4n rooleille
+sitepage.save       = Tallenna
+
+sitepagelist.header = Sivuston sis\u00E4ll\u00F6t
+
+submenu.auth.login                   = Kirjaudu
+submenu.auth.logoutResponse          = Uloskirjautuminen onnistui
+submenu.auth.sendResetMail           = Salasanan palautus
+submenu.bill.billSummary             = Laskujen yhteenveto
+submenu.bill.list                    = N\u00E4yt\u00E4 omat laskut
+submenu.bill.listAll                 = Kaikki laskut
+submenu.index                        = Etusivu
+submenu.map.create                   = Uusi kartta
+submenu.map.list                     = N\u00E4yt\u00E4 kartat
+submenu.orgrole.create               = Luo j\u00E4rjest\u00E4j\u00E4rooli
+submenu.orgrole.list                 = J\u00E4rjest\u00E4j\u00E4roolit
+submenu.pages.create                 = Luo sis\u00E4lt\u00F6\u00E4
+submenu.pages.list                   = N\u00E4yt\u00E4 sis\u00E4ll\u00F6t
+submenu.place.insertToken            = Sy\u00F6t\u00E4 paikkakoodi
+submenu.place.myGroups               = Omat paikkavaraukset
+submenu.place.placemap               = Paikkakartta
+submenu.poll.index                   = Kyselyt
+submenu.product.create               = Uusi tuote
+submenu.product.list                 = Listaa tuotteet
+submenu.role.create                  = Luo rooli
+submenu.role.list                    = Roolit
+submenu.shop.createBill              = Luo lasku
+submenu.shop.listReaders             = N\u00E4yt\u00E4 lukijat
+submenu.shop.showReaderEvents        = Lukijan tapahtumat
+submenu.user.accountEvents           = Tilitapahtumat
+submenu.user.changePassword          = Vaihda salasana
+submenu.user.create                  = Luo k\u00E4ytt\u00E4j\u00E4
+submenu.user.createCardTemplate      = Luo korttiryhm\u00E4
+submenu.user.edit                    = K\u00E4ytt\u00E4j\u00E4n tiedot
+submenu.user.invite                  = Kutsu yst\u00E4vi\u00E4
+submenu.user.list                    = Kaikki k\u00E4ytt\u00E4j\u00E4t
+submenu.user.listCardTemplates       = Korttiryhm\u00E4t
+submenu.user.manageuserlinks         = Hallitse k\u00E4ytt\u00E4ji\u00E4
+submenu.user.rolelinks               = Hallitse rooleja
+submenu.user.sendPicture             = L\u00E4het\u00E4 kuva
+submenu.user.shop                    = Kauppaan
+submenu.user.userlinks               = Muokkaa tietoja
+submenu.useradmin.create             = Luo uusi k\u00E4ytt\u00E4j\u00E4
+submenu.useradmin.createCardTemplate = Luo uusi korttipohja
+submenu.useradmin.list               = Listaa k\u00E4ytt\u00E4j\u00E4t
+submenu.useradmin.listCardTemplates  = Listaa korttipohjat
+submenu.useradmin.validateUser       = Validoi k\u00E4ytt\u00E4j\u00E4
+submenu.voting.compolist             = Kilpailut
+submenu.voting.create                = Uusi kilpailu
+submenu.voting.myEntries             = Omat entryt
+
+supernavi.admin = Yll\u00E4piton\u00E4kym\u00E4
+supernavi.user  = K\u00E4ytt\u00E4j\u00E4n\u00E4kym\u00E4
+
+svm.failure.errorMessage   = Verkkomaksuvirhe.
+svm.failure.successMessage = Maksuvirhe onnistunut. ( Maksu mahdollisesti merkitty jo maksetuksi )
+svm.pending.errorMessage   = Maksukuittausta odotetaan. Kuittauksesta l\u00E4hetet\u00E4\u00E4n ilmoitus s\u00E4hk\u00F6postitse.
+svm.pending.successMessage = Maksukuittausta odotetaan. Kuittauksesta l\u00E4hetet\u00E4\u00E4n ilmoitus s\u00E4hk\u00F6postitse.
+svm.success.errorMessage   = Verkkomaksua ei voitu verifioida! Virheest\u00E4 on raportoitu eteenp\u00E4in.
+svm.success.successMessage = Verkkomaksu onnistui. 
+
+template.loggedInAs = Kirjautunut tunnuksella:
+
+topnavi.adminshop = Kauppa
+topnavi.billing   = Laskutus
+topnavi.compos    = Kilpailut
+topnavi.contents  = Sivuston sis\u00E4lt\u00F6
+topnavi.frontpage = Etusivu
+topnavi.maps      = Kartat
+topnavi.placemap  = Paikkakartta
+topnavi.poll      = Kyselyt
+topnavi.products  = Tuotteet
+topnavi.shop      = Kauppa
+topnavi.user      = Omat tiedot
+topnavi.userinit  = K\u00E4ytt\u00E4j\u00E4n tunnistus
+topnavi.usermgmt  = K\u00E4ytt\u00E4j\u00E4t
+
+user.accountBalance             = Tilin saldo
+user.accountEventHeader         = Tilitapahtumat
+user.accountevents              = Tilitapahtumat
+user.address                    = Osoite
+user.bank                       = Pankki
+user.bankaccount                = Pankkitili
+user.birthday                   = Syntym\u00E4p\u00E4iv\u00E4
+user.cardPower                  = K\u00E4ytt\u00E4j\u00E4tyyppi
+user.changePassword             = Vaihda salasana
+user.changepassword.forUser     = K\u00E4ytt\u00E4j\u00E4lle
+user.changepassword.title       = Vaihda salasana
+user.create                     = Luo k\u00E4ytt\u00E4j\u00E4
+user.createdmessage             = K\u00E4ytt\u00E4j\u00E4tunnus on luotu onnistuneesti. Voit nyt kirjautua sis\u00E4\u00E4n.
+user.defaultImage               = Oletukuva
+user.edit                       = Muokkaa
+user.edit.title                 = Omat tiedot
+user.email                      = S\u00E4hk\u00F6posti
+user.firstNames                 = Etunimi
+user.hasImage                   = Kuva
+user.imageUploaded              = Kuva l\u00E4hetetty.
+user.imagelist                  = Tallennetut kuvat
+user.imagesubmit                = L\u00E4het\u00E4 kuva
+user.insert                     = Sy\u00F6t\u00E4 arvo
+user.invalidLoginCredentials    = K\u00E4ytt\u00E4j\u00E4tunnus tai salasana v\u00E4\u00E4rin.
+user.invite                     = Kutsu
+user.invite.header              = Luo k\u00E4ytt\u00E4j\u00E4 kutsusta
+user.invitemail                 = S\u00E4hk\u00F6postiosoite
+user.lastName                   = Sukunimi
+user.login                      = K\u00E4ytt\u00E4j\u00E4tunnus
+user.nick                       = Nick
+user.noAccountevents            = Ei tilitapahtumia
+user.noCurrentImage             = Ei kuvaa
+user.noImage                    = EI kuvaa
+user.oldPassword                = Nykyinen salasana
+user.page.invite                = Kutsu yst\u00E4vi\u00E4
+user.password                   = Salasana
+user.passwordcheck              = Salasana ( uudelleen )
+user.passwordlengthMessage      = Salasana liian lyhyt 
+user.phone                      = Puhelin
+user.placegroups                = Omat paikkaryhm\u00E4t
+user.realname                   = Nimi
+user.roles                      = Roolit
+user.rolesave                   = Tallenna roolit
+user.save                       = Tallenna
+user.sendPicture                = Kuvan l\u00E4hetys
+user.sex                        = Sukupuoli
+user.sex.FEMALE                 = Nainen
+user.sex.MALE                   = Mies
+user.sex.UNDEFINED              = M\u00E4\u00E4rittelem\u00E4tt\u00E4
+user.shop                       = Osta
+user.shop.title                 = Osta k\u00E4ytt\u00E4j\u00E4lle
+user.successfullySaved          = Tiedot tallennettu onnistuneesti
+user.superadmin                 = Superadmin
+user.thisIsCurrentImage         = Nykyinen kuva
+user.town                       = Kaupunki
+user.uploadimage                = L\u00E4het\u00E4 kuva
+user.username                   = K\u00E4ytt\u00E4j\u00E4tunnus
+user.validate.notUniqueUsername = K\u00E4ytt\u00E4j\u00E4tunnus on jo olemassa. Ole hyv\u00E4 ja valitse toinen tunnus
+user.validateUser.commit        = L\u00E4het\u00E4
+user.validateUser.header        = Ole hyv\u00E4 ja sy\u00F6t\u00E4 kirjautumistiedot
+user.wholeName                  = Nimi
+user.zipCode                    = Postinumero
+
+userimage.webcam = Ota kuva webkameralla
+
+userlist.header        = Etsi k\u00E4ytt\u00E4ji\u00E4
+userlist.onlythisevent = Vain t\u00E4m\u00E4n tapahtuman k\u00E4ytt\u00E4j\u00E4t
+userlist.placeassoc    = Liitetty paikkaan
+userlist.rolefilter    = Annetut roolit
+userlist.saldofilter   = Tilin saldo
+userlist.search        = Etsi
+
+usertitle.managingUser = Kauppa
+
+userview.invalidEmail       = Virheeliinen s\u00E4hk\u00F6postiosoite
+userview.loginstringFaulty  = K\u00E4ytt\u00E4j\u00E4tunnus virheellinen. Pit\u00E4\u00E4 olla v\u00E4hint\u00E4\u00E4n kaksi merkki\u00E4 pitk\u00E4.
+userview.oldPasswordError   = V\u00E4\u00E4r\u00E4 salasana!
+userview.passwordTooShort   = Salasana liian lyhyt. Pit\u00E4\u00E4 olla v\u00E4hint\u00E4\u00E4n {0} merkki\u00E4 pitk\u00E4.
+userview.passwordsChanged   = Salasana vaihdettu
+userview.passwordsDontMatch = Salasanat eiv\u00E4t ole samat! Ole hyv\u00E4 ja sy\u00F6t\u00E4 salasanat uudelleen.
+userview.userExists         = K\u00E4ytt\u00E4j\u00E4tunnus on jo olemassa. Ole hyv\u00E4 ja valitse toinen tunnus.
+
+viewexpired.body  = Ole hyv\u00E4 ja kirjaudu sis\u00E4\u00E4n uudelleen.
+viewexpired.title = N\u00E4kym\u00E4 on vanhentunut
+
+voting.allcompos.curEntries        = Entryja
+voting.allcompos.descri            = Kuvaus
+voting.allcompos.description       = Compojen informaatiot.
+voting.allcompos.endTime           = Lopetusaika
+voting.allcompos.header            = Kaikki compot
+voting.allcompos.maxParts          = Max osallistujam\u00E4\u00E4r\u00E4
+voting.allcompos.name              = Nimi
+voting.allcompos.startTime         = Aloitusaika
+voting.allcompos.submitEnd         = Lis\u00E4ys kiinni
+voting.allcompos.submitEntry       = L\u00E4het\u00E4 entry
+voting.allcompos.submitStart       = Lis\u00E4ys auki
+voting.allcompos.voteEnd           = \u00C4\u00E4nestys kiinni
+voting.allcompos.voteStart         = \u00C4\u00E4nestys auki
+voting.compo.submit                = L\u00E4het\u00E4 kappale
+voting.compo.vote                  = \u00C4\u00E4nest\u00E4
+voting.compoentryadd.button        = L\u00E4het\u00E4
+voting.compoentryadd.description   = Lis\u00E4\u00E4 uusi entry compoon
+voting.compoentryadd.entryname     = Nimi
+voting.compoentryadd.file          = Tiedosto
+voting.compoentryadd.notes         = Huomatuksia
+voting.compoentryadd.screenmessage = Screenmessage
+voting.compoentryadd.title         = Lis\u00E4\u00E4 entry
+voting.compoentryadd.uploadedFile  = asdsda
+voting.compoentrysave.button       = Tallenna
+voting.create.compoEnd             = Lopetusaika
+voting.create.compoStart           = Aloitusaika
+voting.create.createButton         = Luo
+voting.create.dateValidatorEndDate = Loppumisaika ennen alkua.
+voting.create.description          = Kuvaus
+voting.create.header               = Compon luonti
+voting.create.maxParticipants      = Max osallistujat
+voting.create.name                 = Nimi
+voting.create.submitEnd            = Submit kiinni
+voting.create.submitStart          = Submit auki
+voting.create.voteEnd              = \u00C4\u00E4nestys kiinni
+voting.create.voteStart            = \u00C4\u00E4nestys auki

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

-#Generated by ResourceBundle Editor (http://eclipse-rbe.sourceforge.net)
-#Bill number
-# Validationmessages
-
-bill.billMarkedPaidMail.message = Laskusi numero {0} on merkitty maksetuksi. Voit nyt siirty\u00E4 lippukauppaan varamaamaan haluamasi paikat. \nTervetuloa tapahtumaan!\n\nTerveisin,\nInsomnia lippupalvelu\nwww.insomnia.fi
-bill.billMarkedPaidMail.subject = [INSOMNIA] Lasku merkitty maksetuksi
-
-eventorg.edit = Muokkaa
-
-global.infomail = info@insomnia.fi
-global.webpage  = http://www.insomnia.fi
+#Generated by ResourceBundle Editor (http://eclipse-rbe.sourceforge.net)
+#Bill number
+# Validationmessages
+
+actionlog.create.header           = Luo uusi ActionMessage
+actionlog.create.message          = Viesti
+actionlog.create.role             = Kohderooli
+actionlog.create.submitbutton     = L\u00E4het\u00E4
+actionlog.create.taskradio        = Teht\u00E4v\u00E4
+actionlog.crew                    = Crew
+actionlog.message                 = Tapahtuma
+actionlog.messagelist.description = Voit seurata sek\u00E4 luoda uusia ActionMessageja t\u00E4ss\u00E4 n\u00E4kym\u00E4ss\u00E4.
+actionlog.messagelist.header      = Viestilista
+actionlog.state                   = Tila
+actionlog.task                    = Teht\u00E4v\u00E4
+actionlog.tasklist.header         = Teht\u00E4v\u00E4lista
+actionlog.time                    = Aika
+actionlog.user                    = Tekij\u00E4
+
+bill.billMarkedPaidMail.message = Laskusi numero {0} on merkitty maksetuksi. Voit nyt siirty\u00E4 lippukauppaan varamaamaan haluamasi paikat. \nTervetuloa tapahtumaan!\n\nTerveisin,\nInsomnia lippupalvelu\nwww.insomnia.fi
+bill.billMarkedPaidMail.subject = [INSOMNIA] Lasku merkitty maksetuksi
+
+eventorg.create = Luo
+eventorg.edit   = Muokkaa
+
+global.cancel               = Peruuta
+global.copyright            = Codecrew Ry
+global.infomail             = info@insomnia.fi
+global.notAuthorizedExecute = Sinulla ei ole riitt\u00E4v\u00E4sti oikeuksia suorittaa t\u00E4t\u00E4 toimenpidett\u00E4!
+global.notauthorized        = Sinulla ei ole riitt\u00E4vi\u00E4 oikeuksia t\u00E4lle sivulle.
+global.save                 = Tallenna
+global.webpage              = http://www.insomnia.fi
+
+httpsession.creationTime = Luotu
+
+login.login              = Kirjaudu sis\u00E4\u00E4n
+login.logout             = Kirjaudu ulos
+login.logoutmessage      = Olet kirjautunut ulos j\u00E4rjestelm\u00E4st\u00E4.
+login.password           = Salasana
+login.submit             = Kirjaudu sis\u00E4\u00E4n
+login.username           = K\u00E4ytt\u00E4j\u00E4tunnus
+
+loginerror.header        = Kirjautuminen ep\u00E4onnistui
+loginerror.message       = K\u00E4ytt\u00E4j\u00E4tunnus tai salasana ei ollut oikein.
+loginerror.resetpassword = Salasana unohtunut?
+
+passwordChanged.body   = Voit nyt kirjautua k\u00E4ytt\u00E4j\u00E4tunnuksella ja uudella salasanalla sis\u00E4\u00E4n j\u00E4rjestelm\u00E4\u00E4n.
+passwordChanged.header = Salasana vaihdettu onnistuneesti
+
+passwordReset.errorChanging = Odotamaton virhe. Ota yhteytt\u00E4 yll\u00E4pitoon.
+passwordReset.hashNotFound  = Salasanan vaihto on vanhentunut. Jos haluat vaihtaa salasanan l\u00E4het\u00E4 vaihtopyynt\u00F6 uudelleen.
+
+permissiondenied.alreadyLoggedIn = Sinulla ei ole riitt\u00E4v\u00E4sti oikeuksia!
+permissiondenied.header          = P\u00E4\u00E4sy kielletty
+permissiondenied.notLoggedIn     = Sinulla ei ole riitt\u00E4v\u00E4sti oikeuksia t\u00E4lle sivulle. 
+
+resetMail.body   = Voit vaihtaa unohtuneen salasanan sy\u00F6tt\u00E4m\u00E4ll\u00E4 k\u00E4ytt\u00E4j\u00E4tunnuksesi allaolevaan kentt\u00E4\u00E4n. Tunnukseen liitettyyn s\u00E4hk\u00F6postiosoitteeseen l\u00E4hetet\u00E4\u00E4n kertak\u00E4ytt\u00F6inen osoite jossa voit vaihtaa sy\u00F6tt\u00E4m\u00E4si k\u00E4ytt\u00E4j\u00E4tunnuksen salasanan.
+resetMail.header = Salasana unohtunut?
+resetMail.send   = L\u00E4het\u00E4 s\u00E4hk\u00F6posti
+
+resetmailSent.body   = Antamasi k\u00E4ytt\u00E4j\u00E4tunnuksen s\u00E4hk\u00F6postiosoitteeseen on l\u00E4hetetty osoite jossa voit vaihtaa tunnuksen salasanan.
+resetmailSent.header = S\u00E4hk\u00F6posti l\u00E4hetetty

code/LanBortalWeb/src/fi/insomnia/bortal/web/ErrorPageView.java

+package fi.insomnia.bortal.web;
+
+import javax.enterprise.context.RequestScoped;
+import javax.faces.application.FacesMessage;
+import javax.faces.context.FacesContext;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import fi.insomnia.bortal.beans.CardPrintBeanLocal;
+import fi.insomnia.bortal.model.EventUser;
+import fi.insomnia.bortal.web.cdiview.user.UserCartView;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.PrintWriter;
+import java.io.Serializable;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+import java.util.Map;
+
+@Named
+@RequestScoped
+public class ErrorPageView {
+
+	String trace;
+	
+	public String getStackTrace() {
+	 
+	    FacesContext context = FacesContext.getCurrentInstance();
+	    Map requestMap = context.getExternalContext().getRequestMap();
+	    Throwable ex =
+	        (Throwable) requestMap.get("javax.servlet.error.exception");
+	 
+	    StringWriter sw = new StringWriter();
+	    PrintWriter pw = new PrintWriter(sw);
+	    ex.printStackTrace(pw);
+	    trace = sw.toString();
+	 
+	    return trace;
+	 
+	}
+	
+	public Long getTime(){
+	    return Calendar.getInstance().getTimeInMillis();
+	}
+
+}
\ No newline at end of file

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/shop/FoodWaveFoodView.java

+package fi.insomnia.bortal.web.cdiview.shop;
+
+import java.math.BigDecimal;
+import java.util.Iterator;
+
+import javax.ejb.EJB;
+import javax.enterprise.context.ConversationScoped;
+import javax.faces.model.ListDataModel;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import fi.insomnia.bortal.beans.AccountEventBeanLocal;
+import fi.insomnia.bortal.beans.BillBeanLocal;
+import fi.insomnia.bortal.beans.EventBeanLocal;
+import fi.insomnia.bortal.beans.FoodWaveBeanLocal;
+import fi.insomnia.bortal.beans.ProductBeanLocal;
+import fi.insomnia.bortal.enums.apps.ShopPermission;
+import fi.insomnia.bortal.model.Bill;
+import fi.insomnia.bortal.model.EventUser;
+import fi.insomnia.bortal.model.FoodWave;
+import fi.insomnia.bortal.model.Product;
+import fi.insomnia.bortal.web.annotations.SelectedUser;
+import fi.insomnia.bortal.web.cdiview.GenericCDIView;
+import fi.insomnia.bortal.web.helpers.ProductShopItem;
+
+@Named
+@ConversationScoped
+public class FoodWaveFoodView extends GenericCDIView {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 5723448087928988814L;
+
+	@EJB
+	private FoodWaveBeanLocal foodWaveBean;
+	
+	@EJB
+	EventBeanLocal eventBean;
+	
+	@EJB
+	private AccountEventBeanLocal accountEventBean;
+	
+	@EJB
+	private BillBeanLocal billBean;
+	
+	private FoodWave foodWave = null;
+	
+	@EJB
+	private transient ProductBeanLocal productBean;
+	
+	@Inject
+	@SelectedUser
+	private EventUser user;
+	
+	@Inject
+	private BillEditView billEditView;
+	
+	private Integer foodwaveid = 0;
+	private ListDataModel<Product> products;
+	
+	private transient ListDataModel<ProductShopItem> shoppingcart;
+	
+	
+	
+	public void initFoodWaveFoods() {
+		
+		if( requirePermissions(ShopPermission.LIST_USERPRODUCTS) &&
+				getFoodwaveid() > 0 && getShoppingcart() == null) {
+			
+			setFoodWave(foodWaveBean.findFoodwave(getFoodwaveid()));
+			setShoppingcart(new ListDataModel<ProductShopItem>(
+					ProductShopItem.productGTList( getFoodWave().getTemplate().getProducts()  )));
+			
+			System.out.println("beginconversation");
+			this.beginConversation();
+			//products = new ListDataModel<Product>(getFoodWave().getTemplate().getProducts());
+		}
+	}
+
+	
+
+
+	public ListDataModel<Product> getProducts() {
+		return products;
+	}
+
+
+	public void setProducts(ListDataModel<Product> products) {
+		this.products = products;
+	}
+	
+	public Integer getFoodwaveid() {
+		return foodwaveid;
+	}
+
+	public void setFoodwaveid(Integer foodwaveid) {
+		this.foodwaveid = foodwaveid;
+	}
+
+	public FoodWave getFoodWave() {
+		return foodWave;
+	}
+
+	public void setFoodWave(FoodWave foodWave) {
+		this.foodWave = foodWave;
+	}
+
+	public String add(Integer count) {
+		ProductShopItem item = getShoppingcart().getRowData();
+		item.setCount(item.getCount().add(BigDecimal.valueOf(count)));
+		System.out.println("foobar"+item.getCount());
+		return null;
+	}
+	
+	public String addOne()
+	{
+		return add(1);
+	}
+
+	public String addMinusOne()
+	{
+		return add(-1);
+	}
+
+	public BigDecimal getTotalPrice() {
+		BigDecimal ret = BigDecimal.ZERO;
+		for (ProductShopItem cart : getShoppingcart()) {
+			ret = ret.add(cart.getPrice());
+		}
+		return ret;
+	}
+
+
+	
+	/** 
+	 * Just create bills, they are nice
+	 * <insert picture of bill gates here>
+	 * @return
+	 */
+	public Bill createBillFromShoppingcart() {
+		
+		Bill bill = new Bill(eventBean.getCurrentEvent(), user);
+		bill.setOurReference(eventBean.getCurrentEvent().getName());
+
+		for (ProductShopItem shopitem : shoppingcart) {
+			if (shopitem.getCount().compareTo(BigDecimal.ZERO) > 0) {
+				bill.addProduct(shopitem.getProduct(), shopitem.getCount(), getFoodWave());
+			}
+		}
+		billBean.createBill(bill);
+
+		return bill;
+	}
+	
+	public String buyFromCounter() {
+		createBillFromShoppingcart();
+		
+		return "/foodwave/ThanksForOrderingFromCounter";
+	}
+	
+	public String buyFromInternet() {
+		Bill bill = createBillFromShoppingcart();
+		
+		if(bill != null) {
+			getBillEditView().setBillid(bill.getId());
+			
+			return "/bill/showBill?faces-redirect=true&IncludeViewParams=true";
+		}
+		
+		return null;
+	}
+	
+	
+
+	public void setUser(EventUser user) {
+		this.user = user;
+	}
+
+	public EventUser getUser() {
+		return user;
+	}
+
+	public void setShoppingcart(ListDataModel<ProductShopItem> shoppingcart) {
+		this.shoppingcart = shoppingcart;
+	}
+
+	public ListDataModel<ProductShopItem> getShoppingcart() {
+		return shoppingcart;
+	}
+
+	private boolean productsInCart() {
+		Iterator<ProductShopItem> nullcheckIter = getShoppingcart().iterator();
+		while (nullcheckIter.hasNext()) {
+			if (nullcheckIter.next().getCount().compareTo(BigDecimal.ZERO) > 0) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+
+
+
+	public BillEditView getBillEditView() {
+		return billEditView;
+	}
+
+
+
+
+	public void setBillEditView(BillEditView billEditView) {
+		this.billEditView = billEditView;
+	}
+
+	
+	
+}

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/shop/FoodWaveView.java

@@ -3,10 +3,13 @@ package fi.insomnia.bortal.web.cdiview.shop;
 import javax.ejb.EJB;
 import javax.enterprise.context.ConversationScoped;
 import javax.faces.model.ListDataModel;
+import javax.inject.Inject;
 import javax.inject.Named;
 
+import fi.insomnia.bortal.beans.EventBeanLocal;
 import fi.insomnia.bortal.beans.FoodWaveBeanLocal;
 import fi.insomnia.bortal.enums.apps.ShopPermission;
+import fi.insomnia.bortal.model.FoodWave;
 import fi.insomnia.bortal.model.FoodWaveTemplate;
 import fi.insomnia.bortal.web.cdiview.GenericCDIView;
 
@@ -16,24 +19,36 @@ public class FoodWaveView extends GenericCDIView {
 
 	private static final long serialVersionUID = 7281708393927365603L;
 	@EJB
-	private FoodWaveBeanLocal foodwaveBean;
+	private FoodWaveBeanLocal foodWaveBean;
+
+	@Inject
+	private FoodWaveFoodView foodWaveFoodView;
+
 	private ListDataModel<FoodWaveTemplate> templates;
 	private FoodWaveTemplate template;
+	private Integer templateId;
+	@EJB
+	private EventBeanLocal eventbean;
 
-	public void initTemplateList()
-	{
-		if (super.requirePermissions(ShopPermission.MANAGE_PRODUCTS))
-		{
-			setTemplates(new ListDataModel<FoodWaveTemplate>(foodwaveBean.getTemplates()));
+	private ListDataModel<FoodWave> foodWaves;
+
+	private FoodWave selectedFoodWave = null;
+
+	public void initTemplateList() {
+		if (super.requirePermissions(ShopPermission.LIST_USERPRODUCTS)) {
+
+			setTemplates(new ListDataModel<FoodWaveTemplate>(
+					foodWaveBean.getTemplates()));
 			super.beginConversation();
 		}
+
 	}
 
-	public void initEditTemplate()
-	{
+	public void initEditTemplate() {
 
 		if (super.requirePermissions(ShopPermission.MANAGE_PRODUCTS) && template == null)
 		{
+			template = foodWaveBean.findTemplate(templateId);
 
 			super.beginConversation();
 		}
@@ -43,21 +58,27 @@ public class FoodWaveView extends GenericCDIView {
 	{
 		if (super.requirePermissions(ShopPermission.MANAGE_PRODUCTS) && template == null)
 		{
-			setTemplate(new FoodWaveTemplate());
+			template = new FoodWaveTemplate();
+			template.setEvent(eventbean.getCurrentEvent());
 			super.beginConversation();
 		}
 	}
 
-	public String editTemplate()
-	{
+	public void initUserFoodWaveList() {
+		this.foodWaves = new ListDataModel<FoodWave>(
+				foodWaveBean.getOpenFoodWaves());
+	}
+
+	public String editTemplate() {
 		setTemplate(getTemplates().getRowData());
 		return "/foodadmin/editTemplate";
 	}
 
 	public String saveTemplate()
 	{
-		setTemplate(foodwaveBean.saveOrCreateTemplate(getTemplate()));
-		return null;
+		setTemplate(foodWaveBean.saveOrCreateTemplate(getTemplate()));
+
+		return "/foodadmin/editTemplate";
 	}
 
 	public FoodWaveTemplate getTemplate() {
@@ -76,4 +97,42 @@ public class FoodWaveView extends GenericCDIView {
 		this.templates = templates;
 	}
 
+	public ListDataModel<FoodWave> getFoodWaves() {
+		return foodWaves;
+	}
+
+	public String selectFoodWave() {
+		if (foodWaves.isRowAvailable()) {
+			// setSelectedFoodWave(foodWaves.getRowData());
+
+		}
+
+		return "/foodwave/listProducts";
+	}
+
+	public String selectTemplate() {
+		if (templates.isRowAvailable()) {
+			foodWaves = new ListDataModel<FoodWave>(templates.getRowData()
+					.getFoodwaves());
+		}
+
+		return "/foodwave/list";
+	}
+
+	public FoodWave getSelectedFoodWave() {
+		return selectedFoodWave;
+	}
+
+	public void setSelectedFoodWave(FoodWave selectedFoodWave) {
+		this.selectedFoodWave = selectedFoodWave;
+	}
+
+	private FoodWaveFoodView getFoodWaveFoodView() {
+		return foodWaveFoodView;
+	}
+
+	private void setFoodWaveFoodView(FoodWaveFoodView foodWaveFoodView) {
+		this.foodWaveFoodView = foodWaveFoodView;
+	}
+
 }

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/shop/FoodWaveView.java.old

+package fi.insomnia.bortal.web.cdiview.shop;
+
+import javax.ejb.EJB;
+import javax.enterprise.context.ConversationScoped;
+import javax.faces.model.ListDataModel;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import fi.insomnia.bortal.beans.FoodWaveBeanLocal;
+import fi.insomnia.bortal.model.EventUser;
+import fi.insomnia.bortal.model.FoodWave;
+import fi.insomnia.bortal.web.annotations.SelectedUser;
+import fi.insomnia.bortal.web.cdiview.GenericCDIView;
+
+@Named
+@ConversationScoped
+public class FoodWaveView extends GenericCDIView {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -4668803787903428164L;
+
+	@Inject
+	@SelectedUser
+	private transient EventUser eventUser;
+	
+	@EJB
+	private transient FoodWaveBeanLocal foodWaveBean;
+	
+	private ListDataModel<FoodWave> foodWaves;
+
+	public EventUser getEventUser() {
+		return eventUser;
+	}
+
+	public void setEventUser(EventUser eventUser) {
+		this.eventUser = eventUser;
+	}
+
+	public ListDataModel<FoodWave> getFoodWaves() {
+		
+		if(this.foodWaves == null) {
+			this.foodWaves = new ListDataModel<FoodWave>(foodWaveBean.getOpenFoodWaves());
+		}
+		
+		return foodWaves;
+	}
+	
+	public String selectFoodWave() {
+		
+	}
+
+	
+
+
+}

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/shop/ProductShopView.java

@@ -209,7 +209,7 @@ public class ProductShopView extends GenericCDIView {
 			Product credProd = productBean.findCreditProduct();
 			retuser = productBean.createAccountEvent(credProd, cash, user).getUser();
 		}
-		if (user != null) {
+		if (retuser != null) {
 			user = retuser;
 		}
 		shoppingcart = null;

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/user/UserCartView.java

@@ -28,6 +28,7 @@ public class UserCartView extends GenericCDIView {
 
 	public void initView()
 	{
+
 	}
 
 	private static final Logger logger = LoggerFactory.getLogger(UserCartView.class);

code/haeLocalisoimattomat.sh

+#!/bin/bash
+epoc=$(date +%s)
+
+# katotaan kaikki käännetyt
+egrep -v "(\s*#|^\s*$)" ./LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_fi.properties | awk '{print $1}' > /tmp/${epoc}lokalisoidut
+
+# Haetaan kaikki rivit missä on jotain käännettävää
+find . -name \*.xhtml | xargs grep "i18n" > /tmp/${epoc}lista
+
+# grepataan kaikki lokalisoimattomat
+for i in $(cat /tmp/${epoc}lokalisoidut); do sed -i "/${i}/d" /tmp/${epoc}lista ; done
+
+cat /tmp/${epoc}lista
+
+#siivotaan
+rm /tmp/${epoc}lista /tmp/${epoc}lokalisoidut