Merge branch 'devel' of codecrew.fi:bortal into devel

Conflicts:
	code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/MenuBean.java

code/MoyaWeb/src/fi/codecrew/moya/resources/i18n.properties

@@ -224,6 +224,8 @@ resetMail.username = Username
 resetmailSent.body   = Email has been sent containing a link where you can change the password.
 resetmailSent.header = Email sent
 
+submenu.NotImplementedYet         = Not implemented
+
 subnavi.cards = \u0009\u0009
 
 topnavi.license = Lisenssikoodit

code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_en.properties

@@ -519,6 +519,7 @@ menuitem.navigation.key = Product flag
 nasty.user = Go away!
 
 news.abstract           = Abstract
+news.edit               = Edit
 news.expire             = Expire
 news.publish            = Publish
 news.save               = Save
@@ -677,6 +678,8 @@ placegroup.placename              = Place
 placegroup.places                 = Places
 placegroup.printPdf               = Print tickets
 
+placegroupView.editplace = Edit place
+
 placegroupview.groupCreator       = Reserver
 placegroupview.header             = My places
 placegroupview.noMemberships      = No places
@@ -755,6 +758,7 @@ productshop.total         = Total
 reader.assocToCard           = Associate to card
 reader.automaticProduct      = Default product
 reader.automaticProductCount = Amount
+reader.create                = Create reader
 reader.createNewCard         = Create new card
 reader.description           = Description
 reader.edit                  = Edit
@@ -769,6 +773,7 @@ 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
@@ -870,8 +875,20 @@ sitepage.save       = Save
 
 sitepagelist.header = Site pages
 
+submenu.NotImplementedYet            = Not implemented
 submenu.actionlog.messagelist        = ActionLog
+submenu.actionlog.taskview           = View tasks
+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.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.sendResetMail           = Password reset
@@ -931,6 +948,7 @@ submenu.useradmin.listCardTemplates  = Card templates
 submenu.useradmin.sendPicture        = Send a picture
 submenu.useradmin.showTakePicture    = Show webcam
 submenu.useradmin.validateUser       = Validate user
+submenu.utils.index                  = Administration utils
 submenu.voting.admincompolist        = Compos
 submenu.voting.compolist             = Compos
 submenu.voting.create                = Create new compo
@@ -1102,6 +1120,7 @@ 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.
 
 userImport.commit = Commit

code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_fi.properties

@@ -528,6 +528,7 @@ menu.user.edit       = Omat tiedot
 nasty.user = Mene pois!
 
 news.abstract           = Lyhennelm\u00E4
+news.edit               = Muokkaa
 news.expire             = Lopeta julkaisu
 news.publish            = Julkaise
 news.save               = Tallenna
@@ -660,6 +661,8 @@ placegroup.placename              = Paikka
 placegroup.places                 = Paikat
 placegroup.printPdf               = Tulosta lipputositteet
 
+placegroupView.editplace = Muokkaa paikkaa
+
 placegroupview.groupCreator       = Varaaja
 placegroupview.header             = Omat paikat
 placegroupview.noMemberships      = Ei omia paikkoja
@@ -740,6 +743,7 @@ productshop.total         = Yhteens\u00E4
 reader.assocToCard           = Yhdist\u00E4 korttiin
 reader.automaticProduct      = Oletustuote
 reader.automaticProductCount = M\u00E4\u00E4r\u00E4
+reader.create                = Luo lukija
 reader.createNewCard         = Luo uusi kortti
 reader.description           = Kuvaus
 reader.edit                  = Muokkaa
@@ -754,6 +758,7 @@ reader.user                  = K\u00E4ytt\u00E4j\u00E4
 readerView.searchforuser = Etsi k\u00E4ytt\u00E4j\u00E4\u00E4
 
 readerevent.associateToUser = Yhdist\u00E4 k\u00E4ytt\u00E4j\u00E4\u00E4n
+readerevent.saveEvent       = Tallenna tapahtuma
 readerevent.seenSince       = N\u00E4hty viimeksi
 readerevent.shopToUser      = Osta k\u00E4ytt\u00E4j\u00E4lle
 readerevent.tagname         = Tagi
@@ -851,8 +856,20 @@ sitepage.save       = Tallenna
 
 sitepagelist.header = Sivuston sis\u00E4ll\u00F6t
 
+submenu.NotImplementedYet            = Toteuttamatta
 submenu.actionlog.messagelist        = ActionLog
+submenu.actionlog.taskview           = N\u00E4yt\u00E4 toiminnat
+submenu.admin.adduser.login          = Kirjaudu sis\u00E4\u00E4n
+submenu.admin.adduser.start          = Tervetuloa
+submenu.admin.adduser.update         = P\u00E4ivit\u00E4 profiilikuva
+submenu.admin.incoming.index         = Sis\u00E4\u00E4ntulo
+submenu.admin.incoming.printCard     = Kortin tulostus
+submenu.admin.info.computerplaces    = Konepaikat
+submenu.admin.info.general           = Yleisi\u00E4 linkkej\u00E4
+submenu.admin.info.index             = Infosivu
 submenu.auth.login                   = Kirjaudu
+submenu.auth.loginError              = Kirjautuminen ep\u00E4onnistui
+submenu.auth.loginSucessRedirect     = Sis\u00E4\u00E4nkirjautuminen onnistui
 submenu.auth.logout                  = Kirjaudu ulos
 submenu.auth.logoutResponse          = Uloskirjautuminen onnistui
 submenu.auth.sendResetMail           = Salasanan palautus
@@ -864,7 +881,7 @@ submenu.feedback.index               = Vituttaako?
 submenu.foodadmin.createTemplate     = Luo tilauspohja 
 submenu.foodadmin.listTemplates      = Muokkaa tilauspohjia
 submenu.foodmanager.listFoodwaves    = Aktiiviset ruokatilaukset
-submenu.foodwave.list                = Ruokailu
+submenu.foodwave.list                = Ruokatilaukset
 submenu.index                        = Etusivu
 submenu.license.manageCodes          = Hallinnoi lisenssej\u00E4
 submenu.license.viewCodes            = N\u00E4yt\u00E4 koodit
@@ -914,6 +931,7 @@ submenu.useradmin.listCardTemplates  = Listaa korttipohjat
 submenu.useradmin.sendPicture        = L\u00E4het\u00E4 kuva
 submenu.useradmin.showTakePicture    = N\u00E4yt\u00E4 webcam
 submenu.useradmin.validateUser       = Validoi k\u00E4ytt\u00E4j\u00E4
+submenu.utils.index                  = Yll\u00E4pitoty\u00F6kalut
 submenu.voting.admincompolist        = Kilpailut
 submenu.voting.compolist             = Kilpailut
 submenu.voting.create                = Uusi kilpailu
@@ -1082,6 +1100,7 @@ user.validate.notUniqueUsername = K\u00E4ytt\u00E4j\u00E4tunnus on jo olemassa.
 user.validateUser.commit        = L\u00E4het\u00E4
 user.validateUser.header        = Ole hyv\u00E4 ja sy\u00F6t\u00E4 kirjautumistiedot
 user.wholeName                  = Nimi
+user.wholename                  = Koko nimi
 user.zipCode                    = Postinumero
 
 userImport.commit = Hyv\u00E4ksy