diff --git a/binaries/data/mods/public/globalscripts/Technologies.js b/binaries/data/mods/public/globalscripts/Technologies.js index c3e5148a28..3f2a7a49b0 100644 --- a/binaries/data/mods/public/globalscripts/Technologies.js +++ b/binaries/data/mods/public/globalscripts/Technologies.js @@ -35,7 +35,7 @@ function GetTechModifiedProperty_generic(modifications, classes, originalValue) if (!DoesModificationApply(modification, classes)) continue; if (!modification.replace) - warn("GetTechModifiedProperty: modification format not recognised : " + uneval(modification)); + warn("GetTechModifiedProperty: modification format not recognized : " + uneval(modification)); return modification.replace; } @@ -59,7 +59,7 @@ function GetTechModifiedProperty_numeric(modifications, classes, originalValue) else if (modification.add) add += modification.add; else - warn("GetTechModifiedProperty: numeric modification format not recognised : " + uneval(modification)); + warn("GetTechModifiedProperty: numeric modification format not recognized : " + uneval(modification)); } return originalValue * multiply + add; } @@ -80,7 +80,7 @@ function GetTechModifiedProperty_string(modifications, classes, originalValue) if (modification.tokens !== undefined) value = HandleTokens(value, modification.tokens); else - warn("GetTechModifiedProperty: string modification format not recognised : " + uneval(modification)); + warn("GetTechModifiedProperty: string modification format not recognized : " + uneval(modification)); } return value; } diff --git a/binaries/data/mods/public/gui/common/network.js b/binaries/data/mods/public/gui/common/network.js index 43e484d6f4..74f9f28bb7 100644 --- a/binaries/data/mods/public/gui/common/network.js +++ b/binaries/data/mods/public/gui/common/network.js @@ -62,7 +62,7 @@ function getDisconnectReason(id) { switch (id) { - case 0: return translate("An unknown error ocurred."); + case 0: return translate("An unknown error occurred."); case 1: return translate("The connection request has timed out."); case 2: return translate("The host has ended the game."); case 3: return translate("Incorrect network protocol version."); @@ -106,7 +106,7 @@ function getMismatchMessage(mismatchType, clientMismatchInfo, serverMismatchInfo "clientMismatch": clientMismatchInfo, "serverMismatch": serverMismatchInfo }); - default: return sprintf(translate("Unrecognised handshake mismatch type: %(mismatchType)s"), { + default: return sprintf(translate("Unrecognized handshake mismatch type: %(mismatchType)s"), { "mismatchType": mismatchType }); } diff --git a/binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.js b/binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.js index f19d0f2271..694fca21a3 100644 --- a/binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.js +++ b/binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.js @@ -64,7 +64,7 @@ async function init(attribs) break; } default: - error("Unrecognised multiplayer game type: " + attribs.multiplayerGameType); + error("Unrecognized multiplayer game type: " + attribs.multiplayerGameType); break; } @@ -110,7 +110,7 @@ function cancelSetup() else if (g_GameType == "server") switchSetupPage("pageHost"); else - error("cancelSetup: Unrecognised multiplayer game type: " + g_GameType); + error("cancelSetup: Unrecognized multiplayer game type: " + g_GameType); return false; } @@ -240,7 +240,7 @@ function pollAndHandleNetworkClient(loadSavedGame) return true; default: - error("Unrecognised netstatus type: " + message.status); + error("Unrecognized netstatus type: " + message.status); break; } break; @@ -256,7 +256,7 @@ function pollAndHandleNetworkClient(loadSavedGame) return true; default: - error("Unrecognised netstatus type: " + message.status); + error("Unrecognized netstatus type: " + message.status); break; } break; @@ -282,7 +282,7 @@ function pollAndHandleNetworkClient(loadSavedGame) break; default: - error("Unrecognised net message type: " + message.type); + error("Unrecognized net message type: " + message.type); } } else @@ -298,7 +298,7 @@ function pollAndHandleNetworkClient(loadSavedGame) return true; default: - error("Unrecognised netstatus type: " + message.status); + error("Unrecognized netstatus type: " + message.status); break; } break; @@ -321,7 +321,7 @@ function pollAndHandleNetworkClient(loadSavedGame) return; default: - error("Unrecognised netstatus type: " + message.status); + error("Unrecognized netstatus type: " + message.status); break; } break; @@ -330,7 +330,7 @@ function pollAndHandleNetworkClient(loadSavedGame) break; default: - error("Unrecognised net message type: " + message.type); + error("Unrecognized net message type: " + message.type); break; } } diff --git a/binaries/data/mods/public/gui/options/options.json b/binaries/data/mods/public/gui/options/options.json index 024d7fe2af..6a6c0f6236 100644 --- a/binaries/data/mods/public/gui/options/options.json +++ b/binaries/data/mods/public/gui/options/options.json @@ -244,7 +244,7 @@ { "type": "slider", "label": "Sharpness factor", - "tooltip": "The sharpness of the choosen pass.", + "tooltip": "The sharpness of the chosen pass.", "dependencies": [ "postproc", { "config": "rendererbackend", "op": "!=", "value": "glarb" }, @@ -643,7 +643,7 @@ }, { "label": "Display", - "tooltip": "Customise the in-game display.", + "tooltip": "Customize the in-game display.", "options": [ { diff --git a/binaries/data/mods/public/gui/prelobby/common/terms/Privacy_Policy.txt b/binaries/data/mods/public/gui/prelobby/common/terms/Privacy_Policy.txt index 33874ad2a7..8ef831f350 100644 --- a/binaries/data/mods/public/gui/prelobby/common/terms/Privacy_Policy.txt +++ b/binaries/data/mods/public/gui/prelobby/common/terms/Privacy_Policy.txt @@ -1,6 +1,6 @@ [font="sans-bold-18"]0 A.D. Empires Ascendant Multiplayer Lobby Privacy Policy[/font] -[font="sans-bold-14"]Document Date:[/font] 2023-07-27 +[font="sans-bold-14"]Document Date:[/font] 2025-04-10 [font="sans-bold-16"]Personal data processed by Wildfire Games and purposes of processing:[/font] [font="sans-bold-14"]1. Player name[/font] @@ -67,10 +67,10 @@ Requests that are manifestly unfounded or excessive are not responded to or may 2. Wildfire Games documents their processing activities appropriately, in particular the categories of processed personal data and security measures to protect it (GDPR 30). 3. Wildfire Games processes personal data lawfully, fairly and transparently (GDPR 5.1.a, GDPR 12.1). 4. Wildfire Games informs users of the purposes, legal grounds, legitimate interests and retention periods of personal data processing at the time it is processed, recipients of personal data and where applicable, transfer of personal data to third countries and automated decision-making (GDPR 13.1.c-f, GDPR 13.2.a, GDPR 13.2.e-f, GDPR 15.1, GDPR 15.4). - 5. Wildfire Games does not processes personal data for purposes other than the specified ones (GDPR 5.1.b, 'purpose limitation', GDPR 13.3). + 5. Wildfire Games does not process personal data for purposes other than the specified ones (GDPR 5.1.b, 'purpose limitation', GDPR 13.3). 6. Wildfire Games does not process personal data that is not needed for the specified purposes (GDPR 5.1.c, 'data minimization'). 7. Wildfire Games uses a storage form that does not allow identification of natural persons for longer than necessary (GDPR 5.1.e 'storage limitation'). - 8. Wildfire Games secures personal data processing to prevent unauthorised or unlawful processing and accidental loss (GDPR 5.1.f. 'integrity and confidentiality'). + 8. Wildfire Games secures personal data processing to prevent unauthorized or unlawful processing and accidental loss (GDPR 5.1.f. 'integrity and confidentiality'). 9. Wildfire Games informs users of their right to access, to rectify, to erase personal data and the right to restrict, to withdraw consent to, to object to personal data processing and to complain at a supervisory authority (GDPR 13.2.b, GDPR 13.2.c, GDPR 13.2.d). 10. Wildfire Games facilitates the exercise of user rights where possible (GDPR 12.2), without undue delay (GDPR 12.3). 11. Wildfire Games informs the users that to exercise their rights, users might need to provide additional information to identify the natural person or the data (GDPR 12.6, GDPR 13.2.e). diff --git a/binaries/data/mods/public/gui/reference/tips/texts/biomes.txt b/binaries/data/mods/public/gui/reference/tips/texts/biomes.txt index da87e6fd4b..28412633bb 100644 --- a/binaries/data/mods/public/gui/reference/tips/texts/biomes.txt +++ b/binaries/data/mods/public/gui/reference/tips/texts/biomes.txt @@ -1,3 +1,3 @@ BIOMES Biomes can be used on some random maps to determine which region of the world the map represents. -They influence the appearence of the maps and also the available amount of different resources. +They influence the appearance of the maps and also the available amount of different resources. diff --git a/binaries/data/mods/public/gui/session/messages.js b/binaries/data/mods/public/gui/session/messages.js index 7f48bb2ce7..6c029170eb 100644 --- a/binaries/data/mods/public/gui/session/messages.js +++ b/binaries/data/mods/public/gui/session/messages.js @@ -420,7 +420,7 @@ function handleNetMessages() if (g_NetMessageTypes[msg.type]) g_NetMessageTypes[msg.type](msg); else - error("Unrecognised net message type '" + msg.type + "'"); + error("Unrecognized net message type '" + msg.type + "'"); } } diff --git a/binaries/data/mods/public/gui/userreport/Terms_and_Conditions.txt b/binaries/data/mods/public/gui/userreport/Terms_and_Conditions.txt index 8ef1029488..863aaaa1ef 100644 --- a/binaries/data/mods/public/gui/userreport/Terms_and_Conditions.txt +++ b/binaries/data/mods/public/gui/userreport/Terms_and_Conditions.txt @@ -1,6 +1,6 @@ [font="sans-bold-18"]0 A.D. Empires Ascendant UserReporter Terms and Conditions[/font] -[font="sans-bold-14"]Document Date:[/font] 2023-08-17 +[font="sans-bold-14"]Document Date:[/font] 2025-04-10 The 0 A.D. UserReporter is a tool that allows you, the 0 A.D. player, to automatically upload hardware- and software-system details in order to help Wildfire Games and community developers to improve the performance and compatibility of 0 A.D. @@ -60,10 +60,10 @@ Requests that are manifestly unfounded or excessive are not responded to or may 2. Wildfire Games documents their processing activities appropriately, in particular the categories of processed personal data and security measures to protect it (GDPR 30). 3. Wildfire Games processes personal data lawfully, fairly and transparently (GDPR 5.1.a, GDPR 12.1). 4. Wildfire Games informs users of the purposes, legal grounds, legitimate interests and retention periods of personal data processing at the time it is processed, recipients of personal data and where applicable, transfer of personal data to third countries and automated decision-making (GDPR 13.1.c-f, GDPR 13.2.a, GDPR 13.2.e, GDPR 13.2.f, GDPR 15.1, GDPR 15.4). - 5. Wildfire Games does not processes personal data for purposes other than the specified ones (GDPR 5.1.b, "purpose limitation", GDPR 13.3). - 6. Wildfire Games does not process personal data that is not needed for the specified purposes (GDPR 5.1.c, "data minimisation"). + 5. Wildfire Games does not process personal data for purposes other than the specified ones (GDPR 5.1.b, "purpose limitation", GDPR 13.3). + 6. Wildfire Games does not process personal data that is not needed for the specified purposes (GDPR 5.1.c, "data minimization"). 7. Wildfire Games uses a storage form that does not allow identification of natural persons for longer than necessary (GDPR 5.1.e "storage limitation"). - 8. Wildfire Games secures personal data processing to prevent unauthorised or unlawful processing and accidental loss (GDPR 5.1.f. "integrity and confidentiality"). + 8. Wildfire Games secures personal data processing to prevent unauthorized or unlawful processing and accidental loss (GDPR 5.1.f. "integrity and confidentiality"). 9. Wildfire Games informs users of their right to access, to rectify, to erase personal data and the right to restrict, to withdraw consent to, to object to personal data processing and to complain at a supervisory authority (GDPR 13.2.b, GDPR 13.2.c, GDPR 13.2.d). 10. Wildfire Games facilitates the exercise of user rights where possible (GDPR 12.2), without undue delay (GDPR 12.3). 12. Wildfire Games informs the users that to exercise their rights, users might need to provide additional information to identify the natural person or the data (GDPR 12.6, GDPR 13.2.e). diff --git a/binaries/data/mods/public/maps/random/bahrain.json b/binaries/data/mods/public/maps/random/bahrain.json index 6461124149..866edbf5bd 100644 --- a/binaries/data/mods/public/maps/random/bahrain.json +++ b/binaries/data/mods/public/maps/random/bahrain.json @@ -2,7 +2,7 @@ "settings" : { "Name" : "Bahrain", "Script" : "bahrain.js", - "Description" : "Bahrain, centre of the Dilmun civilization which fell in 800 BC, was in turn controlled by Sumerians, Assyrians, Babylonians, Persians and other later peoples. An island strategically placed in the Sinus Persicus (Persian Gulf) and also centre of pearl trading due to its magnificent pearl fisheries, Bahrain is never left unoccupied for long. But now, with the previous occupants gone, the land prepares for war. Will you be the next Ruler of Bahrain?", + "Description" : "Bahrain, center of the Dilmun civilization which fell in 800 BC, was in turn controlled by Sumerians, Assyrians, Babylonians, Persians and other later peoples. An island strategically placed in the Sinus Persicus (Persian Gulf) and also center of pearl trading due to its magnificent pearl fisheries, Bahrain is never left unoccupied for long. But now, with the previous occupants gone, the land prepares for war. Will you be the next Ruler of Bahrain?", "Keywords": ["naval"], "Preview" : "bahrain.png", "CircularMap" : true diff --git a/binaries/data/mods/public/maps/random/empire.json b/binaries/data/mods/public/maps/random/empire.json index 05be161bd8..3dab5481d5 100644 --- a/binaries/data/mods/public/maps/random/empire.json +++ b/binaries/data/mods/public/maps/random/empire.json @@ -2,7 +2,7 @@ "settings" : { "Name" : "Empire", "Script" : "empire.js", - "Description" : "A neighboring province has pledged alegiance to your rule. It's up to you to command them to victory.\n[color=\"yellow\"]Caution! If nomad mode is disabled, each player will start with two civic centers.[/color]", + "Description" : "A neighboring province has pledged allegiance to your rule. It's up to you to command them to victory.\n[color=\"yellow\"]Caution! If nomad mode is disabled, each player will start with two civic centers.[/color]", "Keywords": [], "Preview" : "empire.png", "SupportedBiomes": "generic/", diff --git a/binaries/data/mods/public/maps/random/marmara.json b/binaries/data/mods/public/maps/random/marmara.json index 6b71d1c4c4..b7f62e8066 100644 --- a/binaries/data/mods/public/maps/random/marmara.json +++ b/binaries/data/mods/public/maps/random/marmara.json @@ -2,7 +2,7 @@ "settings" : { "Name" : "Marmara", "Script" : "marmara.js", - "Description" : "The Propontis (Sea of Marmara) connects the Pontus Euxinus (Black Sea) to the Aegean Sea, and seperates Asia Minor from Thrace. To the south-west lies the Hellespont (Dardanelles), at the entrance of which the ancient city of Ilium (Troy) once stood. To the north-east lies the Bosporus Thraciae (Bosporus strait) where in time the Greek city of Byzantium would be founded, later to become the capital of the great Byzantine Empire under the new name of Constantinople. Players start on fertile land with adequate resources.", + "Description" : "The Propontis (Sea of Marmara) connects the Pontus Euxinus (Black Sea) to the Aegean Sea, and separates Asia Minor from Thrace. To the south-west lies the Hellespont (Dardanelles), at the entrance of which the ancient city of Ilium (Troy) once stood. To the north-east lies the Bosporus Thraciae (Bosporus strait) where in time the Greek city of Byzantium would be founded, later to become the capital of the great Byzantine Empire under the new name of Constantinople. Players start on fertile land with adequate resources.", "Keywords": [], "Preview" : "marmara.png", "CircularMap" : true diff --git a/binaries/data/mods/public/maps/random/mediterranean.json b/binaries/data/mods/public/maps/random/mediterranean.json index a5d23cb246..801deb38de 100644 --- a/binaries/data/mods/public/maps/random/mediterranean.json +++ b/binaries/data/mods/public/maps/random/mediterranean.json @@ -2,7 +2,7 @@ "settings" : { "Name" : "Mediterranean", "Script" : "mediterranean.js", - "Description" : "The Mediterranean, home to the Phoenicians, Greeks, Egyptians and later on Romans. They took the rudimentary knowledge and principles of organisation from Mesopotamia and forged it into something more, thereby shifting the centre of learning and knowledge to the Mediterranean Coast, thus laying the foundations of civilization as we know it today. The Mediterranean Sea is almost completely enclosed by land: on the north by Gallia Transalpina (Transalpine Gaul), Italia, Greece (Graecia) and Anatolia, on the east by Syria, on the south by Libya and Mauritania, and on the west by Iberia. The name Mediterranean is derived from Latin, but the Romans themselves preferred the term 'Mare Internum' or even 'Mare Nostrum'.", + "Description" : "The Mediterranean, home to the Phoenicians, Greeks, Egyptians and later on Romans. They took the rudimentary knowledge and principles of organization from Mesopotamia and forged it into something more, thereby shifting the center of learning and knowledge to the Mediterranean Coast, thus laying the foundations of civilization as we know it today. The Mediterranean Sea is almost completely enclosed by land: on the north by Gallia Transalpina (Transalpine Gaul), Italia, Greece (Graecia) and Anatolia, on the east by Syria, on the south by Libya and Mauritania, and on the west by Iberia. The name Mediterranean is derived from Latin, but the Romans themselves preferred the term 'Mare Internum' or even 'Mare Nostrum'.", "Keywords": [], "Preview" : "mediterranean.png", "CircularMap" : true diff --git a/binaries/data/mods/public/maps/random/rmbiome/generic/temperate.json b/binaries/data/mods/public/maps/random/rmbiome/generic/temperate.json index b3f89df419..f1244205f9 100644 --- a/binaries/data/mods/public/maps/random/rmbiome/generic/temperate.json +++ b/binaries/data/mods/public/maps/random/rmbiome/generic/temperate.json @@ -1,7 +1,7 @@ { "Description": { "Title": "Temperate", - "Description": "Lush grasslands carpet the land, in places giving way to magnificent and diverse broadleaf forests. Poplars, pines, beeches and oaks all vie for supremacy but this root-war is a neverending struggle. Numerous apple trees dot the land, deer and sheep gorge themselves on this years fallen fruit." + "Description": "Lush grasslands carpet the land, in places giving way to magnificent and diverse broadleaf forests. Poplars, pines, beeches and oaks all vie for supremacy but this root-war is a never-ending struggle. Numerous apple trees dot the land, deer and sheep gorge themselves on this years fallen fruit." }, "Environment": { "SunColor": { "r": 1.032, "g": 0.99, "b": 0.866 }, diff --git a/binaries/data/mods/public/maps/random/rmgen-common/wall_builder.js b/binaries/data/mods/public/maps/random/rmgen-common/wall_builder.js index fa9bb3393f..53a87cdf3b 100644 --- a/binaries/data/mods/public/maps/random/rmgen-common/wall_builder.js +++ b/binaries/data/mods/public/maps/random/rmgen-common/wall_builder.js @@ -253,7 +253,7 @@ function getWallElement(element, style) ret.length = 0; } else - warn("Unrecognised wall element: '" + element + "' (" + style + "). Defaulting to " + (wallset.tower ? "'tower'." : "a blank element.")); + warn("Unrecognized wall element: '" + element + "' (" + style + "). Defaulting to " + (wallset.tower ? "'tower'." : "a blank element.")); } } diff --git a/binaries/data/mods/public/maps/scenarios/combat_demo_huge.xml b/binaries/data/mods/public/maps/scenarios/combat_demo_huge.xml index 059ef7fd82..e777cbba18 100644 --- a/binaries/data/mods/public/maps/scenarios/combat_demo_huge.xml +++ b/binaries/data/mods/public/maps/scenarios/combat_demo_huge.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ac474d1ae9ba924896f7e0cf57c7dc60e5e61aecb06f01203ef8b75441a68784 +oid sha256:2ccaaa2140252a6cafb29fedb8c981e06bac184f227462627a93e8af61dfef1b size 2600 diff --git a/binaries/data/mods/public/maps/scripts/ConquestCivicCentres.js b/binaries/data/mods/public/maps/scripts/ConquestCivicCentres.js index d7608b1274..a932a99a77 100644 --- a/binaries/data/mods/public/maps/scripts/ConquestCivicCentres.js +++ b/binaries/data/mods/public/maps/scripts/ConquestCivicCentres.js @@ -2,10 +2,10 @@ let cmpTrigger = Engine.QueryInterface(SYSTEM_ENTITY, IID_Trigger); cmpTrigger.ConquestAddVictoryCondition({ "classFilter": "CivilCentre+!Foundation", - "defeatReason": markForTranslation("%(player)s has been defeated (lost all civic centres).") + "defeatReason": markForTranslation("%(player)s has been defeated (lost all civic centers).") }); cmpTrigger.ConquestAddVictoryCondition({ "classFilter": "ConquestCritical CivilCentre+!Foundation", - "defeatReason": markForTranslation("%(player)s has been defeated (lost all civic centres and critical units and structures).") + "defeatReason": markForTranslation("%(player)s has been defeated (lost all civic centers and critical units and structures).") }); } diff --git a/binaries/data/mods/public/maps/skirmishes/barcania_3p.xml b/binaries/data/mods/public/maps/skirmishes/barcania_3p.xml index 2093d17bb1..5495cdf688 100644 --- a/binaries/data/mods/public/maps/skirmishes/barcania_3p.xml +++ b/binaries/data/mods/public/maps/skirmishes/barcania_3p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4976df6db1da04688b0eb2bfff04cf14090325a9471849e91e48587f5db4976f -size 168142 +oid sha256:780d3ed909c11e1482fa6a52dca2ffeef7ab4e4915652deb25e300d891206412 +size 168143 diff --git a/binaries/data/mods/public/maps/skirmishes/isthmus_of_corinth_2p.xml b/binaries/data/mods/public/maps/skirmishes/isthmus_of_corinth_2p.xml index b2e64f2329..3a27d3bc4f 100644 --- a/binaries/data/mods/public/maps/skirmishes/isthmus_of_corinth_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/isthmus_of_corinth_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:930ccc4c63cf97b9cc9afdee187027b91ca8fca012adcea537c564a27ef3ba0e -size 1159118 +oid sha256:e668d0581a147fa1aacab4747e0461e42fcba596910990be52cfdc24d8c16944 +size 1159117 diff --git a/binaries/data/mods/public/maps/skirmishes/north_african_savanna_2p.xml b/binaries/data/mods/public/maps/skirmishes/north_african_savanna_2p.xml index 72e52856f1..301c8e6d74 100644 --- a/binaries/data/mods/public/maps/skirmishes/north_african_savanna_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/north_african_savanna_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b8207ed5a0e01eaecfc25ecda80638b8d485eb342ea30ead9a01ab741537724 +oid sha256:51a4b4c9816995da870f40e23a7eba68713458ac50961e868fac7aa25f0e60a7 size 1383737 diff --git a/binaries/data/mods/public/maps/tutorials/starting_economy_walkthrough.js b/binaries/data/mods/public/maps/tutorials/starting_economy_walkthrough.js index e32c78312b..6d640a9a62 100644 --- a/binaries/data/mods/public/maps/tutorials/starting_economy_walkthrough.js +++ b/binaries/data/mods/public/maps/tutorials/starting_economy_walkthrough.js @@ -21,7 +21,7 @@ Trigger.prototype.tutorialGoals = [ }, { "instructions": [ - markForTranslation("Now that the Civic Center is selected, you will notice that a production panel will appear on the lower right of your screen detailing the actions that the buildings supports. For the production panel, available actions are not masked in any color, while an icon masked in either grey or red indicates that the action has not been unlocked or you do not have sufficient resources to perform that action, respectively. Additionally, you can hover the cursor over any icon to show a tooltip with more details.\n"), + markForTranslation("Now that the Civic Center is selected, you will notice that a production panel will appear on the lower right of your screen detailing the actions that the buildings supports. For the production panel, available actions are not masked in any color, while an icon masked in either gray or red indicates that the action has not been unlocked or you do not have sufficient resources to perform that action, respectively. Additionally, you can hover the cursor over any icon to show a tooltip with more details.\n"), markForTranslation("The top row of buttons contains portraits of units that may be trained at the building while the bottom one or two rows will have researchable technologies. Hover the cursor over the II icon. The tooltip will tell us that advancing to Town Phase requires both more constructed structures as well as more food and wood resources.") ] }, diff --git a/binaries/data/mods/public/simulation/ai/common-api/gamestate.js b/binaries/data/mods/public/simulation/ai/common-api/gamestate.js index 8f082f225d..b6447a70d1 100644 --- a/binaries/data/mods/public/simulation/ai/common-api/gamestate.js +++ b/binaries/data/mods/public/simulation/ai/common-api/gamestate.js @@ -154,7 +154,7 @@ m.GameState.prototype.getBuiltTemplate = function(foundationName) { if (!foundationName.startsWith("foundation|")) { - warn("Foundation " + foundationName + " not recognised as a foundation."); + warn("Foundation " + foundationName + " not recognized as a foundation."); return null; } return this.getTemplate(foundationName.substr(11)); diff --git a/binaries/data/mods/public/simulation/components/Attack.js b/binaries/data/mods/public/simulation/components/Attack.js index a590c9d83a..821a6a9c5b 100644 --- a/binaries/data/mods/public/simulation/components/Attack.js +++ b/binaries/data/mods/public/simulation/components/Attack.js @@ -4,7 +4,7 @@ var g_AttackTypes = ["Melee", "Ranged", "Capture"]; Attack.prototype.preferredClassesSchema = "" + - "" + + "" + "" + "tokens" + "" + @@ -114,9 +114,9 @@ Attack.prototype.Schema = "" + "" + AttackHelper.BuildAttackEffectsSchema() + - "" + + "" + "" + - "" + + "" + "" + ""+ "" + diff --git a/binaries/data/mods/public/simulation/components/Capturable.js b/binaries/data/mods/public/simulation/components/Capturable.js index c1dd55f505..cbcfb32ca6 100644 --- a/binaries/data/mods/public/simulation/components/Capturable.js +++ b/binaries/data/mods/public/simulation/components/Capturable.js @@ -4,10 +4,10 @@ Capturable.prototype.Schema = "" + "" + "" + - "" + + "" + "" + "" + - "" + + "" + "" + ""; diff --git a/binaries/data/mods/public/simulation/components/EntityLimits.js b/binaries/data/mods/public/simulation/components/EntityLimits.js index 11c733b47a..3b58df4878 100644 --- a/binaries/data/mods/public/simulation/components/EntityLimits.js +++ b/binaries/data/mods/public/simulation/components/EntityLimits.js @@ -45,7 +45,7 @@ EntityLimits.prototype.Schema = "" + "" + "" + - "" + + "" + "" + "" + "" + diff --git a/binaries/data/mods/public/simulation/components/Heal.js b/binaries/data/mods/public/simulation/components/Heal.js index 8098d6c267..cf33d9d786 100644 --- a/binaries/data/mods/public/simulation/components/Heal.js +++ b/binaries/data/mods/public/simulation/components/Heal.js @@ -14,7 +14,7 @@ Heal.prototype.Schema = "Cavalry" + "Support Infantry" + "" + - "" + + "" + "" + "" + "" + diff --git a/binaries/data/mods/public/simulation/components/Player.js b/binaries/data/mods/public/simulation/components/Player.js index a5d0d3c602..f39084b112 100644 --- a/binaries/data/mods/public/simulation/components/Player.js +++ b/binaries/data/mods/public/simulation/components/Player.js @@ -313,7 +313,7 @@ Player.prototype.SubtractResourcesOrNotify = function(amounts) else if (i == 4) msg = markForTranslation("Insufficient resources - %(resourceAmount1)s %(resourceType1)s, %(resourceAmount2)s %(resourceType2)s, %(resourceAmount3)s %(resourceType3)s, %(resourceAmount4)s %(resourceType4)s"); else - warn("Localisation: Strings are not localised for more than 4 resources"); + warn("Localization: Strings are not localized for more than 4 resources"); // Send as time-notification. let cmpGUIInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface); diff --git a/binaries/data/mods/public/simulation/components/UnitAI.js b/binaries/data/mods/public/simulation/components/UnitAI.js index b8205e516e..eeff6549e5 100644 --- a/binaries/data/mods/public/simulation/components/UnitAI.js +++ b/binaries/data/mods/public/simulation/components/UnitAI.js @@ -5298,7 +5298,7 @@ UnitAI.prototype.GetTargetPositions = function() break; default: - error("GetTargetPositions: Unrecognised order type '"+order.type+"'"); + error("GetTargetPositions: Unrecognized order type '"+order.type+"'"); return []; } } diff --git a/binaries/data/mods/public/simulation/data/auras/structures/library.json b/binaries/data/mods/public/simulation/data/auras/structures/library.json index 800d72f8cc..95387dcaf3 100644 --- a/binaries/data/mods/public/simulation/data/auras/structures/library.json +++ b/binaries/data/mods/public/simulation/data/auras/structures/library.json @@ -9,5 +9,5 @@ { "value": "Researcher/TechCostMultiplier/time", "multiply": 0.85 } ], "auraDescription": "Structures −15% technology resource costs and research time.", - "auraName": "Centre of Scholarship" + "auraName": "Center of Scholarship" } diff --git a/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_alexander_iii_3.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_alexander_iii_3.json index e88c5f7d5b..19feb15131 100644 --- a/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_alexander_iii_3.json +++ b/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_alexander_iii_3.json @@ -7,6 +7,6 @@ { "value": "Capturable/GarrisonRegenRate", "multiply": 0.5 } ], "auraName": "Conqueror", - "auraDescription": "Enemy Civic Centres −50% capture points garrisoned regeneration rate.", + "auraDescription": "Enemy Civic Centers −50% capture points garrisoned regeneration rate.", "overlayIcon": "art/textures/ui/session/auras/laurel.png" } diff --git a/binaries/data/mods/public/simulation/templates/structures/maur/tower_double.xml b/binaries/data/mods/public/simulation/templates/structures/maur/tower_double.xml index 5936480654..d0eacf351b 100644 --- a/binaries/data/mods/public/simulation/templates/structures/maur/tower_double.xml +++ b/binaries/data/mods/public/simulation/templates/structures/maur/tower_double.xml @@ -15,7 +15,7 @@ Rampart Tower structures/maur/tower_double - Higher health tower with ramparts for up to 16 archers. Visibly garrisoned archers recieve a range and armor bonus. Only archers can garrison. Needs the murder holes tech to protect its foot. + Higher health tower with ramparts for up to 16 archers. Visibly garrisoned archers receive a range and armor bonus. Only archers can garrison. Needs the murder holes tech to protect its foot. maur Udarka diff --git a/source/collada/PMDConvert.cpp b/source/collada/PMDConvert.cpp index bd9fa5f063..b30c7ea77e 100644 --- a/source/collada/PMDConvert.cpp +++ b/source/collada/PMDConvert.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2012 Wildfire Games. +/* Copyright (C) 2025 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -319,7 +319,7 @@ public: { // The relevant joint does exist, but it's not a recognised // bone in our chosen skeleton structure - Log(LOG_ERROR, "Vertex influenced by unrecognised bone '%s'", joint->GetName().c_str()); + Log(LOG_ERROR, "Vertex influenced by unrecognized bone '%s'", joint->GetName().c_str()); continue; } @@ -456,7 +456,7 @@ public: } else { - throw ColladaException("Unrecognised object type"); + throw ColladaException("Unrecognized object type"); } } diff --git a/source/collada/PSAConvert.cpp b/source/collada/PSAConvert.cpp index 054694a501..8265ef73e8 100644 --- a/source/collada/PSAConvert.cpp +++ b/source/collada/PSAConvert.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2024 Wildfire Games. +/* Copyright (C) 2025 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -146,7 +146,7 @@ public: } else { - throw ColladaException("Unrecognised object type"); + throw ColladaException("Unrecognized object type"); } } diff --git a/source/graphics/ObjectBase.cpp b/source/graphics/ObjectBase.cpp index 0c41d2e425..89650a6750 100644 --- a/source/graphics/ObjectBase.cpp +++ b/source/graphics/ObjectBase.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2022 Wildfire Games. +/* Copyright (C) 2025 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -195,7 +195,7 @@ bool CObjectBase::LoadVariant(const CXeromyces& XeroFile, const XMBElement& vari if (variant.GetNodeName() != el_variant) { - LOGERROR("Invalid variant format (unrecognised root element '%s')", XeroFile.GetElementString(variant.GetNodeName())); + LOGERROR("Invalid variant format (unrecognized root element '%s')", XeroFile.GetElementString(variant.GetNodeName())); return false; } @@ -840,7 +840,7 @@ bool CActorDef::Load(const VfsPath& pathname) if (root.GetNodeName() != el_actor && root.GetNodeName() != el_qualitylevels) { - LOGERROR("Invalid actor format (actor '%s', unrecognised root element '%s')", + LOGERROR("Invalid actor format (actor '%s', unrecognized root element '%s')", pathname.string8().c_str(), XeroFile.GetElementString(root.GetNodeName())); return false; } diff --git a/source/graphics/TerrainTextureEntry.cpp b/source/graphics/TerrainTextureEntry.cpp index b5fcb3e281..a5859ac158 100644 --- a/source/graphics/TerrainTextureEntry.cpp +++ b/source/graphics/TerrainTextureEntry.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2024 Wildfire Games. +/* Copyright (C) 2025 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -66,7 +66,7 @@ CTerrainTextureEntry::CTerrainTextureEntry(CTerrainPropertiesPtr properties, con if (root.GetNodeName() != el_terrain) { - LOGERROR("Invalid terrain format (unrecognised root element '%s')", XeroFile.GetElementString(root.GetNodeName())); + LOGERROR("Invalid terrain format (unrecognized root element '%s')", XeroFile.GetElementString(root.GetNodeName())); return; } diff --git a/source/graphics/TextureConverter.cpp b/source/graphics/TextureConverter.cpp index fea45f0dcd..458c0dde92 100644 --- a/source/graphics/TextureConverter.cpp +++ b/source/graphics/TextureConverter.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2024 Wildfire Games. +/* Copyright (C) 2025 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -146,7 +146,7 @@ CTextureConverter::SettingsFile* CTextureConverter::LoadSettings(const VfsPath& if (root.GetNodeName() != el_textures) { - LOGERROR("Invalid texture settings file \"%s\" (unrecognised root element)", path.string8()); + LOGERROR("Invalid texture settings file \"%s\" (unrecognized root element)", path.string8()); return NULL; } diff --git a/source/main.cpp b/source/main.cpp index 9c286f49f2..9924eb5249 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -520,7 +520,7 @@ static void RunGameOrAtlas(const PS::span argv) if (args.Has("autostart-nonvisual") && args.Get("autostart").empty() && !args.Has("rl-interface") && !args.Has("autostart-client")) { - LOGERROR("-autostart-nonvisual cant be used alone. A map with -autostart=\"TYPEDIR/MAPNAME\" is needed."); + LOGERROR("-autostart-nonvisual can't be used alone. A map with -autostart=\"TYPEDIR/MAPNAME\" is needed."); return; } diff --git a/source/ps/Joystick.cpp b/source/ps/Joystick.cpp index 0d37b82857..c4ff7e0280 100644 --- a/source/ps/Joystick.cpp +++ b/source/ps/Joystick.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2021 Wildfire Games. +/* Copyright (C) 2025 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -39,7 +39,7 @@ void CJoystick::Initialise() if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) < 0) { - LOGERROR("CJoystick::Initialise failed to initialise joysticks (\"%s\")", SDL_GetError()); + LOGERROR("CJoystick::Initialise failed to initialize joysticks (\"%s\")", SDL_GetError()); return; } diff --git a/source/ps/Replay.cpp b/source/ps/Replay.cpp index 1cc9c26fe1..240d6056d9 100644 --- a/source/ps/Replay.cpp +++ b/source/ps/Replay.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2024 Wildfire Games. +/* Copyright (C) 2025 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -306,7 +306,7 @@ void CReplayPlayer::Replay(const bool serializationtest, const int rejointesttur g_ProfileViewer.SaveToFile(); } else - debug_printf("Unrecognised replay token %s\n", type.c_str()); + debug_printf("Unrecognized replay token %s\n", type.c_str()); } } diff --git a/source/renderer/backend/vulkan/ShaderProgram.cpp b/source/renderer/backend/vulkan/ShaderProgram.cpp index 54173d13d7..3f9d7a083b 100644 --- a/source/renderer/backend/vulkan/ShaderProgram.cpp +++ b/source/renderer/backend/vulkan/ShaderProgram.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2024 Wildfire Games. +/* Copyright (C) 2025 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -264,7 +264,7 @@ std::unique_ptr CShaderProgram::Create( const uint32_t set = descriporSetsChild.GetAttributes().GetNamedItem(at_set).ToUInt(); if (useDescriptorIndexing && set == 0 && !descriporSetsChild.GetChildNodes().empty()) { - LOGERROR("Descritor set for descriptor indexing shouldn't contain bindings."); + LOGERROR("Descriptor set for descriptor indexing shouldn't contain bindings."); return false; } XERO_ITER_EL(descriporSetsChild, descriporSetChild) diff --git a/source/simulation2/components/CCmpDecay.cpp b/source/simulation2/components/CCmpDecay.cpp index 464fa1a1d1..d6e618a362 100644 --- a/source/simulation2/components/CCmpDecay.cpp +++ b/source/simulation2/components/CCmpDecay.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2022 Wildfire Games. +/* Copyright (C) 2025 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -81,10 +81,10 @@ public: "" "" "" - "" + "" "" "" - "" + "" "" ""; } diff --git a/source/simulation2/components/CCmpFootprint.cpp b/source/simulation2/components/CCmpFootprint.cpp index 78ef0a92db..0d82faccc1 100644 --- a/source/simulation2/components/CCmpFootprint.cpp +++ b/source/simulation2/components/CCmpFootprint.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2022 Wildfire Games. +/* Copyright (C) 2025 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -63,26 +63,26 @@ public: "" "" "" - "" + "" "" "0.0" "" "" - "" + "" "" "0.0" "" "" "" "" - "" + "" "" "0.0" "" "" "" "" - "" + "" "" "" "" diff --git a/source/simulation2/components/CCmpPosition.cpp b/source/simulation2/components/CCmpPosition.cpp index a88cd0b988..66643ea66a 100644 --- a/source/simulation2/components/CCmpPosition.cpp +++ b/source/simulation2/components/CCmpPosition.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2024 Wildfire Games. +/* Copyright (C) 2025 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -119,7 +119,7 @@ public: "pitch-roll" "" "" - "" + "" "" "" "" diff --git a/source/simulation2/components/CCmpSelectable.cpp b/source/simulation2/components/CCmpSelectable.cpp index afaccc81f6..ef82042dde 100644 --- a/source/simulation2/components/CCmpSelectable.cpp +++ b/source/simulation2/components/CCmpSelectable.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2022 Wildfire Games. +/* Copyright (C) 2025 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -104,19 +104,19 @@ public: "" "" "" - "" + "" "" "0.0" "" "" - "" + "" "" "0.0" "" "" "" "" - "" + "" "" "0.0" "" diff --git a/source/simulation2/components/CCmpUnitMotion.h b/source/simulation2/components/CCmpUnitMotion.h index 98311550a1..50c5e34eb0 100644 --- a/source/simulation2/components/CCmpUnitMotion.h +++ b/source/simulation2/components/CCmpUnitMotion.h @@ -252,7 +252,7 @@ public: "" "" "" - "" + "" "" "" "" @@ -263,7 +263,7 @@ public: "" "" "" - "" + "" "" "" "" diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp index 4a966ef301..f3dd8c03f5 100644 --- a/source/simulation2/serialization/BinarySerializer.cpp +++ b/source/simulation2/serialization/BinarySerializer.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2024 Wildfire Games. +/* Copyright (C) 2025 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -296,7 +296,7 @@ void CBinarySerializerScriptImpl::HandleScriptVal(JS::HandleValue val) else { // Unrecognized class - LOGERROR("Cannot serialise JS objects with unrecognized class '%s'", jsclass->name); + LOGERROR("Cannot serialize JS objects with unrecognized class '%s'", jsclass->name); throw PSERROR_Serialize_InvalidScriptValue(); } } @@ -369,7 +369,7 @@ void CBinarySerializerScriptImpl::HandleScriptVal(JS::HandleValue val) } } - LOGERROR("Cannot serialise JS objects of type 'function': %s", utf8_from_wstring(funcname)); + LOGERROR("Cannot serialize JS objects of type 'function': %s", utf8_from_wstring(funcname)); throw PSERROR_Serialize_InvalidScriptValue(); } case JSTYPE_STRING: diff --git a/source/simulation2/system/ComponentManagerSerialization.cpp b/source/simulation2/system/ComponentManagerSerialization.cpp index 311cd6e6a3..8ab921c304 100644 --- a/source/simulation2/system/ComponentManagerSerialization.cpp +++ b/source/simulation2/system/ComponentManagerSerialization.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2020 Wildfire Games. +/* Copyright (C) 2025 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -323,7 +323,7 @@ bool CComponentManager::DeserializeState(std::istream& stream) ComponentTypeId ctid = LookupCID(ctname); if (ctid == CID__Invalid) { - LOGERROR("Deserialization saw unrecognised component type '%s'", ctname.c_str()); + LOGERROR("Deserialization saw unrecognized component type '%s'", ctname.c_str()); return false; } @@ -350,7 +350,7 @@ bool CComponentManager::DeserializeState(std::istream& stream) ComponentTypeId ctid = LookupCID(ctname); if (ctid == CID__Invalid) { - LOGERROR("Deserialization saw unrecognised component type '%s'", ctname.c_str()); + LOGERROR("Deserialization saw unrecognized component type '%s'", ctname.c_str()); return false; } diff --git a/source/simulation2/tests/test_Serializer.h b/source/simulation2/tests/test_Serializer.h index e049d5bfb9..381f687809 100644 --- a/source/simulation2/tests/test_Serializer.h +++ b/source/simulation2/tests/test_Serializer.h @@ -824,7 +824,7 @@ public: TS_ASSERT(script.Eval("([1, 2, function () { }])", &obj)); TS_ASSERT_THROWS(serialize.ScriptVal("script", &obj), const PSERROR_Serialize_InvalidScriptValue&); - TS_ASSERT_STR_CONTAINS(logger.GetOutput(), "ERROR: Cannot serialise JS objects of type 'function': (unnamed)"); + TS_ASSERT_STR_CONTAINS(logger.GetOutput(), "ERROR: Cannot serialize JS objects of type 'function': (unnamed)"); } void test_script_splice() diff --git a/source/soundmanager/scripting/SoundGroup.cpp b/source/soundmanager/scripting/SoundGroup.cpp index 2d8767149d..c9277f3635 100644 --- a/source/soundmanager/scripting/SoundGroup.cpp +++ b/source/soundmanager/scripting/SoundGroup.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2024 Wildfire Games. +/* Copyright (C) 2025 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -334,7 +334,7 @@ bool CSoundGroup::LoadSoundGroup(const VfsPath& pathnameXML) if (root.GetNodeName() != el_soundgroup) { - LOGERROR("Invalid SoundGroup format (unrecognised root element '%s')", XeroFile.GetElementString(root.GetNodeName())); + LOGERROR("Invalid SoundGroup format (unrecognized root element '%s')", XeroFile.GetElementString(root.GetNodeName())); return false; } diff --git a/source/tools/atlas/GameInterface/GameLoop.cpp b/source/tools/atlas/GameInterface/GameLoop.cpp index e09005bbec..0782625d8e 100644 --- a/source/tools/atlas/GameInterface/GameLoop.cpp +++ b/source/tools/atlas/GameInterface/GameLoop.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2021 Wildfire Games. +/* Copyright (C) 2025 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -105,7 +105,7 @@ bool BeginAtlas(const CmdLineArgs& args, const DllLoader& dll) } catch (PSERROR_DllLoader&) { - debug_warn(L"Failed to initialise DLL"); + debug_warn(L"Failed to initialize DLL"); return false; } diff --git a/source/tools/atlas/GameInterface/Handlers/CommandHandlers.cpp b/source/tools/atlas/GameInterface/Handlers/CommandHandlers.cpp index 9a09bb83f9..5f56eaed3f 100644 --- a/source/tools/atlas/GameInterface/Handlers/CommandHandlers.cpp +++ b/source/tools/atlas/GameInterface/Handlers/CommandHandlers.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2009 Wildfire Games. +/* Copyright (C) 2025 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -34,7 +34,7 @@ MESSAGEHANDLER(DoCommand) } else { - debug_warn(L"Unrecognised command"); + debug_warn(L"Unrecognized command"); return; } diff --git a/source/tools/atlas/GameInterface/MessagePasserImpl.cpp b/source/tools/atlas/GameInterface/MessagePasserImpl.cpp index ecd4a13884..ff075a9d7d 100644 --- a/source/tools/atlas/GameInterface/MessagePasserImpl.cpp +++ b/source/tools/atlas/GameInterface/MessagePasserImpl.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2019 Wildfire Games. +/* Copyright (C) 2025 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -45,10 +45,10 @@ void MessagePasserImpl::Add(IMessage* msg) } else { - debug_warn(L"Unrecognised message"); + debug_warn(L"Unrecognized message"); // CLogger might not be initialised, but this error will be sent // to the debug output window anyway so people can still see it - LOGERROR("Unrecognised message (%s)", msg->GetName()); + LOGERROR("Unrecognized message (%s)", msg->GetName()); } // Delete the object - we took ownership of it. AtlasMessage::ShareableDelete(msg); @@ -69,10 +69,10 @@ void MessagePasserImpl::Query(QueryMessage* msg, void(* UNUSED(timeoutCallback) } else { - debug_warn(L"Unrecognised message"); + debug_warn(L"Unrecognized message"); // CLogger might not be initialised, but this error will be sent // to the debug output window anyway so people can still see it - LOGERROR("Unrecognised message (%s)", msg->GetName()); + LOGERROR("Unrecognized message (%s)", msg->GetName()); } } diff --git a/source/tools/fontbuilder2/font_loader.py b/source/tools/fontbuilder2/font_loader.py index 3c78e421cb..3ee1b4c028 100644 --- a/source/tools/fontbuilder2/font_loader.py +++ b/source/tools/fontbuilder2/font_loader.py @@ -37,7 +37,7 @@ _cairo_so.cairo_status.argtypes = [ctypes.c_void_p] # initialize freetype _ft_lib = ctypes.c_void_p() if FT_Err_Ok != _freetype_so.FT_Init_FreeType(ctypes.byref(_ft_lib)): - raise Exception("Error initialising FreeType library.") + raise Exception("Error initializing FreeType library.") _surface = cairo.ImageSurface(cairo.FORMAT_A8, 0, 0)