Skip to content

Commit f49b4ba

Browse files
RobosturmRobosturm
authored
Merge pull request #1889 from FruityGumGuiltyFruit/master
Grammar fixes
2 parents 0adb0ef + 86eaf4b commit f49b4ba

10 files changed

+25
-25
lines changed

‎resources/scripts/cos/co_amy.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ var Constructor = function()
336336
{
337337
values = [CO_AMY.d2dMovementBonus, CO_AMY.d2dHoverCraftBoost];
338338
}
339-
var text = qsTr("\nGlobal Effect: \nHer hovercraft have +%0 movement and gain +%1% firepower. ");
339+
var text = qsTr("\nGlobal Effect: \nHer hovercraft have +%0 movement and +%1% firepower. ");
340340
if (map === null ||
341341
(map !== null && map.getGameRules().getCoGlobalD2D()))
342342
{

‎resources/scripts/cos/co_brenner.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ var Constructor = function()
248248
{
249249
values = [CO_BRENNER.d2dDefBonus];
250250
}
251-
var text = qsTr("\nSpecial Unit:\nRepair Tanks\n\nGlobal Effect: \nBrenner's units gain +%0% defence.") +
251+
var text = qsTr("\nSpecial Unit:\nRepair Tank\n\nGlobal Effect: \nBrenner's units gain +%0% defence.") +
252252
qsTr("\n\nCO Zone Effect: \nBrenner's units gain +%1% firepower and +%2% defence.");
253253
text = replaceTextArgs(text, [values[0], CO_BRENNER.d2dCoZoneOffBonus, CO_BRENNER.d2dCoZoneDefBonus]);
254254
return text;

‎resources/scripts/cos/co_drake.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ var Constructor = function()
369369
}
370370
var text = qsTr("\nSpecial Unit:\nMissile Submarine\n\n" +
371371
"Global Effect: \nDrake's naval units gain +%0 movement, +%1% firepower, and +%2% defence. His air units have %3% firepower." +
372-
"\n\nCO Zone Effect: \nDrake's naval units gain +%4% firepower and +%5% defence. His air units have -%6% firepower and gain +%7% defence. All of his other units gain +%8% firepower and +%7% defence.");
372+
"\n\nCO Zone Effect: \nDrake's naval units gain +%4% firepower and +%5% defence. His air units have %6% firepower and gain +%7% defence. All of his other units gain +%8% firepower and +%7% defence.");
373373
text = replaceTextArgs(text, [values[0], values[1], values[2], values[3],
374374
CO_DRAKE.d2dCoZoneNavalOffBonus, CO_DRAKE.d2dCoZoneNavalDefBonus, CO_DRAKE.d2dCoZoneAirOffBonus, CO_DRAKE.d2dCoZoneDefBonus, CO_DRAKE.d2dCoZoneOtherOffBonus]);
375375
return text;

