Merge branch 'lokalisointia' into 'master'

Lokalisointia

Termien käännösten korjailua

See merge request !308

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

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

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

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

code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n.properties

@@ -2,7 +2,6 @@
 #Generated by ResourceBundle Editor (http://eclipse-rbe.sourceforge.net)
 #Sat Mar 30 17:56:44 EET 2013
 
-acc_line.eventuser=
 accountEvent.commit = Tallenna
 
 actionlog.create.header           = Create new actionmessage
@@ -52,9 +51,9 @@ billine.vatp = vat-%
 
 bortalApplication.BILL                            = Creating, and managing bills
 bortalApplication.COMPO                           = Managing compos
-bortalApplication.CONTENT = Product & shop management
+bortalApplication.CONTENT                         = Content management
 bortalApplication.EVENT                           = Event permissions
-bortalApplication.LAYOUT = Laout management
+bortalApplication.LAYOUT                          = Layout management
 bortalApplication.LICENSE                         = License stuff
 bortalApplication.MAP                             = Map management
 bortalApplication.POLL                            = Polling stuff
@@ -155,78 +154,174 @@ error = Virhe
 error.contact = If this happens again, contact Info with the following code:
 error.error   = You have encountered an error.
 
-etickets.eticketcode = Lippu
-etickets.mailSended  = Lippu l\u00E4hetetty s\u00E4hk\u00F6postiisi
-etickets.place       = Paikka
-etickets.placeinfo   = Paikkatiedot
-etickets.placemap    = Paikat kartalla
-etickets.product     = Lippu
-etickets.sendAsMail  = L\u00E4het\u00E4 s\u00E4hk\u00F6postina
-etickets.showMap     = N\u00E4yt\u00E4 kartta
-etickets.title       = Lippusi
-etickets.user        = Paikan omistaja
-
-event.calendar.title = Tapahtumakalenteri
+etickets.eticketcode = Ticket
+etickets.mailSended  = Ticket has been sent to your email
+etickets.place       = Place
+etickets.placeinfo   = Place info
+etickets.placemap    = Places on map
+etickets.product     = Ticket
+etickets.sendAsMail  = Send as email
+etickets.showMap     = Show map
+etickets.title       = Your ticket
+etickets.user        = Place owner
+
+event.calendar.title          = Event calendar
 event.domains.title           = Domain
 event.edit                    = Edit
 event.endTime                 = End time
 event.id                      = Event ID
-event.listFutureEvents.title = Lista tulevista tapahtumista
+event.listFutureEvents.title  = List of future events
 event.name                    = Event name
 event.nextBillNumber          = Initial bill number
-event.nodates.message = Lis\u00E4\u00E4 tapahtumaan v\u00E4hint\u00E4\u00E4n aloitusp\u00E4iv\u00E4, lopetusp\u00E4iv\u00E4 sek\u00E4 lipunmyynnin aloitusp\u00E4iv\u00E4.
-event.nodates.title  = P\u00E4iv\u00E4m\u00E4\u00E4ri\u00E4 puuttuu!
-event.privateProperties.title = Private Properties
+event.nodates.message         = Remember to add at least event start date, end date and ticket sales start date.
+event.nodates.title           = Dates missing!
+event.privateProperties.title = Private properties
 event.properties.title        = Properties
 event.referenceNumberBase     = Reference number base
-event.running        = K\u00E4ynniss\u00E4
+event.running                 = Running
 event.save                    = Save
 event.startTime               = Start time
-event.theme          = Teema
-event.ticketSale     = Lipunmyynti
-event.ticketSalesBegin = Lipunmyynti alkaa
+event.theme                   = Theme
+event.ticketSale              = Ticket sales
+event.ticketSalesBegin        = Ticket sales begins
 
 eventdomain.add        = Add event domain
 eventdomain.domainname = Domain
 eventdomain.remove     = Remove
 
 eventmap.active          = Active
+eventmap.buyable.lock    = Lock places
+eventmap.buyable.release = Release places
 eventmap.height          = Kartan korkeus (px)
-eventmap.uploaderror = Virhe lis\u00E4tess\u00E4 karttapohjaa
+eventmap.name            = Map name
+eventmap.notes           = Notes
+eventmap.save            = Save
+eventmap.uploaderror     = Error in adding the map
 eventmap.width           = Kartan leveys (px)
 
-eventorg.basicDetails = Perustiedot
-eventorg.codecrewDetails = Tapahtuman j\u00E4rjest\u00E4j\u00E4tiedot
-eventorg.codecrewNotes = Codecrew -muistiinpanot
-eventorg.codecrewResponsible = Codecrewin tukihenkil\u00F6
+eventorg.bankName1            = Bank name 1
+eventorg.bankName2            = Bank name 2
+eventorg.bankNumber1          = Bank account no. 1
+eventorg.bankNumber2          = Bank account no. 2
+eventorg.basicDetails         = Basic details
+eventorg.billAddress1         = Billing address 1
+eventorg.billAddress2         = Billing address 2
+eventorg.billAddress3         = Billing address 3
+eventorg.billAddress4         = Billing address 4
+eventorg.bundleCountry        = Language bundle
+eventorg.codecrewDetails      = Event organizer information
+eventorg.codecrewNotes        = Codecrew notes
+eventorg.codecrewResponsible  = Codecrew support person
 eventorg.create               = Create
-eventorg.create.title = Luo tapahtumaj\u00E4rjest\u00E4j\u00E4
-eventorg.list.title   = Tapahtumaj\u00E4rjest\u00E4j\u00E4t
-eventorg.organiserResponsible = J\u00E4rjest\u00E4j\u00E4n vastaava
-eventorg.title        = Tapahtuman tiedot
-
+eventorg.create.title         = Create event organiser
+eventorg.createEvent.submit   = Create event
+eventorg.createEvent.title    = Create new event
+eventorg.edit                 = Edit
+eventorg.events               = Events of the organisation
+eventorg.id                   = Event ID
+eventorg.list.title           = Event organizers
+eventorg.organisation         = Organization name
+eventorg.organiserResponsible = Organizer responsible
+eventorg.save                 = Save
+eventorg.title                = Event details
+
+eventorgView.eventname = Name of event
+
+eventorganiser.name = Event organizer
+
+feedback.canFeedback = Feedback
+feedback.submit      = Submit
+feedback.thanks      = Thank you
+
+food = Food
+
+foodWave.accountevents      = Paid orders
+foodWave.activeFoodWaves    = Active food waves
+foodWave.billLines          = Pending payments
 foodWave.closeNow           = Close now
-foodWave.deliveredCount = Luovutetut
+foodWave.deliveredCount     = Delivered
+foodWave.deliveredFoodWaves = Delivered foodwaves
+foodWave.description        = Foodwave description
+foodWave.list               = Active foodwaves
+foodWave.name               = Foodwave
 foodWave.openNow            = Open now
-
-foodshop.buyAndPayWithCredits = Varaa ja maksa krediiteill\u00E4
-foodshop.buyProceedToPay      = Varaa ja siirry maksamaan
-foodshop.canBuyToCounter      = Voit maksaa t\u00E4m\u00E4n ruokatilauksen my\u00F6s infotiskille. Mik\u00E4li haluat tehd\u00E4 n\u00E4in, voit sulkea t\u00E4m\u00E4n ikkunan ja tulla infotiskille maksamaan tilauksen. 
-
-foodwave.cancelOrder = Peruuta
-foodwave.closed      = Ruokatilaus on suljettu
-foodwave.foodwaveLastBillPayTime = Maksut viimeist\u00E4\u00E4n
-foodwave.ordersBefore = Tilaukset ennen
-foodwave.template.waitPaymentsMinutes = Verkkomaksujen odotusaika
-
-game.active = Aktiivinen
-game.codecount = Avattuja
-game.codes.available = Lisenssikoodit
-game.codes.opened = Avatut lisenssikoodit
+foodWave.orders             = Amount of orders
+foodWave.paid               = Paid
+foodWave.show               = Show
+foodWave.template.name      = Name
+foodWave.template.waves     = Foodwaves
+foodWave.templatename       = Choose products
+foodWave.time               = Time
+foodWave.totalReserved      = Total
+foodWave.unconfirmedOrders  = Unconfirmed
+
+foodadmin.editTemplate = Edit
+
+foodshop.buyAndPay            = Reserve and pay
+foodshop.buyAndPayWithCredits = Reserve and pay with credits
+foodshop.buyFromCounter       = Pay at info
+foodshop.buyFromInternet      = Pay online
+foodshop.buyProceedToPay      = Reserve and continue to paying
+foodshop.canBuyToCounter      = You can buy this bill on infodesk. If you would like to do so, you can close this window and come to the infodesk to pay this order.
+foodshop.total                = Total
+
+foodwave.buyInPrice                   = Purchase price
+foodwave.cancelOrder                  = Cancel
+foodwave.closed                       = Foodwave is closed
+foodwave.foodwaveBuyInPrice           = Purchase price
+foodwave.foodwaveLastBillPayTime      = Payments at latest at
+foodwave.markPaid                     = Foodwave marked paid
+foodwave.orders                       = Foodwave orders
+foodwave.ordersBefore                 = Orders before
+foodwave.price                        = Foodwave price
+foodwave.summaryView                  = Foodwave summary
+foodwave.template.basicinfo           = Template information
+foodwave.template.description         = Description
+foodwave.template.list.title          = Foodwave templates
+foodwave.template.name                = Name
+foodwave.template.selectproducts      = Products
+foodwave.template.waitPaymentsMinutes = Online payments waiting time
+foodwave.totalCount                   = Amount
+foodwave.totalPrice                   = Price for the customer
+
+foodwaveTemplate.name = Name
+
+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           = Foodwave name
+
+game.active          = Active
+game.code            = Code
+game.codecount       = Opened
+game.codes.available = License codes
+game.codes.opened    = Opened license codes
 game.create          = Create
+game.description     = Description
 game.edit            = Edit
-game.out    = Gamecodes are out, pleace contact administration
-game.product = Tuote
+game.gamepoints      = Game points
+game.name            = Name
+game.noGameCodes     = You have no opened game codes
+game.open            = Open code
+game.out             = Game codes are out, pleace contact administration
+game.product         = Product
+game.service         = Game service
+
+gamepoints = Game points
 
 generic.sure.header  = Confirmation
 generic.sure.message = Are you sure?
@@ -235,70 +330,120 @@ generic.sure.yes    = Yes
 
 global.cancel               = Cancel
 global.copyright            = Codecrew Ry
-global.notAuthorizedExecute = You are not authorized to do that!!
+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
-
-incomingFlow.count = M\u00E4\u00E4r\u00E4
-incomingFlow.leftCount = Noutamatta
-
-incomingView.attach = Liit\u00E4
-incomingView.attachDialogTitle = Liit\u00E4 koodi k\u00E4ytt\u00E4j\u00E4\u00E4n
-incomingView.cancel = Peruuta
-
-incomingflow.allGiven = Merkitty {0} lippu(a) annetuksi.
-incomingflow.alreadyShowingUser.message = Piipattu k\u00E4ytt\u00E4j\u00E4 on jo n\u00E4kyviss\u00E4
-incomingflow.alreadyShowingUser.title = Valmiiksi valittu
-incomingflow.cardCodes = Kortin koodit
+httpsession.hostname              = Hostname
+httpsession.id                    = ID
+httpsession.invalidate            = Invalidate
+httpsession.invalidateSuccessfull = Session has been invalidated
+httpsession.isSessionNew          = New session
+httpsession.lastAccessedTime      = Last seen
+httpsession.maxInactiveInterval   = Timeout (s)
+httpsession.sessionHasExisted     = Session has existed (s)
+httpsession.user                  = Username
+
+imagefile.description = Description
+imagefile.file        = Image file
+
+importuser.file     = File
+importuser.template = Template
+
+incomingFlow.count     = Count
+incomingFlow.leftCount = Ungiven
+
+incomingView.attach            = Attach
+incomingView.attachDialogTitle = Attach code to user
+incomingView.cancel            = Cancel
+
+incomingflow.allGiven                   = Marked {0} ticket(s) as given.
+incomingflow.alreadyShowingUser.message = We are already showing selected user
+incomingflow.alreadyShowingUser.title   = Already selected
+incomingflow.barcode                    = Barcode
+incomingflow.cardCodes                  = Barcodes in card
 incomingflow.cardfiling.label           = Card filing:
-incomingflow.changereader = Vaihda / valitse lukija
-incomingflow.codeattached.message = Piipattu koodi liitetty n\u00E4ytett\u00E4v\u00E4\u00E4n korttiin
-incomingflow.codeattached.title = Koodi liittetty
-incomingflow.giveplace = Merkitse annetuksi
-incomingflow.groupmemberships = Paikkakoodit
-incomingflow.invalidbarcode.message = Viivakoodilla ei l\u00F6ytynyt mit\u00E4\u00E4n
-incomingflow.invalidbarcode.title = virheellinen koodi
-incomingflow.markEverythingGiven = Anna kaikki antamattomat tuotteet
-incomingflow.placesummary = Paikkayhteenveto
-incomingflow.printedCard = Kortti
-incomingflow.usereditor = K\u00E4ytt\u00E4j\u00E4
-incomingflow.usereditor.info = Tiedot
-incomingflow.usereditor.picture = Kuvanotto
-
-infoview.multisearch = K\u00E4ytt\u00E4j\u00E4haku
-
-invite.permissionDenied = Sinulla ei ole oikeutta luovuttaa paikkaa eteenp\u00E4in.
-invite.userLoginSuccessfull = Kutsu vastaanotettu onnistuneesti
-invite.userLoginUnSuccessfull = Kirjautuminen ep\u00E4onnistui
-
+incomingflow.changereader               = Select or change Reader
+incomingflow.codeattached.message       = Code attached to current user's card
+incomingflow.codeattached.title         = Code attached
+incomingflow.giveplace                  = Mark given
+incomingflow.groupmemberships           = Computer places and tickets
+incomingflow.invalidbarcode.message     = Nothing found with the barcode, you can now add it to the user
+incomingflow.invalidbarcode.title       = Invalid code
+incomingflow.markEverythingGiven        = Give all ungiven items
+incomingflow.multisearch                = Multisearch
+incomingflow.placesummary               = Place summary
+incomingflow.printedCard                = Card
+incomingflow.search                     = Search
+incomingflow.ungiveplace                = Mark not given
+incomingflow.userdetails                = User details
+incomingflow.usereditor                 = User
+incomingflow.usereditor.info            = User
+incomingflow.usereditor.picture         = New picture
+
+infoview.back          = Back
+infoview.computerplace = Computer places
+infoview.multisearch   = User search
+infoview.shop          = Shop
+
+inventory.product.info         = Info
+inventory.product.name         = Product
+inventory.product.pickProduct  = Choose product
+inventory.product.quantity     = Amount
+inventory.product.submitButton = Add
+inventory.product.title        = Add items to storage
+
+invite.createNewUserHeader    = Create new user
+invite.emailexists            = User with that email address already exists in the system.
+invite.existingUserHeader     = Login with an existing username
+invite.notFound               = Invite invalid or already used
+invite.permissionDenied       = You don't have the permission to give this place to someone else.
+invite.successfull            = Invite sent successfully
+invite.userCreateSuccessfull  = User successfully created. You can now login.
+invite.userLoginSuccessfull   = Invite received successfully
+invite.userLoginUnSuccessfull = Login unsuccessfull
+
+lanEventPrivateProperty.createProperty        = Create private property
 lanEventPrivateProperty.defaultValue          = Default value
 lanEventPrivateProperty.editProperty          = Edit property
 lanEventPrivateProperty.save                  = Save
 lanEventPrivateProperty.textValue             = Text value
+lanEventPrivateProperty.value                 = Private property value
 lanEventPrivateProperty.valueIsRawdataWarning = Raw value
 
 lanEventProperty.booleanValue          = Boolean value
+lanEventProperty.confirmDelete         = Confirm delete
+lanEventProperty.createProperty        = Create property
 lanEventProperty.defaultValue          = Default value
+lanEventProperty.deleteProperty        = Delete property
+lanEventProperty.editProperty          = Edit property
+lanEventProperty.key                   = Property key
+lanEventProperty.longValue             = Long value
 lanEventProperty.save                  = Save
 lanEventProperty.textValue             = Text value
-
-lecture.availableLectures = Aihealueen kurssit ja luennot
-lecture.availableLecturesCalendar = Kalenterina
-lecture.availableLecturesList = Listana
-lecture.createLecture     = Uuden tiedot
-lecture.createNew         = Luo uusi
-lecture.description       = Kuvaus
-lecture.full              = Kurssi t\u00E4ynn\u00E4
+lanEventProperty.value                 = Property value
+
+layout.editBottom  = Edit bottom content
+layout.editContent = Edit center content
+layout.editTop     = Edit top content
+
+lecture.availableLectures             = Courses and lectures
+lecture.availableLecturesCalendar     = Calendar view
+lecture.availableLecturesList         = List view
+lecture.createLecture                 = New lecture
+lecture.createNew                     = Create new
+lecture.description                   = Description
+lecture.full                          = Lecture full
 lecture.groupFull                     = Kiinti\u00F6 t\u00E4ynn\u00E4
-lecture.hours             = Kesto, tunteja
-lecture.manageParticipants = Hallitse osallistujia
-lecture.maxParticipantsCount = Max. osallistujia
-lecture.multicreate       = Luo monta putkeen
-lecture.name              = Nimi
-lecture.participants      = Osallistujia
-lecture.participate       = Ilmoittaudu
+lecture.hours                         = Kesto tunteina
+lecture.manageParticipants            = Manage participants
+lecture.maxParticipantsCount          = Max participants
+lecture.multicreate                   = Create multiple in a row
+lecture.name                          = Name
+lecture.participants                  = Participants
+lecture.participate                   = Participate
 lecture.participateNotActive.message  = Voit ilmoittautua kursseille kun olet ostanut lipun tapahtumaan
 lecture.participateNotActive.title    = Osta ensiksi p\u00E4\u00E4sylippu
 lecture.participatedLectures          = Kurssi-ilmoittautumisesi
@@ -326,174 +471,933 @@ lecturegroup.create.success = Kurssiryhm\u00E4 luotu onnistuneesti.
 lecturegroup.list.title     = Luennot
 lecturegroup.save.success   = Kurssiryhm\u00E4 tallennettu onnistuneesti.
 
+license.active      = Active
+license.description = Description
+license.name        = Name
+license.product     = Product
+license.save        = Save
+license.service     = Service
+
 login.login              = Login
 login.logout             = Logout
 login.logoutmessage      = You have logged out of the system
 login.password           = Password
 login.submit             = Login
-login.username = S\u00E4hk\u00F6posti tai k\u00E4ytt\u00E4j\u00E4tunnus
+login.username           = Email or username
 
 loginerror.header        = Login failed
 loginerror.message       = Username of password incorrect.
 loginerror.resetpassword = Reset password
 
-manageparticipants.addUser = Lis\u00E4\u00E4 osallistuja
-manageparticipants.lectureTitle = Kurssin / luennon tiedot
-manageparticipants.title   = Osallistujat
+manageparticipants.addUser      = Add participant
+manageparticipants.lectureTitle = Lecture / course info
+manageparticipants.title        = Participants
 
+map.create                        = Create map
+map.createTileMap                 = Create tile map
+map.edit                          = Edit
+map.generate                      = Generate places
+map.height                        = Place height (px)
 map.id                            = #
-
-mapView.check = P\u00E4ivit\u00E4 jonopaikka
-mapView.enterQueue = Liity jonoon
+map.name                          = Name
+map.namebase                      = P\u00F6ytien etuliitteet puolipisteell\u00E4 erotettuna
+map.oneRowTable                   = Single row tables
+map.placesInRow                   = Places in a row
+map.product                       = Place product
+map.showQueue                     = Show map's user queue
+map.startX                        = Table start X coordinate
+map.startY                        = Table start Y coordinate
+map.submitMap                     = Send map image
+map.tableCount                    = Table count
+map.tableXdiff                    = Table start difference (X)
+map.tableYdiff                    = Table start difference (Y)
+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.check                     = Refresh queue position
+mapView.enterQueue                = Enter queue
+mapView.errorWhenReleasingPlace   = Error in releasing place
+mapView.errorWhenReservingPlace   = Error in reserving place!
+mapView.errorWhileBuyingPlaces    = Error in buying places. Please try again. If error reoccurs please contact organizers.
+mapView.notEnoughCreditsToReserve = You don't have enough credits to reserve this place.
+mapView.productcount.productcount = Number of tickets
+mapView.productcount.productname  = Ticket type
+mapView.queuePosition             = Your position in queue
+mapView.queuePositionUpdated      = Queue position updated
+mapView.youAreInQueue             = You are in queue. Wait for your turn to select places.
+mapView.yourPlaces                = Your unused places
+
+mapedit.save = Save map changes
 
 menu = Valikko
 
-mode.admin = Yll\u00E4piton\u00E4kym\u00E4
-mode.title = N\u00E4kym\u00E4
-mode.user  = K\u00E4ytt\u00E4j\u00E4n\u00E4kym\u00E4
+menu.index              = Index
+menu.item               = Item
+menu.name               = Name
+menu.place.placemap     = Place map
+menu.poll.index         = Polls
+menu.select             = Select
+menu.shop.createBill    = Shop
+menu.sort               = Sort
+menu.toAdmin            = Admin view
+menu.toUser             = User view
+menu.user.edit          = My info
 
-navi.auth.login = frontpage
-navi.auth.loginerror = frontpage
-navi.auth.logout = frontpage
+menuitem.key            = Menu item key
+menuitem.navigation.key = Product flag
+
+menulist.header = Menu list
 
-no = Ei
+mode.admin = Admin mode
+mode.title = Select mode
+mode.user  = User view
 
-off = Poissa
+nasty.user = Go away!
 
-on = P\u00E4\u00E4ll\u00E4
+navi.auth.login      = Front page
+navi.auth.loginerror = frontpage
+navi.auth.logout     = frontpage
 
