Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Spelling, typos, grammar, etc #4355

Merged
merged 1 commit into from
Jul 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions MekHQ/resources/mekhq/resources/AtBScenarioBuiltIn.properties
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ battleDetails.ambush.description=One of your MechWarriors is ambushed by 3 enemy
battleDetails.civilianHelp.description=One officer deploys with 4 civilian units against 3 enemy Meks. To win you must destroy 2 of the enemy Meks while keeping alive your officer and at least 1 civilian unit. If you win you receive a bonus for each civilian unit that survived. The winner controls the battlefield.
battleDetails.alliedTraitors.description=One of your Mechwarriors is ambushed by 2 traitors from the allied forces. To win you must destroy the 2 enemy Mek. The winner controls the battlefield.
battleDetails.prisonBreak.description=One random Mechwarrior that pilots a Light/Medium Mek tries to free prisoners from a POW camp. Your Mechwarrior must defend 4 Civilian units against 3 enemy Meks. To win you must keep your Mek and at least 1 civilian unit alive for 8 turns. Guards control the field unless all enemy Meks are destroyed before the end of turn 8. Each civilian unit alive at the end of the scenario gets you a bonus.\nYou can keep the civilian units after the battle.
battleDetails.starLeagueCache1.description=You find a long lost Star League cache with one functional Star League era Mek. Unfortunately the enemy arrives just as the Mek is being powered up. One of your Mechwarriors (random) pilots his Mek together with a single Star League era Mek piloted by a the tech that was powering up the Mek against 3 enemy Meks. To win you must destroy all 3 enemy Meks. If the SL Mek is functional after the battle, up to 3050 the employer will offer a random Mek from the same weight class for the Mek in exchange. You get a minor contract breach if you refuse. If the Mek is primitive you can keep it without fighting a battle. Winner controls the battlefield.
battleDetails.starLeagueCache2.description=The enemy finds a long lost Star League cache with one functional Star League Mek, just one of your pilots is in position to stop the enemy from escaping with the advanced Mek. One of your Mechwarriors pilots his Mek against a Star League era Mek of the same weight class piloted by a enemy Mechwarrior. You must destroy the enemy Mek. Up to 3050 the employer will demand the SL mech in exchange for a random employer Mek of the same weight class. You can also keep the Mek and get a minor contract breach.
battleDetails.starLeagueCache1.description=You find a long-lost Star League cache with one functional Star League era Mek. Unfortunately the enemy arrives just as the Mek is being powered up. One of your Mechwarriors (random) pilots his Mek together with a single Star League era Mek piloted by a tech that was powering up the Mek against 3 enemy Meks. To win you must destroy all 3 enemy Meks. If the SL Mek is functional after the battle, up to 3050 the employer will offer a random Mek from the same weight class for the Mek in exchange. You get a minor contract breach if you refuse. If the Mek is primitive you can keep it without fighting a battle. Winner controls the battlefield.
battleDetails.starLeagueCache2.description=The enemy finds a long-lost Star League cache with one functional Star League Mek, just one of your pilots is in position to stop the enemy from escaping with the advanced Mek. One of your Mechwarriors pilots his Mek against a Star League era Mek of the same weight class piloted by an enemy Mechwarrior. You must destroy the enemy Mek. Up to 3050 the employer will demand the SL mech in exchange for a random employer Mek of the same weight class. You can also keep the Mek and get a minor contract breach.

