Merge branch 'master' of codecrew.fi:bortal

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

@@ -207,7 +207,7 @@ public class MenuBean implements MenuBeanLocal {
 		foodnavi.addPage(menuitemfacade.findOrCreate("/foodadmin/editTemplate"), ShopPermission.MANAGE_FOODWAVES).setVisible(false);
 		foodnavi.addPage(menuitemfacade.findOrCreate("/foodadmin/editTemplate"), ShopPermission.MANAGE_FOODWAVES).setVisible(false);
 
 
 		foodnavi.addPage(menuitemfacade.findOrCreate("/foodmanager/listFoodwaves"), ShopPermission.MANAGE_FOODWAVES);
 		foodnavi.addPage(menuitemfacade.findOrCreate("/foodmanager/listFoodwaves"), ShopPermission.MANAGE_FOODWAVES);
-		foodnavi.addPage(menuitemfacade.findOrCreate("/foodmanager/listOrders"), ShopPermission.MANAGE_FOODWAVES);
+		foodnavi.addPage(menuitemfacade.findOrCreate("/foodmanager/listOrders"), ShopPermission.MANAGE_FOODWAVES).setVisible(false);
 
 
 	}
 	}
 
 

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

@@ -10,6 +10,7 @@
 	<context-param>
 	<context-param>
 		<param-name>javax.faces.PROJECT_STAGE</param-name>
 		<param-name>javax.faces.PROJECT_STAGE</param-name>
 		 <!-- <param-value>Production</param-value> -->
 		 <!-- <param-value>Production</param-value> -->
+
 		 <param-value>Development</param-value>
 		 <param-value>Development</param-value>
 
 
 	</context-param>
 	</context-param>

code/LanBortalWeb/WebContent/actionlog/messagelist.xhtml

@@ -46,7 +46,7 @@
 			<div id="actionlog">
 			<div id="actionlog">
 				<h:form id="refresh">
 				<h:form id="refresh">
 					<p:poll interval="1" update="actionlogtable" />
 					<p:poll interval="1" update="actionlogtable" />
-					<p:dataTable2styleClass="bordertable" id="actionlogtable" value="#{actionLogMessageView.messages}" var="message" paginator="true" rows="30" paginatorTemplate="{CurrentPageReport}  {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}" rowsPerPageTemplate="10,20,30,50,100">
+					<p:dataTable styleClass="bordertable" id="actionlogtable" value="#{actionLogMessageView.messages}" var="message" paginator="true" rows="30" paginatorTemplate="{CurrentPageReport}  {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}" rowsPerPageTemplate="10,20,30,50,100" >
 						<p:column>
 						<p:column>
 							<f:facet name="header">
 							<f:facet name="header">
 								<h:outputText value="#{i18n['actionlog.time']}" />
 								<h:outputText value="#{i18n['actionlog.time']}" />

code/LanBortalWeb/WebContent/foodmanager/listOrders.xhtml

@@ -12,13 +12,12 @@
 		template="/layout/#{sessionHandler.layout}/template.xhtml">
 		template="/layout/#{sessionHandler.layout}/template.xhtml">
 		<f:metadata>
 		<f:metadata>
 			<f:viewParam name="foodwaveid" value="#{foodWaveView.foodWaveId}" />
 			<f:viewParam name="foodwaveid" value="#{foodWaveView.foodWaveId}" />
-			<f:event type="preRenderView"
-				listener="#{foodWaveView.initFoodWaveOrderList}" />
+			<f:event type="preRenderView" listener="#{foodWaveView.initFoodWaveOrderList}" />
 			<!-- 		<f:event type="preRenderView" listener="#{foodWaveView.initFoodwaveAccountEventList}" /> -->
 			<!-- 		<f:event type="preRenderView" listener="#{foodWaveView.initFoodwaveAccountEventList}" /> -->
 		</f:metadata>
 		</f:metadata>
 
 
 		<ui:define name="title">
 		<ui:define name="title">