+neomap.updateMap = Update map
+
+networkassociation.action               = Action
+networkassociation.create_association   = Create association
+networkassociation.create_time          = Created on
+networkassociation.current_associations = Current associations
+networkassociation.drop_association     = Drop
+networkassociation.ip_address           = IP Address
+networkassociation.mac_address          = MAC Address
+networkassociation.modify_time          = Modified on
+networkassociation.pending_associations = Pending associations
+networkassociation.place                = Place
+networkassociation.user                 = User
+
+news.abstract           = Abstract
+news.edit               = Edit
+news.expire             = Expire
+news.publish            = Publish
+news.save               = Save
+news.title              = Title
+
+newsgroup.contents      = Newsgroup content
+newsgroup.create        = Create newsgroup
+newsgroup.createNewNews = Create a news article to this newsgroup
+newsgroup.create_news   = Create a news article
+newsgroup.created       = Newsgroup created
+newsgroup.edit          = Edit
+newsgroup.name          = Newsgroup name
+newsgroup.priority      = Priority
+newsgroup.readerRole    = Reader roles
+newsgroup.save          = Save
+newsgroup.writerRole    = Writer roles
+
+newslist.header = Newsgroups
+
+no = No
+
+off = Off
+
+on = On
+
+orgRoleRequest.discardRequest = Discard request
+orgRoleRequest.handledNotes   = Handling notes
+orgRoleRequest.id             = ID
+orgRoleRequest.requestNotes   = Request notes
+orgRoleRequest.requestOk      = Accept request
+orgRoleRequest.requestedRole  = Requested role
+orgRoleRequest.showAll        = Show all requests
+
+orgrole.create                  = Create
+orgrole.edit                    = Edit orgrole
+orgrole.list.title              = Organization role list
+orgrole.members.header          = Members
+orgrole.name                    = Name
+orgrole.orgainisation           = Organization
+orgrole.parents                 = Parent
+orgrole.pending.title           = Pending organization role requests
+orgrole.save                    = Save
+
+orgrolerequest.commanderror     = Error in handling the request. Please try again.
+orgrolerequest.create           = Create request
+orgrolerequest.requestNotes     = Request information
+orgrolerequest.rolecontent      = Role information
+orgrolerequest.selectedRole     = Requested role
+orgrolerequest.sentSuccessfully = Request sent successfully
+
+page.account.edit.header             = Edit account events
+page.account.list.header             = Account events
+page.admin.sendimage.header          = Send picture
+page.auth.login.header               = Login error
+page.auth.login.loginerror.header    = Login error
+page.auth.login.loginerror.pagegroup = Front page
+page.auth.login.logout.header        = Logout
+page.auth.login.logout.pagegroup     = Front page
+page.auth.login.pagegroup            = Front page
+page.auth.login.title                = Login error
+page.auth.loginerror.header          = Login failed
+page.auth.loginerror.pagegroup       = front page
+page.auth.logout.header              = Logout
+page.auth.logout.pagegroup           = Front page
+page.auth.logoutsuccess.header       = Logout successful
+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.list.header                = Bills
 page.bill.listAll.header             = Bills
 page.bill.placemap.header            = Place map
-page.bill.show.header        = Tilauksen tiedot
-page.svm.error.header        = Verkkomaksu ep\u00E4onnistui
+page.bill.show.header                = Order 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                    = Etusivu
+page.index.pagegroup                 = frontpage
+page.place.edit.header               = Edit place
+page.place.insertToken.header        = Insert place token
+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.svm.error.header                = Payment failed
+page.svm.failure.header              = Payment error
+page.svm.notification.header         = Suomen verkkomaksut notification
+page.svm.pending.header              = Payment pending
+page.svm.success.header              = Payment successfull
+page.user.create.header              = New user
+page.user.edit.header                = Edit user
 
 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.errorChanging = Unexpected error in password reset. Contact your administrator.
 passwordReset.hashNotFound  = Password change token has expired. Please send the query again.
 
+passwordreset.emailnotfound = Email address not found.
+passwordreset.mailBody      = You can change your password in: {0}\n\nIf you have not requested this password reset, ignore this message.
+passwordreset.mailSubject   = [{0}] Password reset
+passwordreset.unknownerror  = Unknown error when resetting password. Please contact administration
+passwordreset.usernotfound  = Username not found. 
+
 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.cancelSend = Peruuta siirto
-place.send       = Siirr\u00E4 paikka
-
-placegroup.noPlacegroups = Sinulla t\u00E4ytyy olla paikkoja ett\u00E4 voit n\u00E4hd\u00E4 lippusi
-placegroup.showEticket   = N\u00E4yt\u00E4 lippu
-
-placegroupview.groupCreator = Tilaaja
-placegroupview.owner        = Omistaja
-placegroupview.placetransferred = Paikka annettu eteenp\u00E4in
-placegroupview.reserveForSelf = Valitse paikka itsellesi
+place.buyable                       = Buyable
+place.cancelSend                    = Cancel transfer
+place.code                          = Place token
+place.commit                        = Save
+place.description                   = Description
+place.details                       = Details
+place.edit                          = Edit
+place.groupremove.confirm           = Are you sure you want to remove this place from the group?
+place.height                        = Height
+place.id                            = ID
+place.mapX                          = X
+place.mapY                          = Y
+place.membership                    = Associated user
+place.name                          = Name
+place.noReserver                    = Not associated to a user
+place.product                       = Product
+place.release                       = Release this place
+place.releasetime                   = Release time
+place.reserveForUser                = Reserve for the user
+place.send                          = Transfer place
+place.width                         = Width
+
+placeReservation.buyConfirm.content = Are you sure, this is difficult to cancel?
+placeReservation.buyConfirm.title   = Buy places for user?
+placeReservation.mapMultiuserNote   = If the same user uses map on multiple computers, you see all place selections in blue.
+placeReservation.selectedPlaces     = Selected places
+
+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   = Selected places
+placeSelect.totalPlaces      = Places total
+
+placegroup.created                = Created
+placegroup.creator                = Reserver
+placegroup.details                = Details
+placegroup.edit                   = Show
+placegroup.edited                 = Edited
+placegroup.name                   = Name
+placegroup.noPlacegroups          = You can view the ticket after you have reserved places.
+placegroup.placename              = Place
+placegroup.places                 = Places
+placegroup.printPdf               = Print tickets
+placegroup.showEticket            = Show ticket
+
+placegroupView.editplace = Edit place
+
+placegroupview.groupCreator       = Orderer
+placegroupview.header             = My places
+placegroupview.noMemberships      = No places
+placegroupview.owner              = Owner
+placegroupview.placeReleaseFailed = Releasing place failed!
+placegroupview.placeReleased      = Place {0} released 
+placegroupview.placetransferred   = Place is transferred
+placegroupview.releasePlace       = Release
+placegroupview.reservationName    = Place
+placegroupview.reservationProduct = Ticket
+placegroupview.reserveForSelf     = Select the place for yourself
+placegroupview.token              = Place token / user
 placegroupview.toptext            = \ 
 
-placeslot.add = Lis\u00E4\u00E4 placeslot
-placeslot.state.expired = Vanhentunut
-
-poll.edit = edit
+placeslot.add           = Add place slot
+placeslot.bill          = Bill
+placeslot.id            = ID
+placeslot.lockSlot      = Lock slot
+placeslot.place         = Place
+placeslot.product       = Slot product
+placeslot.releaseSlot   = Release slot lock
+placeslot.showBill      = Show bill
+placeslot.state.expired = Expired
+placeslot.state.notPaid = Not paid
+placeslot.state.paid    = Paid
+placeslot.stateExpired  = Expired
+placeslot.used          = Used
+
+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 place bought by someone else to your own account by inserting the 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
 
 print = Print
 
-product.description = Kuvaus
-product.expired     = Vanhentuneet
-product.name        = Tuotteen nimi
-product.price       = Hinta (sis. alv)
+printedCard.cardState.PENDING_VALIDATION = Validation pending
+printedCard.cardState.REJECTED           = Rejected
+printedCard.cardState.VALIDATED          = Validated
+printedCard.template                     = Template
+
+product.barcode                          = Barcode
+product.billed                           = Billed
+product.boughtTotal                      = Products billed
+product.buyInPrice                       = Purchase price
+product.cart.count                       = Amount
+product.cashed                           = Paid in cash
+product.color                            = Color in UI
+product.create                           = Create product
+product.createDiscount                   = Add volume discount
+product.createLimit                      = Create product limit
+product.description                      = Description
+product.edit                             = Edit
+product.expired                          = Expired
+product.inventoryQuantity                = Inventory count
+product.name                             = Product name
+product.paid                             = Paid
+product.prepaid                          = Prepaid
+product.price                            = Price (inc. vat)
 product.providedRole                     = Product defines role
 product.returnProductEdit                = Return to product: 
+product.save                             = Save
 product.saved                            = Product saved
-product.vat         = ALV-%
-
-productFlag.CREATE_NEW_PLACE_WHEN_BOUGHT = Luo uusi paikka ostettaessa
-productFlag.USERSHOP_AUTOPRODUCT         = Tuote lis\u00E4t\u00E4\u00E4n k\u00E4ytt\u00E4j\u00E4n tilaukseen
-
+product.shopInstant                      = Create cash payment
+product.shopRequired                     = Role required to buy this product
+product.sort                             = Sort no
+product.totalPrice                       = Total
+product.unitName                         = Unit name
+product.vat                              = VAT-%
+
+productFlag.CREATE_NEW_PLACE_WHEN_BOUGHT = Create new place when bought
+productFlag.HIDE_FROM_INFOSHOP           = Hide from Info shop
+productFlag.PREPAID_CREDIT               = Prepaid credit
+productFlag.USERSHOP_AUTOPRODUCT         = Product will be added to user's order
+productFlag.USER_SHOPPABLE               = Users can buy
+
+productLimit.description = Description
+productLimit.edit        = Edit
+productLimit.last        = Last limit
+productLimit.lowerLimit  = Lower limit
+productLimit.name        = Type
+productLimit.roles       = Roles
+productLimit.save        = Save
+productLimit.sort        = Sort number
+productLimit.type        = Limit type
+productLimit.upperLimit  = Upper limit
+
+productShopView.readBarcode = Read barcode
+
+products.create              = Create product
+products.save                = Save
+
+productsShopView.readBarcode = Read
+
+productshop.billCreated   = Bill created
+productshop.commit        = Buy
+productshop.discounts     = Discounts
+productshop.limits        = Available
 productshop.minusOne      = -1
 productshop.minusTen      = -10
+productshop.noItemsInCart = There are no products in shopping cart
 productshop.plusOne       = +1
 productshop.plusTen       = +10
-
-reader.autopoll = Jatkuva lukijan seuraaminen
-reader.noReader = Ei valittua lukijaa
-
-refresh = P\u00E4ivit\u00E4
-
-registerleaflet.title = Rekisteriseloste
+productshop.total         = Total
+
+queuemgmt.adduser             = Add user to reserving
+queuemgmt.defaultTimeoutMin   = Reservation time
+queuemgmt.minimumSlotsInQueue = Minimum amount of places to enter queue
+queuemgmt.remove              = Remove user from queue
+queuemgmt.reservingSize       = Number of people reserving at the same time
+queuemgmt.saveProperties      = Save properties
+queuemgmt.time                = Reservation time
+queuemgmt.username            = Login
+
+reader.assocToCard           = Associate to card
+reader.automaticProduct      = Default product
+reader.automaticProductCount = Amount
+reader.autopoll              = Reader autopoll
+reader.create                = Create reader
+reader.createNewCard         = Create new card
+reader.description           = Description
+reader.edit                  = Edit
+reader.identification        = Identification
+reader.name                  = Reader name
+reader.noReader              = No reader selected
+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.saveEvent       = Save event
+readerevent.seenSince       = Last seen
+readerevent.shopToUser      = Buy to user
+readerevent.tagname         = Tag
+
+readerview.cards = Cards (print amount)
+
+refresh = Refresh
+
+registerleaflet.title = Register leaflet
+
+rejectcard.body              = Body
+rejectcard.mailBody          = Your profile picture for event {0} has been rejected. Please upload new picture as soon as possible. Picture is valid if your face is shown clearly and you can be easily recognized.
+rejectcard.reject            = Reject
+rejectcard.sendAndReject     = Send and reject
+rejectcard.sendRejectionMail = Send mail
+rejectcard.subject           = Subject
+rejectcard.toAddr            = Email address
+rejectcard.toName            = Name
 
 required = Arvo vaaditaan
 
+resetMail.body     = You can change a forgotten password by inserting your username or email address to the field below. A link where you can change the password will be sent to the email address associated to that.
+resetMail.email    = Email address
 resetMail.header   = Reset lost password
+resetMail.send     = Send
 resetMail.username = Username
 
-resetmailSent.body = Email has been sent containing a link where you can change the password.
+resetmailSent.body   = Email has been sent to you containing a link where you can change the password.
 resetmailSent.header = Email sent
 
-role.userSelectableRole = K\u00E4ytt\u00E4j\u00E4n valittavissaoleva rooli
-
-roleView.adduser = Lis\u00E4\u00E4 k\u00E4ytt\u00E4j\u00E4
-roleView.hidePermissioneditor = Piilota oikeusasetukset
-roleView.members = K\u00E4ytt\u00E4j\u00E4t
-roleView.showPermissioneditor = N\u00E4yt\u00E4 oikeusasetukset
-
-save = Tallenna
-
-shop.customPrice = Uusi hinta
-shop.product.name = Lippu
-shop.unitdiscount = Alennus
+rfidevent.empty      = Empty
+rfidevent.reader     = Reader
+rfidevent.searchuser = Search user
+rfidevent.tag        = Tag
+
+role.cardtemplate             = Card template
+role.create                   = Create role
+role.description              = Description
+role.edit.save                = Save
+role.execute                  = (X)
+role.name                     = Name
+role.parents                  = Parents
+role.permissionheader         = Role permissions
+role.read                     = (R)
+role.savePermissions          = Save permissions
+role.userSelectableRole       = User selectable role
+role.write                    = (W)
+
+roleView.adduser              = Add user
+roleView.eventRoles           = Event roles
+roleView.hidePermissioneditor = Hide permission editor
+roleView.members              = Users
+roleView.save                 = Save changes
+roleView.showPermissioneditor = Show permission editor
+
+salespoint.edit          = Edit
+salespoint.name          = Name
+salespoint.noSalesPoints = Amount
+
+save = Save
+
+sendImage = Send image
+
+sendPicture.header = Send image
+
+shop.accountBalance        = Credits
+shop.actions               = Actions
+shop.afterBalance          = Balance after action
+shop.barcode               = Barcode
+shop.buy                   = Buy
+shop.buyByCredit           = Buy with credits
+shop.buyCash               = Buy with cash
+shop.buyCredit             = Buy credits
+shop.buyForUser            = Osta k\u00E4ytt\u00E4j\u00E4lle
+shop.buyForUser.success    = Places buyed successfully for user!
+shop.calcsubtotal          = Calculate subtotal
+shop.cartPrice             = Cart price
+shop.cash                  = Cash
+shop.cashBack              = Change returned
+shop.cashGiven             = Cash given
+shop.cashback              = Change
+shop.confirmCreditBuy      = Are you sure?
+shop.count                 = Qty
+shop.currentBalance        = Current balance
+shop.customPrice           = New price
+shop.price                 = Price
+shop.product               = Product
+shop.product.name          = Ticket
+shop.readBarcode           = Read
+shop.shop                  = Shop
+shop.shoppingcartCommitted = Products bought
+shop.toAccountValue        = To account
+shop.totalPrice            = Total
+shop.transactionTotal      = Transaction total
+shop.unitdiscount          = Discount
+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 organizations
+sidebar.map.list            = Maps
+sidebar.map.placemap        = Place map
+sidebar.other               = Other
+sidebar.product.create      = New product
+sidebar.product.createBill  = Buy products
+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.users               = Users
+sidebar.utils.flushCache    = Flush cache
+sidebar.utils.testdata      = Test data
+
+sitepage.addContent        = Add content block
+sitepage.content.expire    = Expire time
+sitepage.content.locale    = Language shown
+sitepage.content.publish   = Publish time
+sitepage.content.showToAll = All languages
+sitepage.content.sort      = Sorting number
+sitepage.create            = Create
+sitepage.edit              = Edit
+sitepage.name              = Page name
+sitepage.roles             = Visible for roles
+sitepage.save              = Save
+
+sitepagelist.header = Site pages
 
 submenu.NotImplementedYet                = Not implemented
+submenu.actionlog.messagelist            = ActionLog
+submenu.actionlog.taskview               = View tasks
 submenu.admin.adduser                    = K\u00E4ytt\u00E4j\u00E4nlis\u00E4ys
-submenu.admin.adduser.index = K\u00E4ytt\u00E4j\u00E4nlis\u00E4ys
-submenu.admin.incoming.index = Sis\u00E4\u00E4ntulo
-submenu.frontpage         = Frontpage
-submenu.info.cardlessIncoming = Sis\u00E4\u00E4ntulo
-submenu.info.foodwave.foodwaveshop = Ruokakauppa
-submenu.info.incoming     = Laaja sis\u00E4\u00E4ntulon\u00E4kym\u00E4
-submenu.info.index        = Infon\u00E4kym\u00E4
-submenu.info.shop         = Kauppa
-submenu.info.usermapsearch = Karttahaku
-submenu.info.viplist      = Vippilista
-submenu.lectureadmin.lectureParticipants = Tarkastele osallistujia
-submenu.lectureadmin.manageLectureGroups = Hallinnoi
-submenu.lectures.viewLectures = Ilmoittaudu
-submenu.neomap.view       = Paikkakartta
-submenu.place.placemap    = Paikkakartta
-submenu.place.viewplacemap = Paikkatilanne
-submenu.reports.basicStatistics = Tilastoja
-submenu.shop.createBill   = Osta lippuja
-
-subnavi.cards = \u0009\u0009
-subnavi.info  = Info
-subnavi.vips  = Vippilista
-
-success = Onnistui
+submenu.admin.adduser.index              = Add user
+submenu.admin.adduser.login              = Login
+submenu.admin.adduser.start              = Welcome
+submenu.admin.adduser.update             = Update profile picture
+submenu.admin.incoming.index             = Incoming
+submenu.admin.incoming.printCard         = Print card
+submenu.admin.info.computerplaces        = Computer places
+submenu.admin.info.general               = General functions
+submenu.admin.info.index                 = Info index
+submenu.auth.login                       = Login
+submenu.auth.loginError                  = Login error
+submenu.auth.loginSucessRedirect         = Successfully logged in
+submenu.auth.logout                      = Logout
+submenu.auth.logoutResponse              = Logout successful
+submenu.auth.sendResetMail               = Password reset
+submenu.bill.billSummary                 = Bill summary
+submenu.bill.list                        = My orders
+submenu.bill.listAll                     = All bills
+submenu.eventorg.editEvent               = Edit event
+submenu.feedback.index                   = U Mad?!
+submenu.foodadmin.createTemplate         = Create foodwave template
+submenu.foodadmin.listTemplates          = List foodwave templates
+submenu.foodmanager.listFoodwaves        = List active foodwaves
+submenu.foodwave.list                    = Foodwaves
+submenu.foodwave.listTemplates           = Food providers
+submenu.frontpage                        = Front page
+submenu.help                             = Ticket help
+submenu.index                            = Front page
+submenu.info.cardlessIncoming            = Incoming
+submenu.info.foodwave.foodwaveshop       = Foodshop
+submenu.info.incoming                    = Extendet incoming view
+submenu.info.index                       = Infoview
+submenu.info.placeReservation            = Place reservation
+submenu.info.shop                        = Shop
+submenu.info.usermapsearch               = Map search
+submenu.info.viplist                     = Vip list
+submenu.lectureadmin.lectureParticipants = Lecture participants
+submenu.lectureadmin.manageLectureGroups = Management
+submenu.lectures.viewLectures            = Participate
+submenu.license.manageCodes              = Manage codes
+submenu.license.viewCodes                = View codes
+submenu.map.create                       = Create map
+submenu.map.list                         = List maps
+submenu.neomap.reserve                   = Reserve places
+submenu.neomap.view                      = Map
+submenu.networkassociation.index         = Associations
+submenu.orgrole.create                   = Create organization role
+submenu.orgrole.list                     = Organization roles
+submenu.orgrole.pendingRequests          = Organization role requests
+submenu.orgrole.requestRole              = Request role
+submenu.pages.create                     = Create content
+submenu.pages.list                       = List pages
+submenu.place.adminGroups                = Account places
+submenu.place.adminPlacemap              = Place map
+submenu.place.editGroup                  = Edit group
+submenu.place.insertToken                = Insert place token
+submenu.place.myGroups                   = Place reservations
+submenu.place.placemap                   = Place map
+submenu.place.viewplacemap               = Place status
+submenu.poll.index                       = Polls
+submenu.product.create                   = Create product
+submenu.product.list                     = List products
+submenu.reports.basicStatistics          = Statistics
+submenu.role.create                      = Create role
+submenu.role.list                        = Show Roles
+submenu.shop.createBill                  = Purchase tickets
+submenu.shop.listReaders                 = List readers
+submenu.shop.shopToUser                  = Shop to user
+submenu.temp.pms                         = PMS codes
+submenu.tournaments.admin.index          = View and manage
+submenu.tournaments.index                = Tournaments list
+submenu.tournaments.myparticipations     = My participations
+submenu.user.accountEvents               = Account events
+submenu.user.changePassword              = Change password
+submenu.user.create                      = Create new user
+submenu.user.createCardTemplate          = Create card template
+submenu.user.edit                        = My information
+submenu.user.foodwave                    = Food
+submenu.user.gameids                     = Set GameIDs
+submenu.user.invite                      = Invite friends
+submenu.user.list                        = All users
+submenu.user.listCardTemplates           = Card templates
+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.accountEvents          = User's account events
+submenu.useradmin.create                 = Create user
+submenu.useradmin.createCardTemplate     = Create card template
+submenu.useradmin.edit                   = Edit user
+submenu.useradmin.foodwaveshop           = Foodwave shop
+submenu.useradmin.list                   = Search users
+submenu.useradmin.listCardTemplates      = Card templates
+submenu.useradmin.sendPicture            = Send picture
+submenu.useradmin.showTakePicture        = Show webcam
+submenu.useradmin.validateUser           = Validate user
+submenu.utils.index                      = Administration tools
+submenu.voting.admincompolist            = Compos
+submenu.voting.compolist                 = Compos
+submenu.voting.create                    = Create new compo
+submenu.voting.myEntries                 = My entries
+submenu.voting.submitEntry               = Submit entry
+
+subnavi.billing  = Billing
+subnavi.cards    = Cards
+subnavi.info     = InfoInfo
+subnavi.products = Products
+subnavi.readers  = Readers
+subnavi.roles    = Roles
+subnavi.vips     = VIP-list
+
+success = Success
 
 suffix.minutes = min
 
