1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
|
From: Barry deFreese <bdefreese@debian.org>
Date: Tue, 18 Mar 2014 12:09:37 +0100
Subject: spelling errors
Forwarded: http://battle-planet.de/pbp/board/viewtopic.php?f=48&t=5101
---
ChangeLog | 2 +-
data/campaign/standard/asc008.map.en_US | 2 +-
source/dialogs/editgameoptions.cpp | 2 +-
source/edglobal.cpp | 2 +-
source/gamemap.cpp | 2 +-
source/libs/paragui/src/themes/themeloader.cpp | 2 +-
source/maped-mainscreen.cpp | 4 ++--
source/sg.cpp | 2 +-
source/sgstream.cpp | 2 +-
source/tools/infopage.cpp | 4 ++--
source/tools/infopage.h | 4 ++--
source/weatherdialog.cpp | 2 +-
source/weatherdialog.h | 4 ++--
13 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 694cadc..13024b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28501,7 +28501,7 @@ The old Changelogs were automatically created from CVS history:
* source/: artint.cpp, artint.h, building.cpp, building.h,
controls.cpp, mousehnd.cpp, sg.cpp, sg.wpj, strtmesg.cpp,
dos/mousehnd.cpp, hexagon/asc.tgt, hexagon/mapedit/edhex.tgt,
- tools/asctool.tgt, tools/tools.wpj: Fixed crash when transfering
+ tools/asctool.tgt, tools/tools.wpj: Fixed crash when transferring
ammo to vehicle with > 8 weapons
2000-06-09 17:13 mbickel
diff --git a/data/campaign/standard/asc008.map.en_US b/data/campaign/standard/asc008.map.en_US
index fc8dd5f..bef77f6 100644
--- a/data/campaign/standard/asc008.map.en_US
+++ b/data/campaign/standard/asc008.map.en_US
@@ -1,6 +1,6 @@
map = asc.getLoadingMap()
--- ===== 170 =======
-message = [[Thunderlance HQ, Rogul:#crt##crt#Commander, we have found a hoovercraft. This vehicle is damaged and without fuel. The hoovercraft seems to have been for transfering workers to a little island in the west. Perhaps we will find some tools their to rebuild the bridge across the river.#crt##crt#Thor Menser,#crt#Thunderlance Military Advisor #crt#]]
+message = [[Thunderlance HQ, Rogul:#crt##crt#Commander, we have found a hoovercraft. This vehicle is damaged and without fuel. The hoovercraft seems to have been for transferring workers to a little island in the west. Perhaps we will find some tools their to rebuild the bridge across the river.#crt##crt#Thor Menser,#crt#Thunderlance Military Advisor #crt#]]
asc.setLocalizedEventMessage( map, 170, message )
--- ===== 88 =======
diff --git a/source/dialogs/editgameoptions.cpp b/source/dialogs/editgameoptions.cpp
index e89463e..67ec719 100644
--- a/source/dialogs/editgameoptions.cpp
+++ b/source/dialogs/editgameoptions.cpp
@@ -325,7 +325,7 @@ class EditGameOptions : public ASC_PG_Dialog {
(new PG_PropertyField_String<ASCString>( propertyEditor , "Language Override", &o->languageOverride ));
if ( !mainApp )
- new PG_PropertyField_Checkbox<bool>( propertyEditor, "DEV: Save event message seperately", &o->saveEventMessagesExternal );
+ new PG_PropertyField_Checkbox<bool>( propertyEditor, "DEV: Save event message separately", &o->saveEventMessagesExternal );
PG_Button* ok = new PG_Button( this, PG_Rect( Width() - 100, Height() - 40, 90, 30), "OK" );
diff --git a/source/edglobal.cpp b/source/edglobal.cpp
index b2b1886..52699d3 100644
--- a/source/edglobal.cpp
+++ b/source/edglobal.cpp
@@ -121,7 +121,7 @@
"End PolygonMode",
"Smooth coasts",
"Import BI-Map",
- "SEPERATOR",
+ "SEPARATOR",
"BI-Resource Mode",
"Resize map",
"Insert BI map",
diff --git a/source/gamemap.cpp b/source/gamemap.cpp
index 9850f3a..9d73081 100644
--- a/source/gamemap.cpp
+++ b/source/gamemap.cpp
@@ -2276,7 +2276,7 @@ GameParameterSettings gameParameterSettings[gameparameternum ] = {
{ "TrainingIncrement", 2, 1, maxunitexperience, true, false, "training centers: training increment"}, // cgp_trainingIncrement,
{ "ExperienceEffectDivisorAttack", 1, 1, 10, false, false, "experience effect divisor for attack"}, // gp_experienceDivisorAttack
{ "DisableDirectView", 1, 0, 1, false, false, "disable direct View"}, // cgp_disableDirectView
- { "DisableUnitTrade", 0, 0, 1, false, false, "disable transfering units/buildings to other players"}, // cgp_disableUnitTransfer
+ { "DisableUnitTrade", 0, 0, 1, false, false, "disable transferring units/buildings to other players"}, // cgp_disableUnitTransfer
{ "ExperienceEffectDivisorDefense", 1, 1, 10, false, false, "experience effect divisor for defense"}, // cgp_experienceDivisorDefense
{ "DebugGameEvents", 0, 0, 2, true, false, "debug game events"}, // cgp_debugEvents
{ "ObjectGrowthRate", 0, 0, maxint, true, false, "Object growth rate (percentage)" }, // cgp_objectGrowthMultiplier
diff --git a/source/libs/paragui/src/themes/themeloader.cpp b/source/libs/paragui/src/themes/themeloader.cpp
index f58017c..eba04ce 100644
--- a/source/libs/paragui/src/themes/themeloader.cpp
+++ b/source/libs/paragui/src/themes/themeloader.cpp
@@ -480,7 +480,7 @@ PG_Theme* PG_Theme::Load(const std::string& xmltheme) {
delete file;
delete[] buff;
- PG_LogMSG("theme '%s' loaded sucessfully", filename.c_str());
+ PG_LogMSG("theme '%s' loaded successfully", filename.c_str());
return info.theme;
}
diff --git a/source/maped-mainscreen.cpp b/source/maped-mainscreen.cpp
index cb1846f..87968f8 100644
--- a/source/maped-mainscreen.cpp
+++ b/source/maped-mainscreen.cpp
@@ -133,8 +133,8 @@ void Menu::setup()
addbutton ( "Resi~z~e map\tR", act_resizemap );
addbutton ( "set global uniform ~w~eather\tctrl-W", act_setactweatherglobal );
// addbutton ( "configure weather generator", act_setactnewweather );
- addbutton ( "~C~reate regional ressources", act_createresources );
- addbutton ( "Create global ressources\tctrl+F", act_createresources2 );
+ addbutton ( "~C~reate regional resources", act_createresources );
+ addbutton ( "Create global resources\tctrl+F", act_createresources2 );
addbutton ( "Clear all mineral resources", act_clearresources );
currentMenu->addSeparator();
addbutton ( "~S~et turn number", act_setTurnNumber );
diff --git a/source/sg.cpp b/source/sg.cpp
index d7c53dc..193daa6 100644
--- a/source/sg.cpp
+++ b/source/sg.cpp
@@ -43,7 +43,7 @@
available. They are not modified during runtime in any way and are referenced
by the indiividual instances of Vehicle and Building.
The Vehicletype has information that are shared by all vehicles of this 'type', like speed,
- weapon systems, accessable terrain etc, while the vehicle stores things like remaining movement for this
+ weapon systems, accessible terrain etc, while the vehicle stores things like remaining movement for this
turn, ammo, fuel and cargo.
The primary contents of a GameMap are its fields ( #tfield ). Each field has again a pointer
diff --git a/source/sgstream.cpp b/source/sgstream.cpp
index dbe5d8b..06f460c 100644
--- a/source/sgstream.cpp
+++ b/source/sgstream.cpp
@@ -400,7 +400,7 @@ int readgameoptions ( const ASCString& filename )
if ( !filename.empty() ) {
CGameOptions::Instance()->setChanged();
if ( writegameoptions( filename ))
- displayLogMessage ( 6, "A config file has been sucessfully written to " + filename + " ");
+ displayLogMessage ( 6, "A config file has been successfully written to " + filename + " ");
else {
warningMessage("Unable to write file " + filename );
displayLogMessage ( 6, "Failed to write config file to " + filename + " ");
diff --git a/source/tools/infopage.cpp b/source/tools/infopage.cpp
index afe4691..39f8634 100644
--- a/source/tools/infopage.cpp
+++ b/source/tools/infopage.cpp
@@ -506,7 +506,7 @@ void BuildingCargoPage::buildContent() {
type = addTREntryln(type, cmovemalitypes[h]);
}
}
- addTREntry("Building accessable to", type);
+ addTREntry("Building accessible to", type);
endTable();
if ( !cbt.entranceSystems.empty() ) {
addHeadline("Entrance System", 4);
@@ -734,7 +734,7 @@ void UnitCargoPage::buildContent() {
type = addTREntryln(type, cmovemalitypes[h]);
}
}
- addTREntry("Unit accessable for", type);
+ addTREntry("Unit accessible for", type);
endTable();
if ( !cbt.entranceSystems.empty() ) {
addHeadline("Entrance System", 4);
diff --git a/source/tools/infopage.h b/source/tools/infopage.h
index d9547c7..8f225f3 100644
--- a/source/tools/infopage.h
+++ b/source/tools/infopage.h
@@ -478,8 +478,8 @@ public:
};
/**
-@brief Representation of one the building information page containing the information which ressources
- the building can provide. Research points are treated as one ressource a building can provide
+@brief Representation of one the building information page containing the information which resources
+ the building can provide. Research points are treated as one resource a building can provide
*@author Kevin Hirschmann
*/
class BuildingResourcePage: public BuildingInfoPage {
diff --git a/source/weatherdialog.cpp b/source/weatherdialog.cpp
index 512fa34..4f20ce1 100644
--- a/source/weatherdialog.cpp
+++ b/source/weatherdialog.cpp
@@ -411,7 +411,7 @@ void EventWindChangesDialog::addNewWindInformation(WindInformation* wi) {
const int AddWindChangeDialog::xSize = 400;
const int AddWindChangeDialog::ySize = 400;
-const string SEPERATOR = ";";
+const string SEPARATOR = ";";
AddWindChangeDialog::AddWindChangeDialog(EventWindChangesDialog* ewcd): ASC_PG_Dialog(ewcd, PG_Rect( 0, 0, xSize, ySize ), "Add Weather Area", SHOW_CLOSE ) {
int valueXPos = static_cast<int>(xSize * 0.75);
diff --git a/source/weatherdialog.h b/source/weatherdialog.h
index 984d3f5..9e71951 100644
--- a/source/weatherdialog.h
+++ b/source/weatherdialog.h
@@ -115,7 +115,7 @@ bool closeWindow();
private:
static const int xSize;
static const int ySize;
- static const string SEPERATOR;
+ static const string SEPARATOR;
list<WeatherAreaInformation*> currentList;
list<WeatherAreaInformation*> removeList;
list<WeatherAreaInformation*> addList;
@@ -159,7 +159,7 @@ bool closeWindow();
private:
static const int xSize;
static const int ySize;
- static const string SEPERATOR;
+ static const string SEPARATOR;
list<WindInformation*> currentList;
list<WindInformation*> addList;
|
