Merge APP_V2/main: Combine quality updates with league features

- Merged remote changes: Liga krog3 and league state management
- Resolved merge conflicts in locale files and templates
- Kept local v1.0.1 version and styling improvements
- Added league combine functionality from remote
- Preserved new league_state.json and tournament_results.json
- Integrated i18n improvements

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>

tv_app.py

@@ -1087,7 +1087,21 @@ def results_display():
                                  translations=get_translations(),
                                  current_language=get_current_language())
     
-    # Priority 1.5: Check if current results are from a finished league (even if league state was archived)
+    # Priority 1.5: Check if results contain league_data (from league preview/combiner)
+    elif results and results.get('league_data'):
+        league_data = results.get('league_data')
+        calculate_league_final_scores(league_data)
+        participants = get_league_final_rankings(league_data)
+
+        return render_template('league_scoreboard_display.html',
+                             league=league_data,
+                             participants=participants,
+                             results=None,
+                             preview_mode=True,
+                             translations=get_translations(),
+                             current_language=get_current_language())
+
+    # Priority 1.6: Check if current results are from a finished league (even if league state was archived)
     elif results and results.get('league_tournament_number'):
         # This is a league tournament result, but league state was archived
         # Try to find the archived league data
@@ -1580,6 +1594,8 @@ def finish_tournament():
                         'participated': False,
                         'joker': True
                     })
+                    # Mark joker as used for this player
+                    participant['joker_used'] = True
             
             # Calculate total shots correctly for any tournament type
             tournament_type = results.get('tournament_type', '20_targets')