-			<h1>#{foodWaveView.foodWave.name}</h1>
+			<h1>#{foodWaveView.selectedFoodWave.name}</h1>
 		</ui:define>
 		</ui:define>
 		<ui:define name="content">
 		<ui:define name="content">
 
 

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

@@ -18,8 +18,6 @@
 </composite:interface>
 </composite:interface>
 
 
 <composite:implementation>
 <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:outputScript library="primefaces" name="jquery/jquery.js" />
 
 
 
 
@@ -84,14 +82,14 @@
 			</p:column>
 			</p:column>
 
 
 		</p:dataTable>
 		</p:dataTable>
-		
-		<h:commandButton action="#{cc.attrs.selectaction}" value="#{i18n[cc.attrs.commitValue]}"  >
-		
-		</h:commandButton>
-		
-		<h:commandButton action="#{foodWaveFoodView.buyFromInternet}" value="#{i18n['foodshop.buyFromInternet']}"  >
-		
-		</h:commandButton>
+		<div>
+		<h:outputLabel for="total" value="#{i18n['foodshop.total']}: "/>
+		<h:outputText id="total" value="#{foodWaveFoodView.totalPrice}" >
+			<f:convertNumber minFractionDigits="0" maxFractionDigits="2" />
+		</h:outputText>
+		</div>
+		<h:commandButton action="#{cc.attrs.selectaction}" value="#{i18n[cc.attrs.commitValue]}"  />
+		<h:commandButton action="#{foodWaveFoodView.buyFromInternet}" value="#{i18n['foodshop.buyFromInternet']}"  />
 
 
 	</h:form>
 	</h:form>
 
 

code/LanBortalWeb/src/fi/insomnia/bortal/HostnameFilter.java

 package fi.insomnia.bortal;
 package fi.insomnia.bortal;
 
 
 import java.io.IOException;
 import java.io.IOException;
-import java.util.LinkedList;
-import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
 
 
 import javax.ejb.EJB;
 import javax.ejb.EJB;
-import javax.enterprise.context.SessionScoped;
 import javax.faces.context.FacesContext;
 import javax.faces.context.FacesContext;
 import javax.servlet.Filter;
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
 import javax.servlet.FilterChain;
