Skip to content

Commit f461665

Browse files
ornicarornicar
committed
Merge branch 'master' of github.com:lichess-org/lila
2 parents cb11069 + 86d5ac7 commit f461665

File tree

25 files changed

+157
-56
lines changed

25 files changed

+157
-56
lines changed

‎modules/puzzle/src/main/PuzzleForm.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ object PuzzleForm:
3939
)
4040

4141
val report = Form(
42-
single("reason" -> nonEmptyText(1, 200))
42+
single("reason" -> nonEmptyText(1, 2000))
4343
)
4444

4545
val themeVote = Form(

‎project/Dependencies.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ object Dependencies {
2323
val googleOAuth = "com.google.auth" % "google-auth-library-oauth2-http" % "1.31.0"
2424
val galimatias = "io.mola.galimatias" % "galimatias" % "0.2.2-NF"
2525
val scalatags = "com.lihaoyi" %% "scalatags" % "0.13.1"
26-
val lettuce = "io.lettuce" % "lettuce-core" % "6.5.2.RELEASE"
26+
val lettuce = "io.lettuce" % "lettuce-core" % "6.5.3.RELEASE"
2727
val nettyTransport =
2828
("io.netty" % s"netty-transport-native-$notifier" % "4.1.117.Final").classifier(s"$os-$arch")
2929
val lilaSearch = "org.lichess.search" %% "client" % "3.1.0"
@@ -70,7 +70,7 @@ object Dependencies {
7070
}
7171

7272
object macwire {
73-
val version = "2.6.5"
73+
val version = "2.6.6"
7474
val macros = "com.softwaremill.macwire" %% "macros" % version % "provided"
7575
val util = "com.softwaremill.macwire" %% "util" % version % "provided"
7676
val tagging = "com.softwaremill.common" %% "tagging" % "2.3.5"

‎translation/dest/broadcast/ko-KR.xml

+1
Original file line numberDiff line numberDiff line change
@@ -79,4 +79,5 @@
7979
<string name="optionalDetails">선택적 세부 정보</string>
8080
<string name="pastBroadcasts">과거 방송들</string>
8181
<string name="allBroadcastsByMonth">월별 방송들 모두 보기</string>
82+
<string name="backToLiveMove">실시간 수로 돌아가기</string>
8283
</resources>

‎translation/dest/class/ml-IN.xml

+21-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,27 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<string name="reopen">വീണ്ടും തുറക്കുക</string>
4-
<string name="removeStudent">ശിഷ്യനിന് നീക്കം ചെയുക</string>
5-
<string name="removedStudents">നീക്കം ചെയ്തിരിക്കുന്നു</string>
3+
<string name="features">സവിശേഷതകൾ</string>
4+
<string name="quicklyGenerateSafeUsernames">വിദ്യാൎത്ഥികൾക്കായി പെട്ടന്നു് സുരക്ഷിതമായ രഹസ്യവാക്കുകളും ഉപയോക്തൃപ്പേരുകളും സൃഷ്ടിക്കുക</string>
5+
<string name="reopen" comment="A button, permitting a teacher to reopen a closed class.">വീണ്ടും തുറക്കുക</string>
6+
<string name="removeStudent" comment="Removes a student from the class. Note the same text is used both for initial removal, and for full erasure.">ശിഷ്യനിന് നീക്കം ചെയുക</string>
7+
<string name="removedStudents" comment="This is in plural form. It is a heading showing all students who have been removed from the class.">നീക്കം ചെയ്തിരിക്കുന്നു</string>
8+
<string name="sendAMessage">എല്ലാ വിദ്യാൎത്ഥികളെയൊരു സന്ദേശം അയയ്ക്കുക.</string>
69
<string name="resetPassword">രഹസ്യവാക്ക് മാറ്റുക</string>
710
<string name="passwordX">രഹസ്യവാക്ക്: %s</string>
811
<string name="generateANewPassword">ശിഷ്യനിന് പുതിയ രഹസ്യവാക്ക് ഉണ്ടാക്കുക</string>
9-
<string name="createANewLichessAccount">പുതിയ Lichess അക്കൌണ്ട് ഉണ്ടാക്കുക</string>
12+
<string name="realName">ഉണ്മയായ പോരു്</string>
13+
<string name="addStudent">വിദ്യാൎത്ഥിയെ ചേൎക്കുക</string>
14+
<string name="studentCredentials">വിദ്യാൎത്ഥി: %1$s
15+
ഉപയോക്തൃപ്പേരു്: %2$s
16+
രഹസ്യവാക്കു്: %3$s</string>
17+
<string name="inviteALichessAccount">Lichess അക്കൌണ്ടിനെ ക്ഷണിക്കുക</string>
18+
<string name="createANewLichessAccount" comment="The person who would see this would always be a teacher.&#10;In this context, it is to create a new account for a student of their class.">പുതിയ Lichess അക്കൌണ്ട് ഉണ്ടാക്കുക</string>
1019
<string name="lichessUsername">Lichess ഉപയോക്തൃപേര്</string>
11-
<string name="generateANewUsername">പുതിയ ഉപയോക്തൃപേര് ഉണ്ടാക്കുക</string>
20+
<string name="generateANewUsername" comment="A button which lets teachers create a random username for students they are registering.">പുതിയ ഉപയോക്തൃപേര് ഉണ്ടാക്കുക</string>
21+
<string name="pending" comment="Appears in a table of students. Refers to invitation by a teacher to join a class, which the student has not yet responded to.">ശേഷിക്കുന്ന</string>
22+
<string name="declined" comment="Appears in a table of students. Refers to invitation by a teacher to join a class, which the student declined.">വേണ്ടവച്ചതു്</string>
23+
<string name="lastActiveDate">സജീവം</string>
24+
<string name="managed">കൈകാര്യചെയ്തവ</string>
1225
<string name="closeStudent">അക്കൗണ്ട് അടച്ചുപൂട്ടുക</string>
1326
<string name="teachers">അധ്യപകർ</string>
1427
<plurals name="nbTeachers">
@@ -23,6 +36,9 @@
2336
<string name="progress">മുന്നേറ്റം</string>
2437
<string name="overDays">ദിവസങ്ങൾ തോറും</string>
2538
<string name="variantXOverLastY">%1$s %2$s വഴിനീളെ</string>
39+
<string name="winrate">വിജയനിരക്കു്</string>
40+
<string name="na">ലഭ്യമല്ല</string>
41+
<string name="overview">അവലോകനം</string>
2642
<string name="news">വാർത്ത</string>
2743
<string name="invite">ക്ഷണിക്കുക</string>
2844
</resources>

‎translation/dest/dgt/la-VA.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<resources></resources>
2+
<resources>
3+
<string name="dgtBoard">Scaccarium DGT</string>
4+
</resources>

‎translation/dest/emails/so-SO.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<string name="emailConfirm_subject">Hubi akoonkaaga lichess.org, %s</string>
4-
<string name="emailConfirm_click" comment="emailConfirm_click&#10;&#10;Part of the confirmation email upon registering for a Lichess account.&#10;&#10;The unique reset link is presented just after this string.">Taabo mareegtan hoose si aad u furtid akoonkaaga Lichess:</string>
4+
<string name="emailConfirm_click" comment="emailConfirm_click&#10;&#10;Part of the confirmation email upon registering for a Lichess account.&#10;&#10;The unique reset link is presented just after this string.">Taabo dabarkan hoose si aad u furtid akoonkaaga Lichess:</string>
55
<string name="emailConfirm_ignore">Haddii aanad iska diwaan-gelin Lichess uma baahnid farriintan.</string>
66
<string name="passwordReset_subject">Cusboonaysii furahaaga lichess.org, %s</string>
77
<string name="passwordReset_intro">Wuu na soo gaadhay codsigii cusboonaysiinta furaha akoonkaagu.</string>
8-
<string name="passwordReset_clickOrIgnore">Haddii uu codsigani adiga kaa yimid, riix mareegtan hoose. Haddii kale, iska dhaaf farriintan.</string>
8+
<string name="passwordReset_clickOrIgnore">Haddii uu codsigani adiga kaa yimid, riix dabarkan hoose. Haddii kale, iska dhaaf farriintan.</string>
99
<string name="emailChange_subject">Hubi cinwaankaaga cusub, %s</string>
1010
<string name="emailChange_intro">Waxaad codsatay beddelidda cinwaankaaga.</string>
1111
<string name="emailChange_click">Si aad u caddaysid in aad cinwaankan leedahay, fadlan riix mareegtan hoose:</string>

‎translation/dest/onboarding/so-SO.xml

+2
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,6 @@
55
<string name="thisIsYourProfilePage">Halkani waa boggaagii.</string>
66
<string name="learnChessRules">Baro sharciyada shataranjiga/chess</string>
77
<string name="improveWithChessTacticsPuzzles">Horumari xirfadahaaga shatranjiga/chess adoo xallinaya Hal-xiraale.</string>
8+
<string name="playOpponentsFromAroundTheWorld">La ciyaar ciyaaryahannada adduunka oo dhan.</string>
9+
<string name="exploreTheSiteAndHaveFun">Sahami websaydka oo ku baashaal :)</string>
810
</resources>

‎translation/dest/patron/la-VA.xml

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<resources></resources>
2+
<resources>
3+
<string name="donate">Sustine</string>
4+
<string name="lichessPatron">Patronus Lichess</string>
5+
</resources>

‎translation/dest/puzzle/la-VA.xml

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<string name="puzzles">Exercitii</string>
4-
<string name="puzzleId">Problema %s</string>
3+
<string name="puzzles">Compositiones</string>
4+
<string name="mates">Matta</string>
5+
<string name="origin">Origo</string>
6+
<string name="puzzleId">Compositio %s</string>
7+
<string name="puzzleOfTheDay">Compositio cotidiana</string>
8+
<string name="dailyPuzzle">Compositio Cotidiana</string>
59
<string name="goodMove">Bonum spatium</string>
610
<string name="bestMove">Optimum spatium!</string>
711
<string name="byOpenings">Initiis</string>
812
<string name="puzzlesByOpenings">Problemae Initiis</string>
913
<string name="hidden">conditus</string>
14+
<string name="normal">Normalis</string>
1015
<string name="easier">Facilior</string>
1116
<string name="easiest">Facillimus</string>
1217
<string name="harder">Difficilior</string>

‎translation/dest/puzzleTheme/ko-KR.xml

+1
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
<string name="interferenceDescription">상대의 두 기물 사이에 기물을 집어넣어 그 기물들을 지켜지지 않게 만듭니다. 두 룩 사이의 나이트처럼요.</string>
5858
<string name="intermezzo">사잇수</string>
5959
<string name="intermezzoDescription">예상되는 플레이를 하는 대신, 먼저 상대가 즉시 해결해야 하는 또 다른 위협을 끼워 넣습니다. \"Zwischenzug\"나 \"In between\"이라고도 합니다.</string>
60+
<string name="killBoxMate">킬 박스 체크메이트</string>
6061
<string name="killBoxMateDescription">킹 옆에서는 룩이 체크를 넣고, 퀸이 그 룩을 지켜주면서 킹의 도주로를 차단하는 체크메이트 패턴입니다. 룩과 퀸이 3 x 3 \"킬 박스\" 안에서 킹을 공격합니다.</string>
6162
<string name="knightEndgame">나이트 엔딩</string>
6263
<string name="knightEndgameDescription">나이트와 폰만 있는 엔드게임</string>

‎translation/dest/settings/ko-KR.xml

+2
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,7 @@
44
<string name="closeAccount">계정 폐쇄</string>
55
<string name="managedAccountCannotBeClosed">당신의 계정은 관리되고 있으며, 폐쇄될 수 없습니다.</string>
66
<string name="cantOpenSimilarAccount">대소문자가 다르더라도, 똑같은 이름으로 계정을 다시 열 수 없습니다.</string>
7+
<string name="cancelKeepAccount">취소하고 계정 지키기</string>
8+
<string name="closeAccountAreYouSure">계정을 정말로 폐쇄하시겠습니까?</string>
79
<string name="thisAccountIsClosed">계정이 폐쇄되었습니다.</string>
810
</resources>

‎translation/dest/site/be-BY.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -131,15 +131,15 @@
131131
<string name="inaccuracy">Недакладнасць</string>
132132
<plurals name="nbBlunders">
133133
<item quantity="one">%s позех</item>
134-
<item quantity="few">%s позеха</item>
134+
<item quantity="few">%s зяўкоў</item>
135135
<item quantity="many">%s позехаў</item>
136136
<item quantity="other">%s позехаў</item>
137137
</plurals>
138138
<plurals name="numberBlunders">
139-
<item quantity="one">%s Позех</item>
140-
<item quantity="few">%s Позеха</item>
141-
<item quantity="many">%s Позехаў</item>
142-
<item quantity="other">%s Позехаў</item>
139+
<item quantity="one">%s Зявок</item>
140+
<item quantity="few">%s Зяўкоў</item>
141+
<item quantity="many">%s Зяўкоў</item>
142+
<item quantity="other">%s Зяўкоў</item>
143143
</plurals>
144144
<plurals name="nbMistakes">
145145
<item quantity="one">%s памылка</item>
@@ -1024,7 +1024,7 @@
10241024
<string name="analysisOptions">Параметры аналізу</string>
10251025
<string name="focusChat">Сфакусавацца на чаце</string>
10261026
<string name="showHelpDialog">Паказаць чат дапамогі</string>
1027-
<string name="reopenYourAccount">Пераадкрыць уліковы запіс</string>
1027+
<string name="reopenYourAccount" comment="Appears on the page where players can reopen their closed account - https://lichess.org/account/reopen (you can only see this when you logged out).">Пераадкрыць уліковы запіс</string>
10281028
<string name="emailAssociatedToaccount">Адрас электроннай пошты, звязаны з уліковым запісам</string>
10291029
<string name="sentEmailWithLink">Мы адправілі вам электронны ліст са спасылка.</string>
10301030
<string name="tournamentEntryCode">Код далучэння да турніру</string>

‎translation/dest/site/id-ID.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@
6969
<string name="promoteVariation">Variasi promosi</string>
7070
<string name="makeMainLine">Buat jalur utama</string>
7171
<string name="deleteFromHere">Hapus dari sini</string>
72+
<string name="collapseVariations">Tutup variasi</string>
73+
<string name="expandVariations">Buka variasi</string>
7274
<string name="forceVariation">Paksakan variasi</string>
7375
<string name="copyVariationPgn">Salin Variasi dalam PGN</string>
7476
<string name="move">Langkah</string>
@@ -914,7 +916,7 @@ Kosongkan untuk memulai permainan dari posisi awal yang normal.</string>
914916
<string name="analysisOptions">Setelan analisa</string>
915917
<string name="focusChat">Fokus pada kotak obroloan</string>
916918
<string name="showHelpDialog">Tampilkan halaman bantuan ini</string>
917-
<string name="reopenYourAccount">Buka kembali akun Anda</string>
919+
<string name="reopenYourAccount" comment="Appears on the page where players can reopen their closed account - https://lichess.org/account/reopen (you can only see this when you logged out).">Buka kembali akun Anda</string>
918920
<string name="emailAssociatedToaccount">Alamat e-mail yang terkait dengan akun ini</string>
919921
<string name="sentEmailWithLink">Kami telah mengirimkan Anda email dengan tautan.</string>
920922
<string name="tournamentEntryCode">Kode masuk turnamen</string>

‎translation/dest/site/ko-KR.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -743,6 +743,7 @@
743743
<string name="onlineAndOfflinePlay">온라인/오프라인 게임 모두 지원</string>
744744
<string name="viewTheSolution">정답 보기</string>
745745
<string name="followAndChallengeFriends">친구를 팔로우하고 도전하기</string>
746+
<string name="noChallenges">도전 없음.</string>
746747
<plurals name="availableInNbLanguages">
747748
<item quantity="other">%s개의 언어를 지원합니다!</item>
748749
</plurals>
@@ -937,7 +938,8 @@ FEN 포지션을 생성하기 위해 %s를 사용할 수 있습니다.
937938
<string name="analysisOptions">분석 옵션</string>
938939
<string name="focusChat">채팅에 포커스 주기</string>
939940
<string name="showHelpDialog">이 도움말 보기</string>
940-
<string name="reopenYourAccount">계정 재활성화</string>
941+
<string name="reopenYourAccount" comment="Appears on the page where players can reopen their closed account - https://lichess.org/account/reopen (you can only see this when you logged out).">계정 재활성화</string>
942+
<string name="reopenYourAccountDescription" comment="Appears on the page where players can reopen their closed account - https://lichess.org/account/reopen (you can only see this when you logged out).">계정을 폐쇄한 후 마음이 바뀌었다면, 계정을 다시 활성화할 수 있는 기회가 한 번 있습니다.</string>
941943
<string name="emailAssociatedToaccount">계정에 등록된 이메일 주소</string>
942944
<string name="sentEmailWithLink">링크가 포함된 이메일을 보냈습니다.</string>
943945
<string name="tournamentEntryCode">토너먼트 입장 코드</string>

0 commit comments

Comments
 (0)