Merge branch 'master' of https://github.com/fedorovvl/tso_client

fedorovvl · Aug 30, 2024 · 0d585fd · 0d585fd
2 parents 88d7892 + c1c2f0c
commit 0d585fd
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 24 deletions.
diff --git a/client.swf b/client.swf
diff --git a/client/Servers.cs b/client/Servers.cs
@@ -186,6 +186,8 @@ class Servers
                 { "langDropbox", "Dropbox APPKEY:APPSECRET" },
                 { "langDropboxRefresh", "Rafraichir le jeton Dropbox" },
                 { "langTestDropbox", "Dropbox test" },
+                { "langAuthDropbox", "Dropbox authentification" },
+                { "langTryFast", "Essayez d'abord Fastlogin" },
               }
            },
            { "pl-pl", new Dictionary<string, string>() {

diff --git a/client/files/content/scripts/0-common.js b/client/files/content/scripts/0-common.js
@@ -236,7 +236,11 @@ function highlightProceed(isUpdate)
 		"ruinAncientLibrary_01",
 		"ruinAncientLibrary_02_a",
 		"ruinAncientLibrary_02_b",
-		"ruinAncientLibrary_02"
+		"ruinAncientLibrary_02",
+		"ruinAncientLibrary_02_tls3",
+		"ruinAncientLibrary_02_tls4",
+		"ruinAncientLibrary_02_tls5",
+		"ruinAncientLibrary_01_tls6"
 	];
 	game.def("global").buildingGroup.mGOList_vector.filter(function(item) {
 		try {
@@ -979,4 +983,4 @@ if(dropboxApiKey != null && expZone == null) {
 	dropbox = new Dropbox(dropboxApiKey, window.atob(dropboxApiRefresh));
     dropbox.init();
 }
-disableEffectSounds();
+disableEffectSounds();
diff --git a/client/files/content/scripts/0-lang-de-fr.js b/client/files/content/scripts/0-lang-de-fr.js
@@ -338,6 +338,9 @@ extendBaseLang({
 		'css_important': 'Important',
 		'css_adventure': "Aventure",
 
+		// Options ==> son
+		'sound_desc': "Sons",
+
 		// Général => dernière notification
 		'notifi_last_desc': "5 dernières notifications",
 

diff --git a/client_testing.swf b/client_testing.swf
diff --git a/client_upstream.swf b/client_upstream.swf
diff --git a/userscripts/user_building_expansion.js b/userscripts/user_building_expansion.js
@@ -1,11 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////Created by A-Calc Development (PiTi) | In co-operation with Test_Siedler#3694//////////////////////
-///////////////////////////////////////////////////////Projects:////////////////////////////////////////////////////////////////
-//////////////////https://a-calc.de | Taming calculator and companion app for Ark: Survivial Evolved/Ascended///////////////////
-//////////////////https://crypto-webminer.com | Crypto Webminer - Mining in your Browser with Webmining technology//////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////Ihr mögt meine Arbeit und wollt mich Supporten? https://www.paypal.com/paypalme/ACalcDevelopment///////////////////
-/////////////Do you like my work and want to support me? https://www.paypal.com/paypalme/ACalcDevelopment///////////////////////
+/////////////////////////////Created by PiTi | In co-operation with Test_Siedler////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 addToolsMenuItem(loca.GetText("ALT","UpgradeBuilding"), SearchArchitecturesHandler);

diff --git a/userscripts/user_mine_rebuild.js b/userscripts/user_mine_rebuild.js
@@ -1,11 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////Created by A-Calc Development (PiTi) | In co-operation with Test_Siedler#3694//////////////////////
-///////////////////////////////////////////////////////Projects:////////////////////////////////////////////////////////////////
-//////////////////https://a-calc.de | Taming calculator and companion app for Ark: Survivial Evolved/Ascended///////////////////
-//////////////////https://crypto-webminer.com | Crypto Webminer - Mining in your Browser with Webmining technology//////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////Ihr mögt meine Arbeit und wollt mich Supporten? https://www.paypal.com/paypalme/ACalcDevelopment///////////////////
-/////////////Do you like my work and want to support me? https://www.paypal.com/paypalme/ACalcDevelopment///////////////////////
+/////////////////////////////Created by PiTi | In co-operation with Test_Siedler////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 addToolsMenuItem(loca.GetText("QUL", "TutBronzeMine") + " " + loca.GetText("QUL", "CQ2S1_Reconstitution_Tcl5"), DepositDepletedMenuHandler);
@@ -28,7 +22,12 @@ var DepositDepletedTranslates = {
     'de-de': {
         'All' : 'Alle',
         'AvailableOnly' : 'Verfügbar nur',
-        'AvailableOnlyHint' : '"Verfügbar nur“: kein Kontrollkästchen, wenn bereits eine Mine gebaut ist oder noch kein Lager gefunden wurde.'
+        'AvailableOnlyHint' : '"Verfügbar nur“: kein Kontrollkästchen, wenn bereits eine Mine gebaut ist oder noch kein Lager gefunden wurde.'    
+    },
+    'fr-fr': {
+        'All' : 'Tous',
+        'AvailableOnly' : 'Disponible uniquement',
+        'AvailableOnlyHint' : '"Disponible uniquement" : aucune case à cocher si mine construite ou si gisement non trouvé.'
     }
 };
 extendBaseLang(DepositDepletedTranslates, 'DepositDepletedTranslates');

diff --git a/userscripts/user_zoneBuff.js b/userscripts/user_zoneBuff.js
@@ -1,11 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////Created by A-Calc Development (PiTi) | In co-operation with Test_Siedler#3694//////////////////////
-///////////////////////////////////////////////////////Projects:////////////////////////////////////////////////////////////////
-//////////////////https://a-calc.de | Taming calculator and companion app for Ark: Survivial Evolved/Ascended///////////////////
-//////////////////https://crypto-webminer.com | Crypto Webminer - Mining in your Browser with Webmining technology//////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////Ihr mögt meine Arbeit und wollt mich Supporten? https://www.paypal.com/paypalme/ACalcDevelopment///////////////////
-/////////////Do you like my work and want to support me? https://www.paypal.com/paypalme/ACalcDevelopment///////////////////////
+/////////////////////////////Created by PiTi | In co-operation with Test_Siedler////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 addToolsMenuItem(loca.GetText("HIL", "Help_window_zonebuffs_0"), SearchZoneBuffHandler);