@@ -33,6 +31,7 @@ public class HostnameFilter implements Filter {
 
 
 	@EJB
 	@EJB
 	private SessionMgmtBeanLocal sessionmgmt;
 	private SessionMgmtBeanLocal sessionmgmt;
+	private static final String HTTP_TRAIL_NAME = "lanbortal_http_trail";
 
 
 	/**
 	/**
 	 * Default constructor.
 	 * Default constructor.
@@ -48,11 +47,11 @@ public class HostnameFilter implements Filter {
 	public void destroy() {
 	public void destroy() {
 		// Nothing...
 		// Nothing...
 	}
 	}
-	@SessionScoped
-	Queue<String> trail = new LinkedList<String>();
+
 	/**
 	/**
 	 * @see Filter#doFilter(ServletRequest, ServletResponse, FilterChain)
 	 * @see Filter#doFilter(ServletRequest, ServletResponse, FilterChain)
 	 */
 	 */
+	@SuppressWarnings("unchecked")
 	@Override
 	@Override
 	public void doFilter(ServletRequest request, ServletResponse response,
 	public void doFilter(ServletRequest request, ServletResponse response,
 			FilterChain chain) throws IOException, ServletException {
 			FilterChain chain) throws IOException, ServletException {
@@ -117,12 +116,22 @@ public class HostnameFilter implements Filter {
 			{
 			{
 				sessionmgmt.updateSessionUser(httpRequest.getSession().getId(), httpRequest.getUserPrincipal().getName());
 				sessionmgmt.updateSessionUser(httpRequest.getSession().getId(), httpRequest.getUserPrincipal().getName());
 			}
 			}
-			while (trail.size() >= 10) {
-				trail.remove();
+
+			Object trailO = httpRequest.getSession().getAttribute(HTTP_TRAIL_NAME);
+			ConcurrentLinkedQueue<Object> trail = null;
+			if (trailO != null && trailO instanceof ConcurrentLinkedQueue)
+			{
+				trail = (ConcurrentLinkedQueue<Object>) trailO;
+			} else {
+				trail = new ConcurrentLinkedQueue<Object>();
+				httpRequest.getSession().setAttribute(HTTP_TRAIL_NAME, trail);
+			}
+			for (int remove = trail.size() - 10; remove > 0; --remove) {
+				Object removed = trail.poll();
+				logger.debug("Removed {} from http trail", removed);
 			}
 			}
 			if (!httpRequest.getRequestURI().matches(".*(resource).*")) {
 			if (!httpRequest.getRequestURI().matches(".*(resource).*")) {
 				trail.add(httpRequest.getRequestURI());
 				trail.add(httpRequest.getRequestURI());
-				httpRequest.getSession().setAttribute("trail", trail);
 			}
 			}
 
 
 		}
 		}

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

-
-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 = ----
-
-error.contact = If this happens again, contact Info with the following code:
-error.error   = You have encountered an error.
-
-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 m\u00E4\u00E4ritt\u00E4\u00E4 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
+
+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 = ----
+
+error.contact = If this happens again, contact Info with the following code:
+error.error   = You have encountered an error.
+
+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 m\u00E4\u00E4ritt\u00E4\u00E4 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

-
-acc_line.eventuser = Customer
-acc_line.nick      = Nick
-acc_line.product   = Product
-acc_line.quantity  = Quantity
-acc_line.time      = Transaction Date
-
-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
-
-barcodeReader.readBarcode = Read barcode
-
-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
-bill.totalprice           = Total
-
-billLine.eventuser = Customer
-billLine.nick      = Nick
-billLine.price     = Unit Price
-billLine.product   = Product
-billLine.quantity  = Quantity
-billLine.time      = Order Date
-
-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
-
-card.massprint.title     = Print all
-
-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
-
-cart.item           = Item
-cart.item_quantity  = Quantity
-cart.item_total     = Total
-cart.item_unitprice = Price
-cart.total          = Total
-
-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.savesort            = Save order
-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
-
-error.contact = If this happens again, contact Info with the following code:
-error.error   = You have encountered an error.
-
-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
-
-food = Food
-
-foodWave.billLines         = Pending Online Payments
-foodWave.description       = Description
-foodWave.list              = FoodWave Listing
-foodWave.name              = Foodwave
-foodWave.orders            = Amount of Orders
-foodWave.paid              = Paid
-foodWave.show              = Show
-foodWave.template.name     = Template
-foodWave.template.waves    = Foodwaves
-foodWave.templatename      = Choose Products
-foodWave.time              = Time
-foodWave.totalReserved     = Total
-foodWave.unconfirmedOrders = Unconfirmed
-
-foodshop.buyFromCounter  = Pay at info
-foodshop.buyFromInternet = Pay at Internet
-
-foodwave.orders                     = Foodwave Orders
-foodwave.template.basicinfo         = Template Information
-foodwave.template.edit.title        = Foodwave Template Editor
-foodwave.template.list.title        = Foodwave Templates
-foodwave.template.selectproducts    = Products
-
-foodwaveTemplate.name = Name
-
-foodwavetemplate.actions            = Actions
-foodwavetemplate.addproduct         = Add
-foodwavetemplate.basicinfo          = Template
-foodwavetemplate.createFoodwave     = Create Foodwave
-foodwavetemplate.description        = Description
-foodwavetemplate.editRow            = Edit
-foodwavetemplate.name               = Name
-foodwavetemplate.price              = Price
-foodwavetemplate.productdescription = Description
-foodwavetemplate.productname        = Name
-foodwavetemplate.removeFromList     = Remove
-foodwavetemplate.save               = Ok
-foodwavetemplate.savetemplate       = Submit
-foodwavetemplate.selectproducts     = Products
-
-game.gamepoints = Game points
-
-gamepoints = Gamepoints
-
-global.cancel               = Cancel
-global.copyright            = Codecrew Ry
-global.eventname            = Event name
-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
-
-importuser.file     = File
-importuser.template = Template
-
-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.id                            = #
-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.
-
-menu.item               = Item
-menu.name               = Name
-menu.select             = Select
-menu.sort               = Sort
-
-menuitem.navigation.key = Product flag
-
-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.id                          = ID
-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.create      = Create
-poll.description = Description
-poll.edit        = Edit
-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.providedRole        = Product defines role
-product.save                = Save
-product.shopInstant         = Create automatic cashpayment
-product.sort                = Sort nr
-product.totalPrice          = Total
-product.unitName            = Unit name
-product.vat                 = VAT
-
-productShopView.readBarcode = Read barcode
-
-products.save             = Save
-
-productshop.billCreated   = Bill created
-productshop.commit        = Buy
-productshop.limits        = Available
-productshop.minusOne      = -1
-productshop.minusTen      = -10
-productshop.noItemsInCart = There are no products in shopping cart
-productshop.plusOne       = +1
-productshop.plusTen       = +10
-productshop.total         = Total
-
-reader.assocToCard           = Associate to card
-reader.automaticProduct      = Default product
-reader.automaticProductCount = Amount
-reader.createNewCard         = Create new card
-reader.description           = Description
-reader.edit                  = Edit
-reader.identification        = Identification
-reader.name                  = Reader name
-reader.save                  = Save
-reader.select                = Select reader
-reader.tag                   = Tag
-reader.type                  = Type
-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
-
-rfidevent.empty      = Empty
-rfidevent.reader     = Reader
-rfidevent.searchuser = Search user
-rfidevent.tag        = Tag
-
-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)
-
-salespoint.edit          = Edit
-salespoint.name          = Name
-salespoint.noSalesPoints = Amount
-
-sendPicture.header = S
-
-shop.accountBalance = Account balance
-shop.cash           = Cash deposit
-shop.readBarcode    = Read barcode
-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.foodwave.list                = Open foodwaves
-submenu.foodwave.listTemplates       = Food provides
-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.foodwave                = Food
-submenu.user.invite                  = Invite friends
-submenu.user.manageuserlinks         = Manage users
-submenu.user.other                   = Other
-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.showTakePicture    = Show webcam
-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.foodwave  = Food
-topnavi.frontpage = Front page
-topnavi.log       = Log
-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.food.title                 = Choose Menu
-user.foodwave.products.title    = Choose Products
-user.foodwavelist.title         = Choose Foodwave
-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.
-
-userImport.commit = Commit
-
-userView.image = Image
-
-usercart.addSearchedUsers = Add searched users
-usercart.cartsize         = Size
-usercart.clear            = Clear Cart
-usercart.showCart         = Show usercart
-usercart.traverse         = Traverse
-
-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
-userlist.showAdvancedSearch = Advanced 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
+
+acc_line.eventuser = Customer
+acc_line.nick      = Nick
+acc_line.product   = Product
+acc_line.quantity  = Quantity
+acc_line.time      = Transaction Date
+
+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
+
+barcodeReader.readBarcode = Read barcode
+
+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
+bill.totalprice           = Total
+
+billLine.eventuser = Customer
+billLine.nick      = Nick
+billLine.price     = Unit Price
+billLine.product   = Product
+billLine.quantity  = Quantity
+billLine.time      = Order Date
+
+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
+
+card.massprint.title     = Print all
+
+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
+
+cart.item           = Item
+cart.item_quantity  = Quantity
+cart.item_total     = Total
+cart.item_unitprice = Price
+cart.total          = Total
+
+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.savesort            = Save order
+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
+
+error.contact = If this happens again, contact Info with the following code:
+error.error   = You have encountered an error.
+
+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
+
+food = Food
+
+foodWave.billLines         = Pending Online Payments
+foodWave.description       = Description
+foodWave.list              = FoodWave Listing
+foodWave.name              = Foodwave
+foodWave.orders            = Amount of Orders
+foodWave.paid              = Paid
+foodWave.show              = Show
+foodWave.template.name     = Template
+foodWave.template.waves    = Foodwaves
+foodWave.templatename      = Choose Products
+foodWave.time              = Time
+foodWave.totalReserved     = Total
+foodWave.unconfirmedOrders = Unconfirmed
+
+foodadmin.editTemplate = Edit
+
+foodshop.buyAndPay       = Buy and Pay 
+foodshop.buyFromCounter  = Pay at info
+foodshop.buyFromInternet = Pay at Internet
+foodshop.total           = Total
+
+foodwave.orders                     = Foodwave Orders
+foodwave.template.basicinfo         = Template Information
+foodwave.template.description       = Description
+foodwave.template.edit.title        = Foodwave Template Editor
+foodwave.template.list.title        = Foodwave Templates
+foodwave.template.name              = Name
+foodwave.template.selectproducts    = Products
+
+foodwaveTemplate.name = Name
+
+foodwavetemplate.actions            = Actions
+foodwavetemplate.addproduct         = Add
+foodwavetemplate.basicinfo          = Template
+foodwavetemplate.createFoodwave     = Create Foodwave
+foodwavetemplate.createwave         = Create foodwave
+foodwavetemplate.description        = Description
+foodwavetemplate.edit               = Edit foodwave template
+foodwavetemplate.editRow            = Edit
+foodwavetemplate.maxfoods           = Maximum orders
+foodwavetemplate.name               = Name
+foodwavetemplate.price              = Price
+foodwavetemplate.productdescription = Description
+foodwavetemplate.productname        = Name
+foodwavetemplate.removeFromList     = Remove
+foodwavetemplate.save               = Ok
+foodwavetemplate.savetemplate       = Submit
+foodwavetemplate.selectproducts     = Products
+foodwavetemplate.startTime          = Foodwave time
+foodwavetemplate.waveName           = Wave name
+
+game.gamepoints = Game points
+
+gamepoints = Gamepoints
+
+global.cancel               = Cancel
+global.copyright            = Codecrew Ry
+global.eventname            = Event name
+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
+
+importuser.file     = File
+importuser.template = Template
+
+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.id                            = #
+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.
+
+menu.item               = Item
+menu.name               = Name
+menu.select             = Select
+menu.sort               = Sort
+
+menuitem.navigation.key = Product flag
+
+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.id                          = ID
+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.create      = Create
+poll.description = Description
+poll.edit        = Edit
+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.providedRole        = Product defines role
+product.save                = Save
+product.shopInstant         = Create automatic cashpayment
+product.sort                = Sort nr
+product.totalPrice          = Total
+product.unitName            = Unit name
+product.vat                 = VAT
+
+productShopView.readBarcode = Read barcode
+
+products.save             = Save
+
+productshop.billCreated   = Bill created
+productshop.commit        = Buy
+productshop.limits        = Available
+productshop.minusOne      = -1
+productshop.minusTen      = -10
+productshop.noItemsInCart = There are no products in shopping cart
+productshop.plusOne       = +1
+productshop.plusTen       = +10
+productshop.total         = Total
+
+reader.assocToCard           = Associate to card
+reader.automaticProduct      = Default product
+reader.automaticProductCount = Amount
+reader.createNewCard         = Create new card
+reader.description           = Description
+reader.edit                  = Edit
+reader.identification        = Identification
+reader.name                  = Reader name
+reader.save                  = Save
+reader.select                = Select reader
+reader.tag                   = Tag
+reader.type                  = Type
+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
+
+rfidevent.empty      = Empty
+rfidevent.reader     = Reader
+rfidevent.searchuser = Search user
+rfidevent.tag        = Tag
+
+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)
+
+salespoint.edit          = Edit
+salespoint.name          = Name
+salespoint.noSalesPoints = Amount
+
+sendPicture.header = S
+
+shop.accountBalance = Account balance
+shop.cash           = Cash deposit
+shop.readBarcode    = Read barcode
+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.foodadmin.createTemplate     = Create foodwave template
+submenu.foodadmin.listTemplates      = List foodwave templates
+submenu.foodmanager.listFoodwaves    = List active foodwaves
+submenu.foodwave.list                = Open foodwaves
+submenu.foodwave.listTemplates       = Food provides
+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.foodwave                = Food
+submenu.user.invite                  = Invite friends
+submenu.user.manageuserlinks         = Manage users
+submenu.user.other                   = Other
+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.showTakePicture    = Show webcam
+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.foodwave  = Food
+topnavi.frontpage = Front page
+topnavi.log       = Log
+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.food.title                 = Choose Menu
+user.foodwave.products.title    = Choose Products
+user.foodwavelist.title         = Choose Foodwave
+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.
+
+userImport.commit = Commit
+
+userView.image = Image
+
+usercart.addSearchedUsers = Add searched users
+usercart.cartsize         = Size
+usercart.clear            = Clear Cart
+usercart.showCart         = Show usercart
+usercart.traverse         = Traverse
+
+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
+userlist.showAdvancedSearch = Advanced 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
-
-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
-
-error.contact = If this happens again, contact Info with the following code:
-error.error   = You have encountered an error.
-
-eventorg.create = Create
-eventorg.edit   = Edit
-
-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
+#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
+
+error.contact = If this happens again, contact Info with the following code:
+error.error   = You have encountered an error.
+
+eventorg.create = Create
+eventorg.edit   = Edit
+
+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

