Merge branch 'master' into ai

* master:
  zh "中文" translation #2712. Author: BB9z@myopera.com.
  nb "Norsk bokmål" translation #2710. Author: Pastis.
  ro "Română" translation #2709. Author: adiprenne.
  only registered players can write in forum
This commit is contained in:
Thibault Duplessis 2013-06-06 14:14:26 +02:00
commit 5e78d3d26b
4 changed files with 21 additions and 2 deletions

View file

@ -44,11 +44,14 @@ blackLeftTheGame=Svart forlot partiet
shareThisUrlToLetSpectatorsSeeTheGame=Del denne lenken for å få andre til å følge dette spillet
youAreViewingThisGameAsASpectator=Du observerer dette partiet
replayAndAnalyse=Spill igjen og analysér
computerAnalysisInProgress=Datamaskinanalyse pågår
theComputerAnalysisYouRequestedIsNowAvailable=Datamaskin analysen du etterspurte er nå tilgjengelig
theComputerAnalysisHasFailed=Datamaskin analysen gikk feil
viewTheComputerAnalysis=Se datamaskin analysen
requestAComputerAnalysis=Be om datamaskinanalyse
blunders=Blundere
mistakes=Feil
inaccuracies=Unøyaktigheter
viewGameStats=Vis spillstatistikk
flipBoard=Snu brettet
threefoldRepetition=Trekkgjentagelse
@ -188,6 +191,7 @@ clickOnTheBoardToMakeYourMove=Klikk på brettet for å gjøre en bevegelse, og b
notACheckmate=Ikke en sjakkmatt
colorPlaysCheckmateInOne=%s spiller; sjakkmatt i en
retry=Prøv igjen
reconnecting=Gjennopretter forbindelsen
onlineFriends=Online venner
noFriendsOnline=Ingen venner online
findFriends=Finn venner
@ -205,3 +209,5 @@ nbFollowing=%s følger
profile=Profil
more=Mer
memberSince=Ble registrert
lastLogin=Forrige login
challengeToPlay=Utfordre til å spille

View file

@ -210,3 +210,4 @@ profile=Profil
more=mai mult
memberSince=Membru din
lastLogin=Ultima logare
challengeToPlay=Provoaca la joc

View file

@ -44,6 +44,10 @@ blackLeftTheGame=黑色弃局
shareThisUrlToLetSpectatorsSeeTheGame=分享这个网址,让观众看到比赛
youAreViewingThisGameAsASpectator=你在观看这盘棋如旁观者
replayAndAnalyse=重放和分析
computerAnalysisInProgress=AI思考中
theComputerAnalysisHasFailed=AI分析失败
viewTheComputerAnalysis=查看AI分析结果
requestAComputerAnalysis=请求AI分析
viewGameStats=查看游戏状态
flipBoard=翻转棋板
threefoldRepetition=三回重复
@ -64,6 +68,7 @@ viewInFullSize=查看全尺寸
logOut=登出
signIn=登录
newToLichess=新来的吗
youNeedAnAccountToDoThat=你需要先登入帐号
signUp=注册
people=人们
games=棋
@ -112,8 +117,10 @@ chatRoom=聊天室
spectatorRoom=观众室
composeMessage=编写信息
sentMessages=发送信息
noNewMessages=没有新消息
subject=话题
recipient=收件人
send=发送
incrementInSeconds=增加秒数
freeOnlineChess=免费的在线国际象棋
spectators=观众
@ -138,6 +145,7 @@ takebackPropositionCanceled=取消悔棋
yourOpponentProposesATakeback=对手要求悔棋
bookmarkThisGame=标记这局比赛
toggleBackground=开启/关闭背景颜色
search=搜索
advancedSearch=高级搜索
tournament=比赛
tournamentPoints=比赛成績
@ -170,8 +178,12 @@ fromPosition=由此盘面
continueFromHere=到此盘面
importGame=輸入遊戲
nbImportedGames=%s 已輸入的遊戲
retry=重试
reconnecting=连接中
onlineFriends=朋友
noFriendsOnline=没有好友在线
findFriends=找朋友
block=拉黑
profile=资料
more=更多
lastLogin=最后登入

View file

@ -17,13 +17,13 @@ trait Granter {
true)
def isGrantedWrite(categSlug: String)(implicit ctx: Context): Fu[Boolean] =
categSlug match {
fuccess(ctx.isAuth) >>& (categSlug match {
case StaffSlug
fuccess(ctx.me exists Master(Permission.StaffForum))
case TeamSlugPattern(teamId)
ctx.me.??(me userBelongsToTeam(teamId, me.id))
case _ fuccess(true)
}
})
def isGrantedMod(categSlug: String)(implicit ctx: Context): Fu[Boolean] =
categSlug match {