Fix conflicts with upstream

lichess-org · Dec 12, 2024 · 0b99e6b · 0b99e6b
2 parents 56075dc + 0b8c1d9
commit 0b99e6b
Show file tree

Hide file tree

Showing 127 changed files with 3,720 additions and 2,898 deletions.
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
@@ -1,7 +1,6 @@
 {
   "mobileAllGames": "All games",
   "mobileAreYouSure": "Are you sure?",
-  "mobileBlindfoldMode": "Blindfold",
   "mobileCancelTakebackOffer": "Cancel takeback offer",
   "mobileClearButton": "Clear",
   "mobileCorrespondenceClearSavedMove": "Clear saved move",
@@ -365,7 +364,6 @@
   "broadcastTimezone": "Time zone",
   "broadcastFideRatingCategory": "FIDE rating category",
   "broadcastOptionalDetails": "Optional details",
-  "broadcastUpcomingBroadcasts": "Upcoming broadcasts",
   "broadcastPastBroadcasts": "Past broadcasts",
   "broadcastAllBroadcastsByMonth": "View all broadcasts by month",
   "broadcastNbBroadcasts": "{count, plural, =1{{count} broadcast} other{{count} broadcasts}}",
@@ -616,6 +614,7 @@
   "preferencesNotifyWeb": "Browser",
   "preferencesNotifyDevice": "Device",
   "preferencesBellNotificationSound": "Bell notification sound",
+  "preferencesBlindfold": "Blindfold",
   "puzzlePuzzles": "Puzzles",
   "puzzlePuzzleThemes": "Puzzle Themes",
   "puzzleRecommended": "Recommended",

diff --git a/lib/l10n/l10n.dart b/lib/l10n/l10n.dart
@@ -216,12 +216,6 @@ abstract class AppLocalizations {
   /// **'Are you sure?'**
   String get mobileAreYouSure;
 
-  /// No description provided for @mobileBlindfoldMode.
-  ///
-  /// In en, this message translates to:
-  /// **'Blindfold'**
-  String get mobileBlindfoldMode;
-
   /// No description provided for @mobileCancelTakebackOffer.
   ///
   /// In en, this message translates to:
@@ -1044,12 +1038,6 @@ abstract class AppLocalizations {
   /// **'Optional details'**
   String get broadcastOptionalDetails;
 
-  /// No description provided for @broadcastUpcomingBroadcasts.
-  ///
-  /// In en, this message translates to:
-  /// **'Upcoming broadcasts'**
-  String get broadcastUpcomingBroadcasts;
-
   /// No description provided for @broadcastPastBroadcasts.
   ///
   /// In en, this message translates to:
@@ -1806,6 +1794,12 @@ abstract class AppLocalizations {
   /// **'Bell notification sound'**
   String get preferencesBellNotificationSound;
 
+  /// No description provided for @preferencesBlindfold.
+  ///
+  /// In en, this message translates to:
+  /// **'Blindfold'**
+  String get preferencesBlindfold;
+
   /// No description provided for @puzzlePuzzles.
   ///
   /// In en, this message translates to:

diff --git a/lib/l10n/l10n_af.dart b/lib/l10n/l10n_af.dart
@@ -14,9 +14,6 @@ class AppLocalizationsAf extends AppLocalizations {
   @override
   String get mobileAreYouSure => 'Is jy seker?';
 
-  @override
-  String get mobileBlindfoldMode => 'Geblinddoek';
-
   @override
   String get mobileCancelTakebackOffer => 'Cancel takeback offer';
 
@@ -592,9 +589,6 @@ class AppLocalizationsAf extends AppLocalizations {
   @override
   String get broadcastOptionalDetails => 'Optional details';
 
-  @override
-  String get broadcastUpcomingBroadcasts => 'Upcoming broadcasts';
-
   @override
   String get broadcastPastBroadcasts => 'Past broadcasts';
 
@@ -1011,6 +1005,9 @@ class AppLocalizationsAf extends AppLocalizations {
   @override
   String get preferencesBellNotificationSound => 'Klokkie kennisgewing klank';
 
+  @override
+  String get preferencesBlindfold => 'Blinddoek';
+
   @override
   String get puzzlePuzzles => 'Raaisels';
 

diff --git a/lib/l10n/l10n_ar.dart b/lib/l10n/l10n_ar.dart
@@ -14,9 +14,6 @@ class AppLocalizationsAr extends AppLocalizations {
   @override
   String get mobileAreYouSure => 'هل أنت واثق؟';
 
-  @override
-  String get mobileBlindfoldMode => 'معصوب العينين';
-
   @override
   String get mobileCancelTakebackOffer => 'إلغاء عرض الاسترداد';
 
@@ -660,9 +657,6 @@ class AppLocalizationsAr extends AppLocalizations {
   @override
   String get broadcastOptionalDetails => 'Optional details';
 
-  @override
-  String get broadcastUpcomingBroadcasts => 'Upcoming broadcasts';
-
   @override
   String get broadcastPastBroadcasts => 'Past broadcasts';
 
@@ -1083,6 +1077,9 @@ class AppLocalizationsAr extends AppLocalizations {
   @override
   String get preferencesBellNotificationSound => 'صوت التنبيه';
 
+  @override
+  String get preferencesBlindfold => 'معصوب العينين';
+
   @override
   String get puzzlePuzzles => 'الألغاز';
 

diff --git a/lib/l10n/l10n_az.dart b/lib/l10n/l10n_az.dart
@@ -14,9 +14,6 @@ class AppLocalizationsAz extends AppLocalizations {
   @override
   String get mobileAreYouSure => 'Are you sure?';
 
-  @override
-  String get mobileBlindfoldMode => 'Blindfold';
-
   @override
   String get mobileCancelTakebackOffer => 'Cancel takeback offer';
 
@@ -592,9 +589,6 @@ class AppLocalizationsAz extends AppLocalizations {
   @override
   String get broadcastOptionalDetails => 'Optional details';
 
-  @override
-  String get broadcastUpcomingBroadcasts => 'Upcoming broadcasts';
-
   @override
   String get broadcastPastBroadcasts => 'Past broadcasts';
 
@@ -1011,6 +1005,9 @@ class AppLocalizationsAz extends AppLocalizations {
   @override
   String get preferencesBellNotificationSound => 'Bell notification sound';
 
+  @override
+  String get preferencesBlindfold => 'Blindfold';
+
   @override
   String get puzzlePuzzles => 'Tapmacalar';
 

diff --git a/lib/l10n/l10n_be.dart b/lib/l10n/l10n_be.dart
@@ -14,9 +14,6 @@ class AppLocalizationsBe extends AppLocalizations {
   @override
   String get mobileAreYouSure => 'Вы ўпэўнены?';
 
-  @override
-  String get mobileBlindfoldMode => 'Blindfold';
-
   @override
   String get mobileCancelTakebackOffer => 'Cancel takeback offer';
 
@@ -626,9 +623,6 @@ class AppLocalizationsBe extends AppLocalizations {
   @override
   String get broadcastOptionalDetails => 'Optional details';
 
-  @override
-  String get broadcastUpcomingBroadcasts => 'Upcoming broadcasts';
-
   @override
   String get broadcastPastBroadcasts => 'Past broadcasts';
 
@@ -1045,6 +1039,9 @@ class AppLocalizationsBe extends AppLocalizations {
   @override
   String get preferencesBellNotificationSound => 'Гукавое паведамленне';
 
+  @override
+  String get preferencesBlindfold => 'Blindfold';
+
   @override
   String get puzzlePuzzles => 'Задачы';
 
@@ -1908,7 +1905,7 @@ class AppLocalizationsBe extends AppLocalizations {
   String get usingServerAnalysis => 'Выкарыстоўваецца серверны аналіз';
 
   @override
-  String get loadingEngine => 'Загружаем шахматную праграму...';
+  String get loadingEngine => 'Загружаем рухавічок...';
 
   @override
   String get calculatingMoves => 'Пралічваем хады...';

diff --git a/lib/l10n/l10n_bg.dart b/lib/l10n/l10n_bg.dart
@@ -14,9 +14,6 @@ class AppLocalizationsBg extends AppLocalizations {
   @override
   String get mobileAreYouSure => 'Сигурни ли сте?';
 
-  @override
-  String get mobileBlindfoldMode => 'Blindfold';
-
   @override
   String get mobileCancelTakebackOffer => 'Cancel takeback offer';
 
@@ -496,16 +493,16 @@ class AppLocalizationsBg extends AppLocalizations {
   String get broadcastRecentTournaments => 'Recent tournaments';
 
   @override
-  String get broadcastOpenLichess => 'Open in Lichess';
+  String get broadcastOpenLichess => 'Отвори в Lichess';
 
   @override
-  String get broadcastTeams => 'Teams';
+  String get broadcastTeams => 'Отбори';
 
   @override
-  String get broadcastBoards => 'Boards';
+  String get broadcastBoards => 'Дъски';
 
   @override
-  String get broadcastOverview => 'Overview';
+  String get broadcastOverview => 'Общ преглед';
 
   @override
   String get broadcastSubscribeTitle => 'Subscribe to be notified when each round starts. You can toggle bell or push notifications for broadcasts in your account preferences.';
@@ -533,10 +530,10 @@ class AppLocalizationsBg extends AppLocalizations {
   String get broadcastNotYetStarted => 'The broadcast has not yet started.';
 
   @override
-  String get broadcastOfficialWebsite => 'Official website';
+  String get broadcastOfficialWebsite => 'Официален уебсайт';
 
   @override
-  String get broadcastStandings => 'Standings';
+  String get broadcastStandings => 'Класиране';
 
   @override
   String get broadcastOfficialStandings => 'Official Standings';
@@ -566,10 +563,10 @@ class AppLocalizationsBg extends AppLocalizations {
   String get broadcastRatingDiff => 'Rating diff';
 
   @override
-  String get broadcastGamesThisTournament => 'Games in this tournament';
+  String get broadcastGamesThisTournament => 'Игри в този турнир';
 
   @override
-  String get broadcastScore => 'Score';
+  String get broadcastScore => 'Резултат';
 
   @override
   String get broadcastAllTeams => 'All teams';
@@ -592,9 +589,6 @@ class AppLocalizationsBg extends AppLocalizations {
   @override
   String get broadcastOptionalDetails => 'Optional details';
 
-  @override
-  String get broadcastUpcomingBroadcasts => 'Upcoming broadcasts';
-
   @override
   String get broadcastPastBroadcasts => 'Past broadcasts';
 
@@ -1011,6 +1005,9 @@ class AppLocalizationsBg extends AppLocalizations {
   @override
   String get preferencesBellNotificationSound => 'Мелодия за известия';
 
+  @override
+  String get preferencesBlindfold => 'Blindfold';
+
   @override
   String get puzzlePuzzles => 'Задачи';
 
@@ -4339,7 +4336,7 @@ class AppLocalizationsBg extends AppLocalizations {
   String get nothingToSeeHere => 'Nothing to see here at the moment.';
 
   @override
-  String get stats => 'Stats';
+  String get stats => 'Статистика';
 
   @override
   String opponentLeftCounter(int count) {

diff --git a/lib/l10n/l10n_bn.dart b/lib/l10n/l10n_bn.dart
@@ -14,9 +14,6 @@ class AppLocalizationsBn extends AppLocalizations {
   @override
   String get mobileAreYouSure => 'Are you sure?';
 
-  @override
-  String get mobileBlindfoldMode => 'Blindfold';
-
   @override
   String get mobileCancelTakebackOffer => 'Cancel takeback offer';
 
@@ -592,9 +589,6 @@ class AppLocalizationsBn extends AppLocalizations {
   @override
   String get broadcastOptionalDetails => 'Optional details';
 
-  @override
-  String get broadcastUpcomingBroadcasts => 'Upcoming broadcasts';
-
   @override
   String get broadcastPastBroadcasts => 'Past broadcasts';
 
@@ -1011,6 +1005,9 @@ class AppLocalizationsBn extends AppLocalizations {
   @override
   String get preferencesBellNotificationSound => 'Bell notification sound';
 
+  @override
+  String get preferencesBlindfold => 'Blindfold';
+
   @override
   String get puzzlePuzzles => 'পাজল';
 

diff --git a/lib/l10n/l10n_br.dart b/lib/l10n/l10n_br.dart
@@ -14,9 +14,6 @@ class AppLocalizationsBr extends AppLocalizations {
   @override
   String get mobileAreYouSure => 'Are you sure?';
 
-  @override
-  String get mobileBlindfoldMode => 'Blindfold';
-
   @override
   String get mobileCancelTakebackOffer => 'Cancel takeback offer';
 
@@ -643,9 +640,6 @@ class AppLocalizationsBr extends AppLocalizations {
   @override
   String get broadcastOptionalDetails => 'Optional details';
 
-  @override
-  String get broadcastUpcomingBroadcasts => 'Upcoming broadcasts';
-
   @override
   String get broadcastPastBroadcasts => 'Past broadcasts';
 
@@ -1062,6 +1056,9 @@ class AppLocalizationsBr extends AppLocalizations {
   @override
   String get preferencesBellNotificationSound => 'Klevet ar c\'hloc\'h';
 
+  @override
+  String get preferencesBlindfold => 'Blindfold';
+
   @override
   String get puzzlePuzzles => 'Poelladennoù';
 
@@ -5528,16 +5525,16 @@ class AppLocalizationsBr extends AppLocalizations {
   String get studyWhereDoYouWantToStudyThat => 'Pelec\'h ho peus c\'hoant da studiañ se?';
 
   @override
-  String get studyGoodMove => 'Good move';
+  String get studyGoodMove => 'Fiñvadenn vat';
 
   @override
-  String get studyMistake => 'Mistake';
+  String get studyMistake => 'Fazi';
 
   @override
   String get studyBrilliantMove => 'Brilliant move';
 
   @override
-  String get studyBlunder => 'Blunder';
+  String get studyBlunder => 'Bourd';
 
   @override
   String get studyInterestingMove => 'Interesting move';

diff --git a/lib/l10n/l10n_bs.dart b/lib/l10n/l10n_bs.dart
@@ -14,9 +14,6 @@ class AppLocalizationsBs extends AppLocalizations {
   @override
   String get mobileAreYouSure => 'Are you sure?';
 
-  @override
-  String get mobileBlindfoldMode => 'Blindfold';
-
   @override
   String get mobileCancelTakebackOffer => 'Cancel takeback offer';
 
@@ -609,9 +606,6 @@ class AppLocalizationsBs extends AppLocalizations {
   @override
   String get broadcastOptionalDetails => 'Optional details';
 
-  @override
-  String get broadcastUpcomingBroadcasts => 'Upcoming broadcasts';
-
   @override
   String get broadcastPastBroadcasts => 'Past broadcasts';
 
@@ -1029,6 +1023,9 @@ class AppLocalizationsBs extends AppLocalizations {
   @override
   String get preferencesBellNotificationSound => 'Zvuk obavještenja';
 
+  @override
+  String get preferencesBlindfold => 'Blindfold';
+
   @override
   String get puzzlePuzzles => 'Problemi';