@@ -208,13 +208,19 @@ foodWave.time              = Aika
 foodWave.totalReserved     = Yhteens\u00E4
 foodWave.totalReserved     = Yhteens\u00E4
 foodWave.unconfirmedOrders = Vahvistamattomia
 foodWave.unconfirmedOrders = Vahvistamattomia
 
 
+foodadmin.editTemplate = Muokkaa
+
+foodshop.buyAndPay       = Varaa ja maksa
 foodshop.buyFromCounter  = Maksa infossa
 foodshop.buyFromCounter  = Maksa infossa
 foodshop.buyFromInternet = Maksa Internetiss\u00E4
 foodshop.buyFromInternet = Maksa Internetiss\u00E4
+foodshop.total           = Yhteens\u00E4
 
 
 foodwave.orders                     = Maksetut Tilaukset
 foodwave.orders                     = Maksetut Tilaukset
 foodwave.template.basicinfo         = Template Infot
 foodwave.template.basicinfo         = Template Infot
+foodwave.template.description       = Kuvaus
 foodwave.template.edit.title        = Foodwave Template Editori
 foodwave.template.edit.title        = Foodwave Template Editori
 foodwave.template.list.title        = Ruokatilaus Templatet
 foodwave.template.list.title        = Ruokatilaus Templatet
