Merge remote-tracking branch 'upstream/main' into public-achivements-ui

# Conflicts:
#	src/client/AccountModal.ts

resources/lang/en.json

@@ -27,7 +27,22 @@
     "click_to_copy": "Click to copy",
     "enabled": "Enabled",
     "disabled": "Disabled",
-    "map_default": "Map default"
+    "map_default": "Map default",
+    "month_jan": "January",
+    "month_feb": "February",
+    "month_mar": "March",
+    "month_apr": "April",
+    "month_may": "May",
+    "month_jun": "June",
+    "month_jul": "July",
+    "month_aug": "August",
+    "month_sep": "September",
+    "month_oct": "October",
+    "month_nov": "November",
+    "month_dec": "December",
+    "duration_hour_short": "h",
+    "duration_minute_short": "min",
+    "duration_second_short": "s"
   },
   "main": {
     "title": "OpenFront (ALPHA)",
@@ -285,7 +300,6 @@
     "no_pending_applications": "No pending applications.",
     "applied": "Applied",
     "cancel_request": "Cancel",
-    "statistics": "Statistics",
     "stats_total": "Total",
     "stats_ffa": "FFA",
     "stats_team": "Teams",
@@ -340,7 +354,43 @@
     "error_rate_limited_generic": "Please wait before joining another clan",
     "error_network": "Network error",
     "error_failed": "Action failed",
-    "error_loading": "Failed to load"
+    "error_loading": "Failed to load",
+    "tab_overview": "Overview",
+    "tab_members": "Members",
+    "tab_game_history": "Game History",
+    "members_visible_to_members": "Member list is visible to clan members only.",
+    "history_empty": "No games played yet.",
+    "history_unavailable": "Game history is unavailable.",
+    "history_members_only": "Game history is visible to clan members only.",
+    "history_watch_replay": "Watch Replay",
+    "history_result_victory": "Victory!",
+    "history_result_defeat": "Defeat",
+    "history_result_partial": "{wins} / {total} Won",
+    "history_clan_winners": "Clan Member Winners",
+    "history_clan_members": "Clan Members",
+    "history_filter_all": "All",
+    "history_filter_hvn": "HvN",
+    "history_filter_ranked": "Ranked",
+    "history_game_type": "Game Type",
+    "history_type_ffa": "FFA",
+    "history_type_team": "Team",
+    "history_type_hvn": "Humans vs Nations",
+    "history_type_duos": "Duos",
+    "history_type_trios": "Trios",
+    "history_type_quads": "Quads",
+    "history_type_n_teams": "{count, plural, one {# Team} other {# Teams}}",
+    "history_type_ranked": "Ranked {ranked}",
+    "history_map": "Map",
+    "history_clan_players": "Clan players",
+    "history_clan_players_value": "{clanCount} / {total} total",
+    "history_players": "Players",
+    "history_duration": "Duration",
+    "history_game_id": "Game ID",
+    "history_today_at": "Today at {time}",
+    "history_yesterday": "Yesterday",
+    "history_today": "Today",
+    "history_load_more_failed": "Couldn't load more games.",
+    "history_end_of_history": "End of history."
   },
   "account_modal": {
     "title": "Account",
@@ -386,7 +436,43 @@
     "clear_session": "Clear Session",
     "failed_to_send_recovery_email": "Failed to send recovery email",
     "enter_email_address": "Please enter an email address",
-    "public_player_id": "Public Player ID:"
+    "public_player_id": "Public Player ID:",
+    "tab_account": "Account",
+    "tab_stats": "Stats",
+    "tab_games": "Games",
+    "tab_friends": "Friends",
+    "no_stats": "No stats available yet. Play some games to start tracking.",
+    "no_games": "No games played yet."
+  },
+  "friends": {
+    "team_info": "Friends are placed on the same team.",
+    "add_friend": "Add Friend",
+    "public_id_placeholder": "Enter their public player ID",
+    "send_request": "Send Request",
+    "pending_requests": "Pending Requests",
+    "incoming": "Incoming",
+    "outgoing": "Outgoing",
+    "accept": "Accept",
+    "deny": "Deny",
+    "withdraw": "Withdraw",
+    "your_friends": "Your Friends",
+    "no_friends": "You haven't added any friends yet.",
+    "friends_since": "Friends since {date}",
+    "remove": "Remove",
+    "load_more": "Load More",
+    "confirm_remove": "Remove {publicId} from your friends?",
+    "request_sent": "Friend request sent",
+    "request_auto_accepted": "Friend request accepted — you are now friends",
+    "request_accepted": "Friend request accepted",
+    "request_denied": "Friend request denied",
+    "request_withdrawn": "Friend request withdrawn",
+    "friend_removed": "Friend removed",
+    "load_failed": "Failed to load friends",
+    "cannot_friend_self": "You can't add yourself as a friend",
+    "error_not_found": "Player not found",
+    "error_conflict": "Already friends or request already sent",
+    "error_bad_request": "Invalid request",
+    "error_generic": "Something went wrong. Please try again."
   },
   "achievements": {
     "win_no_nukes": "Win Without Nukes",
@@ -525,7 +611,9 @@
     "taiwanstrait": "Taiwan Strait",
     "danishstraits": "Danish Straits",
     "northwestpassage": "Northwest Passage",
-    "venice": "Venice"
+    "venice": "Venice",
+    "indiansubcontinent": "Indian Subcontinent",
+    "balkans": "Balkans"
   },
   "map_categories": {
     "featured": "Featured",
@@ -957,7 +1045,6 @@
     "youtube_tutorial": "Need some help?"
   },
   "leaderboard": {
-    "hide": "Hide",
     "player": "Player",
     "team": "Team",
     "owned": "Owned",
@@ -971,7 +1058,6 @@
     "show_units": "Show Units"
   },
   "events_display": {
-    "events": "Events",
     "retreating": "retreating",
     "alliance_request_status": "{name} {status} your alliance request",
     "alliance_accepted": "accepted",
@@ -984,6 +1070,8 @@
     "betrayed_you": "{name} broke their alliance with you",
     "about_to_expire": "Your alliance with {name} is about to expire!",
     "alliance_expired": "Your alliance with {name} expired",
+    "atom_bomb_detonated": "{name} - atom bomb detonated",
+    "hydrogen_bomb_detonated": "{name} - hydrogen bomb detonated",
     "attack_request": "{name} requests you attack {target}",
     "sent_emoji": "Sent {name}: {emoji}",
     "renew_alliance": "Request to renew",
@@ -999,7 +1087,6 @@
     "betrayal_debuff_ends": "{time} seconds left until betrayal debuff ends",
     "attack_cancelled_retreat": "Attack cancelled, {troops} soldiers killed during retreat",
     "received_gold_from_captured_ship": "Received {gold} gold from ship captured from {name}",
-    "received_gold_from_trade": "Received {gold} gold from trade with {name}",
     "received_gold_from_conquest": "Conquered {name}, received {gold} gold",
     "conquered_no_gold": "Conquered {name} (didn't play, no gold awarded)",
     "missile_intercepted": "Missile intercepted {unit}",