-svm.success.successMessage = Verkkomaksu onnistui.
-
-topnavi.adminlectures = Kurssit ja luennot
-topnavi.license       = Lisenssikoodit
-topnavi.userlectures  = Kurssit ja luennot
-
-user.cancelInvite = Peruuta kutsu
-user.createdmessage = K\u00E4ytt\u00E4j\u00E4tunnus on luotu onnistuneesti.
-user.cropImage    = Crop
-user.email        = S\u00E4hk\u00F6postiosoite
-user.emailAgain   = S\u00E4hk\u00F6posti (uudelleen)
-user.emailAndUsername = Email (toimii k\u00E4ytt\u00E4j\u00E4tunnuksena)
-user.imageUpload.imageNotFound = Select image to upload
-user.info         = K\u00E4ytt\u00E4j\u00E4
-user.invite.placeInvite.header = Liit\u00E4 paikka itsellesi
+supernavi.admin = Admin view
+supernavi.user  = User view
+
+svm.failure.errorMessage        = Payment error.
+svm.failure.successMessage      = There might have been an error while processing the payment, please check ticket sales/Moya to view payment status. In unclear situations, contact support.
+svm.notification.errorMessage   = Payment failed.
+svm.notification.successMessage = Payment notification received.
+svm.pending.errorMessage        = Unknown error! If payment was successfull, an email will be sent after verification.
+svm.pending.successMessage      = Payment pending. You will receive email after payment verification.
+svm.success.successMessage      = Payment was successful.
+
+template.keepaliveError = Page has expired. Please refresh the page.
+template.loggedInAs     = Logged in as
+
+tmp.code         = Code
+tmp.yourpmscodes = Your PMS codes
+
+topmenu.admin    = Admin view
+topmenu.helpdesk = Helpdesk
+topmenu.user     = User view
+
+topnavi.adminassoc    = Net associations
+topnavi.adminlectures = Lectures and courses
+topnavi.adminshop     = Admin shop
+topnavi.billing       = Billing
+topnavi.competitions  = Competitions
+topnavi.compos        = Compos
+topnavi.contents      = Site contents
+topnavi.createuser    = Create user
+topnavi.event         = Event
+topnavi.foodwave      = Foodwave
+topnavi.frontpage     = Front page
+topnavi.game          = Game codes
+topnavi.help          = Help
+topnavi.infoviews     = Info views
+topnavi.license       = License codes
+topnavi.log           = Log
+topnavi.login         = Login
+topnavi.maps          = Maps
+topnavi.placemap      = Map
+topnavi.poll          = Polls
+topnavi.products      = Products
+topnavi.profile       = Profile
+topnavi.shop          = Shop
+topnavi.user          = My properties
+topnavi.userevent     = Event
+topnavi.userinit      = User auth
+topnavi.userlectures  = Lectures and courses
+topnavi.usermgmt      = Users
+topnavi.userplaces    = Computer places
+topnavi.usershop      = Shop
+
+tournament.admin.back_to_index                                  = Back to tournament administration
+tournament.admin.create                                         = Create new tournament
+tournament.admin.delete                                         = Delete
+tournament.admin.delete_cancel                                  = Cancel deletion
+tournament.admin.delete_confirm                                 = Confirm deletion
+tournament.admin.edit                                           = Edit
+tournament.admin.tournament_deleted_successfully                = Tournament deleted successfully
+tournament.admin.tournament_edited_successfully                 = Edited successfully
+tournament.admin.tournament_rules_edit_failed                   = Editing rules failed
+tournament.admin.tournament_rules_edited_successfully           = Rules successfully edited
+tournament.admin.view                                           = View
+tournament.already_participated_into_tournament                 = You have already participated into the selected tournament!
+tournament.backup_player_successfully_added_to_team             = Backup player added
+tournament.cancel_participation                                 = Cancel participation
+tournament.cannot_add_anon_user                                 = Cannot add anonymous user
+tournament.cannot_remove_captain                                = Cannot remove the team captain (you)
+tournament.control                                              = Control
+tournament.create                                               = Create tournament
+tournament.edit                                                 = Edit tournament
+tournament.fillamount                                           = Participants signed up
+tournament.full                                                 = Tournament full
+tournament.game                                                 = Game
+tournament.my_participations                                    = My participations
+tournament.name                                                 = Tournament name
+tournament.not_within_participation_time                        = Tournament sign up is not active
+tournament.participant_captain                                  = Captain
+tournament.participant_email                                    = Participant email
+tournament.participant_gameid                                   = Game-ID
+tournament.participant_nick                                     = Nickname
+tournament.participants                                         = Participants
+tournament.participate                                          = Participate
+tournament.participation_failed                                 = Sign up failed
+tournament.participation_success                                = Successfully signed up to the tournament
+tournament.participation_time                                   = Sign up time
+tournament.player_already_exists_in_team                        = Player already exists in the team
+tournament.player_successfully_added_to_team                    = Player added to the team
+tournament.playerspermatch_slash_teamsize                       = Players / team size
+tournament.rules                                                = Rules
+tournament.rules_for_tournament                                 = Rules for tournament
+tournament.status                                               = Status
+tournament.team_members                                         = Team members
+tournament.team_name                                            = Team name
+tournament.team_name_required                                   = Team name is required
+tournament.teammember.delete                                    = Delete
+tournament.teammember.login                                     = Login
+tournament.teammember.name                                      = Name
+tournament.type                                                 = Type
+
+tournaments.accept_rules_and_participate                        = Accept rules and sign up
+tournaments.active_tournaments                                  = Active tournaments
+tournaments.add_backup_player_to_team                           = Add backup player
+tournaments.add_player_to_team                                  = Add player to team
+tournaments.admin.begin_time_constraints                        = Tournament begin time
+tournaments.admin.cancel_edits                                  = Cancel edits
+tournaments.admin.create                                        = Create tournament
+tournaments.admin.create_a_game                                 = Create a game
+tournaments.admin.create_new_ruleset                            = Create a new ruleset
+tournaments.admin.create_tournament                             = Create a tournament
+tournaments.admin.description                                   = Manage tournaments
+tournaments.admin.edit                                          = Edit tournament
+tournaments.admin.edit_rules                                    = Edit rules
+tournaments.admin.edit_tournament                               = Edit tournament
+tournaments.admin.game_description                              = Game description
+tournaments.admin.game_name                                     = Game name
+tournaments.admin.registration_time_constraints                 = Registration time
+tournaments.admin.remove_confirmation_text                      = Are you sure you want to remove this tournament? THIS CANNOT BE REVERSED!
+tournaments.admin.remove_title                                  = Confirm tournament removal
+tournaments.admin.rules                                         = Rules
+tournaments.admin.select_a_game                                 = Select a game
+tournaments.admin.select_a_ruleset                              = Select a ruleset
+tournaments.admin.set_time_constraints                          = Set time limits
+tournaments.admin.title                                         = Tournaments management
+tournaments.admin.view_tournament_description                   = You may view tournament participants and verify details and make minor edits for the teams. You may also remove any invalid participations.
+tournaments.admin.view_tournament_description_teamview_addition = Team listing is of form TeamMember (Game-ID).
+tournaments.admin.view_tournament_title                         = View tournament: 
+tournaments.back_to_tournament_list                             = Back to tournament list
+tournaments.backup_players                                      = Max backup players
+tournaments.cancel_participation                                = Cancel participation
+tournaments.completed_tournaments                               = Past tournaments
+tournaments.description                                         = You can view & sign up to tournaments on this page.
+tournaments.in_progress_tournaments                             = In progress
+tournaments.max_participants                                    = Max participants
+tournaments.menutitle                                           = Tournaments
+tournaments.open_tournaments                                    = Open tournaments
+tournaments.participate_actual_team_members                     = Actual team members
+tournaments.participate_backup_player_count                     = Backup player amount
+tournaments.participate_backup_team_members                     = Backup team members
+tournaments.participate_description                             = You may sign up to the tournament on this page.
+tournaments.participate_player_count                            = Player count
+tournaments.participate_rules                                   = Rules
+tournaments.participate_team_counters                           = Counters
+tournaments.participate_team_members                            = Select team members
+tournaments.participate_title                                   = Sign up to tournament
+tournaments.participated_user_not_found                         = User not found. Please check the username.
+tournaments.participation_already_exists                        = Participant is already added.
+tournaments.players_per_match                                   = Max players per match
+tournaments.registration_closes                                 = Registration closing time
+tournaments.registration_opens                                  = Registration opening time
+tournaments.ruleset_description                                 = Ruleset description
+tournaments.ruleset_name                                        = Ruleset name
+tournaments.ruleset_rules                                       = Tournament ruleset
+tournaments.setup_closed_tournaments                            = Sign up closed
+tournaments.start_time                                          = Start time
+tournaments.team_details                                        = Team details
+tournaments.title                                               = Tournaments
+tournaments.tournament_details                                  = Tournament details
+tournaments.tournament_gameplay                                 = Gameplay settings
+tournaments.tournament_name                                     = Tournament name
+tournaments.tournament_type                                     = Tournament type
+
+user.accountBalance             = Account balance
+user.accountEventHeader         = Account events
+user.accountevents              = Account events
+user.addToEvent                 = Associate user to event
+user.address                    = Street address
+user.age                        = Age
+user.bank                       = Bank
+user.bankaccount                = Bank account
+user.birthday                   = Birthday
+user.cancelInvite               = Cancel invite
+user.cardPower                  = User type
+user.changePassword             = Change password
+user.changepassword.forUser     = For user
+user.changepassword.title       = Change password
+user.confirmUserToEventAdding   = Are you sure you want to associate this user to this event?
+user.create                     = Create user
+user.createdmessage             = User has been created successfully.
+user.cropImage                  = Crop image
+user.cropUserImage              = Crop image
+user.defaultImage               = Default picture
+user.edit.gameids               = Edit GameIDs
+user.edit.title                 = My information
+user.email                      = Email
+user.emailAgain                 = Email (again)
+user.emailAndUsername           = Email (works also as username)
+user.emailsunmatch              = Email addresses does not match.
+user.emailtooshortmessage       = Email must be at least {0} characters long.
+user.firstNames                 = First name
+user.food.title                 = Choose menu
+user.foodwave.products.title    = Choose products
+user.foodwavelist.title         = Choose foodwave
+user.game.add_gameid            = Add
+user.game.add_new_gameid        = Add new GameID
+user.game.current_gameids       = Current GameIDs
+user.game.gameid_added          = GameID successfully added
+user.game.gameid_removed        = GameID successfully removed
+user.game.manage                = Manage
+user.game.remove_gameid         = Remove
+user.hasImage                   = Image
+user.image                      = Image
+user.imageCropRefresh           = Refresh page
+user.imageTooBig                = Image is too big
+user.imageUpload.imageNotFound  = First choose image to upload
+user.imageUploaded              = Image uploaded.
+user.imagelist                  = Saved images
+user.imagesubmit                = Send image
+user.info                       = User
+user.insert                     = Insert
+user.insertToken                = Insert token
+user.invalidLoginCredentials    = Invalid user credentials
+user.invite.header              = Accept invitation
+user.invite.placeInvite.header  = Accept received place
+user.invitemail                 = Email address
+user.lastName                   = Last name
+user.login                      = Login
+user.logout                     = Logout
 user.meta.box.title             = Metadata
-user.roles        = Pakotetut roolit
-user.saveSuccessfull=Changes saved successfully
-user.saveUserSelectableRoles = Tallenna
+user.myGroups                   = My place reservations
+user.myPlaces                   = Reserved places
+user.myProperties               = My properties
+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.profile                    = Profile
+user.realname                   = Name
+user.roles                      = Forced roles
+user.rolesave                   = Save roles
+user.save                       = Save
+user.saveFailed                 = Save failed, missing required permissions!
+user.saveRoles                  = Save roles
+user.saveSuccessfull            = Changes saved successfully
+user.saveUserSelectableRoles    = Save
+user.searchUser                 = Search user
+user.sendPicture                = Send image
+user.sex.FEMALE                 = Female
+user.sex.MALE                   = Male
+user.sex.UNDEFINED              = Prefer not to say
 user.shirt.L                    = Unisex L
 user.shirt.LadyL                = Ladyfit L
 user.shirt.LadyM                = Ladyfit M
@@ -508,45 +1412,126 @@ user.shirt.XXL    = Unisex XXL
 user.shirt.XXXL                 = Unisex XXXL
 user.shirt.select               = Valitse yksi
 user.shirtSize                  = Paidan koko
-user.unauthenticated = Kirjautumaton
-user.userSelectableRoles = Valitse yksi
-
+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.unauthenticated            = Unauthenticated
+user.uploadimage                = Send image
+user.userSelectableRoles        = Select one
+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 no.
+
+userImport.commit = Commit
+
+userView.image = Image
+
+usercart.addSearchedUsers = Add found users
+usercart.cartsize         = Size
+usercart.clear            = Empty cart
 usercart.downloadCsv      = CSV
-usercart.showoverview = Vie tarkastusn\u00E4kym\u00E4\u00E4n
-
-viewlectures.title = Kurssit ja luennot
-
-vip.backToList = Takaisin listaukseen
-vip.create     = Luo
-vip.createNew  = Luo uusi
-vip.deliver    = Toimita
-vip.description = Lis\u00E4tietoja
-vip.edit       = Muokkaa
-vip.host       = Is\u00E4nt\u00E4
-vip.hostsName  = Is\u00E4nt\u00E4
-vip.productDelivered = Toimitettu
-vip.productQuantity = Lkm
-vip.products   = Tuote
-vip.save       = Tallenna
-vip.shortdescr = Nimi
-
-vipProduct.create = Lis\u00E4\u00E4
-vipProduct.deliver = Toimita
-vipProduct.deliverNotes = Huomiot
-vipProduct.delivered = Toimitettu
-vipProduct.name   = Tuote
-vipProduct.quantity = Lukum\u00E4\u00E4r\u00E4
-
-yes = Kyll\u00E4
-vip.delete=Poista
-tmp.yourpmscodes=PMS -koodisi
-tmp.code=Koodi
-submenu.temp.pms=Pms koodit
-shop.buyForUser=Osta k\u00E4ytt\u00E4j\u00E4lle
-shop.buyForUser.success=Ostettu k\u00E4ytt\u00E4j\u00E4lle onnistuneesti
-submenu.info.placeReservation=Paikanvaraus
-placeReservation.selectedPlaces=Valitut paikat
-placeReservation.mapMultiuserNote=Jos sama k\u00E4ytt\u00E4j\u00E4 k\u00E4ytt\u00E4\u00E4 karttaa monelta koneelta, n\u00E4kyv\u00E4t kaikkien koneiden klikkailut kartassa sinisell\u00E4.
-placeReservation.buyConfirm.content=Haluatko varmasti ostaa valitut paikat k\u00E4ytt\u00E4j\u00E4lle, t\u00E4t\u00E4 ei voi peruuttaa?
-placeReservation.buyConfirm.title=Ostetaanko paikat k\u00E4ytt\u00E4j\u00E4lle?
-template.keepaliveError.title=View has been expired
+usercart.next             = Next user
+usercart.prev             = Previous user
+usercart.removeCurrent    = Remove from user cart
+usercart.showCart         = Show user cart
+usercart.showoverview     = Export to check view
+usercart.traverse         = Check
+
+userimage.webcam = Take picture with webcam
+
+userlist.header               = Search users
+userlist.onlythisevent        = Limit to users of this event 
+userlist.placeassoc           = Assigned to place
+userlist.rolefilter           = Assigned roles
+userlist.saldofilter          = Account balance
+userlist.search               = Search
+userlist.searchcount          = Search results
+userlist.showAdvancedSearch   = Advanced search
+userlist.usersWithUnusedCodes = List this event's users with unused place tokens
+
+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 at least {0} characters long!
+userview.passwordsChanged   = Password changed
+userview.passwordsDontMatch = Passwords do not match! Please try again!
+userview.userExists         = Username already exists! You may already have an account.
+userview.userExistsByEmail  = Email already exists! You may already have an account.
+
+viewexpired.body  = Please login again.
+viewexpired.title = Login expired. Please login again.
+
+viewlectures.title = Courses and lectures
+
+vip.backToList          = Back to VIP list
+vip.create              = Create
+vip.createNew           = Create new 
+vip.delete              = Delete
+vip.deliver             = Deliver
+vip.description         = Description
+vip.edit                = Edit
+vip.host                = Host
+vip.hostsName           = Host
+vip.productDelivered    = Delivered
+vip.productQuantity     = Qty
+vip.products            = Product
+vip.save                = Save
+vip.shortdescr          = Name
+
+vipProduct.create       = Create
+vipProduct.deliver      = Deliver
+vipProduct.deliverNotes = Notes
+vipProduct.delivered    = Delivered
+vipProduct.name         = Product
+vipProduct.quantity     = Quantity
+
+voting.allcompos.curEntries        = No. of entries
+voting.allcompos.descri            = Description
+voting.allcompos.description       = List of all compos and their information.
+voting.allcompos.endTime           = End time
+voting.allcompos.header            = All compos
+voting.allcompos.hidden            = Hidden
+voting.allcompos.holdVoting        = Hold voting
+voting.allcompos.maxParts          = Max participants
+voting.allcompos.name              = Name
+voting.allcompos.startTime         = Start time
+voting.allcompos.submitEnd         = End submitting
+voting.allcompos.submitEntry       = Submit entry
+voting.allcompos.submitStart       = Start submitting
+voting.allcompos.voteEnd           = End voting
+voting.allcompos.voteStart         = Start voting
+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 = Message for compo slide
+voting.compoentryadd.title         = Add entry
+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.hidden               = Hidden
+voting.create.maxParticipants      = Max participants
+voting.create.name                 = Name
+voting.create.saveCompo            = Save compo
+voting.create.submitEnd            = Submit close
+voting.create.submitStart          = Submit open
+voting.create.voteEnd              = Voting close
+voting.create.voteStart            = Voting start
+
+yes = Yes

code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_en.properties

@@ -120,7 +120,7 @@ billedit.billnotfound = Bill not found. Select again.
 billine.linePrice         = Total (inc. vat)
 billine.name              = Ticket
 billine.product           = Product
-billine.quantity  = Quantityicket
+billine.quantity          = Quantity
 billine.referencedProduct = Referenced product
 billine.save              = Save
 billine.unitName          = Unit
@@ -132,9 +132,9 @@ bills.noBills = No bills
 
 bortalApplication.BILL                                               = Creating, and managing bills
 bortalApplication.COMPO                                              = Managing compos
-bortalApplication.CONTENT = Product & shop management
+bortalApplication.CONTENT                                            = Content management
 bortalApplication.EVENT                                              = Event permissions
-bortalApplication.LAYOUT = Laout management
+bortalApplication.LAYOUT                                             = Laoyut management
 bortalApplication.LECTURE                                            = Lecture permissions
 bortalApplication.LICENSE                                            = License stuff
 bortalApplication.MAP                                                = Map management
@@ -252,14 +252,14 @@ cardTemplate.clone = Clone
 cardTemplate.create      = Create
 cardTemplate.edit        = Edit
 cardTemplate.id          = Id
-cardTemplate.imageheader = Current Template
+cardTemplate.imageheader = Current template
 cardTemplate.name        = Card template
 cardTemplate.power       = Card power
 cardTemplate.roles       = Associated roles
 cardTemplate.save        = Save
 cardTemplate.sendImage   = Upload Image
 
-cardTemplateData.list = List datas
+cardTemplateData.list = List data
 
 cardTextData.create               = Add text data
 cardTextData.delete               = Delete
@@ -273,7 +273,7 @@ cardTextData.fontstyle.BOLDITALIC = Bold and Italic
 cardTextData.fontstyle.ITALIC     = Italic
 cardTextData.fontstyle.PLAIN      = Plain
 cardTextData.save                 = Save
-cardTextData.size   = Size of text (px)
+cardTextData.size                 = Text size (px)
 cardTextData.text                 = Static text
 cardTextData.textalignment        = Font alignment
 cardTextData.textalignment.CENTER = Center
@@ -282,13 +282,13 @@ cardTextData.textalignment.RIGHT = Right
 cardTextData.type                 = Type
 cardTextData.type.AGE             = Age
 cardTextData.type.AUTHCODE        = MoyaAuth code
-cardTextData.type.FIRSTNAME = Firstname
-cardTextData.type.LASTNAME = Lastname
+cardTextData.type.FIRSTNAME       = First name
+cardTextData.type.LASTNAME        = Last name
 cardTextData.type.NICK            = Nick
 cardTextData.type.ROLE            = Role
 cardTextData.type.STATIC          = Static
 cardTextData.type.UNKNOWN         = Unknown
-cardTextData.type.WHOLENAME = Wholename
+cardTextData.type.WHOLENAME       = Whole name
 cardTextData.x                    = X coordinate
 cardTextData.y                    = Y coordinate
 cardTextData.zindex               = Z index
@@ -299,16 +299,16 @@ 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.errorMessage   = Error in cancellation, 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.errorMessage   = Error while processing rejected payment, please report this 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.errorDelayed   = Error confirming delayed payment, please report this to code@codecrew.fi
+checkout.return.errorMessage   = Error in confirming the payment, please report this to code@codecrew.fi
+checkout.return.successDelayed = Delayed payment successfull. Payment will be confirmed at a later time, usually within one hour.
 checkout.return.successMessage = Payment confirmed. Your products have been paid.
 
-code.inputfield = Give readercode
+code.inputfield = Give barcode
 
 compo.edit                  = Edit compo
 compo.saveVotes             = Save votes
@@ -339,7 +339,7 @@ discount.code   = Discount code
 discount.create     = Create new
 discount.details    = Details
 discount.edit       = Edit
-discount.maxNum = Max nr of discounts
+discount.maxNum     = Max no of discounts
 discount.perUser    = Discounts per user
 discount.percentage = Discount multiplier
 discount.products   = Products
@@ -347,14 +347,14 @@ discount.role   = Role discount
 discount.save       = Save
 discount.shortdesc  = Description
 discount.validFrom  = Valid from
-discount.validTo = Valid to
+discount.validTo    = Valid until
 
 edit = Edit
 
 editplace.header           = Edit place
-editplace.placegroup.title = Placegroup
+editplace.placegroup.title = Place group
 
-editplacegroup.header = Placegroup information
+editplacegroup.header = Place group information
 
 entry.edit = Edit entry
 