+foodwave.template.name              = Nimi
 foodwave.template.selectproducts    = Tuotteet
 foodwave.template.selectproducts    = Tuotteet
 
 
 foodwaveTemplate.name = Nimi
 foodwaveTemplate.name = Nimi
@@ -223,16 +229,21 @@ foodwavetemplate.actions            = Toimet
 foodwavetemplate.addproduct         = Lis\u00E4\u00E4
 foodwavetemplate.addproduct         = Lis\u00E4\u00E4
 foodwavetemplate.basicinfo          = Templeitti
 foodwavetemplate.basicinfo          = Templeitti
 foodwavetemplate.createFoodwave     = Luo ruokatilaus
 foodwavetemplate.createFoodwave     = Luo ruokatilaus
+foodwavetemplate.createwave         = Luo tilauspohja
 foodwavetemplate.description        = Kuvaus
 foodwavetemplate.description        = Kuvaus
+foodwavetemplate.edit               = Muokkaa tilauspohjaa
 foodwavetemplate.editRow            = Muokkaa
 foodwavetemplate.editRow            = Muokkaa
+foodwavetemplate.maxfoods           = Tilausten enimm\u00E4ism\u00E4\u00E4r\u00E4
 foodwavetemplate.name               = Nimi
 foodwavetemplate.name               = Nimi
 foodwavetemplate.price              = Hinta
 foodwavetemplate.price              = Hinta
 foodwavetemplate.productdescription = Kuvaus
 foodwavetemplate.productdescription = Kuvaus
