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

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

@@ -982,10 +982,21 @@ topnavi.usermgmt     = Users
 topnavi.userplaces   = Computer Places
 topnavi.userplaces   = Computer Places
 topnavi.usershop     = Shop
 topnavi.usershop     = Shop
 
 
+tournament.create                               = Create tournament
+tournament.edit                                 = Edit tournament
+tournament.game                                 = Game
+tournament.name                                 = Tournament name
+tournament.playerspermatch_slash_teamsize       = Players / team size
+tournament.rules                                = Rules
+tournament.status                               = Status
+tournament.type                                 = Type
+
+tournaments.active_tournaments                  = Active tournaments
 tournaments.admin.begin_time_constraints        = Tournament begin time
 tournaments.admin.begin_time_constraints        = Tournament begin time
 tournaments.admin.create_a_game                 = Create a game
 tournaments.admin.create_a_game                 = Create a game
 tournaments.admin.create_new_ruleset            = Create a new ruleset
 tournaments.admin.create_new_ruleset            = Create a new ruleset
 tournaments.admin.create_tournament             = Create a tournament
 tournaments.admin.create_tournament             = Create a tournament
+tournaments.admin.description                   = Manage tournaments
 tournaments.admin.game_description              = Game description
 tournaments.admin.game_description              = Game description
 tournaments.admin.game_name                     = Game name
 tournaments.admin.game_name                     = Game name
 tournaments.admin.registration_time_constraints = Registration time constraints
 tournaments.admin.registration_time_constraints = Registration time constraints
@@ -993,6 +1004,7 @@ tournaments.admin.rules                         = Rules
 tournaments.admin.select_a_game                 = Select a game
 tournaments.admin.select_a_game                 = Select a game
 tournaments.admin.select_a_ruleset              = Select a ruleset
 tournaments.admin.select_a_ruleset              = Select a ruleset
 tournaments.admin.set_time_constraints          = Set time constraints
 tournaments.admin.set_time_constraints          = Set time constraints
+tournaments.admin.title                         = Tournaments management
 tournaments.registration_closes                 = Set registration closing time
 tournaments.registration_closes                 = Set registration closing time
 tournaments.registration_opens                  = Set registration opening time
 tournaments.registration_opens                  = Set registration opening time
 tournaments.ruleset_description                 = Ruleset description
 tournaments.ruleset_description                 = Ruleset description

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

@@ -965,10 +965,21 @@ topnavi.usermgmt     = K\u00E4ytt\u00E4j\u00E4t
 topnavi.userplaces   = Konepaikat
 topnavi.userplaces   = Konepaikat
 topnavi.usershop     = Kauppa
 topnavi.usershop     = Kauppa
 
 
+tournament.create                               = Luo turnaus
+tournament.edit                                 = Muokkaa turnausta
+tournament.game                                 = Peli
+tournament.name                                 = Turnauksen nimi
+tournament.playerspermatch_slash_teamsize       = Pelaajat / tiimin koko
+tournament.rules                                = S\u00E4\u00E4nn\u00F6t
+tournament.status                               = Tilanne
+tournament.type                                 = Tyyppi
+
+tournaments.active_tournaments                  = Aktiiviset turnaukset
 tournaments.admin.begin_time_constraints        = Turnauksen aloitusaika
 tournaments.admin.begin_time_constraints        = Turnauksen aloitusaika
 tournaments.admin.create_a_game                 = Luo peli
 tournaments.admin.create_a_game                 = Luo peli
 tournaments.admin.create_new_ruleset            = Luo uusi s\u00E4\u00E4nn\u00F6st\u00F6
 tournaments.admin.create_new_ruleset            = Luo uusi s\u00E4\u00E4nn\u00F6st\u00F6
 tournaments.admin.create_tournament             = Luo turnaus
 tournaments.admin.create_tournament             = Luo turnaus
+tournaments.admin.description                   = Hallinnoi turnauksia
 tournaments.admin.game_description              = Pelin kuvaus
 tournaments.admin.game_description              = Pelin kuvaus
 tournaments.admin.game_name                     = Pelin nimi
 tournaments.admin.game_name                     = Pelin nimi
 tournaments.admin.registration_time_constraints = Rekister\u00F6itymisaika
 tournaments.admin.registration_time_constraints = Rekister\u00F6itymisaika
@@ -976,6 +987,7 @@ tournaments.admin.rules                         = S\u00E4\u00E4nn\u00F6t
 tournaments.admin.select_a_game                 = Valitse peli
 tournaments.admin.select_a_game                 = Valitse peli
 tournaments.admin.select_a_ruleset              = Valitse s\u00E4\u00E4nn\u00F6st\u00F6
 tournaments.admin.select_a_ruleset              = Valitse s\u00E4\u00E4nn\u00F6st\u00F6
 tournaments.admin.set_time_constraints          = Aseta aikarajat
 tournaments.admin.set_time_constraints          = Aseta aikarajat
+tournaments.admin.title                         = Turnauksien hallinnointi
 tournaments.registration_closes                 = Rekister\u00F6itymisen sulkeutumisaika
 tournaments.registration_closes                 = Rekister\u00F6itymisen sulkeutumisaika
 tournaments.registration_opens                  = Rekister\u00F6itymisen aukeamisaika
 tournaments.registration_opens                  = Rekister\u00F6itymisen aukeamisaika
 tournaments.ruleset_description                 = S\u00E4\u00E4nn\u00F6st\u00F6n kuvaus
 tournaments.ruleset_description                 = S\u00E4\u00E4nn\u00F6st\u00F6n kuvaus