@@ -364,12 +364,12 @@ error.contact = If this happens again, contact Info with the following code:
 error.error   = You have encountered an error.
 
 etickets.eticketcode = Ticket
-etickets.mailSended  = Ticket has been sended to your email
+etickets.mailSended  = Ticket has been sent to your email
 etickets.place       = Place
-etickets.placeinfo   = Placeinfo
+etickets.placeinfo   = Place info
 etickets.placemap    = Places on map
 etickets.product     = Ticket
-etickets.sendAsMail  = Send as mail
+etickets.sendAsMail  = Send as email
 etickets.showMap     = Show map
 etickets.title       = Your ticket
 etickets.user        = Place owner
@@ -383,17 +383,17 @@ event.id             = Event ID
 event.listFutureEvents.title  = List of future events
 event.name                    = Event name
 event.nextBillNumber          = Initial bill number
-event.nodates.message = Remember to add event start-date, end-date and ticket's sales start-date.
+event.nodates.message         = Remember to add at least event start date, end date and ticket sales start date.
 event.nodates.title           = Dates missing!
-event.privateProperties.title = Private Properties
+event.privateProperties.title = Private properties
 event.properties.title        = Properties
 event.referenceNumberBase     = Reference number base
 event.running                 = Running
 event.save                    = Save
 event.startTime               = Start time
 event.theme                   = Theme
-event.ticketSale     = Tickets sale
-event.ticketSalesBegin = Ticket sales begin
+event.ticketSale              = Ticket sales
+event.ticketSalesBegin        = Ticket sales begins
 
 eventdomain.add        = Add event domain
 eventdomain.domainname = Domain
@@ -407,101 +407,101 @@ eventmap.height = Map height (px)
 eventmap.name            = Map name
 eventmap.notes           = Notes
 eventmap.save            = Save
-eventmap.uploaderror = Error when adding map
+eventmap.uploaderror     = Error in adding the map
 eventmap.width           = Map width (px)
 
-eventorg.bankName1 = Bank name 2
+eventorg.bankName1            = Bank name 1
 eventorg.bankName2            = Bank name 2
-eventorg.bankNumber1 = Bank account nr. 1
-eventorg.bankNumber2 = Bank account nr. 2
-eventorg.basicDetails = Basicdetails
+eventorg.bankNumber1          = Bank account no. 1
+eventorg.bankNumber2          = Bank account no. 2
+eventorg.basicDetails         = Basic details
 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.bundleCountry        = Language bundle
 eventorg.codecrewDetails      = Event organizer information
 eventorg.codecrewNotes        = Codecrew notes
-eventorg.codecrewResponsible = Codecrew support
+eventorg.codecrewResponsible  = Codecrew support person
 eventorg.create               = Create
-eventorg.create.title = Create eventorganiser
-eventorg.createEvent = Create event
-eventorg.createevent = Create new event
+eventorg.create.title         = Create event organiser
+eventorg.createEvent.submit   = Create event
+eventorg.createEvent.title    = Create new event
+eventorg.createevent.title    = Create new event
 eventorg.edit                 = Edit
-eventorg.events    = Event of the organisation
+eventorg.events               = Events of the organisation
 eventorg.id                   = Event ID
-eventorg.list.title = Event organisers
-eventorg.organisation = Organisation name
+eventorg.list.title           = Event organizers
+eventorg.organisation         = Organization name
 eventorg.organiserResponsible = Organizer responsible
 eventorg.save                 = Save
 eventorg.title                = Event details
 
 eventorgView.eventname = Name of event
 
-eventorganiser.name = Eventorganiser
+eventorganiser.name = Event organizer
 
 feedback.canFeedback = Feedback
 feedback.submit      = Submit
-feedback.thanks      = Thanks
+feedback.thanks      = Thank you
 
 food = Food
 
-foodWave.accountevents = Accountevents
-foodWave.activeFoodWaves = Active Foodwaves
-foodWave.billLines     = Pending Payments
+foodWave.accountevents      = Paid orders
+foodWave.activeFoodWaves    = Active food waves
+foodWave.billLines          = Pending payments
 foodWave.closeNow           = Close now
 foodWave.deliveredCount     = Delivered
-foodWave.deliveredFoodWaves = Delivered Foodwaves
+foodWave.deliveredFoodWaves = Delivered foodwaves
 foodWave.description        = Foodwave description
-foodWave.list          = Active Foodwaves
+foodWave.list               = Active foodwaves
 foodWave.name               = Foodwave
 foodWave.openNow            = Open now
-foodWave.orders        = Amount of Orders
+foodWave.orders             = Amount of orders
 foodWave.paid               = Paid
 foodWave.show               = Show
 foodWave.template.name      = Name
 foodWave.template.waves     = Foodwaves
-foodWave.templatename  = Choose Products
+foodWave.templatename       = Choose products
 foodWave.time               = Time
 foodWave.totalReserved      = Total
 foodWave.unconfirmedOrders  = Unconfirmed
 
 foodadmin.editTemplate = Edit
 
-foodshop.buyAndPay = Buy and Pay 
-foodshop.buyAndPayWithCredits = Reserve and buy with credits
+foodshop.buyAndPay            = Reserve and pay
+foodshop.buyAndPayWithCredits = Reserve and pay with credits
 foodshop.buyFromCounter       = Pay at info
-foodshop.buyFromInternet = Pay at Internet
-foodshop.buyProceedToPay = Reserve and continue to buy
-foodshop.canBuyToCounter = You can buy this bill on infodesk. If you want to buy this order at the infodesk, you can close this window and come to infodesk to buy this order.
+foodshop.buyFromInternet      = Pay online
+foodshop.buyProceedToPay      = Reserve and continue to paying
+foodshop.canBuyToCounter      = You can buy this bill on infodesk. If you would like to do so, you can close this window and come to the infodesk to pay this order.
 foodshop.total                = Total
 
-foodwave.buyInPrice = Buy In Price
+foodwave.buyInPrice                   = Purchase price
 foodwave.cancelOrder                  = Cancel
 foodwave.closed                       = Foodwave is closed
-foodwave.foodwaveBuyInPrice = Total buy in price
-foodwave.foodwaveLastBillPayTime = Last payments time
+foodwave.foodwaveBuyInPrice           = Purchase price
+foodwave.foodwaveLastBillPayTime      = Payments at latest at
 foodwave.markPaid                     = Foodwave marked paid
-foodwave.orders     = Foodwave Orders
+foodwave.orders                       = Foodwave orders
 foodwave.ordersBefore                 = Orders before
 foodwave.price                        = Foodwave price
-foodwave.summaryView = Foodwave Summary
-foodwave.template.basicinfo = Template Information
+foodwave.summaryView                  = Foodwave summary
+foodwave.template.basicinfo           = Template information
 foodwave.template.description         = Description
 foodwave.template.edit.title          = Foodwave Template Editor
-foodwave.template.list.title = Foodwave Templates
+foodwave.template.list.title          = Foodwave templates
 foodwave.template.name                = Name
 foodwave.template.selectproducts      = Products
-foodwave.template.waitPaymentsMinutes = Webpayments waittime
+foodwave.template.waitPaymentsMinutes = Online payments waiting time
 foodwave.totalCount                   = Amount
-foodwave.totalPrice = Customer Price
+foodwave.totalPrice                   = Price for the customer
 
 foodwaveTemplate.name = Name
 
-foodwavetemplate.actions = Actions
 foodwavetemplate.addproduct         = Add
 foodwavetemplate.basicinfo          = Template
-foodwavetemplate.createFoodwave = Create Foodwave
+foodwavetemplate.createFoodwave     = Create foodwave
 foodwavetemplate.createwave         = Create foodwave
 foodwavetemplate.description        = Description
 foodwavetemplate.edit               = Edit foodwave template
@@ -516,25 +516,25 @@ foodwavetemplate.save    = Ok
 foodwavetemplate.savetemplate       = Submit
 foodwavetemplate.selectproducts     = Products
 foodwavetemplate.startTime          = Foodwave time
-foodwavetemplate.waveName = Wave name
+foodwavetemplate.waveName           = Foodwave name
 
 game.active          = Active
 game.code            = Code
 game.codecount       = Opened
-game.codes.available = Licensecodes
-game.codes.opened = Opened licensecodes
+game.codes.available = License codes
+game.codes.opened    = Opened license codes
 game.create          = Create
 game.description     = Description
 game.edit            = Edit
 game.gamepoints      = Game points
 game.name            = Name
-game.noGameCodes = You have no opened gamecodes
+game.noGameCodes     = You have no opened game codes
 game.open            = Open code
-game.out    = Please contact out customer service
+game.out             = Game codes are out, pleace contact administration
 game.product         = Product
 game.service         = Game service
 
-gamepoints = Gamepoints
+gamepoints = Game points
 
 generic.sure.header  = Confirmation
 generic.sure.message = Are you sure?
@@ -544,16 +544,23 @@ generic.sure.yes    = Yes
 global.cancel               = Cancel
 global.copyright            = Codecrew Ry
 global.eventname            = Event name
-global.notAuthorizedExecute = You are not authorized to do that!!
+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.hostname              = Hostname
+httpsession.id                    = ID
 httpsession.invalidate            = Invalidate
+httpsession.invalidateSuccessfull = Session has been invalidated
+httpsession.isSessionNew          = New session
+httpsession.lastAccessedTime      = Last seen
+httpsession.maxInactiveInterval   = Timeout (s)
+httpsession.sessionHasExisted     = Session has existed (s)
+httpsession.user                  = Username
 
 imagefile.description = Description
-imagefile.file        = Imagefile
+imagefile.file        = Image file
 
 importuser.file     = File
 importuser.template = Template
@@ -565,50 +572,50 @@ incomingView.attach = Attach
 incomingView.attachDialogTitle = Attach code to user
 incomingView.cancel            = Cancel
 
-incomingflow.allGiven = Marked {0} tickets given.
+incomingflow.allGiven                   = Marked {0} ticket(s) as given.
 incomingflow.alreadyShowingUser.message = We are already showing selected user
 incomingflow.alreadyShowingUser.title   = Already selected
 incomingflow.barcode                    = Barcode
 incomingflow.cardCodes                  = Barcodes in card
 incomingflow.cardfiling.label           = Card filing:
-incomingflow.changereader = Select or Change Reader
+incomingflow.changereader               = Select or change Reader
 incomingflow.codeattached.message       = Code attached to current user's card
 incomingflow.codeattached.title         = Code attached
 incomingflow.giveplace                  = Mark given
-incomingflow.groupmemberships = Group memberships
-incomingflow.invalidbarcode.message = Nothing found with barcode, you can now add it to the user
+incomingflow.groupmemberships           = Computer places and tickets
+incomingflow.invalidbarcode.message     = Nothing found with the barcode, you can now add it to the user
 incomingflow.invalidbarcode.title       = Invalid code
-incomingflow.markEverythingGiven = Give ewerything ungiven stuff
+incomingflow.markEverythingGiven        = Give all ungiven items
 incomingflow.multisearch                = Multisearch
-incomingflow.placesummary = Placesummary
+incomingflow.placesummary               = Place summary
 incomingflow.printedCard                = Card
 incomingflow.search                     = Search
 incomingflow.ungiveplace                = Mark not given
 incomingflow.userdetails                = User details
 incomingflow.usereditor                 = User
 incomingflow.usereditor.info            = User
-incomingflow.usereditor.picture = Picturetake
+incomingflow.usereditor.picture         = New picture
 
 infoview.back          = Back
 infoview.computerplace = Computer places
-infoview.multisearch = Usersearch
+infoview.multisearch   = User search
 infoview.shop          = Shop
 
 inventory.product.info         = Info
 inventory.product.name         = Product
-inventory.product.pickProduct = Pick product
-inventory.product.quantity = Quantatity
+inventory.product.pickProduct  = Choose product
+inventory.product.quantity     = Amount
 inventory.product.submitButton = Add
 inventory.product.title        = Add items to storage
 
 invite.createNewUserHeader    = Create new user
 invite.emailexists            = User with that email address already exists in the system.
-invite.existingUserHeader  = Login with existing username
+invite.existingUserHeader     = Login with an existing username
 invite.notFound               = Invite invalid or already used
-invite.permissionDenied    = You don't have permission to regive this place.
+invite.permissionDenied       = You don't have the permission to give this place to someone else.
 invite.successfull            = Invite sent successfully
 invite.userCreateSuccessfull  = User successfully created. You can now login.
-invite.userLoginSuccessfull = Invite accepted successfully
+invite.userLoginSuccessfull   = Invite received successfully
 invite.userLoginUnSuccessfull = Login unsuccessfull
 
 javax.validation.constraints.AssertFalse.message = must be false
@@ -648,21 +655,21 @@ lanEventProperty.value        = Property value
 lanEventProperty.valueIsRawdataWarning = Raw data warning
 
 layout.editBottom  = Edit bottom content
-layout.editContent = Edit center
-layout.editTop    = Edit topcontent
+layout.editContent = Edit center content
+layout.editTop     = Edit top content
 
-lecture.availableLectures = available lectures
-lecture.availableLecturesCalendar = In calendar
-lecture.availableLecturesList = In list
+lecture.availableLectures             = Courses and lectures
+lecture.availableLecturesCalendar     = Calendar view
+lecture.availableLecturesList         = List view
 lecture.createLecture                 = New lecture
 lecture.createNew                     = Create new
 lecture.description                   = Description
 lecture.full                          = Lecture full
 lecture.groupFull                     = Limit reached
-lecture.hours             = Duration hours
+lecture.hours                         = Duration (hours)
 lecture.manageParticipants            = Manage participants
 lecture.maxParticipantsCount          = Max participants
-lecture.multicreate       = Create multible in row
+lecture.multicreate                   = Create multiple in a row
 lecture.name                          = Name
 lecture.participants                  = Participants
 lecture.participate                   = Participate
@@ -717,23 +724,23 @@ manageparticipants.lectureTitle = Lecture / course info
 manageparticipants.title        = Participants
 
 map.create                        = Create map
-map.createTileMap = Create tilemap
+map.createTileMap                 = Create tile map
 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.namebase                      = Table prefixes separated by a semicolon
+map.oneRowTable                   = Single row tables
+map.placesInRow                   = Places in a row
 map.product                       = Place product
-map.showQueue = Show maps user queue
-map.startX = Place start X-coordinate
-map.startY = Place start Y-coordinate\n
+map.showQueue                     = Show map's user queue
+map.startX                        = Table start X coordinate
+map.startY                        = Table start Y coordinate
 map.submitMap                     = Send map image
-map.tableCount = Place count
-map.tableXdiff = Table X difference 
-map.tableYdiff = Table Y difference
+map.tableCount                    = Table count
+map.tableXdiff                    = Table start difference (X)
+map.tableYdiff                    = Table start difference (Y)
 map.tablesHorizontal              = Generate horizontal tables
 map.width                         = Place width (px)
 
@@ -743,18 +750,18 @@ mapManage.lockedPlaces = Locked {0} places.
 mapManage.releasedPlaces = Released {0} places
 
 mapView.buyPlaces                 = Lock selected places
-mapView.check     = Check own queuestatus
+mapView.check                     = Refresh queue position
 mapView.enterQueue                = Enter queue
-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.errorWhenReleasingPlace   = Error in releasing place
+mapView.errorWhenReservingPlace   = Error in reserving place!
+mapView.errorWhileBuyingPlaces    = Error in buying places. Please try again. If error reoccurs please contact organizers.
 mapView.lockPlacesBeforeLeaving   = Remember to lock the places before leaving this page
 mapView.notEnoughCreditsToReserve = You don't have enough credits to reserve this place.
 mapView.productcount.productcount = Number of tickets
 mapView.productcount.productname  = Ticket type
 mapView.queuePosition             = Your position in queue
 mapView.queuePositionUpdated      = Queue position updated
-mapView.youAreInQueue = You are in queue Wait for your turn to select places.
+mapView.youAreInQueue             = You are in queue. Wait for your turn to select places.
 mapView.yourPlaces                = Your unused places
 
 mapedit.save = Save map changes
@@ -764,35 +771,39 @@ menu = Menu
 menu.index              = Index
 menu.item               = Item
 menu.name               = Name
-menu.place.placemap = Placemap
+menu.place.placemap     = Place map
 menu.poll.index         = Polls
 menu.select             = Select
+menu.shop.createBill    = Shop
 menu.sort               = Sort
-menu.toAdmin = Adminview
-menu.toUser = Userview
+menu.toAdmin            = Admin view
+menu.toUser             = User view
+menu.user.edit          = My info
 
-menuitem.key = Menuitem key
+menuitem.key            = Menu item key
 menuitem.navigation.key = Product flag
 
-menulist.header = Menulist
+menulist.header = Menu list
 
-mode.admin = Adminmode
+mode.admin = Admin mode
 mode.title = Select mode
-mode.user  = Usermode
+mode.user  = User view
 
 nasty.user = Go away!
 
+navi.auth.login = Front page
+
 neomap.updateMap = Update map
 
 networkassociation.action               = Action
 networkassociation.create_association   = Create association
 networkassociation.create_time          = Created on
-networkassociation.current_associations = Current Associations
+networkassociation.current_associations = Current associations
 networkassociation.drop_association     = Drop
 networkassociation.ip_address           = IP Address
 networkassociation.mac_address          = MAC Address
 networkassociation.modify_time          = Modified on
-networkassociation.pending_associations = Pending Associations
+networkassociation.pending_associations = Pending associations
 networkassociation.place                = Place
 networkassociation.user                 = User
 
@@ -834,20 +845,20 @@ orgRoleRequest.id             = ID
 orgRoleRequest.requestNotes   = Request notes
 orgRoleRequest.requestOk      = Accept request
 orgRoleRequest.requestedRole  = Requested role
-orgRoleRequest.showAll        = Show all request
+orgRoleRequest.showAll        = Show all requests
 
 orgrole.create                  = Create
 orgrole.edit                    = Edit orgrole
 orgrole.list.title              = Organization role list
 orgrole.members.header          = Members
 orgrole.name                    = Name
-orgrole.orgainisation = Organisation
+orgrole.orgainisation           = Organization
 orgrole.parents                 = Parent
-orgrole.pending.title = Pending organisation role requests
+orgrole.pending.title           = Pending organization role requests
 orgrole.save                    = Save
 orgrole.userRequestable         = User requestable role
 
-orgrolerequest.commanderror = Error handling request. Please try again.
+orgrolerequest.commanderror     = Error in handling the request. Please try again.
 orgrolerequest.create           = Create request
 orgrolerequest.requestNotes     = Request information
 orgrolerequest.rolecontent      = Role information
@@ -856,19 +867,19 @@ orgrolerequest.sentSuccessfully = Request sent successfully
 
 page.account.edit.header                 = Edit account events
 page.account.list.header                 = Account events
-page.admin.sendimage.header = Send image
+page.admin.sendimage.header              = Send picture
 page.auth.login.header                   = Login error
 page.auth.login.loginerror.header        = Login error
-page.auth.login.loginerror.pagegroup = frontpage
+page.auth.login.loginerror.pagegroup     = Front page
 page.auth.login.logout.header            = Logout
-page.auth.login.logout.pagegroup = frontpage
-page.auth.login.pagegroup = frontpage
+page.auth.login.logout.pagegroup         = Front page
+page.auth.login.pagegroup                = Front page
 page.auth.login.title                    = Login error
 page.auth.loginerror.header              = Login failed
-page.auth.loginerror.pagegroup = frontpage
+page.auth.loginerror.pagegroup           = front page
 page.auth.logout.header                  = Logout
-page.auth.logout.pagegroup = frontpage
-page.auth.logoutsuccess.header = Logout
+page.auth.logout.pagegroup               = Front page
+page.auth.logoutsuccess.header           = Logout successful
 page.auth.notauthorized.pagegroup        = frontpage
 page.auth.resetPassword.header           = Reset password
 page.bill.billSummary.header             = Summary of bills
@@ -883,13 +894,11 @@ 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.header                        = Front page
 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
@@ -930,11 +939,11 @@ 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.errorChanging = Unexpected error in password reset. Contact your administrator.
 passwordReset.hashNotFound  = Password change token has expired. Please send the query again.
 
 passwordreset.emailnotfound = Email address not found.
-passwordreset.mailBody      = You can change your password in address: {0}\n\nIf you have not requested password reset, ignore this message.\n\n
+passwordreset.mailBody      = You can change your password in: {0}\n\nIf you have not requested this password reset, ignore this message.
 passwordreset.mailSubject   = [{0}] Password reset
 passwordreset.unknownerror  = Unknown error when resetting password. Please contact administration
 passwordreset.usernotfound  = Username not found. 
@@ -945,7 +954,7 @@ permissiondenied.notLoggedIn     = You don't have enough rights to enter this si
 
 place.buyable                       = Buyable
 place.cancelSend                    = Cancel transfer
-place.code    = Placecode
+place.code                          = Place token
 place.commit                        = Save
 place.description                   = Description
 place.details                       = Details
@@ -958,13 +967,19 @@ place.mapX    = X
 place.mapY                          = Y
 place.membership                    = Associated user
 place.name                          = Name
+place.noReserver                    = Not associated to a user
 place.product                       = Product
 place.release                       = Release this place
-place.releasetime = Releasetime
+place.releasetime                   = Release time
 place.reserveForUser                = Reserve for the user
 place.send                          = Transfer place
 place.width                         = Width
 
+placeReservation.buyConfirm.content = Are you sure, this is difficult to cancel?
+placeReservation.buyConfirm.title   = Buy places for user?
+placeReservation.mapMultiuserNote   = If the same user uses map on multiple computers, you see all place selections in blue.
+placeReservation.selectedPlaces     = Selected places
+
 placeSelect.legend.blue      = My selected place
 placeSelect.legend.green     = My reserved place
 placeSelect.legend.grey      = Released if needed
@@ -975,8 +990,8 @@ placeSelect.placePrice  = Price
 placeSelect.placeProductName = Place type
 placeSelect.placesleft       = Places left
 placeSelect.reservationPrice = Reservation price
-placeSelect.reservedPlaces = Reserved places
-placeSelect.totalPlaces = Places in total
+placeSelect.reservedPlaces   = Selected places
+placeSelect.totalPlaces      = Places total
 
 placegroup.created                = Created
 placegroup.creator                = Reserver
@@ -984,11 +999,11 @@ placegroup.details = Details
 placegroup.edit                   = Show
 placegroup.edited                 = Edited
 placegroup.name                   = Name