-foodwavetemplate.productname        = Nimi\r\n
+foodwavetemplate.productname        = Nimi\n
 foodwavetemplate.removeFromList     = Poista
 foodwavetemplate.removeFromList     = Poista
 foodwavetemplate.save               = Ok
 foodwavetemplate.save               = Ok
 foodwavetemplate.savetemplate       = Tallenna
 foodwavetemplate.savetemplate       = Tallenna
 foodwavetemplate.selectproducts     = Tuotteet
 foodwavetemplate.selectproducts     = Tuotteet
+foodwavetemplate.startTime          = Tilausaika
+foodwavetemplate.waveName           = Tilauksen nimi
 
 
 game.gamepoints = Insomnia Game pisteet:
 game.gamepoints = Insomnia Game pisteet:
 
 
@@ -603,6 +614,9 @@ submenu.auth.sendResetMail           = Salasanan palautus
 submenu.bill.billSummary             = Laskujen yhteenveto
 submenu.bill.billSummary             = Laskujen yhteenveto
 submenu.bill.list                    = N\u00E4yt\u00E4 omat laskut
 submenu.bill.list                    = N\u00E4yt\u00E4 omat laskut
 submenu.bill.listAll                 = Kaikki laskut
 submenu.bill.listAll                 = Kaikki laskut
