Merge branch 'master' into setupAnonCookie

* master:
  Translate cancel links
  az "azərbaycan dili" translation #946. Author: bextiyar memmedzade. bextiyar memmedzade
  ca "Català" translation #943. Author: Anonymous.
  ro "Română" translation #942. Author: Andrei.
  nb "Norsk bokmål" translation #941. Author: Gul Snø.
  hr "hrvatski" translation #939. Author: Anonymous.

app/views/forum/topic/form.scala.html

@@ -18,6 +18,6 @@ title = "New forum topic") {
   @base.captcha(form("post")("move"), form("post")("gameId"), captcha)
   @errMsg(form("post"))
   <button class="submit button" type="submit">Create the topic</button>
-  <a href="@routes.ForumCateg.show(categ.slug)" style="margin-left:20px">Cancel</a>
+  <a href="@routes.ForumCateg.show(categ.slug)" style="margin-left:20px">@trans.cancel()</a>
 </form>
 }

app/views/forum/topic/show.scala.html

@@ -52,7 +52,7 @@ title = topic.name) {
       @base.captcha(form("move"), form("gameId"), captcha)
       @errMsg(form)
       <input type="submit" class="submit button" value="Reply" />
-      <a href="@routes.ForumCateg.show(categ.slug)" style="margin-left:20px">Cancel</a>
+      <a href="@routes.ForumCateg.show(categ.slug)" style="margin-left:20px">@trans.cancel()</a>
     </form>
   </div>
   }

app/views/team/edit.scala.html

@@ -26,7 +26,7 @@
       </label>
       </section>
       <button class="submit button" type="submit">Update</button>
-      <a href="@routes.Team.show(t.id)" style="margin-left:20px">Cancel</a>
+      <a href="@routes.Team.show(t.id)" style="margin-left:20px">@trans.cancel()</a>
     </form>
   </div>
 </div>

app/views/team/form.scala.html

@@ -33,7 +33,7 @@ currentTab = "form".some) {
       @base.captcha(form("move"), form("gameId"), captcha)
       @errMsg(form)
       <button class="submit button" type="submit">@trans.newTeam()</button>
-      <a href="@routes.Team.home(1)" style="margin-left:20px">Cancel</a>
+      <a href="@routes.Team.home(1)" style="margin-left:20px">@trans.cancel()</a>
     </form>
   </div>
 </div>

app/views/team/requestForm.scala.html

@@ -21,7 +21,7 @@
       @base.captcha(form("move"), form("gameId"), captcha)
       @errMsg(form)
       <button class="submit button" type="submit">@trans.joinTeam()</button>
-      <a href="@routes.Team.home(1)" style="margin-left:20px">Cancel</a>
+      <a href="@routes.Team.home(1)" style="margin-left:20px">@trans.cancel()</a>
     </form>
   </div>
 </div>

conf/messages.az

@@ -140,3 +140,7 @@ toggleBackground=Arxaplan rəngi
 advancedSearch=Mütərəqqi axtarış
 tournament=Turnir
 freeOnlineChessGamePlayChessNowInACleanInterfaceNoRegistrationNoAdsNoPluginRequiredPlayChessWithComputerFriendsOrRandomOpponents=Bu, internet şəbəkəsi üzərində pulsuz Şahmat oyunudur. İndi təmiz araüzdə şahmat oynaya bilərsiniz. Qeydiyyat gərəkli deyil. Heçbir reklam və proqram əlavəsinə ehtiyac yoxdur. Komputer, yoldaşların və ya istənilən rəqiblə oynaya bilərsiniz.
+teams=komandalar
+allTeams=butun komandalar
+newTeam=yeni komanda
+myTeams=menim komandalarim

conf/messages.ca

@@ -141,6 +141,7 @@ advancedSearch=Recerca avançada
 tournament=Torneig
 freeOnlineChessGamePlayChessNowInACleanInterfaceNoRegistrationNoAdsNoPluginRequiredPlayChessWithComputerFriendsOrRandomOpponents=Joc d'escacs gratuït online. Juga a escacs ara amb una interfície neta. No cal registrar-se, sense anuncis, no calen plugins. Juga a escacs amb l'ordinador, amics o oponents a l'atzar.
 teams=Equips
+nbMembers=%s membres
 allTeams=Tots els equips
 newTeam=Nou equip
 myTeams=Els meus equips

conf/messages.hr

@@ -154,5 +154,6 @@ joiningPolicy=Pravila priključivanja
 teamLeader=Vođa ekipe
 teamBestPlayers=Najbolji igrači ekipe
 teamRecentMembers=nedavni članovi ekipe
+averageElo=Prosječna ocjena
 location=Lokacija
 settings=Postavke

conf/messages.nb

@@ -150,3 +150,6 @@ quitTeam=Forlat laget
 anyoneCanJoin=Alle kan bli med
 aConfirmationIsRequiredToJoin=En bekreftelse kreves for å bli med.
 joiningPolicy=Regler for å bli med
+averageElo=Gjennomsnittlig ELO
+location=Sted
+settings=Instillinger

conf/messages.ro

@@ -140,3 +140,20 @@ toggleBackground=Schimbă culoarea de fundal
 advancedSearch=Căutare Avansată
 tournament=Campionat
 freeOnlineChessGamePlayChessNowInACleanInterfaceNoRegistrationNoAdsNoPluginRequiredPlayChessWithComputerFriendsOrRandomOpponents=Șah online gratuit. Joacă șah acum într-o interfață curată. Fără înregistrare, fără reclame, fără plugin-uri. Joacă șah împotriva calculatorului, prietenilor sau altor jucători aleși aleatoriu.
+teams=Echipe
+nbMembers=%s membri
+allTeams=Toate echipele
+newTeam=Echipă nouă
+myTeams=Echipele mele
+noTeamFound=Nu s-a găsit nicio echipă
+joinTeam=Intră în echipă
+quitTeam=Ieşi din echipă
+anyoneCanJoin=Oicine poate intra
+aConfirmationIsRequiredToJoin=O confirmare este necesară pentru a intra
+joiningPolicy=Politică de intrare
+teamLeader=Lider de echipă
+teamBestPlayers=Cei mai buni jucători ai echipei
+teamRecentMembers=Cei mai recenţi membri ai echipei
+averageElo=Media ELO
+location=Locaţie
+settings=Setări