-placegroup.noPlacegroups = You must have placegroups that you can have places
+placegroup.noPlacegroups          = You can view the ticket after you have reserved places.
 placegroup.placename              = Place
 placegroup.places                 = Places
 placegroup.printPdf               = Print tickets
-placegroup.showEticket = Show eticket
+placegroup.showEticket            = Show ticket
 
 placegroupView.editplace = Edit place
 
@@ -996,16 +1011,16 @@ placegroupview.groupCreator = Orderer
 placegroupview.header             = My places
 placegroupview.noMemberships      = No places
 placegroupview.owner              = Owner
-placegroupview.placeReleaseFailed = Releasing of place failed!
+placegroupview.placeReleaseFailed = Releasing place failed!
 placegroupview.placeReleased      = Place {0} released 
 placegroupview.placetransferred   = Place is transferred
 placegroupview.releasePlace       = Release
 placegroupview.reservationName    = Place
 placegroupview.reservationProduct = Ticket
-placegroupview.reserveForSelf = Select place for yourself
-placegroupview.token        = Placecode / user
+placegroupview.reserveForSelf     = Select the place for yourself
+placegroupview.token              = Place token / user
 
-placeslot.add = Add placeslot
+placeslot.add           = Add place slot
 placeslot.bill          = Bill
 placeslot.id            = ID
 placeslot.lockSlot      = Lock slot
@@ -1025,7 +1040,7 @@ 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
+placetoken.topText       = You can associate a place bought by someone else to your own account by inserting the token to the field below
 
 poll.answer      = Answer to poll
 poll.begin       = Open poll
@@ -1039,7 +1054,7 @@ poll.save   = Send answers
 print = Print
 
 printedCard.cardState                    = Card state
-printedCard.cardState.PENDING_VALIDATION = Pending validation
+printedCard.cardState.PENDING_VALIDATION = Validation pending
 printedCard.cardState.REJECTED           = Rejected
 printedCard.cardState.VALIDATED          = Validated
 printedCard.template                     = Template
@@ -1047,52 +1062,53 @@ printedCard.template  = Template
 product.barcode                          = Barcode
 product.billed                           = Billed
 product.boughtTotal                      = Products billed
-product.buyInPrice = Buy in price
-product.cart.count = Count
-product.cashed  = Cashpaid
+product.buyInPrice                       = Purchase price
+product.cart.count                       = Amount
+product.cashed                           = Paid in cash
 product.color                            = Color in UI
 product.create                           = Create product
-product.createDiscount = Add volumediscount
-product.createLimit = Create product limitation
+product.createDiscount                   = Add volume discount
+product.createLimit                      = Create product limit
 product.description                      = Description
-product.edit    = edit
+product.edit                             = Edit
 product.expired                          = Expired
 product.inventoryQuantity                = Inventory count
 product.name                             = Product name
 product.paid                             = Paid
 product.prepaid                          = Prepaid
-product.prepaidInstant = Created when prepaid is paid
 product.price                            = Price (inc. vat)
 product.providedRole                     = Product defines role
 product.returnProductEdit                = Return to product: 
 product.save                             = Save
 product.saved                            = Product saved
-product.shopInstant = Create automatic cashpayment
+product.shopInstant                      = Create cash payment
 product.shopRequired                     = Role required to buy this product
-product.sort    = Sort nr
+product.sort                             = Sort no
 product.totalPrice                       = Total
 product.unitName                         = Unit name
 product.vat                              = VAT-%
 
-productFlag.CREATE_NEW_PLACE_WHEN_BOUGHT = Create new place bought
-productFlag.HIDE_FROM_INFOSHOP           = Hide from info shop
+productFlag.CREATE_NEW_PLACE_WHEN_BOUGHT = Create new place when bought
+productFlag.HIDE_FROM_INFOSHOP           = Hide from Info shop
 productFlag.PREPAID_CREDIT               = Prepaid credit
 productFlag.PREPAID_INSTANT_CREATE       = Prepaid instant create
 productFlag.RESERVE_PLACE_WHEN_BOUGHT    = Reserve place when bought
-productFlag.USERSHOP_AUTOPRODUCT         = Product will be added to user order
-productFlag.USER_SHOPPABLE               = User shoppable
+productFlag.USERSHOP_AUTOPRODUCT         = Product will be added to user's order
+productFlag.USER_SHOPPABLE               = Users can buy
 
 productLimit.description = Description
 productLimit.edit        = Edit
-productLimit.last        = Last limitation
+productLimit.last        = Last limit
 productLimit.lowerLimit  = Lower limit
 productLimit.name        = Type
 productLimit.roles       = Roles
 productLimit.save        = Save
 productLimit.sort        = Sort number
-productLimit.type        = Limitation type
+productLimit.type        = Limit type
 productLimit.upperLimit  = Upper limit
 
+productShopView.readBarcode = Read barcode
+
 products.create              = Create product
 products.save                = Save
 
@@ -1109,10 +1125,10 @@ productshop.plusOne     = +1
 productshop.plusTen       = +10
 productshop.total         = Total
 
-queuemgmt.adduser = Add user as reserving
+queuemgmt.adduser             = Add user to reserving
 queuemgmt.defaultTimeoutMin   = Reservation time
-queuemgmt.minimumSlotsInQueue = Minimum slotscount to enter queue
-queuemgmt.remove  = Remove login from queue
+queuemgmt.minimumSlotsInQueue = Minimum amount of places to enter queue
+queuemgmt.remove              = Remove user from queue
 queuemgmt.reservingSize       = Number of people reserving at the same time
 queuemgmt.saveProperties      = Save properties
 queuemgmt.time                = Reservation time
@@ -1128,7 +1144,7 @@ reader.description = Description
 reader.edit                  = Edit
 reader.identification        = Identification
 reader.name                  = Reader name
-reader.noReader    = No selected reader
+reader.noReader              = No reader selected
 reader.save                  = Save
 reader.select                = Select reader
 reader.tag                   = Tag
@@ -1143,15 +1159,15 @@ readerevent.seenSince       = Last seen
 readerevent.shopToUser      = Buy to user
 readerevent.tagname         = Tag
 
-readerview.cards = Card ( printcount )
+readerview.cards = Cards (print amount)
 
 refresh = Refresh
 
 registerleaflet.title = Register leaflet
 
 rejectcard.body              = Body
-rejectcard.mailBody = Your profile picture for event {0} has been rejected. Please upload new picture as soon as possible. Picture is valid if your face is shown clearly and can be easily recognized. \n\n
-rejectcard.mailSubject = Profile picture rejected 
+rejectcard.mailBody          = Your profile picture for event {0} has been rejected. Please upload new picture as soon as possible. Picture is valid if your face is shown clearly and you can be easily recognized.
+rejectcard.mailSubject       = {0} - Profile picture rejected 
 rejectcard.reject            = Reject
 rejectcard.sendAndReject     = Send and reject
 rejectcard.sendRejectionMail = Send mail
@@ -1167,7 +1183,7 @@ resetMail.header = Reset lost password
 resetMail.send     = Send
 resetMail.username = Username
 
-resetmailSent.body = Email has been sent containing a link where you can change the password.
+resetmailSent.body   = Email has been sent to you containing a link where you can change the password.
 resetmailSent.header = Email sent
 
 rfidevent.empty      = Empty
@@ -1175,7 +1191,7 @@ rfidevent.reader = Reader
 rfidevent.searchuser = Search user
 rfidevent.tag        = Tag
 
-role.cardtemplate = Cardtemplate
+role.cardtemplate             = Card template
 role.create                   = Create role
 role.description              = Description
 role.edit                     = Edit
@@ -1190,11 +1206,11 @@ role.userSelectableRole = User selectable role
 role.write                    = (W)
 
 roleView.adduser              = Add user
-roleView.eventRoles = Eventroles
-roleView.hidePermissioneditor = Hide permissioneditor
+roleView.eventRoles           = Event roles
+roleView.hidePermissioneditor = Hide permission editor
 roleView.members              = Users
 roleView.save                 = Save changes
-roleView.showPermissioneditor = Show permissioneditor
+roleView.showPermissioneditor = Show permission editor
 
 salespoint.edit          = Edit
 salespoint.name          = Name
@@ -1204,27 +1220,29 @@ save = Save
 
 sendImage = Send image
 
-sendPicture.header = S
+sendPicture.header = Send image
 
 shop.accountBalance        = Credits
 shop.actions               = Actions
 shop.afterBalance          = Balance after action
 shop.barcode               = Barcode
 shop.buy                   = Buy
-shop.buyByCredit    = Buy by credit
-shop.buyCash        = Buy by Cash
-shop.buyCredit      = Buy Credit
-shop.calcsubtotal   = Calc Subtotal
+shop.buyByCredit           = Buy with credits
+shop.buyCash               = Buy with cash
+shop.buyCredit             = Buy credits
+shop.buyForUser            = Buy for user
+shop.buyForUser.success    = Places bought successfully for user!
+shop.calcsubtotal          = Calculate subtotal
 shop.cartPrice             = Cart price
 shop.cash                  = Cash
-shop.cashBack       = Back
+shop.cashBack              = Change returned
 shop.cashGiven             = Cash given
-shop.cashback       = Cashback
-shop.confirmCreditBuy = Are You sure ?
-shop.count          = Q
+shop.cashback              = Change
+shop.confirmCreditBuy      = Are you sure?
+shop.count                 = Qty
 shop.currentBalance        = Current balance
-shop.customPrice    = new price
-shop.price          = price
+shop.customPrice           = New price
+shop.price                 = Price
 shop.product               = Product
 shop.product.name          = Ticket
 shop.readBarcode           = Read
@@ -1243,9 +1261,9 @@ 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.eventorg.list       = My organizations
 sidebar.map.list            = Maps
-sidebar.map.placemap = Placemap
+sidebar.map.placemap        = Place map
 sidebar.maps                = Maps
 sidebar.other               = Other
 sidebar.product.create      = New product
@@ -1261,12 +1279,12 @@ 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
+sidebar.utils.flushCache    = Flush cache
+sidebar.utils.testdata      = Test data
 
 sitepage.addContent        = Add content block
 sitepage.content.expire    = Expire time
-sitepage.content.locale = Show for language
+sitepage.content.locale    = Language shown
 sitepage.content.publish   = Publish time
 sitepage.content.showToAll = All languages
 sitepage.content.sort      = Sorting number
@@ -1282,41 +1300,42 @@ submenu.NotImplementedYet = Not implemented
 submenu.actionlog.messagelist            = ActionLog
 submenu.actionlog.taskview               = View tasks
 submenu.admin.adduser                    = Adduser
-submenu.admin.adduser.index = Adduser
+submenu.admin.adduser.index              = Add user
 submenu.admin.adduser.login              = Login
 submenu.admin.adduser.start              = Welcome
 submenu.admin.adduser.update             = Update profile picture
 submenu.admin.incoming.index             = Incoming
 submenu.admin.incoming.printCard         = Print card
-submenu.admin.info.computerplaces = Computerplaces
+submenu.admin.info.computerplaces        = Computer places
 submenu.admin.info.general               = General functions
 submenu.admin.info.index                 = Info index
 submenu.auth.login                       = Login
 submenu.auth.loginError                  = Login error
 submenu.auth.loginSucessRedirect         = Successfully logged in
 submenu.auth.logout                      = Logout
-submenu.auth.logoutResponse = Logout successfull
+submenu.auth.logoutResponse              = Logout successful
 submenu.auth.sendResetMail               = Password reset
 submenu.bill.billSummary                 = Bill summary
 submenu.bill.list                        = My orders
 submenu.bill.listAll                     = All bills
 submenu.eventorg.editEvent               = Edit event
-submenu.eventorg.list     = Manage Event
 submenu.feedback.index                   = U Mad?!
 submenu.foodadmin.createTemplate         = Create foodwave template
 submenu.foodadmin.listTemplates          = List foodwave templates
 submenu.foodmanager.listFoodwaves        = List active foodwaves
 submenu.foodwave.list                    = Foodwaves
-submenu.foodwave.listTemplates = Food provides
+submenu.foodwave.listTemplates           = Food providers
+submenu.frontpage                        = Front page
 submenu.help                             = Ticket help
-submenu.index             = Frontpage
+submenu.index                            = Front page
 submenu.info.cardlessIncoming            = Incoming
 submenu.info.foodwave.foodwaveshop       = Foodshop
-submenu.info.incoming     = Extendet Incomingview
+submenu.info.incoming                    = Extendet incoming view
 submenu.info.index                       = Infoview
+submenu.info.placeReservation            = Place reservation
 submenu.info.shop                        = Shop
-submenu.info.usermapsearch = Mapsearch
-submenu.info.viplist      = Viplist
+submenu.info.usermapsearch               = Map search
+submenu.info.viplist                     = Vip list
 submenu.lectureadmin.lectureParticipants = Lecture participants
 submenu.lectureadmin.manageLectureGroups = Management
 submenu.lectures.viewLectures            = Participate
@@ -1327,19 +1346,19 @@ submenu.map.list          = List maps
 submenu.neomap.reserve                   = Reserve places
 submenu.neomap.view                      = Map
 submenu.networkassociation.index         = Associations
-submenu.orgrole.create    = Create organisationrole
-submenu.orgrole.list      = Organisation roles
-submenu.orgrole.pendingRequests = Organisation role requests
+submenu.orgrole.create                   = Create organization role
+submenu.orgrole.list                     = Organization roles
+submenu.orgrole.pendingRequests          = Organization role requests
 submenu.orgrole.requestRole              = Request role
 submenu.pages.create                     = Create content
 submenu.pages.list                       = List pages
 submenu.place.adminGroups                = Account places
-submenu.place.adminPlacemap = Placemap
+submenu.place.adminPlacemap              = Place map
 submenu.place.editGroup                  = Edit group
-submenu.place.insertToken = Insert placecode
+submenu.place.insertToken                = Insert place token
 submenu.place.myGroups                   = Place reservations
-submenu.place.placemap    = Placemap
-submenu.place.viewplacemap = Places status
+submenu.place.placemap                   = Place map
+submenu.place.viewplacemap               = Place status
 submenu.poll.index                       = Polls
 submenu.product.create                   = Create product
 submenu.product.list                     = List products
@@ -1350,33 +1369,37 @@ submenu.shop.createBill   = Purchase tickets
 submenu.shop.listReaders                 = List readers
 submenu.shop.shopToUser                  = Shop to user
 submenu.shop.showReaderEvents            = Reader events
+submenu.temp.pms                         = PMS codes
 submenu.tournaments.admin.index          = View and manage
-submenu.tournaments.index = View and participate
-submenu.tournaments.myparticipations = My Participations
+submenu.tournaments.index                = Tournaments list
+submenu.tournaments.myparticipations     = My participations
 submenu.user.accountEvents               = Account events
 submenu.user.changePassword              = Change password
 submenu.user.create                      = Create new user
+submenu.user.createCardTemplate          = Create card template
 submenu.user.edit                        = My information
 submenu.user.foodwave                    = Food
 submenu.user.gameids                     = Set GameIDs
 submenu.user.invite                      = Invite friends
+submenu.user.list                        = All users
+submenu.user.listCardTemplates           = Card templates
 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.accountEvents = Account events
+submenu.useradmin.accountEvents          = User's account events
 submenu.useradmin.create                 = Create user
-submenu.useradmin.createCardTemplate = Create cardtemplate
+submenu.useradmin.createCardTemplate     = Create card template
 submenu.useradmin.edit                   = Edit user
-submenu.useradmin.foodwaveshop = Food wave shop
-submenu.useradmin.list    = Search Users
+submenu.useradmin.foodwaveshop           = Foodwave shop
+submenu.useradmin.list                   = Search users
 submenu.useradmin.listCardTemplates      = Card templates
-submenu.useradmin.sendPicture = Send a picture
+submenu.useradmin.sendPicture            = Send picture
 submenu.useradmin.showTakePicture        = Show webcam
 submenu.useradmin.validateUser           = Validate user
-submenu.utils.index       = Administration utils
+submenu.utils.index                      = Administration tools
 submenu.voting.admincompolist            = Compos
 submenu.voting.compolist                 = Compos
 submenu.voting.create                    = Create new compo
@@ -1395,40 +1418,43 @@ success = Success
 
 suffix.minutes = min
 
-supernavi.admin = Adminview
-supernavi.user  = Userview
+supernavi.admin = Admin view
+supernavi.user  = User view
 
 svm.failure.errorMessage        = Payment error.
-svm.failure.successMessage = Payment error successfull\u2026 ( Possibly already marked paid )
-svm.notification.errorMessage = Payment failed
-svm.notification.successMessage = Payment notification received
-svm.pending.errorMessage = Unknown error! If payment was successfull email will be sent after verification.
+svm.failure.successMessage      = There might have been an error while processing the payment, please check ticket sales/Moya to view payment status. In unclear situations, contact support.
+svm.notification.errorMessage   = Payment failed.
+svm.notification.successMessage = Payment notification received.
+svm.pending.errorMessage        = Unknown error! If payment was successfull, an 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.
+svm.success.successMessage      = Payment was successful.
 
 template.keepaliveError = Page has expired. Please refresh the page.
 template.loggedInAs     = Logged in as
 
-topmenu.admin = Admin View
+tmp.code         = Code
+tmp.yourpmscodes = Your PMS codes
+
+topmenu.admin    = Admin view
 topmenu.helpdesk = Helpdesk
-topmenu.user  = User View
+topmenu.user     = User view
 
-topnavi.adminassoc = Net Associations
+topnavi.adminassoc    = Net associations
 topnavi.adminlectures = Lectures and courses
-topnavi.adminshop  = Adminshop
+topnavi.adminshop     = Admin shop
 topnavi.billing       = Billing
 topnavi.competitions  = Competitions
 topnavi.compos        = Compos
 topnavi.contents      = Site contents
 topnavi.createuser    = Create user
 topnavi.event         = Event
-topnavi.foodwave   = Food
+topnavi.foodwave      = Foodwave
 topnavi.frontpage     = Front page
-topnavi.game       = Gamecodes
+topnavi.game          = Game codes
 topnavi.help          = Help
-topnavi.infoviews  = Infoviews
-topnavi.license    = Licensecodes
+topnavi.infoviews     = Info views
+topnavi.license       = License codes
 topnavi.log           = Log
 topnavi.login         = Login
 topnavi.maps          = Maps
@@ -1442,22 +1468,22 @@ topnavi.userevent  = Event
 topnavi.userinit      = User auth
 topnavi.userlectures  = Lectures and courses
 topnavi.usermgmt      = Users
-topnavi.userplaces = Computer Places
+topnavi.userplaces    = Computer places
 topnavi.usershop      = Shop
 
 tournament.admin.back_to_index                                  = Back to tournament administration
 tournament.admin.control                                        = Control
 tournament.admin.create                                         = Create new tournament
 tournament.admin.delete                                         = Delete
-tournament.admin.delete_cancel = Cancel Deletion
-tournament.admin.delete_confirm = Confirm Deletion
+tournament.admin.delete_cancel                                  = Cancel deletion
+tournament.admin.delete_confirm                                 = Confirm deletion
 tournament.admin.edit                                           = Edit
 tournament.admin.tournament_deleted_successfully                = Tournament deleted successfully
 tournament.admin.tournament_edited_successfully                 = Edited successfully
-tournament.admin.tournament_rules_edit_failed = Rule Edit Failed
+tournament.admin.tournament_rules_edit_failed                   = Editing rules failed
 tournament.admin.tournament_rules_edited_successfully           = Rules successfully edited
 tournament.admin.view                                           = View
-tournament.already_participated_into_tournament = Already participated into the selected tournament!
+tournament.already_participated_into_tournament                 = You have already participated into the selected tournament!
 tournament.backup_player_successfully_added_to_team             = Backup player added
 tournament.cancel_participation                                 = Cancel participation
 tournament.cannot_add_anon_user                                 = Cannot add anonymous user
@@ -1465,58 +1491,58 @@ tournament.cannot_remove_captain = Cannot remove the team captain (you)
 tournament.control                                              = Control
 tournament.create                                               = Create tournament
 tournament.edit                                                 = Edit tournament
-tournament.fillamount          = Places taken
-tournament.full                = Tournament Full
+tournament.fillamount                                           = Participants signed up
+tournament.full                                                 = Tournament full
 tournament.game                                                 = Game
-tournament.my_participations   = My Participations
+tournament.my_participations                                    = My participations
 tournament.name                                                 = Tournament name
-tournament.not_within_participation_time = Not within the participation time for the tournament
+tournament.not_within_participation_time                        = Tournament sign up is not active
 tournament.participant_captain                                  = Captain
-tournament.participant_email   = Participant E-Mail
+tournament.participant_email                                    = Participant email
 tournament.participant_gameid                                   = Game-ID
 tournament.participant_nick                                     = Nickname
 tournament.participants                                         = Participants
 tournament.participate                                          = Participate
-tournament.participation_failed = Participation failed
-tournament.participation_success = Successfully participated into tournament
-tournament.participation_time  = Participation time
+tournament.participation_failed                                 = Sign up failed
+tournament.participation_success                                = Successfully signed up to the tournament
+tournament.participation_time                                   = Sign up time
 tournament.player_already_exists_in_team                        = Player already exists in the team
 tournament.player_successfully_added_to_team                    = Player added to the team
 tournament.playerspermatch_slash_teamsize                       = Players / team size
 tournament.rules                                                = Rules
 tournament.rules_for_tournament                                 = Rules for tournament
 tournament.status                                               = Status
-tournament.team_members        = Team Members
-tournament.team_name           = Team Name
+tournament.team_members                                         = Team members
+tournament.team_name                                            = Team name
 tournament.team_name_required                                   = Team name is required
 tournament.teammember.delete                                    = Delete
 tournament.teammember.login                                     = Login
 tournament.teammember.name                                      = Name
 tournament.type                                                 = Type
 
-tournaments.accept_rules_and_participate = Accept rules and participate
+tournaments.accept_rules_and_participate                        = Accept rules and sign up
 tournaments.active_tournaments                                  = Active tournaments
 tournaments.add_backup_player_to_team                           = Add backup player
 tournaments.add_player_to_team                                  = Add player to team
 tournaments.admin.begin_time_constraints                        = Tournament begin time