+submenu.foodadmin.createTemplate     = Luo tilauspohja 
+submenu.foodadmin.listTemplates      = Muokkaa tilauspohjia
+submenu.foodmanager.listFoodwaves    = Aktiiviset ruokatilaukset
 submenu.foodwave.list                = Avoimet tilaukset
 submenu.foodwave.list                = Avoimet tilaukset
 submenu.index                        = Etusivu
 submenu.index                        = Etusivu
 submenu.map.create                   = Uusi kartta
 submenu.map.create                   = Uusi kartta

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

-#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
-
-error.contact = Jos t\u00E4m\u00E4 toistuu, ota seuraava koodi talteen ja ota yhteys Infoon:
-error.error   = Olet kohdannut virheen.
-
-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
+#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
+
+error.contact = Jos t\u00E4m\u00E4 toistuu, ota seuraava koodi talteen ja ota yhteys Infoon:
+error.error   = Olet kohdannut virheen.
+
+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/cdiview/shop/FoodWaveView.java

@@ -15,7 +15,8 @@ import javax.faces.model.ListDataModel;
 import javax.inject.Inject;
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Named;
 
 
-import com.sun.xml.rpc.processor.schema.UnimplementedFeatureException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 import fi.insomnia.bortal.beans.AccountEventBeanLocal;
 import fi.insomnia.bortal.beans.AccountEventBeanLocal;
 import fi.insomnia.bortal.beans.BillBeanLocal;
 import fi.insomnia.bortal.beans.BillBeanLocal;
@@ -68,9 +69,12 @@ public class FoodWaveView extends GenericCDIView {
 	private Integer foodWaveId;
 	private Integer foodWaveId;
 	private ListDataModel<AccountEvent> accountEventLines;
 	private ListDataModel<AccountEvent> accountEventLines;
 	private List<FoodWave> foodWaves;
 	private List<FoodWave> foodWaves;
+	private static final Logger logger = LoggerFactory.getLogger(FoodWaveView.class);
 
 
 	public List<Product> getProducts() {
 	public List<Product> getProducts() {
-		return productbeanlocal.getProducts();
+		List<Product> ret = productbeanlocal.getProducts();
+		ret.removeAll(template.getProducts());
+		return ret;
 	}
 	}
 
 
 	public void onEdit() {
 	public void onEdit() {
@@ -143,22 +147,22 @@ public class FoodWaveView extends GenericCDIView {
 			super.beginConversation();
 			super.beginConversation();
 		}
 		}
 	}
 	}
