diff --git a/Moose Development/Moose/Core/Database.lua b/Moose Development/Moose/Core/Database.lua index 5ce11f221..68a17c91b 100644 --- a/Moose Development/Moose/Core/Database.lua +++ b/Moose Development/Moose/Core/Database.lua @@ -1358,7 +1358,7 @@ function DATABASE:GetCoalitionFromClientTemplate( ClientName ) if self.Templates.ClientsByName[ClientName] then return self.Templates.ClientsByName[ClientName].CoalitionID end - self:E("ERROR: Template does not exist for client "..tostring(ClientName)) + self:E("WARNING: Template does not exist for client "..tostring(ClientName)) return nil end @@ -1370,7 +1370,7 @@ function DATABASE:GetCategoryFromClientTemplate( ClientName ) if self.Templates.ClientsByName[ClientName] then return self.Templates.ClientsByName[ClientName].CategoryID end - self:E("ERROR: Template does not exist for client "..tostring(ClientName)) + self:E("WARNING: Template does not exist for client "..tostring(ClientName)) return nil end @@ -1382,7 +1382,7 @@ function DATABASE:GetCountryFromClientTemplate( ClientName ) if self.Templates.ClientsByName[ClientName] then return self.Templates.ClientsByName[ClientName].CountryID end - self:E("ERROR: Template does not exist for client "..tostring(ClientName)) + self:E("WARNING: Template does not exist for client "..tostring(ClientName)) return nil end diff --git a/Moose Development/Moose/Ops/ATIS.lua b/Moose Development/Moose/Ops/ATIS.lua index 7b0d71961..9953be1e9 100644 --- a/Moose Development/Moose/Ops/ATIS.lua +++ b/Moose Development/Moose/Ops/ATIS.lua @@ -882,6 +882,66 @@ ATIS.Messages = { FARP = "Farp", DELIMITER = "Punto", -- decimal delimiter }, + -- French messages thanks to @Wojtech and Bing + FR = { + HOURS = "Heures", + TIME = "Temps", + NOCLOUDINFO = "Informations sur la couverture nuageuse non disponibles", + OVERCAST = "Ciel couvert", + BROKEN = "Nuages fragmentés", + SCATTERED = "Nuages épars", + FEWCLOUDS = "Nuages rares", + NOCLOUDS = "Clair", + AIRPORT = "Aéroport", + INFORMATION ="Information", + SUNRISEAT = "Levé du soleil à %s heure locale", + SUNSETAT = "Couché du soleil à %s heure locale", + WINDFROMMS = "Vent du %s pour %s mètres par seconde", + WINDFROMKNOTS = "Vent du %s pour %s noeuds", + GUSTING = "Rafale de vent", + VISIKM = "Visibilité %s kilomètres", + VISISM = "Visibilité %s Miles", + RAIN = "Pluie", + TSTORM = "Orage", + SNOW = "Neige", + SSTROM = "Tempête de neige", + FOG = "Brouillard", + DUST = "Poussière", + PHENOMENA = "Phénomène météorologique", + CLOUDBASEM = "Couverture nuageuse de %s à %s mètres", + CLOUDBASEFT = "Couverture nuageuse de %s à %s pieds", + TEMPERATURE = "Température", + DEWPOINT = "Point de rosée", + ALTIMETER = "Altimètre", + ACTIVERUN = "Décollages piste", + ACTIVELANDING = "Atterrissages piste", + LEFT = "Gauche", + RIGHT = "Droite", + RWYLENGTH = "Longueur de piste", + METERS = "Mètre", + FEET = "Pieds", + ELEVATION = "Hauteur", + TOWERFREQ = "Fréquences de la tour", + ILSFREQ = "Fréquences ILS", + OUTERNDB = "Fréquences Outer NDB", + INNERNDB = "Fréquences Inner NDB", + VORFREQ = "Fréquences VOR", + VORFREQTTS = "Fréquences V O R", + TACANCH = "Canal TACAN %d", + RSBNCH = "Canal RSBN", + PRMGCH = "Canal PRMG", + ADVISE = "Informez le contrôle que vous avez copié l'information", + STATUTE = "Statute Miles", + DEGREES = "Degré celcius", + FAHRENHEIT = "Degré Fahrenheit", + INCHHG = "Pouces de mercure", + MMHG = "Millimètres de mercure", + HECTO = "Hectopascals", + METERSPER = "Mètres par seconde", + TACAN = "TAKAN", + FARP = "FARPE", + DELIMITER = "Décimal", -- decimal delimiter + } } --- @@ -1061,7 +1121,7 @@ end -- @return #ATIS self function ATIS:_InitLocalization() self:T(self.lid.."_InitLocalization") - self.gettext = TEXTANDSOUND:New("AWACS","en") -- Core.TextAndSound#TEXTANDSOUND + self.gettext = TEXTANDSOUND:New("ATIS","en") -- Core.TextAndSound#TEXTANDSOUND self.locale = "en" for locale,table in pairs(self.Messages) do local Locale = string.lower(tostring(locale)) diff --git a/Moose Development/Moose/Sound/SRS.lua b/Moose Development/Moose/Sound/SRS.lua index 853d17520..3f621d594 100644 --- a/Moose Development/Moose/Sound/SRS.lua +++ b/Moose Development/Moose/Sound/SRS.lua @@ -271,11 +271,11 @@ MSRS.Voices = { ["David"] = "Microsoft David Desktop", -- en-US ["Zira"] = "Microsoft Zira Desktop", -- en-US ["Hortense"] = "Microsoft Hortense Desktop", --fr-FR - ["de-DE-Hedda"] = "Microsoft Hedda Desktop", -- de-DE - ["en-GB-Hazel"] = "Microsoft Hazel Desktop", -- en-GB - ["en-US-David"] = "Microsoft David Desktop", -- en-US - ["en-US-Zira"] = "Microsoft Zira Desktop", -- en-US - ["fr-FR-Hortense"] = "Microsoft Hortense Desktop", --fr-FR + ["de_DE_Hedda"] = "Microsoft Hedda Desktop", -- de-DE + ["en_GB_Hazel"] = "Microsoft Hazel Desktop", -- en-GB + ["en_US_David"] = "Microsoft David Desktop", -- en-US + ["en_US_Zira"] = "Microsoft Zira Desktop", -- en-US + ["fr_FR_Hortense"] = "Microsoft Hortense Desktop", --fr-FR }, MicrosoftGRPC = { -- en-US/GB voices only as of Jan 2024, working ones if using gRPC and MS, if voice packs are installed --["Hedda"] = "Hedda", -- de-DE @@ -304,8 +304,7 @@ MSRS.Voices = { ["en_CA_Linda"] = "Linda", --en-CA ["en_IN_Ravi"] = "Ravi", --en-IN ["en_IN_Heera"] = "Heera", --en-IN - ["en_IR_Sean"] = "Sean", --en-IR - --]] + ["en_IR_Sean"] = "Sean", --en-IR }, Google = { Standard = {