-tournaments.admin.cancel_edits           = Cancel Edits
+tournaments.admin.cancel_edits                                  = Cancel edits
 tournaments.admin.create                                        = Create tournament
 tournaments.admin.create_a_game                                 = Create a game
 tournaments.admin.create_new_ruleset                            = Create a new ruleset
 tournaments.admin.create_tournament                             = Create a tournament
 tournaments.admin.description                                   = Manage tournaments
 tournaments.admin.edit                                          = Edit tournament
-tournaments.admin.edit_rules             = Edit Rules
-tournaments.admin.edit_tournament        = Edit Tournament
+tournaments.admin.edit_rules                                    = Edit rules
+tournaments.admin.edit_tournament                               = Edit tournament
 tournaments.admin.game_description                              = Game description
 tournaments.admin.game_name                                     = Game name
-tournaments.admin.registration_time_constraints = Registration time constraints
+tournaments.admin.registration_time_constraints                 = Registration time
 tournaments.admin.remove_confirmation_text                      = Are you sure you want to remove this tournament? THIS CANNOT BE REVERSED!
-tournaments.admin.remove_title           = Confirm Tournament Removal
+tournaments.admin.remove_title                                  = Confirm tournament removal
 tournaments.admin.rules                                         = Rules
 tournaments.admin.select_a_game                                 = Select a game
 tournaments.admin.select_a_ruleset                              = Select a ruleset
-tournaments.admin.set_time_constraints   = Set time constraints
+tournaments.admin.set_time_constraints                          = Set time limits
 tournaments.admin.title                                         = Tournaments management
 tournaments.admin.view_tournament_description                   = You may view tournament participants and verify details and make minor edits for the teams. You may also remove any invalid participations.
 tournaments.admin.view_tournament_description_teamview_addition = Team listing is of form TeamMember (Game-ID).
@@ -1524,32 +1550,32 @@ tournaments.admin.view_tournament_title  = View tournament:
 tournaments.back_to_tournament_list                             = Back to tournament list
 tournaments.backup_players                                      = Max backup players
 tournaments.cancel_participation                                = Cancel participation
-tournaments.completed_tournaments        = Completed tournaments
-tournaments.description                  = You can view & participate into tournaments from this page.
+tournaments.completed_tournaments                               = Past tournaments
+tournaments.description                                         = You can view & sign up to tournaments on this page.
 tournaments.in_progress_tournaments                             = In progress
 tournaments.max_participants                                    = Max participants
 tournaments.menutitle                                           = Tournaments
 tournaments.open_tournaments                                    = Open tournaments
 tournaments.participate_actual_team_members                     = Actual team members
-tournaments.participate_backup_player_count = Backup Player Count
+tournaments.participate_backup_player_count                     = Backup player count
 tournaments.participate_backup_team_members                     = Backup team members
-tournaments.participate_description      = You may participate to the tournament from this page.
-tournaments.participate_player_count     = Player Count
+tournaments.participate_description                             = You may sign up to the tournament on this page.
+tournaments.participate_player_count                            = Player count
 tournaments.participate_rules                                   = Rules
 tournaments.participate_team_counters                           = Counters
-tournaments.participate_team_members     = Team members for participation
-tournaments.participate_title            = Participate to tournament
+tournaments.participate_team_members                            = Select team members
+tournaments.participate_title                                   = Sign up to tournament
 tournaments.participated_user_not_found                         = User not found. Please check the username.
-tournaments.participation_already_exists = Participant is already added.
+tournaments.participation_already_exists                        = Participant has already been added.
 tournaments.players_per_match                                   = Max players per match
-tournaments.registration_closes          = Set registration closing time
-tournaments.registration_opens           = Set registration opening time
+tournaments.registration_closes                                 = Registration closing time
+tournaments.registration_opens                                  = Registration opening time
 tournaments.ruleset_description                                 = Ruleset description
 tournaments.ruleset_name                                        = Ruleset name
 tournaments.ruleset_rules                                       = Tournament ruleset
-tournaments.setup_closed_tournaments     = Participation closed
-tournaments.start_time                   = Start Time
-tournaments.team_details                 = Team Details
+tournaments.setup_closed_tournaments                            = Sign up closed
+tournaments.start_time                                          = Start time
+tournaments.team_details                                        = Team details
 tournaments.title                                               = Tournaments
 tournaments.tournament_details                                  = Tournament details
 tournaments.tournament_gameplay                                 = Gameplay settings
@@ -1563,10 +1589,10 @@ user.addToEvent     = Associate user to event
 user.address                    = Street address
 user.age                        = Age
 user.bank                       = Bank
-user.bankaccount    = Bank number
+user.bankaccount                = Bank account
 user.birthday                   = Birthday
 user.cancelInvite               = Cancel invite
-user.cardPower      = Usertype
+user.cardPower                  = User type
 user.changePassword             = Change password
 user.changepassword.forUser     = For user
 user.changepassword.title       = Change password
@@ -1583,11 +1609,11 @@ user.email          = Email
 user.emailAgain                 = Email (again)
 user.emailAndUsername           = Email (works also as username)
 user.emailsunmatch              = Email addresses does not match.
-user.emailtooshortmessage = Email must be atleast {0} characters long.
-user.firstNames     = Firstname
-user.food.title     = Choose Menu
-user.foodwave.products.title = Choose Products
-user.foodwavelist.title = Choose Foodwave
+user.emailtooshortmessage       = Email must be at least {0} characters long.
+user.firstNames                 = First name
+user.food.title                 = Choose menu
+user.foodwave.products.title    = Choose products
+user.foodwavelist.title         = Choose foodwave
 user.game.add_gameid            = Add
 user.game.add_new_gameid        = Add new GameID
 user.game.current_gameids       = Current GameIDs
@@ -1599,6 +1625,8 @@ user.hasImage       = Image
 user.image                      = Image
 user.imageCropRefresh           = Refresh page
 user.imageTooBig                = Image is too big
+user.imageUpload.imageNotFound  = First choose image to upload
+user.imageUploaded              = Image uploaded.
 user.imagelist                  = Saved images
 user.imagesubmit                = Send image
 user.info                       = User
@@ -1607,11 +1635,12 @@ user.insertToken    = Insert token
 user.invalidLoginCredentials    = Invalid user credentials
 user.invite                     = Invite
 user.invite.header              = Accept invitation
-user.invite.placeInvite.header = Receive sendet place
+user.invite.placeInvite.header  = Accept received place
 user.invitemail                 = Email address
-user.lastName       = Lastname
+user.lastName                   = Last name
 user.login                      = Login
 user.logout                     = Logout
+user.meta.box.title             = Meta data
 user.myGroups                   = My place reservations
 user.myPlaces                   = Reserved places
 user.myProperties               = My properties
@@ -1622,7 +1651,7 @@ user.noImage        = No image
 user.oldPassword                = Current password
 user.page.invite                = Invite friends
 user.password                   = Password
-user.passwordcheck  = Password ( again )
+user.passwordcheck              = Password (again)
 user.passwordlengthMessage      = Password is too short! 
 user.phone                      = Tel
 user.profile                    = Profile
@@ -1630,7 +1659,7 @@ user.realname       = Name
 user.roles                      = Forced roles
 user.rolesave                   = Save roles
 user.save                       = Save
-user.saveFailed     = Save failed, Not enough permissions!
+user.saveFailed                 = Save failed, missing required permissions!
 user.saveRoles                  = Save roles
 user.saveSuccessfull            = Changes saved successfully
 user.saveUserSelectableRoles    = Save
@@ -1669,33 +1698,34 @@ user.validate.notUniqueUsername = Username already exists. Please select another
 user.validateUser.commit        = Send
 user.validateUser.header        = Please insert credentials
 user.wholeName                  = Name
-user.wholename      = Full name
-user.zipCode        = Postal nr.
+user.zipCode                    = Postal no.
 
 userImport.commit = Commit
 
 userView.image = Image
 
-usercart.addSearchedUsers = Add searched users
+usercart.addSearchedUsers = Add found users
 usercart.cartsize         = Size
-usercart.clear            = Clear Cart
+usercart.clear            = Empty cart
+usercart.downloadCsv      = CSV
 usercart.next             = Next user
 usercart.prev             = Previous user
-usercart.removeCurrent    = Remove from usercart
-usercart.showCart         = Show usercart
-usercart.traverse         = Traverse
+usercart.removeCurrent    = Remove from user cart
+usercart.showCart         = Show user cart
+usercart.showoverview     = Export to check view
+usercart.traverse         = Check
 
 userimage.webcam = Take picture with webcam
 
-userlist.header = Users
+userlist.header               = Search users
 userlist.onlythisevent        = Limit to users of this event 
 userlist.placeassoc           = Assigned to place
 userlist.rolefilter           = Assigned roles
-userlist.saldofilter = Saldo
+userlist.saldofilter          = Account balance
 userlist.search               = Search
-userlist.searchcount = Result count
+userlist.searchcount          = Search results
 userlist.showAdvancedSearch   = Advanced search
-userlist.usersWithUnusedCodes = List this event's users with unused place codes
+userlist.usersWithUnusedCodes = List this event's users with unused place tokens
 
 usertitle.managingUser = Shop
 
@@ -1703,7 +1733,7 @@ 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 {0} characters long!
+userview.passwordTooShort   = Password has to be at least {0} characters long!
 userview.passwordsChanged   = Password changed
 userview.passwordsDontMatch = Passwords do not match! Please try again!
 userview.userExists         = Username already exists! You may already have an account.
@@ -1714,9 +1744,10 @@ viewexpired.title = Login expired. Please login again.
 
 viewlectures.title = Courses and lectures
 
-vip.backToList = Back to viplist list
+vip.backToList          = Back to VIP list
 vip.create              = Create
 vip.createNew           = Create new 
+vip.delete              = Delete
 vip.deliver             = Deliver
 vip.description         = Description
 vip.edit                = Edit
@@ -1735,9 +1766,9 @@ vipProduct.delivered = Delivered
 vipProduct.name         = Product
 vipProduct.quantity     = Quantity
 
-voting.allcompos.curEntries = # of entries
+voting.allcompos.curEntries        = No. of entries
 voting.allcompos.descri            = Description
-voting.allcompos.description = List of all compos and theirs information.
+voting.allcompos.description       = List of all compos and their information.
 voting.allcompos.endTime           = End time
 voting.allcompos.header            = All compos
 voting.allcompos.hidden            = Hidden
@@ -1745,11 +1776,11 @@ voting.allcompos.holdVoting = Hold voting
 voting.allcompos.maxParts          = Max participants
 voting.allcompos.name              = Name
 voting.allcompos.startTime         = Start time
-voting.allcompos.submitEnd  = Submit end
+voting.allcompos.submitEnd         = End submitting
 voting.allcompos.submitEntry       = Submit entry
-voting.allcompos.submitStart = Submit start
-voting.allcompos.voteEnd    = Vote end
-voting.allcompos.voteStart  = Vote start
+voting.allcompos.submitStart       = Start submitting
+voting.allcompos.voteEnd           = End voting
+voting.allcompos.voteStart         = Start voting
 voting.compo.submit                = Submit entry
 voting.compo.vote                  = Vote
 voting.compoentryadd.button        = Send
@@ -1757,9 +1788,8 @@ 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.screenmessage = Message for compo slide
 voting.compoentryadd.title         = Add entry
-voting.compoentryadd.uploadedFile = File to 
 voting.compoentrysave.button       = Save
 voting.create.compoEnd             = End time
 voting.create.compoStart           = Start time
@@ -1773,20 +1803,8 @@ voting.create.maxParticipants = Max participants
 voting.create.name                 = Name
 voting.create.saveCompo            = Save compo
 voting.create.submitEnd            = Submit close
-voting.create.submitStart   = Submit start
+voting.create.submitStart          = Submit open
 voting.create.voteEnd              = Voting close
 voting.create.voteStart            = Voting start
 
 yes = Yes
-vip.delete=Delete
-tmp.yourpmscodes=Your pms -codes
-tmp.code=Code
-submenu.temp.pms=PMS codes
-shop.buyForUser=Buy for user
-shop.buyForUser.success=Places buyd successfully for user\!
-submenu.info.placeReservation=Placereservation
-placeReservation.selectedPlaces=Selected places
-placeReservation.mapMultiuserNote=If same user uses map from multible computers, you see all computers selections on blue.
-placeReservation.buyConfirm.content=Are you sure, this is hard to cancel?
-placeReservation.buyConfirm.title=Buy places for user?
-template.keepaliveError.title=View has been expired

code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_fi.properties

@@ -133,7 +133,7 @@ bills.noBills = Ei laskuja
 
 bortalApplication.BILL                                               = Laskujen oikeudet
 bortalApplication.COMPO                                              = Compojen oikeudet
-bortalApplication.CONTENT = Sis\u00E4lt\u00F6jen hallitaoikeudet
+bortalApplication.CONTENT                                            = Sis\u00E4lt\u00F6jen hallintaoikeudet
 bortalApplication.EVENT                                              = Tapahtuman oikeudet
 bortalApplication.LAYOUT                                             = N\u00E4kymien hallinta
 bortalApplication.LECTURE                                            = Kurssien ja luentojen oikeudet
@@ -234,9 +234,9 @@ card.massprint.title = Tulosta kaikki
 cardCode.code = Koodi
 cardCode.type = Tyyppi
 
-cardObjectData.create = Liit\u00E4 kuvia
+cardObjectData.create             = Liit\u00E4 tietoja
 cardObjectData.delete             = Poista
-cardObjectData.deleteQ = Poistetaanko objektidata korttipohjalta?
+cardObjectData.deleteQ            = Poistetaanko tiedot korttipohjalta?
 cardObjectData.edit               = Muokkaa
 cardObjectData.save               = Tallenna
 cardObjectData.size               = Leveys (px)
@@ -260,7 +260,7 @@ cardTemplate.roles = Yhdistetyt roolit
 cardTemplate.save        = Tallenna
 cardTemplate.sendImage   = Lataa kuva
 
-cardTemplateData.list = Ohjeissis\u00E4ll\u00F6n listaus
+cardTemplateData.list = Oheissis\u00E4ll\u00F6n listaus
 
 cardTextData.create               = Liit\u00E4 teksti\u00E4
 cardTextData.delete               = Poista
@@ -300,12 +300,12 @@ cart.item_total = Yhteens\u00E4
 cart.item_unitprice = Hinta
 cart.total          = Yhteens\u00E4
 
-checkout.cancel.errorMessage = Virhe peruutuksen vahvistuksessa\u2026 Ilmoita t\u00E4st\u00E4 osoitteeseen code@codecrew.fi
+checkout.cancel.errorMessage   = Virhe peruutuksessa, ilmoita t\u00E4st\u00E4 osoitteeseen code@codecrew.fi
 checkout.cancel.successMessage = Voit yritt\u00E4\u00E4 maksua uudelleen omista laskuistasi.
-checkout.reject.errorMessage = Virhe hyl\u00E4tyn maksun k\u00E4sittelyss\u00E4. Raportoi t\u00E4m\u00E4 virhe osoitteeseen: code@codecrew.fi
+checkout.reject.errorMessage   = Virhe hyl\u00E4tyn maksun k\u00E4sittelyss\u00E4, ilmoita t\u00E4st\u00E4 osoitteeseen code@codecrew.fi
 checkout.reject.successMessage = Maksu hyl\u00E4tty. Voit yritt\u00E4\u00E4 maksua uudelleen omista laskuistasi.
-checkout.return.errorDelayed = Virhe viiv\u00E4stetyn maksun vahvistuksessa. Ota yhteytt\u00E4 code@codecrew.fi
-checkout.return.errorMessage = Virhe maksun onnistuneen maksun vahvistuksessa. Raportoi t\u00E4m\u00E4 virhe yll\u00E4pidolle: code@codecrew.fi
+checkout.return.errorDelayed   = Virhe viiv\u00E4stetyn maksun vahvistuksessa, ilmoita t\u00E4st\u00E4 osoitteeseen code@codecrew.fi
+checkout.return.errorMessage   = Virhe maksun vahvistuksessa, ilmoita t\u00E4st\u00E4 osoitteeseen code@codecrew.fi
 checkout.return.successDelayed = Viiv\u00E4stetty maksu onnistunut. Maksu vahvistet\u00E4\u00E4n my\u00F6hemp\u00E4n\u00E4 ajankohtana, yleens\u00E4 noin tunnin sis\u00E4ll\u00E4.
 checkout.return.successMessage = Maksu vahvistettu. Tuotteet on maksettu. Voit siirty\u00E4 eteenp\u00E4in tilauksessasi.
 
@@ -365,7 +365,7 @@ error.contact = Jos t\u00E4m\u00E4 toistuu, ota seuraava koodi talteen ja ota yh
 error.error   = Olet kohdannut virheen.
 
 etickets.eticketcode = Lippu
-etickets.mailSended  = Lippu l\u00E4hetetty s\u00E4hk\u00F6postiisi
+etickets.mailSended  = Lippu on l\u00E4hetetty s\u00E4hk\u00F6postiisi
 etickets.place       = Paikka
 etickets.placeinfo   = Paikkatiedot
 etickets.placemap    = Paikat kartalla
@@ -380,7 +380,7 @@ event.defaultRole    = K\u00E4ytt\u00E4jien oletusrooli
 event.domains.title           = Verkkotunnus
 event.edit                    = Muokkaa
 event.endTime                 = Lopetusp\u00E4iv\u00E4
-event.id             = Eventin id
+event.id                      = Eventin ID
 event.listFutureEvents.title  = Lista tulevista tapahtumista
 event.name                    = Tapahtuman nimi
 event.nextBillNumber          = Seuraavan laskun numero
@@ -420,14 +420,15 @@ eventorg.billAddress1 = Laskutusosoite 1
 eventorg.billAddress2         = Laskutusosoite 2
 eventorg.billAddress3         = Laskutusosoite 3
 eventorg.billAddress4         = Laskutusosoite 4
-eventorg.bundleCountry = Kieli-bundle
+eventorg.bundleCountry        = Kieli bundle
 eventorg.codecrewDetails      = Tapahtuman j\u00E4rjest\u00E4j\u00E4tiedot
-eventorg.codecrewNotes = Codecrew -muistiinpanot
-eventorg.codecrewResponsible = Codecrewin tukihenkil\u00F6
+eventorg.codecrewNotes        = Codecrewn muistiinpanot
+eventorg.codecrewResponsible  = Codecrewn tukihenkil\u00F6
 eventorg.create               = Luo
 eventorg.create.title         = Luo tapahtumaj\u00E4rjest\u00E4j\u00E4
-eventorg.createEvent = Luo tapahtuma
-eventorg.createevent = Luo uusi tapahtuma
+eventorg.createEvent.submit   = Luo tapahtuma
+eventorg.createEvent.title    = Luo uusi tapahtuma
+eventorg.createevent.title    = Luo uusi tapahtuma
 eventorg.edit                 = Muokkaa
 eventorg.events               = Organisaation tapahtumat
 eventorg.id                   = Tapahtuman ID
@@ -448,20 +449,20 @@ feedback.thanks      = Kiiiiitooooos! :)
 food = Ruoka
 
 foodWave.accountevents      = Maksetut tilaukset
-foodWave.activeFoodWaves = Aktiiviset Ruokatilaukset
+foodWave.activeFoodWaves    = Aktiiviset ruokatilaukset
 foodWave.billLines          = Maksamattomat maksut
 foodWave.closeNow           = Sulje nyt
 foodWave.deliveredCount     = Toimitetut
-foodWave.deliveredFoodWaves = Toimitetut Ruokatilaukset
+foodWave.deliveredFoodWaves = Toimitetut ruokatilaukset
 foodWave.description        = Ruokatilauksen kuvaus
-foodWave.list          = Ruokatilaukset
+foodWave.list               = Aktiiviset ruokatilaukset
 foodWave.name               = Ruokatilaus
 foodWave.openNow            = Avaa nyt
-foodWave.orders        = Tilausten M\u00E4\u00E4r\u00E4
+foodWave.orders             = Tilausten m\u00E4\u00E4r\u00E4
 foodWave.paid               = Maksettuja
 foodWave.show               = N\u00E4yt\u00E4
 foodWave.template.name      = Nimi
-foodWave.template.waves = Ruokatilaus
+foodWave.template.waves     = Ruokatilaukset
 foodWave.templatename       = Valitse tuotteet
 foodWave.time               = Aika
 foodWave.totalReserved      = Yhteens\u00E4
@@ -472,9 +473,9 @@ foodadmin.editTemplate = Muokkaa
 foodshop.buyAndPay            = Varaa ja maksa
 foodshop.buyAndPayWithCredits = Varaa ja maksa krediiteill\u00E4
 foodshop.buyFromCounter       = Maksa infossa
-foodshop.buyFromInternet = Maksa Internetiss\u00E4
+foodshop.buyFromInternet      = Maksa verkkomaksuna
 foodshop.buyProceedToPay      = Varaa ja siirry maksamaan
-foodshop.canBuyToCounter = Voit maksaa t\u00E4m\u00E4n ruokatilauksen my\u00F6s infotiskille. Mik\u00E4li haluat tehd\u00E4 n\u00E4in, voit sulkea t\u00E4m\u00E4n ikkunan ja tulla infotiskille maksamaan tilauksen. 
+foodshop.canBuyToCounter      = Voit maksaa t\u00E4m\u00E4n ruokatilauksen my\u00F6s infotiskille. Mik\u00E4li haluat tehd\u00E4 niin, voit sulkea t\u00E4m\u00E4n ikkunan ja tulla infotiskille maksamaan tilauksen. 
 foodshop.total                = Yhteens\u00E4
 
 foodwave.buyInPrice                   = Sis\u00E4\u00E4nostohinta
@@ -483,23 +484,22 @@ foodwave.closed     = Ruokatilaus on suljettu
 foodwave.foodwaveBuyInPrice           = Sis\u00E4\u00E4nostohinta
 foodwave.foodwaveLastBillPayTime      = Maksut viimeist\u00E4\u00E4n
 foodwave.markPaid                     = Merkitty maksetuksi
-foodwave.orders     = Maksetut Tilaukset
+foodwave.orders                       = Maksetut tilaukset
 foodwave.ordersBefore                 = Tilaukset ennen
 foodwave.price                        = Tilausten kokonaishinta
-foodwave.summaryView = Ruokatilauksen Yhteenveto
-foodwave.template.basicinfo = Template Infot
+foodwave.summaryView                  = Ruokatilauksen yhteenveto
+foodwave.template.basicinfo           = Template infot
 foodwave.template.description         = Kuvaus
 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.waitPaymentsMinutes = Verkkomaksujen odotusaika
 foodwave.totalCount                   = M\u00E4\u00E4r\u00E4