-	
+
 	public List<FoodwaveProductSummary> getProductSummaries() {
 	public List<FoodwaveProductSummary> getProductSummaries() {
-		
+
 		System.out.println("..asdfasdf");
 		System.out.println("..asdfasdf");
 		HashMap<Product, FoodwaveProductSummary> pmap = new HashMap<Product, FoodwaveProductSummary>();
 		HashMap<Product, FoodwaveProductSummary> pmap = new HashMap<Product, FoodwaveProductSummary>();
-		
-		for(AccountEvent ae : getSelectedFoodWave().getAccountEvents()) {
-			if(!pmap.containsKey(ae.getProduct())) {
+
+		for (AccountEvent ae : getSelectedFoodWave().getAccountEvents()) {
+			if (!pmap.containsKey(ae.getProduct())) {
 				pmap.put(ae.getProduct(), new FoodwaveProductSummary(ae.getProduct(), new BigDecimal(0), new BigDecimal(0)));
 				pmap.put(ae.getProduct(), new FoodwaveProductSummary(ae.getProduct(), new BigDecimal(0), new BigDecimal(0)));
 			}
 			}
-		
+
 			System.out.println("..");
 			System.out.println("..");
 			pmap.get(ae.getProduct()).add(ae);
 			pmap.get(ae.getProduct()).add(ae);
 		}
 		}
-		System.out.println("::"+pmap.values().size());
-		return new ArrayList<FoodwaveProductSummary>(pmap.values()); 
+		System.out.println("::" + pmap.values().size());
+		return new ArrayList<FoodwaveProductSummary>(pmap.values());
 	}
 	}
 
 
 	private void createNewProductSkeleton() {
 	private void createNewProductSkeleton() {
@@ -222,9 +226,9 @@ public class FoodWaveView extends GenericCDIView {
 
 
 	public void initFoodWaveOrderList() {
 	public void initFoodWaveOrderList() {
 		if (super.requirePermissions(ShopPermission.MANAGE_FOODWAVES) && selectedFoodWave == null) {
 		if (super.requirePermissions(ShopPermission.MANAGE_FOODWAVES) && selectedFoodWave == null) {
-			System.out.println("Testiä");
-			selectedFoodWave = foodWaveBean.findFoodwave(foodWaveId);
 
 
+			selectedFoodWave = foodWaveBean.findFoodwave(foodWaveId);
+			logger.debug("Got foodwave {} with id {}", selectedFoodWave, foodWaveId);
 			this.setAccountEventLines(new ListDataModel<AccountEvent>(selectedFoodWave.getAccountEvents()));
 			this.setAccountEventLines(new ListDataModel<AccountEvent>(selectedFoodWave.getAccountEvents()));
 
 
 			List<BillLine> tmpLines = new ArrayList<BillLine>();
 			List<BillLine> tmpLines = new ArrayList<BillLine>();
@@ -265,7 +269,7 @@ public class FoodWaveView extends GenericCDIView {
 	}
 	}
 
 
 	public FoodWave getSelectedFoodWave() {
 	public FoodWave getSelectedFoodWave() {
-		//System.out.println("APOFKASFASFASFASFASFASFASFASFASFKJIOJIO");
+		// System.out.println("APOFKASFASFASFASFASFASFASFASFASFKJIOJIO");
 		return selectedFoodWave;
 		return selectedFoodWave;
 	}
 	}
 
 

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

@@ -72,7 +72,6 @@ public class ProductShopView extends GenericCDIView {
 	private boolean blip = false;
 	private boolean blip = false;
 	private ListDataModel<ProductShopItem> boughtItems;
 	private ListDataModel<ProductShopItem> boughtItems;
 
 
-	@EJB
 	public void initBillView() {
 	public void initBillView() {
 		if (requirePermissions(ShopPermission.LIST_USERPRODUCTS)
 		if (requirePermissions(ShopPermission.LIST_USERPRODUCTS)
 				&& shoppingcart == null) {
 				&& shoppingcart == null) {