battleDetails.allyRescue.specialConditions=8-unit allied force deploys in center at beginning of battle. Enemy force is 12 Meks deploying at N. Player units deploy at S in (12-walking speed) turns, each unit deploying according to its speed
battleDetails.allyRescue.victory=Player must destroy 50% of attacking force while keeping at least 3 units of the allied force alive. If the player loses more than 5 units of the allied force or 50% of the rescuing force is destroyed, the battle is a loss.
Expand Down
2 changes: 1 addition & 1 deletion MekHQ/resources/mekhq/resources/CampaignGUI.properties
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ panObjectives.title=Current Objectives
lblRating.text=<html><nobr><b>Unit Rating:</b></nobr></html>;
lblPersonnel.text=<html><nobr><b>Personnel:</b></nobr></html>;
lblMorale.text=<html><nobr><b>Morale:</b></nobr></html>;
lblAdministrativeCapacity.text=<html><nobr><b>Adminstrative Capacity:</b></nobr></html>;
lblAdministrativeCapacity.text=<html><nobr><b>Administrative Capacity:</b></nobr></html>;
lblMissionSuccess.text=<html><nobr><b>Mission Success Rate:</b></nobr></html>;
lblExperience.text=<html><nobr><b>Experience:</b></nobr></html>;
lblComposition.text=<html><nobr><b>Unit Composition:</b></nobr></html>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ reverseQualityNames.toolTipText=<html>If checked, quality name reporting will be
chkUseRandomUnitQualities.text=Random New Unit Quality
chkUseRandomUnitQualities.toolTipText=If checked, the quality of new units is randomized when they are added to the campaign. Otherwise, quality will always default to D.
useUnofficialMaintenance.text=Only damage parts that are already at worst quality (Unofficial)
useUnofficialMaintenance.toolTipText=<html>When this option is checked and you are using quality maintenance, <br>the margin of failure rolls for damaging parts only happen for parts that are already rated at the lowest level.</html>
useUnofficialMaintenance.toolTipText=<html>When this option is checked, and you are using quality maintenance, <br>the margin of failure rolls for damaging parts only happen for parts that are already rated at the lowest level.</html>
logMaintenance.text=Log maintenance rolls in log file
logMaintenance.toolTipText=If checked, details of each maintenance check will be added to mekhq.log
useEraModsCheckBox.text=Use era mods for repair rolls
Expand Down Expand Up @@ -443,7 +443,7 @@ marriageSurnameWeightsPanel.toolTipText=<html>These are the weights used in dete
randomMarriagePanel.title=Random Marriages (Unofficial)
lblRandomMarriageMethod.text=Random Marriage Method
lblRandomMarriageMethod.toolTipText=This is the method used to determine if an eligible person randomly marries.
chkUseRandomSameSexMarriages.text=Use Same Sex Random Marriage
chkUseRandomSameSexMarriages.text=Use Same-sex Random Marriage
chkUseRandomSameSexMarriages.toolTipText=This enables random marriages between fitting same sex members of your force.
chkUseRandomClanPersonnelMarriages.text=Use Random Clan Personnel Marriages
chkUseRandomClanPersonnelMarriages.toolTipText=Allow clan-origin personnel to randomly marry other personnel.
Expand Down Expand Up @@ -482,7 +482,7 @@ percentageRandomDivorcePanel.title=Percentage Random Divorce
lblPercentageRandomDivorceOppositeSexChance.text=Opposite Sex Chance
lblPercentageRandomDivorceOppositeSexChance.toolTipText=This is the percent chance that a fitting member of your force will divorce their opposite sex spouse.
lblPercentageRandomDivorceSameSexChance.text=Same Sex Chance
lblPercentageRandomDivorceSameSexChance.toolTipText=This is the percent chance that a fitting member of your force will divorce their same sex spouse.
lblPercentageRandomDivorceSameSexChance.toolTipText=This is the percent chance that a fitting member of your force will divorce their same-sex spouse.

# Procreation
procreationPanel.title=Procreation (Unofficial)
Expand Down Expand Up @@ -936,5 +936,5 @@ btnLoadPreset.toolTipText=Load a Campaign Preset and apply it to the current dia

## Option Validation Warnings
CampaignOptionsPane.EmptyCampaignName.text=You cannot have an empty campaign name.
CampaignOptionsPane.NullFactionSelected.text=You cannot have an empty campaign name.
CampaignOptionsPane.NullFactionSelected.text=You cannot have an empty campaign faction.
CampaignOptionsPane.FactionWithoutFactionCodeSelected.text=You cannot select a faction named %s, as it is missing its faction code.
4 changes: 2 additions & 2 deletions MekHQ/resources/mekhq/resources/Personnel.properties
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ cannotDivorce.RandomClanPersonnelSpouse.text=Their spouse is from a clan, and ra
cannotDivorce.RandomPrisoner.text=They are a prisoner, and random prisoner divorce is disabled.
cannotDivorce.RandomPrisonerSpouse.text=Their spouse is a prisoner, and random prisoner divorce is disabled.
cannotDivorce.OppositeSexDivorceDisabled.text=They cannot randomly divorce as they are in an opposite sex marriage and opposite sex random divorce is disabled.
cannotDivorce.SameSexDivorceDisabled.text=They cannot randomly divorce as they are in an same-sex marriage and same-sex random divorce is disabled.
cannotDivorce.SameSexDivorceDisabled.text=They cannot randomly divorce as they are in a same-sex marriage and same-sex random divorce is disabled.
divorce.report=%s has divorced %s!


Expand Down Expand Up @@ -684,7 +684,7 @@ cannotProcreate.AlreadyPregnant.text=She is already pregnant.
cannotProcreate.Inactive.text=She is currently inactive.
cannotProcreate.Deployed.text=She is actively deployed.
cannotProcreate.Child.text=She is a child. Those thirteen and under cannot procreate in MekHQ.
cannotProcreate.TooOld.text=She is too old to have child. Those fifty one and over cannot procreate in MekHQ.
cannotProcreate.TooOld.text=She is too old to have child. Those fifty-one and over cannot procreate in MekHQ.
cannotProcreate.ClanPersonnel.text=She is from a clan, and clan personnel procreation is disabled.
cannotProcreate.Prisoner.text=She is a prisoner, and prisoner procreation is disabled.
cannotProcreate.NoSpouse.text=She does not have a spouse and relationshipless random procreation is disabled.
Expand Down