-foodwave.totalPrice = Asiakkaan Hinta
+foodwave.totalPrice                   = Hinta asiakkaalle
 
 foodwaveTemplate.name = Nimi
 
-foodwavetemplate.actions = Toimet
 foodwavetemplate.addproduct         = Lis\u00E4\u00E4
 foodwavetemplate.basicinfo          = Tilauspohja
 foodwavetemplate.createFoodwave     = Luo ruokatilaus
@@ -544,7 +544,7 @@ generic.sure.yes    = Kyll\u00E4
 
 global.cancel               = Peruuta
 global.copyright            = Codecrew Ry
-global.eventname = Tapahtumanimi
+global.eventname            = Tapahtuman nimi
 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
@@ -553,7 +553,7 @@ httpsession.creationTime = Luotu
 httpsession.hostname              = Hostname
 httpsession.id                    = ID
 httpsession.invalidate            = Mit\u00E4t\u00F6i
-httpsession.invalidateSuccessfull = Sessio onnistuneesti mit\u00F6t\u00F6ity
+httpsession.invalidateSuccessfull = Sessio onnistuneesti mit\u00E4t\u00F6ity
 httpsession.isSessionNew          = Uusi sessio
 httpsession.lastAccessedTime      = Viimeksi n\u00E4hty
 httpsession.maxInactiveInterval   = Aikakatkaisu (s)
@@ -591,11 +591,11 @@ incomingflow.multisearch = Monihaku
 incomingflow.placesummary               = Paikkayhteenveto
 incomingflow.printedCard                = Kortti
 incomingflow.search                     = Etsi
-incomingflow.ungiveplace = Ei olekkaan annettu
+incomingflow.ungiveplace                = Ei olekaan annettu
 incomingflow.userdetails                = K\u00E4ytt\u00E4j\u00E4n tiedot
 incomingflow.usereditor                 = K\u00E4ytt\u00E4j\u00E4
 incomingflow.usereditor.info            = K\u00E4vij\u00E4
-incomingflow.usereditor.picture = Kuvanotto
+incomingflow.usereditor.picture         = Uusi kuva
 
 index.title = Etusivu
 
@@ -664,7 +664,7 @@ layout.editTop    = Muokkaa yl\u00E4sis\u00E4lt\u00F6\u00E4
 lecture.availableLectures             = Aihealueen kurssit ja luennot
 lecture.availableLecturesCalendar     = Kalenterina
 lecture.availableLecturesList         = Listana
-lecture.createLecture     = Uuden tiedot
+lecture.createLecture                 = Uusi luento
 lecture.createNew                     = Luo uusi
 lecture.description                   = Kuvaus
 lecture.full                          = Kurssi t\u00E4ynn\u00E4
@@ -719,7 +719,7 @@ login.submit = Kirjaudu sis\u00E4\u00E4n
 login.username           = S\u00E4hk\u00F6posti tai k\u00E4ytt\u00E4j\u00E4tunnus
 
 loginerror.header        = Kirjautuminen ep\u00E4onnistui
-loginerror.message = K\u00E4ytt\u00E4j\u00E4tunnus tai salasana ei ollut oikein.
+loginerror.message       = K\u00E4ytt\u00E4j\u00E4tunnus tai salasana virheellinen.
 loginerror.resetpassword = Salasana unohtunut?
 
 manageparticipants.addUser      = Lis\u00E4\u00E4 osallistuja
@@ -733,7 +733,7 @@ map.generate = Generoi paikat
 map.height                        = Paikan korkeus (px)
 map.id                            = #
 map.name                          = Nimi
-map.namebase = Puolipisteell\u00E4 erotetut p\u00F6yt\u00E4-etuliitteet
+map.namebase                      = P\u00F6ytien etuliitteet puolipisteell\u00E4 erotettuna
 map.oneRowTable                   = Yhden rivin p\u00F6yd\u00E4t
 map.placesInRow                   = Paikkoja riviss\u00E4
 map.product                       = Paikkatuote
@@ -742,8 +742,8 @@ map.startX = P\u00F6yd\u00E4n X-aloituskoord.
 map.startY                        = P\u00F6yd\u00E4n Y-aloituskoord. 
 map.submitMap                     = L\u00E4het\u00E4 karttapohja
 map.tableCount                    = P\u00F6ytien lukum\u00E4\u00E4r\u00E4
-map.tableXdiff = P\u00F6ytien v\u00E4li ( X )
-map.tableYdiff = P\u00F6ytien v\u00E4li ( Y )
+map.tableXdiff                    = P\u00F6ytien aloituspisteiden erotus (X)
+map.tableYdiff                    = P\u00F6ytien aloituspisteiden erotus (Y)
 map.tablesHorizontal              = P\u00F6yd\u00E4t vaakatasossa
 map.width                         = Leveys (px)
 
@@ -756,7 +756,7 @@ mapView.buyPlaces = Lukitse valitut paikat
 mapView.check                     = P\u00E4ivit\u00E4 jonopaikka
 mapView.enterQueue                = Liity jonoon
 mapView.errorWhenReleasingPlace   = Paikkaa vapauttassa tapahtui virhe.
-mapView.errorWhenReservingPlace = Paikkaa varatessa tapahtui virhe.
+mapView.errorWhenReservingPlace   = Paikkaa varatessa tapahtui virhe!
 mapView.errorWhileBuyingPlaces    = Virhe paikkojen ostossa. Ole hyv\u00E4 ja yrit\u00E4 uudelleen. Jos virhe toistuu ota yhteytt\u00E4 j\u00E4rjest\u00E4jiin.
 mapView.lockPlacesBeforeLeaving   = Lukitse paikat ennen sivulta poistumista
 mapView.notEnoughCreditsToReserve = Sinulla ei ole riitt\u00E4v\u00E4sti suoritettuja konepaikkamaksuja t\u00E4m\u00E4n paikan varaamiseen.
@@ -772,6 +772,7 @@ mapedit.save = Tallenna muutokset
 menu = Valikko
 
 menu.index              = Etusivu
+menu.item               = Tuote
 menu.name               = Nimi
 menu.place.placemap     = Paikkakartta
 menu.poll.index         = Kyselyt
@@ -783,6 +784,7 @@ menu.toUser = K\u00E4ytt\u00E4j\u00E4n\u00E4kym\u00E4
 menu.user.edit          = Omat tiedot
 
 menuitem.key            = Valikkolinkin avain
+menuitem.navigation.key = Tuoteavain
 
 menulist.header = Valikkolista
 
@@ -792,6 +794,8 @@ mode.user  = K\u00E4ytt\u00E4j\u00E4n\u00E4kym\u00E4
 
 nasty.user = Mene pois!
 
+navi.auth.login = Etusivu
+
 neomap.updateMap = P\u00E4ivit\u00E4 kartta
 
 networkassociation.action               = Toiminto
@@ -806,7 +810,7 @@ networkassociation.pending_associations = Odottavat assosiaatiot
 networkassociation.place                = Paikka
 networkassociation.user                 = K\u00E4ytt\u00E4j\u00E4
 
-news.abstract = Lyhennelm\u00E4
+news.abstract           = Tiivistelm\u00E4
 news.edit               = Muokkaa
 news.expire             = Lopeta julkaisu
 news.publish            = Julkaise
@@ -874,7 +878,7 @@ page.auth.login.logout.header = Uloskirjautuminen
 page.auth.login.logout.pagegroup         = Etusivu
 page.auth.login.pagegroup                = Etusivu
 page.auth.login.title                    = Kirjautumisvirhe
-page.auth.loginerror.header = kirjautuminen ep\u00E4onnistui
+page.auth.loginerror.header              = Kirjautuminen ep\u00E4onnistui
 page.auth.loginerror.pagegroup           = etusivu
 page.auth.logout.header                  = Uloskirjautuminen
 page.auth.logout.pagegroup               = Etusivu
@@ -891,10 +895,18 @@ page.checkout.cancel.header = Maksu peruutettu.
 page.checkout.delayed.header             = Viiv\u00E4stetty maksu
 page.checkout.reject.header              = Maksu hyl\u00E4tty!
 page.checkout.return.header              = Maksu vahvistettu
+page.game.list.header                    = Insomnia Game
+page.game.start.header                   = Insomnia Game
+page.index.header                        = Etusivu
+page.index.pagegroup                     = etusivu
+page.place.edit.header                   = Muokkaa paikkaa
 page.place.insertToken.header            = Sy\u00F6t\u00E4 paikkakoodi
-page.place.mygroups.header = Paikkaryhm\u00E4t
-page.place.placemap.header = Paikkakartta
+page.poll.answer.header                  = Kysely
+page.poll.answered.header                = Kiitos vastauksistasi
+page.poll.start.header                   = Kysely
+page.product.create.pagegroup            = yll\u00E4pito
 page.product.createBill.header           = Osta tuotteita
+page.product.createBill.pagegroup        = kauppa
 page.product.validateBillProducts.header = Tilaus luotu
 page.svm.error.header                    = Verkkomaksu ep\u00E4onnistui
 page.svm.failure.header                  = Verkkomaksuvirhe
@@ -902,6 +914,7 @@ page.svm.notification.header = Maksutapahtuman rekister\u00F6inti
 page.svm.pending.header                  = Maksukuittausta odotetaan
 page.svm.success.header                  = Verkkomaksu onnistui
 page.user.create.header                  = Luo uusi k\u00E4ytt\u00E4j\u00E4
+page.user.edit.header                    = Muokkaa k\u00E4ytt\u00E4j\u00E4\u00E4
 
 pagination.firstpage    = Ensimm\u00E4inen
 pagination.lastpage     = Viimeinen
@@ -934,7 +947,7 @@ place.description = Kuvaus
 place.details                       = Tiedot
 place.edit                          = Muokkaa
 place.groupremove                   = Poista paikka paikkaryhm\u00E4st\u00E4
-place.groupremove.confirm = Oletko varma, ett\u00E4 haluat poistaa konepaikan ryhm\u00E4st\u00E4.
+place.groupremove.confirm           = Oletko varma, ett\u00E4 haluat poistaa konepaikan ryhm\u00E4st\u00E4?
 place.height                        = Korkeus
 place.id                            = ID
 place.mapX                          = X
@@ -949,6 +962,11 @@ place.reserveForUser = Varaa k\u00E4ytt\u00E4j\u00E4lle
 place.send                          = Siirr\u00E4 paikka
 place.width                         = Leveys
 
+placeReservation.buyConfirm.content = Oletko varma, t\u00E4t\u00E4 on vaikea peruuttaa?
+placeReservation.buyConfirm.title   = Ostetaanko paikat k\u00E4ytt\u00E4j\u00E4lle?
+placeReservation.mapMultiuserNote   = Jos sama k\u00E4ytt\u00E4j\u00E4 k\u00E4ytt\u00E4\u00E4 karttaa monelta koneelta, n\u00E4kyv\u00E4t kaikkien koneiden klikkailut kartassa sinisell\u00E4.
+placeReservation.selectedPlaces     = Valitut paikat
+
 placeSelect.legend.blue      = Oma valittu paikka
 placeSelect.legend.green     = Oma ostettu paikka
 placeSelect.legend.grey      = Vapautetaan tarvittaessa
@@ -968,10 +986,10 @@ placegroup.details = Tiedot
 placegroup.edit                   = N\u00E4yt\u00E4
 placegroup.edited                 = Muokattu
 placegroup.name                   = Nimi
-placegroup.noPlacegroups = Sinulla t\u00E4ytyy olla paikkoja ett\u00E4 voit n\u00E4hd\u00E4 lippusi
+placegroup.noPlacegroups          = Lippu on avattavissa vasta paikkavarauksen j\u00E4lkeen.
 placegroup.placename              = Paikka
 placegroup.places                 = Paikat
-placegroup.printPdf = Tulosta lipputositteet
+placegroup.printPdf               = Tulosta liput
 placegroup.showEticket            = N\u00E4yt\u00E4 lippu
 
 placegroupView.editplace = Muokkaa paikkaa
@@ -989,7 +1007,7 @@ placegroupview.reservationProduct = Lippu
 placegroupview.reserveForSelf     = Valitse paikka itsellesi
 placegroupview.token              = Paikkakoodi / k\u00E4ytt\u00E4j\u00E4
 
-placeslot.add = Lis\u00E4\u00E4 placeslot
+placeslot.add           = Lis\u00E4\u00E4 paikkaslotti
 placeslot.bill          = Lasku
 placeslot.id            = ID
 placeslot.lockSlot      = Lukitse
@@ -1005,7 +1023,7 @@ placeslot.stateExpired = Vanhentunut
 placeslot.used          = K\u00E4ytetty
 
 placetoken.commit        = Liit\u00E4
-placetoken.pageHeader = Lis\u00E4\u00E4 konepaikkakoodi
+placetoken.pageHeader    = Lis\u00E4\u00E4 paikkakoodi
 placetoken.placelist     = Omat paikat
 placetoken.token         = Paikkakoodi
 placetoken.tokenNotFound = Paikkakoodia ei l\u00F6ytynyt! Tarkista koodi.
@@ -1045,7 +1063,6 @@ product.inventoryQuantity = Varastotilanne
 product.name                             = Tuotteen nimi
 product.paid                             = Maksettu
 product.prepaid                          = Prepaid
-product.prepaidInstant = Luodaan kun prepaid maksetaan
 product.price                            = Hinta (sis. alv)
 product.providedRole                     = Tuote tarjoaa roolin
 product.returnProductEdit                = Palaa tuotteeseen: 
@@ -1053,13 +1070,13 @@ product.save    = Tallenna
 product.saved                            = Tuote tallennettu
 product.shopInstant                      = Luo k\u00E4teismaksu tuotteille
 product.shopRequired                     = Tuotteen ostamiseen vaadittu rooli
-product.sort    = J\u00E4rjestys luku
+product.sort                             = J\u00E4rjestysluku
 product.totalPrice                       = Summa
 product.unitName                         = Tuoteyksikk\u00F6
 product.vat                              = ALV-%
 
 productFlag.CREATE_NEW_PLACE_WHEN_BOUGHT = Luo uusi paikka ostettaessa
-productFlag.HIDE_FROM_INFOSHOP           = Piilota infon kaupasta
+productFlag.HIDE_FROM_INFOSHOP           = Piilota Infon kaupasta
 productFlag.PREPAID_CREDIT               = Prepaid credit
 productFlag.PREPAID_INSTANT_CREATE       = Ostettaessa luotava tuote
 productFlag.RESERVE_PLACE_WHEN_BOUGHT    = Varaa paikka ostettaessa
@@ -1071,7 +1088,7 @@ productLimit.edit        = Muokkaa
 productLimit.last        = Viimeinen rajoite
 productLimit.lowerLimit  = Alarajoite
 productLimit.name        = Tyyppi
-productLimit.roles       = roolit
+productLimit.roles       = Roolit
 productLimit.save        = Tallenna
 productLimit.sort        = J\u00E4rjestysnumero
 productLimit.type        = Rajoitteen tyyppi
@@ -1129,15 +1146,15 @@ readerevent.seenSince       = N\u00E4hty viimeksi
 readerevent.shopToUser      = Osta k\u00E4ytt\u00E4j\u00E4lle
 readerevent.tagname         = Tagi
 
-readerview.cards = Kortit ( tulostuslkm )
+readerview.cards = Kortit (tulostuslkm)
 
 refresh = P\u00E4ivit\u00E4
 
 registerleaflet.title = Rekisteriseloste
 
 rejectcard.body              = Viestin sis\u00E4lt\u00F6
-rejectcard.mailBody = {0} -tapahtuman profiiliisi sy\u00F6tetty kuva on hyl\u00E4tty soveltumattomana. Sy\u00F6t\u00E4 uusi kuva v\u00E4litt\u00F6m\u00E4sti. Kuvan saat asetettua profiili-sivulta. Hyv\u00E4ksytt\u00E4v\u00E4ss\u00E4 kuvassa kasvosi tulee n\u00E4ky\u00E4 selke\u00E4sti ja kokonaan. Tarkista uuden kuvan l\u00E4hett\u00E4misen j\u00E4lkeen, ett\u00E4 se on rajautunut oikein ja on oikeassa asennossa.
-rejectcard.mailSubject = {0} -tapahtuman profiilin kuva hyl\u00E4tty
+rejectcard.mailBody          = {0} -tapahtuman profiiliisi sy\u00F6tetty kuva on hyl\u00E4tty soveltumattomana. Sy\u00F6t\u00E4 uusi kuva v\u00E4litt\u00F6m\u00E4sti. Kuvan saat asetettua Profiili/Omat tiedot -sivulta. Hyv\u00E4ksytt\u00E4v\u00E4ss\u00E4 kuvassa kasvosi tulee n\u00E4ky\u00E4 selke\u00E4sti ja kokonaan. Tarkista uuden kuvan l\u00E4hett\u00E4misen j\u00E4lkeen, ett\u00E4 se on rajautunut oikein ja on oikeassa asennossa.
+rejectcard.mailSubject       = {0} - Profiilikuva hyl\u00E4tty
 rejectcard.reject            = Hylk\u00E4\u00E4
 rejectcard.sendAndReject     = L\u00E4het\u00E4 ja hylk\u00E4\u00E4
 rejectcard.sendRejectionMail = L\u00E4het\u00E4 s\u00E4hk\u00F6postia
@@ -1147,30 +1164,33 @@ rejectcard.toName = Nimi
 
 required = Vaaditaan
 
-resetMail.body = Voit vaihtaa unohtuneen salasanan sy\u00F6tt\u00E4m\u00E4ll\u00E4 k\u00E4ytt\u00E4j\u00E4tunnuksesi tai tunnukseen liitetyn s\u00E4hk\u00F6postiosoitteen 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.body     = Voit vaihtaa unohtuneen salasanan sy\u00F6tt\u00E4m\u00E4ll\u00E4 k\u00E4ytt\u00E4j\u00E4tunnuksesi tai tunnukseen liitetyn s\u00E4hk\u00F6postiosoitteen 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.email    = S\u00E4hk\u00F6postiosoite
 resetMail.header   = Salasana unohtunut?
 resetMail.send     = L\u00E4het\u00E4
 resetMail.username = K\u00E4ytt\u00E4j\u00E4tunnus
 
-resetmailSent.body = Antamasi k\u00E4ytt\u00E4j\u00E4tunnuksen s\u00E4hk\u00F6postiosoitteeseen on l\u00E4hetetty osoite jossa voit vaihtaa tunnuksen salasanan.
+resetmailSent.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
 
 rfidevent.empty      = Tyhj\u00E4
 rfidevent.reader     = Lukija
 rfidevent.searchuser = Hae k\u00E4ytt\u00E4j\u00E4\u00E4
-rfidevent.tag   = T\u00E4gi
+rfidevent.tag        = Tagi
 
 role.cardtemplate             = Korttipohja
 role.create                   = Luo rooli
 role.description              = Kuvaus
 role.edit                     = Muokkaa
 role.edit.save                = Tallenna
+role.execute                  = (X)
 role.name                     = Nimi
 role.parents                  = Periytyy
 role.permissionheader         = Roolin oikeudet
+role.read                     = (R)
 role.savePermissions          = Tallenna oikeudet
 role.userSelectableRole       = K\u00E4ytt\u00E4j\u00E4n valittavissaoleva rooli
+role.write                    = (W)
 
 roleView.adduser              = Lis\u00E4\u00E4 k\u00E4ytt\u00E4j\u00E4
 roleView.eventRoles           = Tapahtumaroolit
@@ -1197,13 +1217,15 @@ shop.buy            = Osta
 shop.buyByCredit           = Maksa krediiteill\u00E4.
 shop.buyCash               = K\u00E4teismaksu
 shop.buyCredit             = Credit
+shop.buyForUser            = Osta k\u00E4ytt\u00E4j\u00E4lle
+shop.buyForUser.success    = Paikat ostettu onnistuneesti k\u00E4ytt\u00E4j\u00E4lle. Voit poistua sivulta!
 shop.calcsubtotal          = Laske v\u00E4lisumma
 shop.cartPrice             = Korin hinta
 shop.cash                  = K\u00E4teinen
 shop.cashBack              = Vaihtoraha palautettu
 shop.cashGiven             = K\u00E4teist\u00E4 saatu
 shop.cashback              = Takaisin
-shop.confirmCreditBuy = Varmastikko ?
+shop.confirmCreditBuy      = Oletko varma?
 shop.count                 = Lkm
 shop.currentBalance        = T\u00E4m\u00E4nhetkinen saldo
 shop.customPrice           = Uusi hinta
@@ -1211,6 +1233,7 @@ shop.price          = Hinta
 shop.product               = Tuote
 shop.product.name          = Lippu
 shop.readBarcode           = Lue
+shop.shop                  = Kauppa
 shop.shoppingcartCommitted = Tuotteet ostettu
 shop.toAccountValue        = Tilille
 shop.totalPrice            = Yhteens\u00E4
@@ -1240,10 +1263,11 @@ sidebar.roles     = Roolit
 sidebar.shop.readerEvents   = Lukijan tapahtumat
 sidebar.shop.readerlist     = N\u00E4yt\u00E4 lukijat
 sidebar.user.create         = Uusi k\u00E4ytt\u00E4j\u00E4
+sidebar.user.editself       = Asetukset
 sidebar.user.list           = K\u00E4ytt\u00E4j\u00E4t
 sidebar.users               = K\u00E4ytt\u00E4j\u00E4t
 sidebar.utils.flushCache    = Flush Cache
-sidebar.utils.testdata = Testdata
+sidebar.utils.testdata      = Test data
 
 sitepage.addContent        = Lis\u00E4\u00E4 sis\u00E4lt\u00F6laatikko
 sitepage.content.expire    = Vanhenemisaika
@@ -1282,26 +1306,27 @@ submenu.bill.billSummary  = Laskujen yhteenveto
 submenu.bill.list                        = N\u00E4yt\u00E4 omat tilaukset
 submenu.bill.listAll                     = Kaikki laskut
 submenu.eventorg.editEvent               = Tapahtuman tiedot
-submenu.eventorg.list     = Organisaation hallinta
 submenu.feedback.index                   = Vituttaako?
 submenu.foodadmin.createTemplate         = Luo tilauspohja 
 submenu.foodadmin.listTemplates          = Muokkaa tilauspohjia
 submenu.foodmanager.listFoodwaves        = Aktiiviset ruokatilaukset
 submenu.foodwave.list                    = Ruokatilaukset
