Fix a bunch of spelling mistakes

This fixes a bunch of spelling mistakes found in user facing strings.

Fixes #7716
This commit is contained in:
Dunedan
2025-04-11 06:24:32 +02:00
parent 9bae3c86d6
commit 8482f25800
52 changed files with 106 additions and 106 deletions
@@ -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;
}
@@ -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
});
}
@@ -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;
}
}
@@ -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":
[
{
@@ -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).
@@ -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.
@@ -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 + "'");
}
}
@@ -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).
@@ -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
@@ -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/",
@@ -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
@@ -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
@@ -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 },
@@ -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."));
}
}
@@ -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).")
});
}
Binary file not shown.
@@ -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.")
]
},
@@ -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));
@@ -4,7 +4,7 @@ var g_AttackTypes = ["Melee", "Ranged", "Capture"];
Attack.prototype.preferredClassesSchema =
"<optional>" +
"<element name='PreferredClasses' a:help='Space delimited list of classes preferred for attacking. If an entity has any of theses classes, it is preferred. The classes are in descending order of preference'>" +
"<element name='PreferredClasses' a:help='Space delimited list of classes preferred for attacking. If an entity has any of these classes, it is preferred. The classes are in descending order of preference'>" +
"<attribute name='datatype'>" +
"<value>tokens</value>" +
"</attribute>" +
@@ -114,9 +114,9 @@ Attack.prototype.Schema =
"<text/>" +
"</element>" +
AttackHelper.BuildAttackEffectsSchema() +
"<element name='MaxRange' a:help='Maximum attack range (in metres)'><ref name='nonNegativeDecimal'/></element>" +
"<element name='MaxRange' a:help='Maximum attack range (in meters)'><ref name='nonNegativeDecimal'/></element>" +
"<optional>" +
"<element name='MinRange' a:help='Minimum attack range (in metres). Defaults to 0.'><ref name='nonNegativeDecimal'/></element>" +
"<element name='MinRange' a:help='Minimum attack range (in meters). Defaults to 0.'><ref name='nonNegativeDecimal'/></element>" +
"</optional>" +
"<optional>"+
"<element name='Origin' a:help='The offset from which the attack occurs, relative to the entity position. Defaults to {0,0,0}.'>" +
@@ -4,10 +4,10 @@ Capturable.prototype.Schema =
"<element name='CapturePoints' a:help='Maximum capture points.'>" +
"<ref name='positiveDecimal'/>" +
"</element>" +
"<element name='RegenRate' a:help='Number of capture points that are regenerated per second in favour of the owner.'>" +
"<element name='RegenRate' a:help='Number of capture points that are regenerated per second in favor of the owner.'>" +
"<ref name='nonNegativeDecimal'/>" +
"</element>" +
"<element name='GarrisonRegenRate' a:help='Factor how much each garrisoned entity will add capture points to the regeneration per second in favour of the owner.'>" +
"<element name='GarrisonRegenRate' a:help='Factor how much each garrisoned entity will add capture points to the regeneration per second in favor of the owner.'>" +
"<ref name='nonNegativeDecimal'/>" +
"</element>";
@@ -45,7 +45,7 @@ EntityLimits.prototype.Schema =
"</element>" +
"<element name='LimitRemovers' a:help='List of building/unit(s) requirements to lift a specific limit.'>" +
"<zeroOrMore>" +
"<element a:help='Specifies a category of building/unit on which to remove this limit. The limit will be removed if all the followings requirements are satisfied'>" +
"<element a:help='Specifies a category of building/unit on which to remove this limit. The limit will be removed if all the following requirements are satisfied'>" +
"<anyName />" +
"<oneOrMore>" +
"<element a:help='Possible requirements are: RequiredTechs and RequiredClasses'>" +
@@ -14,7 +14,7 @@ Heal.prototype.Schema =
"<UnhealableClasses datatype=\"tokens\">Cavalry</UnhealableClasses>" +
"<HealableClasses datatype=\"tokens\">Support Infantry</HealableClasses>" +
"</a:example>" +
"<element name='Range' a:help='Range (in metres) where healing is possible.'>" +
"<element name='Range' a:help='Range (in meters) where healing is possible.'>" +
"<ref name='nonNegativeDecimal'/>" +
"</element>" +
"<optional>" +
@@ -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);
@@ -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 [];
}
}
@@ -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"
}
@@ -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"
}
@@ -15,7 +15,7 @@
<Identity>
<GenericName>Rampart Tower</GenericName>
<SelectionGroupName>structures/maur/tower_double</SelectionGroupName>
<Tooltip>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.</Tooltip>
<Tooltip>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.</Tooltip>
<Civ>maur</Civ>
<SpecificName>Udarka</SpecificName>
<Requirements>
+3 -3
View File
@@ -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");
}
}
+2 -2
View File
@@ -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");
}
}
+3 -3
View File
@@ -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;
}
+2 -2
View File
@@ -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;
}
+2 -2
View File
@@ -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;
}
+1 -1
View File
@@ -520,7 +520,7 @@ static void RunGameOrAtlas(const PS::span<const char* const> 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;
}
+2 -2
View File
@@ -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;
}
+2 -2
View File
@@ -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());
}
}
@@ -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> 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)
+3 -3
View File
@@ -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:
"<element name='DelayTime' a:help='Time to wait before starting to sink, in seconds'>"
"<ref name='nonNegativeDecimal'/>"
"</element>"
"<element name='SinkRate' a:help='Initial rate of sinking, in metres per second'>"
"<element name='SinkRate' a:help='Initial rate of sinking, in meters per second'>"
"<ref name='nonNegativeDecimal'/>"
"</element>"
"<element name='SinkAccel' a:help='Acceleration rate of sinking, in metres per second per second'>"
"<element name='SinkAccel' a:help='Acceleration rate of sinking, in meters per second per second'>"
"<ref name='nonNegativeDecimal'/>"
"</element>";
}
@@ -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:
"</a:example>"
"<choice>"
"<element name='Square' a:help='Set the footprint to a square of the given size'>"
"<attribute name='width' a:help='Size of the footprint along the left/right direction (in metres)'>"
"<attribute name='width' a:help='Size of the footprint along the left/right direction (in meters)'>"
"<data type='decimal'>"
"<param name='minExclusive'>0.0</param>"
"</data>"
"</attribute>"
"<attribute name='depth' a:help='Size of the footprint along the front/back direction (in metres)'>"
"<attribute name='depth' a:help='Size of the footprint along the front/back direction (in meters)'>"
"<data type='decimal'>"
"<param name='minExclusive'>0.0</param>"
"</data>"
"</attribute>"
"</element>"
"<element name='Circle' a:help='Set the footprint to a circle of the given size'>"
"<attribute name='radius' a:help='Radius of the footprint (in metres)'>"
"<attribute name='radius' a:help='Radius of the footprint (in meters)'>"
"<data type='decimal'>"
"<param name='minExclusive'>0.0</param>"
"</data>"
"</attribute>"
"</element>"
"</choice>"
"<element name='Height' a:help='Vertical extent of the footprint (in metres)'>"
"<element name='Height' a:help='Vertical extent of the footprint (in meters)'>"
"<ref name='nonNegativeDecimal'/>"
"</element>"
"<optional>"
@@ -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:
"<value a:help='Rotate in all directions to follow the terrain (e.g. carts)'>pitch-roll</value>"
"</choice>"
"</element>"
"<element name='Altitude' a:help='Height above terrain in metres'>"
"<element name='Altitude' a:help='Height above terrain in meters'>"
"<data type='decimal'/>"
"</element>"
"<element name='Floating' a:help='Whether the entity floats on water'>"
@@ -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:
"<element name='Shape' a:help='Specifies shape of overlay. If not specified, footprint shape will be used.'>"
"<choice>"
"<element name='Square' a:help='Set the overlay to a square of the given size'>"
"<attribute name='width' a:help='Size of the overlay along the left/right direction (in metres)'>"
"<attribute name='width' a:help='Size of the overlay along the left/right direction (in meters)'>"
"<data type='decimal'>"
"<param name='minExclusive'>0.0</param>"
"</data>"
"</attribute>"
"<attribute name='depth' a:help='Size of the overlay along the front/back direction (in metres)'>"
"<attribute name='depth' a:help='Size of the overlay along the front/back direction (in meters)'>"
"<data type='decimal'>"
"<param name='minExclusive'>0.0</param>"
"</data>"
"</attribute>"
"</element>"
"<element name='Circle' a:help='Set the overlay to a circle of the given size'>"
"<attribute name='radius' a:help='Radius of the overlay (in metres)'>"
"<attribute name='radius' a:help='Radius of the overlay (in meters)'>"
"<data type='decimal'>"
"<param name='minExclusive'>0.0</param>"
"</data>"
@@ -252,7 +252,7 @@ public:
"<element name='FormationController'>"
"<data type='boolean'/>"
"</element>"
"<element name='WalkSpeed' a:help='Basic movement speed (in metres per second).'>"
"<element name='WalkSpeed' a:help='Basic movement speed (in meters per second).'>"
"<ref name='positiveDecimal'/>"
"</element>"
"<optional>"
@@ -263,7 +263,7 @@ public:
"<element name='InstantTurnAngle' a:help='Angle we can turn instantly. Any value greater than pi will disable turning times. Avoid zero since it stops the entity every turn.'>"
"<ref name='positiveDecimal'/>"
"</element>"
"<element name='Acceleration' a:help='Acceleration (in metres per second^2).'>"
"<element name='Acceleration' a:help='Acceleration (in meters per second^2).'>"
"<ref name='positiveDecimal'/>"
"</element>"
"<element name='PassabilityClass' a:help='Identifies the terrain passability class (values are defined in special/pathfinder.xml).'>"
@@ -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:
@@ -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;
}
+1 -1
View File
@@ -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()
+2 -2
View File
@@ -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;
}
@@ -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;
}
@@ -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;
}
@@ -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());
}
}
+1 -1
View File
@@ -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)