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>

locales/en.json

@@ -23,6 +23,7 @@
     "enable_selected": "Enable Selected",
     "disable_selected": "Disable Selected",
     "print": "Print",
+    "export": "Export JSON",
     "visible": "Visible",
     "date": "Date",
     "view": "View",
@@ -96,7 +97,8 @@
     "created": "Created",
     "tournaments": "Tournaments",
     "league_tournament": "League Tournament",
-    "finished": "Finished"
+    "finished": "Finished",
+    "view_current_results": "View Current Standings"
   },
   "tournament_types": {
     "4_targets": "4 Targets",
@@ -142,6 +144,33 @@
     "highest_score": "Highest Score",
     "average_final": "Average Final",
     "5_tournament_league": "5 Tournament League - Best 4 Count",
+    "combine_leagues": "Combine Leagues",
+    "combine_mode": "Combine Leagues",
+    "convert_mode": "Convert Tournaments to League",
+    "upload_league_files": "Upload League JSON Files",
+    "upload_tournament_files": "Upload Tournament JSON Files",
+    "combine_leagues_desc": "Upload multiple league JSON files to combine them into a single results table.",
+    "convert_tournaments_desc": "Upload 1-5 tournament JSON files to create a league. You can upload partial leagues as tournaments complete. Final scoring uses best 4 results when all 5 are uploaded.",
+    "click_browse": "Click to browse",
+    "drag_drop_files": "or drag and drop league JSON files here",
+    "supports_multiple": "Supports multiple file selection",
+    "clear_all": "Clear All",
+    "combine_preview": "Combine & Preview",
+    "convert_to_league": "Convert to League",
+    "valid_league": "Valid League",
+    "valid_tournament": "Valid Tournament",
+    "participants": "participants",
+    "tournaments": "tournaments",
+    "invalid_format": "Invalid file format",
+    "select_mode": "Select Mode",
+    "start_over": "Start Over",
+    "export_combined_results": "Export Combined Results",
+    "combined_league_info": "Combined League Information",
+    "uploaded_files": "Uploaded Files",
+    "remove": "Remove",
+    "type": "Type",
+    "failed_parse_json": "Failed to parse JSON",
+    "invalid_tournament_format": "Invalid tournament file format",
     "joker_used_badge": "Joker Used",
     "search_players_placeholder": "Search players by name...",
     "no_players_found": "No players found matching your search criteria.",
@@ -169,7 +198,8 @@
     "camera": "Camera",
     "tournaments": "Tournaments",
     "results.most_tens": "Most 10s",
-    "progress": "Progress"
+    "progress": "Progress",
+    "combine_leagues": "Combine Leagues"
   },
   "results": {
     "results": "Results",

locales/sl.json

@@ -23,6 +23,7 @@
     "enable_selected": "Omogoči Izbrane",
     "disable_selected": "Onemogoči Izbrane",
     "print": "Natisni",
+    "export": "Izvozi JSON",
     "visible": "Vidni",
     "date": "Datum",
     "view": "Oglej",
@@ -97,7 +98,8 @@
     "league_completed": "Liga Zaključena",
     "section_title": "Sekcija",
     "finished": "Zaključeno",
-    "targets": "Število Tarč"
+    "targets": "Število Tarč",
+    "view_current_results": "Oglej Trenutne Rezultate"
   },
   "tournament_types": {
     "4_targets": "4 Tarče",
@@ -174,7 +176,25 @@
     "camera": "Kamera",
     "tournaments": "Turnirji",
     "results.most_tens": "Največ Desetk",
-    "progress": "Stanje"
+    "progress": "Stanje",
+    "combine_leagues": "Združi Lige",
+    "combine_mode": "Združi Lige",
+    "convert_mode": "Pretvori Turnirje v Ligo",
+    "upload_league_files": "Naloži Datoteke Lig",
+    "upload_tournament_files": "Naloži Datoteke Turnirjev",
+    "combine_leagues_desc": "Naloži več datotek lig JSON, da jih združiš v eno tabelo rezultatov.",
+    "convert_tournaments_desc": "Naloži 1-5 datotek turnirjev JSON za ustvarjanje lige. Lahko naložiš delne lige ko turnirji napredujejo. Končno točkovanje uporablja najboljše 4 rezultate, ko so vseh 5 naloženih.",
+    "click_browse": "Klikni za brskanje",
+    "drag_drop_files": "ali povleci in spusti datoteke JSON lig tukaj",
+    "supports_multiple": "Podpira izbiro več datotek",
+    "combine_preview": "Združi in Predoglej",
+    "convert_to_league": "Pretvori v Ligo",
+    "valid_league": "Veljavna Liga",
+    "valid_tournament": "Veljaven Turnir",
+    "participants": "udeleženci",
+    "invalid_format": "Neveljavna oblika datoteke",
+    "select_mode": "Izberi Način",
+    "start_over": "Začni Znova"
   },
   "results": {
     "results": "Rezultati",