‎resources/scripts/cos/co_greyfield.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ var Constructor = function()
323323
};
324324
this.getCODescription = function(co)
325325
{
326-
return qsTr("Copter, seaplanes and sea units are superior.");
326+
return qsTr("Copters, seaplanes and sea units are superior.");
327327
};
328328
this.getLongCODescription = function(co, map)
329329
{
@@ -334,15 +334,15 @@ var Constructor = function()
334334
values = [CO_GREYFIELD.d2dOffBonus, CO_GREYFIELD.d2dDefBonus];
335335
}
336336
var text = qsTr("\nSpecial Unit:\nMissile Submarine\n") +
337-
qsTr("\nGlobal Effect: \nGreyfield's copters and naval units gain +%0% firepower and +%1% defence.") +
338-
qsTr("\n\nCO Zone Effect: \nGreyfield's copters and naval units gain +%2% firepower and +%3% defence. His other units gain +%4% firepower and +%5% defence.");
337+
qsTr("\nGlobal Effect: \nGreyfield's copters, seaplanes, and naval units gain +%0% firepower and +%1% defence.") +
338+
qsTr("\n\nCO Zone Effect: \nGreyfield's copters, seaplanes, and naval units gain +%2% firepower and +%3% defence. His other units gain +%4% firepower and +%5% defence.");
339339
text = replaceTextArgs(text, [values[0], values[1],
340340
CO_GREYFIELD.d2dCoZoneOffBonus, CO_GREYFIELD.d2dCoZoneDefBonus, CO_GREYFIELD.d2dCoZoneBaseOffBonus, CO_GREYFIELD.d2dCoZoneBaseDefBonus]);
341341
return text;
342342
};
343343
this.getPowerDescription = function(co)
344344
{
345-
var text = qsTr("Greyfield's copters and naval units gain +%0% firepower and +%1% defence. His other units gain +%2% firepower and +%3% defence. All of his units replenish all fuel and ammunition.");
345+
var text = qsTr("Greyfield's copters, seaplanes, and naval units gain +%0% firepower and +%1% defence. His other units gain +%2% firepower and +%3% defence. All of his units replenish all fuel and ammunition.");
346346
text = replaceTextArgs(text, [CO_GREYFIELD.powerOffBonus, CO_GREYFIELD.powerDefBonus, CO_GREYFIELD.powerBaseOffBonus, CO_GREYFIELD.powerBaseDefBonus]);
347347
return text;
348348
};
@@ -352,7 +352,7 @@ var Constructor = function()
352352
};
353353
this.getSuperPowerDescription = function(co)
354354
{
355-
var text = qsTr("Greyfield's copters and naval units gain +%0% firepower, +%1% defence, and +%2 movement. His other units gain +%3% firepower and +%4% defence. All of his units replenish all fuel and ammunition.");
355+
var text = qsTr("Greyfield's copters, seaplanes, and naval units gain +%0% firepower, +%1% defence, and +%2 movement. His other units gain +%3% firepower and +%4% defence. All of his units replenish all fuel and ammunition.");
356356
text = replaceTextArgs(text, [CO_GREYFIELD.superPowerOffBonus, CO_GREYFIELD.superPowerDefBonus, CO_GREYFIELD.superPowerMovementBonus, CO_GREYFIELD.powerBaseOffBonus, CO_GREYFIELD.powerBaseDefBonus]);
357357
return text;
358358
};