+submenu.foodwave.listTemplates           = Ruuantoimittajat
 submenu.frontpage                        = Etusivu
 submenu.help                             = Lippuopas
 submenu.index                            = Etusivu
 submenu.info.cardlessIncoming            = Sis\u00E4\u00E4ntulo
 submenu.info.foodwave.foodwaveshop       = Ruokakauppa
-submenu.info.incoming     = Laaja Sis\u00E4\u00E4ntulon\u00E4kym\u00E4
+submenu.info.incoming                    = Laaja sis\u00E4\u00E4ntulon\u00E4kym\u00E4
 submenu.info.index                       = Infon\u00E4kym\u00E4
+submenu.info.placeReservation            = Paikanvaraus
 submenu.info.shop                        = Kauppa
 submenu.info.usermapsearch               = Karttahaku
 submenu.info.viplist                     = Vippilista
 submenu.lectureadmin.lectureParticipants = Kurssiosallistujat
 submenu.lectureadmin.manageLectureGroups = Hallinnoi
 submenu.lectures.viewLectures            = Ilmoittaudu
-submenu.license.manageCodes = Hallinnoi lisenssej\u00E4
+submenu.license.manageCodes              = Hallinnoi koodeja
 submenu.license.viewCodes                = N\u00E4yt\u00E4 koodit
 submenu.map.create                       = Uusi kartta
 submenu.map.list                         = N\u00E4yt\u00E4 kartat
@@ -1331,31 +1356,32 @@ submenu.shop.createBill   = Osta lippuja
 submenu.shop.listReaders                 = N\u00E4yt\u00E4 lukijat
 submenu.shop.shopToUser                  = Osta k\u00E4ytt\u00E4j\u00E4lle
 submenu.shop.showReaderEvents            = Lukijan tapahtumat
+submenu.temp.pms                         = PMS koodit
 submenu.tournaments.admin.index          = Katsele ja hallinnoi
 submenu.tournaments.index                = Listaa turnaukset
 submenu.tournaments.myparticipations     = Omat ilmoittautumiset
 submenu.user.accountEvents               = Tilitapahtumat
 submenu.user.changePassword              = Vaihda salasana
 submenu.user.create                      = Luo k\u00E4ytt\u00E4j\u00E4
-submenu.user.createCardTemplate = Luo korttiryhm\u00E4
+submenu.user.createCardTemplate          = Luo korttipohja
 submenu.user.edit                        = Omat tiedot
 submenu.user.foodwave                    = Ruoka
 submenu.user.gameids                     = Aseta Peli-IDt
 submenu.user.invite                      = Kutsu yst\u00E4vi\u00E4
 submenu.user.list                        = Kaikki k\u00E4ytt\u00E4j\u00E4t
-submenu.user.listCardTemplates = Korttiryhm\u00E4t
+submenu.user.listCardTemplates           = Korttipohjat
 submenu.user.manageuserlinks             = Hallitse k\u00E4ytt\u00E4ji\u00E4
 submenu.user.other                       = Muuta
 submenu.user.rolelinks                   = Hallitse rooleja
 submenu.user.sendPicture                 = L\u00E4het\u00E4 kuva
 submenu.user.shop                        = Kauppaan
 submenu.user.userlinks                   = Muokkaa tietoja
-submenu.useradmin.accountEvents = Tunnuksen tapahtumat
+submenu.useradmin.accountEvents          = K\u00E4ytt\u00E4j\u00E4n tilitapahtumat
 submenu.useradmin.create                 = Luo uusi k\u00E4ytt\u00E4j\u00E4
 submenu.useradmin.createCardTemplate     = Luo uusi korttipohja
 submenu.useradmin.edit                   = Muokkaa k\u00E4ytt\u00E4j\u00E4\u00E4
 submenu.useradmin.foodwaveshop           = Ruokatilauskauppa
-submenu.useradmin.list    = Etsi K\u00E4ytt\u00E4ji\u00E4
+submenu.useradmin.list                   = Etsi k\u00E4ytt\u00E4ji\u00E4
 submenu.useradmin.listCardTemplates      = Listaa korttipohjat
 submenu.useradmin.sendPicture            = L\u00E4het\u00E4 kuva
 submenu.useradmin.showTakePicture        = N\u00E4yt\u00E4 webcam
@@ -1383,10 +1409,10 @@ supernavi.admin = Yll\u00E4piton\u00E4kym\u00E4
 supernavi.user  = K\u00E4ytt\u00E4j\u00E4n\u00E4kym\u00E4
 
 svm.failure.errorMessage        = Verkkomaksuvirhe.
-svm.failure.successMessage = Maksuvirhe onnistunut. ( Maksu mahdollisesti merkitty jo maksetuksi )
+svm.failure.successMessage      = Maksussa saattoi tapahtua virhe, tarkista lipunmyynnist\u00E4/Moyasta menik\u00F6 maksu perille. Ep\u00E4selviss\u00E4 tilanteissa, ota yhteys tukeen.
 svm.notification.errorMessage   = Maksutapahtuma ep\u00E4onnistui
-svm.notification.successMessage = Maksutapahtuma vastaanotettu
-svm.pending.errorMessage = Maksukuittausta odotetaan. Kuittauksesta l\u00E4hetet\u00E4\u00E4n ilmoitus s\u00E4hk\u00F6postitse.
+svm.notification.successMessage = Maksutapahtuma vastaanotettu.
+svm.pending.errorMessage        = Tuntematon virhe, mik\u00E4li maksu kuitenkin oli onnistunut, saat vahvistuksen s\u00E4hk\u00F6postitse.
 svm.pending.successMessage      = Maksukuittausta odotetaan. Kuittauksesta l\u00E4hetet\u00E4\u00E4n ilmoitus s\u00E4hk\u00F6postitse.
 svm.success.errorMessage        = Verkkomaksua ei voitu verifioida! Virheest\u00E4 on raportoitu eteenp\u00E4in.
 svm.success.successMessage      = Verkkomaksu onnistui. 
@@ -1394,8 +1420,11 @@ svm.success.successMessage = Verkkomaksu onnistui.
 template.keepaliveError = Sivu on vanhentunut. Ole hyv\u00E4 ja p\u00E4ivit\u00E4 sivu.
 template.loggedInAs     = Kirjautunut tunnuksella
 
+tmp.code         = Koodi
+tmp.yourpmscodes = PMS-koodisi
+
 topmenu.admin    = Yll\u00E4piton\u00E4kym\u00E4
-topmenu.helpdesk = Helpdesk
+topmenu.helpdesk = Tuki
 topmenu.user     = K\u00E4ytt\u00E4j\u00E4n\u00E4kym\u00E4
 
 topnavi.adminassoc    = Verkkoassosioinnit
@@ -1403,7 +1432,7 @@ topnavi.adminlectures = Kurssit ja luennot
 topnavi.adminshop     = Kauppa
 topnavi.billing       = Laskutus
 topnavi.competitions  = Kilpailut
-topnavi.compos     = Kilpailut
+topnavi.compos        = Compos
 topnavi.contents      = Sivuston sis\u00E4lt\u00F6
 topnavi.createuser    = Luo k\u00E4ytt\u00E4j\u00E4
 topnavi.event         = Tapahtuma
@@ -1433,8 +1462,8 @@ tournament.admin.back_to_index = Takaisin turnauksen yll\u00E4pitosivulle
 tournament.admin.control                                        = Hallitse
 tournament.admin.create                                         = Luo uusi turnaus
 tournament.admin.delete                                         = Poista
-tournament.admin.delete_cancel = Peruuta
-tournament.admin.delete_confirm = Vahvista Poisto
+tournament.admin.delete_cancel                                  = Peruuta poisto
+tournament.admin.delete_confirm                                 = Vahvista poisto
 tournament.admin.edit                                           = Muokkaa
 tournament.admin.tournament_deleted_successfully                = Turnaus onnistuneesti poistettu
 tournament.admin.tournament_edited_successfully                 = Turnauksen asetuksia muutettu
@@ -1483,14 +1512,14 @@ tournaments.active_tournaments           = Aktiiviset turnaukset
 tournaments.add_backup_player_to_team                           = Lis\u00E4\u00E4 varaj\u00E4sen
 tournaments.add_player_to_team                                  = Lis\u00E4\u00E4 pelaaja joukkueeseen
 tournaments.admin.begin_time_constraints                        = Turnauksen aloitusaika
-tournaments.admin.cancel_edits           = Peruuta Muokkaukset
+tournaments.admin.cancel_edits                                  = Peruuta muokkaukset
 tournaments.admin.create                                        = Luo turnaus
 tournaments.admin.create_a_game                                 = Luo peli
 tournaments.admin.create_new_ruleset                            = Luo uusi s\u00E4\u00E4nn\u00F6st\u00F6
 tournaments.admin.create_tournament                             = Luo turnaus
 tournaments.admin.description                                   = Hallinnoi turnauksia
 tournaments.admin.edit                                          = Muokkaa turnausta
-tournaments.admin.edit_rules             = Editoi s\u00E4\u00E4nt\u00F6j\u00E4
+tournaments.admin.edit_rules                                    = Muokkaa s\u00E4\u00E4nt\u00F6j\u00E4
 tournaments.admin.edit_tournament                               = Muokkaa turnausta
 tournaments.admin.game_description                              = Pelin kuvaus
 tournaments.admin.game_name                                     = Pelin nimi
@@ -1509,19 +1538,19 @@ tournaments.back_to_tournament_list      = Takaisin turnauslistaukseen
 tournaments.backup_players                                      = Maksimim\u00E4\u00E4r\u00E4 varapelaajia
 tournaments.cancel_participation                                = Peruuta osallistuminen
 tournaments.completed_tournaments                               = Menneet turnaukset
-tournaments.description                  = Voit osallistua sek\u00E4 katselmoida turnauksia t\u00E4ll\u00E4 sivulla.
+tournaments.description                                         = Voit tarkastella ja osallistua turnauksiin t\u00E4ll\u00E4 sivulla.
 tournaments.in_progress_tournaments                             = K\u00E4ynniss\u00E4
 tournaments.max_participants                                    = Maksimiosallistujam\u00E4\u00E4r\u00E4
 tournaments.menutitle                                           = Turnaukset
 tournaments.open_tournaments                                    = Avoimet turnaukset
 tournaments.participate_actual_team_members                     = Varsinaiset joukkueen j\u00E4senet
-tournaments.participate_backup_player_count = Varapelaajat
+tournaments.participate_backup_player_count                     = Varapelaajien lkm
 tournaments.participate_backup_team_members                     = Joukkueen varaj\u00E4senet
 tournaments.participate_description                             = Voit osallistua turnaukseen t\u00E4ll\u00E4 sivulla.
 tournaments.participate_player_count                            = Pelaajam\u00E4\u00E4r\u00E4
 tournaments.participate_rules                                   = S\u00E4\u00E4nn\u00F6t
 tournaments.participate_team_counters                           = Laskurit
-tournaments.participate_team_members     = Valitse joukkueesi
+tournaments.participate_team_members                            = Valitse pelaajat joukkueeseesi
 tournaments.participate_title                                   = Osallistu turnaukseen
 tournaments.participated_user_not_found                         = K\u00E4ytt\u00E4j\u00E4\u00E4 ei l\u00F6ydy. Tarkista k\u00E4ytt\u00E4j\u00E4tunnus.
 tournaments.participation_already_exists                        = K\u00E4ytt\u00E4j\u00E4 on jo lis\u00E4tty.
@@ -1544,7 +1573,7 @@ user.accountBalance = Tilin saldo
 user.accountEventHeader         = Tilitapahtumat
 user.accountevents              = Tilitapahtumat
 user.addToEvent                 = Liit\u00E4 k\u00E4ytt\u00E4j\u00E4 tapahtumaan
-user.address        = l\u00E4hiosoite
+user.address                    = L\u00E4hiosoite
 user.age                        = Ik\u00E4
 user.bank                       = Pankki
 user.bankaccount                = Pankkitili
@@ -1556,9 +1585,9 @@ user.changepassword.forUser = K\u00E4ytt\u00E4j\u00E4lle
 user.changepassword.title       = Vaihda salasana
 user.confirmUserToEventAdding   = Oletko varma ett\u00E4 haluat liitt\u00E4\u00E4 t\u00E4m\u00E4n k\u00E4ytt\u00E4j\u00E4n t\u00E4h\u00E4n tapahtumaan?
 user.create                     = Luo k\u00E4ytt\u00E4j\u00E4
-user.createdmessage = K\u00E4ytt\u00E4j\u00E4tunnus on luotu onnistuneesti.
+user.createdmessage             = K\u00E4ytt\u00E4j\u00E4tunnus luotiin onnistuneesti.
 user.cropImage                  = Rajaa
-user.cropUserImage  = Crop image
+user.cropUserImage              = Rajaa
 user.defaultImage               = Oletukuva
 user.edit                       = Muokkaa
 user.edit.gameids               = Muokkaa peli-id merkint\u00F6j\u00E4
@@ -1569,9 +1598,9 @@ user.emailAndUsername = S\u00E4hk\u00F6posti (toimii my\u00F6s k\u00E4ytt\u00E4j
 user.emailsunmatch              = S\u00E4hk\u00F6postiosoitteet eiv\u00E4t t\u00E4sm\u00E4\u00E4.
 user.emailtooshortmessage       = S\u00E4hk\u00F6postin tarvitsee olla v\u00E4hint\u00E4\u00E4n {0} merkki\u00E4 pitk\u00E4.
 user.firstNames                 = Etunimi
-user.food.title     = Valitse Menu
+user.food.title                 = Valitse menu
 user.foodwave.products.title    = Valitse tuotteet
-user.foodwavelist.title = Valitse Ruokatilaus
+user.foodwavelist.title         = Valitse ruokatilaus
 user.game.add_gameid            = Lis\u00E4\u00E4
 user.game.add_new_gameid        = Lis\u00E4\u00E4 uusi Peli-ID
 user.game.current_gameids       = Nykyiset Peli-IDt
@@ -1589,36 +1618,37 @@ user.imagelist      = Tallennetut kuvat
 user.imagesubmit                = L\u00E4het\u00E4 kuva
 user.info                       = K\u00E4ytt\u00E4j\u00E4
 user.insert                     = Sy\u00F6t\u00E4 arvo
+user.insertToken                = Lis\u00E4\u00E4 koodi
 user.invalidLoginCredentials    = K\u00E4ytt\u00E4j\u00E4tunnus tai salasana v\u00E4\u00E4rin.
 user.invite                     = Kutsu
-user.invite.header  = Luo k\u00E4ytt\u00E4j\u00E4 kutsusta
+user.invite.header              = Vastaanota kutsu
 user.invite.placeInvite.header  = Vastaanota l\u00E4hetetty paikka
 user.invitemail                 = S\u00E4hk\u00F6postiosoite
 user.lastName                   = Sukunimi
 user.login                      = K\u00E4ytt\u00E4j\u00E4tunnus
 user.logout                     = Kirjaudu ulos
 user.meta.box.title             = Metatiedot
+user.myGroups                   = Varaukseni
 user.myPlaces                   = Omat konepaikat
 user.myProperties               = Omat tiedot
 user.nick                       = Nick
 user.noAccountevents            = Ei tilitapahtumia
 user.noCurrentImage             = Ei kuvaa
-user.noImage        = EI kuvaa
+user.noImage                    = Ei kuvaa
 user.oldPassword                = Nykyinen salasana
 user.page.invite                = Kutsu yst\u00E4vi\u00E4
 user.password                   = Salasana
-user.passwordcheck  = Salasana ( uudelleen )
+user.passwordcheck              = Salasana (uudelleen)
 user.passwordlengthMessage      = Salasana liian lyhyt 
 user.phone                      = Puhelin
-user.placegroups    = Omat paikkaryhm\u00E4t
 user.profile                    = Profiili
 user.realname                   = Nimi
 user.roles                      = Pakotetut roolit
 user.rolesave                   = Tallenna roolit
 user.save                       = Tallenna
-user.saveFailed=
+user.saveFailed                 = Tallennus ep\u00E4onnistui, ei tarvittavia oikeuksia!
 user.saveRoles                  = Tallenna roolit
-user.saveSuccessfull=Tallennettu onnistuneesti
+user.saveSuccessfull            = Tallennettu onnistuneesti
 user.saveUserSelectableRoles    = Tallenna
 user.search                     = Hae
 user.searchUser                 = Hae k\u00E4ytt\u00E4j\u00E4\u00E4
@@ -1655,20 +1685,21 @@ user.validate.notUniqueUsername = K\u00E4ytt\u00E4j\u00E4tunnus on jo olemassa.
 user.validateUser.commit        = L\u00E4het\u00E4
 user.validateUser.header        = Ole hyv\u00E4 ja sy\u00E4t\u00E4 kirjautumistiedot
 user.wholeName                  = Nimi
-user.wholename      = Koko nimi
 user.zipCode                    = Postinumero
 
 userImport.commit = Hyv\u00E4ksy
 
 userView.image = Kuva
 
-usercart.addSearchedUsers = Lis\u00E4\u00E4 haetut k\u00E4ytt\u00E4j\u00E4t
+usercart.addSearchedUsers = Lis\u00E4\u00E4 l\u00F6ydetyt k\u00E4ytt\u00E4j\u00E4t
 usercart.cartsize         = Koko
 usercart.clear            = Tyhjenn\u00E4 k\u00E4ytt\u00E4j\u00E4kori
-usercart.next             = Seuraava k\u00E4vij\u00E4
-usercart.prev             = Edellinen k\u00E4vij\u00E4
+usercart.downloadCsv      = CSV
+usercart.next             = Seuraava k\u00E4ytt\u00E4j\u00E4
+usercart.prev             = Edellinen k\u00E4ytt\u00E4j\u00E4
 usercart.removeCurrent    = Poista k\u00E4ytt\u00E4j\u00E4korista
 usercart.showCart         = K\u00E4ytt\u00E4j\u00E4kori
+usercart.showoverview     = Vie tarkastusn\u00E4kym\u00E4\u00E4n
 usercart.traverse         = K\u00E4y l\u00E4pi
 
 userimage.webcam = Ota kuva webkameralla
@@ -1685,12 +1716,13 @@ userlist.usersWithUnusedCodes = Lista t\u00E4m\u00E4n tapahtuman k\u00E4ytt\u00E
 
 usertitle.managingUser = Kauppa
 
+userview.header             = K\u00E4ytt\u00E4j\u00E4t
 userview.invalidEmail       = Virheellinen s\u00E4hk\u00F6postiosoite
 userview.loginstringFaulty  = K\u00E4ytt\u00E4j\u00E4tunnus virheellinen. Pit\u00E4\u00E4 olla v\u00E4hint\u00E4\u00E4n kaksi merkki\u00E4 pitk\u00E4.
 userview.oldPasswordError   = V\u00E4\u00E4r\u00E4 salasana!
 userview.passwordTooShort   = Salasana liian lyhyt. Pit\u00E4\u00E4 olla v\u00E4hint\u00E4\u00E4n {0} merkki\u00E4 pitk\u00E4.
 userview.passwordsChanged   = Salasana vaihdettu
-userview.passwordsDontMatch = Salasanat eiv\u00E4t ole samat! Ole hyv\u00E4 ja sy\u00F6t\u00E4 salasanat uudelleen.
+userview.passwordsDontMatch = Salasanat eiv\u00E4t ole samat! Sy\u00F6t\u00E4 salasanat uudelleen.
 userview.userExists         = K\u00E4ytt\u00E4j\u00E4tunnus on jo olemassa. Sinulla saattaa jo olla tunnus j\u00E4rjestelm\u00E4ss\u00E4.
 userview.userExistsByEmail  = S\u00E4hk\u00F6posti on jo olemassa. Sinulla saattaa jo olla tunnus j\u00E4rjestelm\u00E4ss\u00E4.
 
@@ -1699,9 +1731,10 @@ viewexpired.title = N\u00E4kym\u00E4 on vanhentunut
 
 viewlectures.title = Kurssit ja luennot
 
-vip.backToList = Takaisin listaukseen
+vip.backToList          = Takaisin VIP-listaukseen
 vip.create              = Luo
 vip.createNew           = Luo uusi
+vip.delete              = Poista
 vip.deliver             = Toimita
 vip.description         = Lis\u00E4tietoja
 vip.edit                = Muokkaa
@@ -1742,9 +1775,8 @@ voting.compoentryadd.description = Ilmoittaudu kilpailuun:
 voting.compoentryadd.entryname     = Nimi
 voting.compoentryadd.file          = Tiedosto
 voting.compoentryadd.notes         = Huomatuksia
-voting.compoentryadd.screenmessage = Screenmessage
+voting.compoentryadd.screenmessage = Composliden viesti
 voting.compoentryadd.title         = Ilmoittaudu
-voting.compoentryadd.uploadedFile = asdsda
 voting.compoentrysave.button       = Tallenna
 voting.create.compoEnd             = Lopetusaika
 voting.create.compoStart           = Aloitusaika
@@ -1763,15 +1795,3 @@ voting.create.voteEnd       = \u00C4\u00E4nestys kiinni
 voting.create.voteStart            = \u00C4\u00E4nestys auki
 
 yes = Kyll\u00E4
-vip.delete=Poista
-tmp.yourpmscodes=PMS -koodisi
-tmp.code=Koodi
-submenu.temp.pms=PMS koodit
-shop.buyForUser=Osta k\u00E4ytt\u00E4j\u00E4lle
-shop.buyForUser.success=Paikat on ostettu onnistuneesti k\u00E4ytt\u00E4j\u00E4lle. Voit poistua sivulta\!
-submenu.info.placeReservation=Paikanvaraus
-placeReservation.selectedPlaces=Valitut paikat
-placeReservation.mapMultiuserNote=Jos sama k\u00E4ytt\u00E4j\u00E4 k\u00E4ytt\u00E4\u00E4 karttaa monelta koneelta, n\u00E4kyv\u00E4t kaikkien koneiden klikkailut kartassa sinisell\u00E4.
-placeReservation.buyConfirm.content=Oletko varma, t\u00E4t\u00E4 on vaikea peruuttaa?
-placeReservation.buyConfirm.title=Ostetaanko paikat k\u00E4ytt\u00E4j\u00E4lle?
-template.keepaliveError.title=Näkymä on vanhentunut