‎resources/ui/editor/mapEditDialog.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
<x>lastX + lastWidth + 10</x>
139139
<y>lastY</y>
140140
<width>250</width>
141-
<tooltip>QT_TRANSLATE_NOOP("GAME","The heigth of the map.")</tooltip>
141+
<tooltip>QT_TRANSLATE_NOOP("GAME","The height of the map.")</tooltip>
142142
<startValue>mapEdit.getMapHeight()</startValue>
143143
<infinite>1</infinite>
144144
<min>1</min>
@@ -210,7 +210,7 @@
210210
<Checkbox>
211211
<x>lastX + lastWidth + 10</x>
212212
<y>lastY</y>
213-
<tooltip>QT_TRANSLATE_NOOP("GAME","If the map is predeoployed.")</tooltip>
213+
<tooltip>QT_TRANSLATE_NOOP("GAME","If the map is predeployed.")</tooltip>
214214
<startValue>mapEdit.getMapFlag(GameEnums.MapFilterFlags_Predeployed)</startValue>
215215
<onEvent>mapEdit.setMapFlag(GameEnums.MapFilterFlags_Predeployed, input);</onEvent>
216216
</Checkbox>
@@ -241,14 +241,14 @@
241241
<x>10</x>
242242
<y>lastY + lastHeight + 10</y>
243243
<width>250</width>
244-
<text>QT_TRANSLATE_NOOP("GAME","Symetric:")</text>
244+
<text>QT_TRANSLATE_NOOP("GAME","Symmetric:")</text>
245245
<font>"main"</font>
246246
<fontSize>24</fontSize>
247247
</Label>
248248
<Checkbox>
249249
<x>lastX + lastWidth + 10</x>
250250
<y>lastY</y>
251-
<tooltip>QT_TRANSLATE_NOOP("GAME","If the map is symetric.")</tooltip>
251+
<tooltip>QT_TRANSLATE_NOOP("GAME","If the map is symmetric.")</tooltip>
252252
<startValue>mapEdit.getMapFlag(GameEnums.MapFilterFlags_Symetric)</startValue>
253253
<onEvent>mapEdit.setMapFlag(GameEnums.MapFilterFlags_Symetric, input);</onEvent>
254254
</Checkbox>
@@ -323,7 +323,7 @@
323323
<Checkbox>
324324
<x>lastX + lastWidth + 10</x>
325325
<y>lastY</y>
326-
<tooltip>QT_TRANSLATE_NOOP("GAME","If the map is designed as historical map.")</tooltip>
326+
<tooltip>QT_TRANSLATE_NOOP("GAME","If the map is designed as a historical map.")</tooltip>
327327
<startValue>mapEdit.getMapFlag(GameEnums.MapFilterFlags_Historical)</startValue>
328328
<onEvent>mapEdit.setMapFlag(GameEnums.MapFilterFlags_Historical, input);</onEvent>
329329
</Checkbox>
@@ -346,7 +346,7 @@
346346
<Checkbox>
347347
<x>lastX + lastWidth + 10</x>
348348
<y>lastY</y>
349-
<tooltip>QT_TRANSLATE_NOOP("GAME","If the map is designed as low funds map.")</tooltip>
349+
<tooltip>QT_TRANSLATE_NOOP("GAME","If the map is designed as a low funds map.")</tooltip>
350350
<startValue>mapEdit.getMapFlag(GameEnums.MapFilterFlags_LowFunds)</startValue>
351351
<onEvent>mapEdit.setMapFlag(GameEnums.MapFilterFlags_LowFunds, input);</onEvent>
352352
</Checkbox>
@@ -361,7 +361,7 @@
361361
<Checkbox>
362362
<x>lastX + lastWidth + 10</x>
363363
<y>lastY</y>
364-
<tooltip>QT_TRANSLATE_NOOP("GAME","If the map is designed as high funds map.")</tooltip>
364+
<tooltip>QT_TRANSLATE_NOOP("GAME","If the map is designed as a high funds map.")</tooltip>
365365
<startValue>mapEdit.getMapFlag(GameEnums.MapFilterFlags_HighFunds)</startValue>
366366
<onEvent>mapEdit.setMapFlag(GameEnums.MapFilterFlags_HighFunds, input);</onEvent>
367367
</Checkbox>
@@ -384,7 +384,7 @@
384384
<Checkbox>
385385
<x>lastX + lastWidth + 10</x>
386386
<y>lastY</y>
387-
<tooltip>QT_TRANSLATE_NOOP("GAME","If the map is designed as naval map.")</tooltip>
387+
<tooltip>QT_TRANSLATE_NOOP("GAME","If the map is designed as a naval map.")</tooltip>
388388
<startValue>mapEdit.getMapFlag(GameEnums.MapFilterFlags_Naval)</startValue>
389389
<onEvent>mapEdit.setMapFlag(GameEnums.MapFilterFlags_Naval, input);</onEvent>
390390
</Checkbox>
@@ -399,7 +399,7 @@
399399
<Checkbox>
400400
<x>lastX + lastWidth + 10</x>
401401
<y>lastY</y>
402-
<tooltip>QT_TRANSLATE_NOOP("GAME","If the map is designed as amphibious map.")</tooltip>
402+
<tooltip>QT_TRANSLATE_NOOP("GAME","If the map is designed as an amphibious map.")</tooltip>
403403
<startValue>mapEdit.getMapFlag(GameEnums.MapFilterFlags_Amphibious)</startValue>
404404
<onEvent>mapEdit.setMapFlag(GameEnums.MapFilterFlags_Amphibious, input);</onEvent>
405405
</Checkbox>
@@ -414,7 +414,7 @@
414414
<Checkbox>
415415
<x>lastX + lastWidth + 10</x>
416416
<y>lastY</y>
417-
<tooltip>QT_TRANSLATE_NOOP("GAME","If the map is designed as ground map.")</tooltip>
417+
<tooltip>QT_TRANSLATE_NOOP("GAME","If the map is designed as a ground map.")</tooltip>
418418
<startValue>mapEdit.getMapFlag(GameEnums.MapFilterFlags_Ground)</startValue>
419419
<onEvent>mapEdit.setMapFlag(GameEnums.MapFilterFlags_Ground, input);</onEvent>
420420
</Checkbox>
@@ -429,7 +429,7 @@
429429
<Checkbox>
430430
<x>lastX + lastWidth + 10</x>
431431
<y>lastY</y>
432-
<tooltip>QT_TRANSLATE_NOOP("GAME","If the map is designed as air map.")</tooltip>
432+
<tooltip>QT_TRANSLATE_NOOP("GAME","If the map is designed as an air map.")</tooltip>
433433
<startValue>mapEdit.getMapFlag(GameEnums.MapFilterFlags_Air)</startValue>
434434
<onEvent>mapEdit.setMapFlag(GameEnums.MapFilterFlags_Air, input);</onEvent>
435435
</Checkbox>
@@ -459,7 +459,7 @@
459459
<Checkbox>
460460
<x>lastX + lastWidth + 10</x>
461461
<y>lastY</y>
462-
<tooltip>QT_TRANSLATE_NOOP("GAME","If the map is designed as scripted map.")</tooltip>
462+
<tooltip>QT_TRANSLATE_NOOP("GAME","If the map is designed as a scripted map.")</tooltip>
463463
<startValue>mapEdit.getMapFlag(GameEnums.MapFilterFlags_Scripted)</startValue>
464464
<onEvent>mapEdit.setMapFlag(GameEnums.MapFilterFlags_Scripted, input);</onEvent>
465465
</Checkbox>

‎resources/ui/options/optionaudiomenu.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<Checkbox>
4141
<x>lastX + lastWidth + 10</x>
4242
<y>lastY</y>
43-
<tooltip>QT_TRANSLATE_NOOP("GAME","If checked: mutes all sounds and music, when the game looses it focused.")</tooltip>
43+
<tooltip>QT_TRANSLATE_NOOP("GAME","If checked: mutes all sounds and music, when the game is not focused.")</tooltip>
4444
<startValue>settings.getMuteOnFcousedLost()</startValue>
4545
<onEvent>settings.setMuteOnFcousedLost(input)</onEvent>
4646
</Checkbox>

‎resources/ui/options/optioncontrolsmenu.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@
577577
<SelectKey>
578578
<x>lastX + lastWidth + 10</x>
579579
<y>lastY</y>
580-
<tooltip>QT_TRANSLATE_NOOP("GAME","Key for quiting a running match.")</tooltip>
580+
<tooltip>QT_TRANSLATE_NOOP("GAME","Key for quitting a running match.")</tooltip>
581581
<startValue>settings.getKey_Escape()</startValue>
582582
<onEvent>settings.setKey_Escape(input)</onEvent>
583583
</SelectKey>

‎resources/ui/serverLogin/changePasswordDialog.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<x>lastX + lastWidth + 10</x>
4545
<y>lastY</y>
4646
<width>400</width>
47-
<tooltip>QT_TRANSLATE_NOOP("GAME","You're old password or password received via mail.")</tooltip>
47+
<tooltip>QT_TRANSLATE_NOOP("GAME","Your old password or password received via mail.")</tooltip>
4848
<startValue>""</startValue>
4949
<onEvent>ChangePasswordDialog.oldPassword(input);</onEvent>
5050
</Passwordbox>

‎resources/ui/serverLogin/deleteAccountDialog.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
<x>lastX + lastWidth + 10</x>
7979
<y>lastY</y>
8080
<width>400</width>
81-
<tooltip>QT_TRANSLATE_NOOP("GAME","E-Mail-Address of your account.")</tooltip>
81+
<tooltip>QT_TRANSLATE_NOOP("GAME","E-Mail address of your account.")</tooltip>
8282
<startValue>""</startValue>
8383
<onEvent>DeleteAccountDialog.emailAdress(input);</onEvent>
8484
</Textbox>

‎resources/ui/serverLogin/forgotPasswordDialog.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<x>lastX + lastWidth + 10</x>
4545
<y>lastY</y>
4646
<width>400</width>
47-
<tooltip>QT_TRANSLATE_NOOP("GAME","E-Mail-Address for your account.")</tooltip>
47+
<tooltip>QT_TRANSLATE_NOOP("GAME","E-Mail address for your account.")</tooltip>
4848
<startValue>""</startValue>
4949
<onEvent>ForgotPasswordDialog.emailAdress(input);</onEvent>
5050
</Textbox>

0 commit comments

Comments
 (0)