8000 Fix: Ensured all properties files are UTF-8. by rjhancock · Pull Request #7095 · MegaMek/mekhq · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Fix: Ensured all properties files are UTF-8. #7095

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

Merged
merged 1 commit into from
May 23, 2025
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
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,3 @@ CampaignTransportUtilities.selectTransport.null.text=None
CampaignTransportUtilities.selectTransport.TACTICAL_TRANSPORT.text=Tactical
CampaignTransportUtilities.selectTransport.SHIP_TRANSPORT.text=Ship
CampaignTransportUtilities.selectTransport.TOW_TRANSPORT.text=Tractor

2 changes: 1 addition & 1 deletion MekHQ/resources/mekhq/resources/AtBContract.properties
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ responseBringItOn.text=Bring It On
responseBringItOn.tooltip=You will face the full strength of the Clans during this contract.

refusalConfirmation.text=Are you sure? %s will not forget this betrayal.
refusalReport.text=<center><b>YOU DARE TO REFUSE MY BATCHALL!?!</b></center>
refusalReport.text=<center><b>YOU DARE TO REFUSE MY BATCHALL!?!</b></center>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AutoResolveBehaviorSettingsDialog.title=Auto Resolve Help
AutoResolveBehaviorSettingsDialog.autoResolveHelpPath=docs/help/en/AutoResolve.html
AutoResolveBehaviorSettingsDialog.help=Auto Resolve Help
AutoResolveBehaviorSettingsDialog.helpTooltip=Open the Auto Resolve Help documentation in a new window
AutoResolveBehaviorSettingsDialog.helpTooltip=Open the Auto Resolve Help documentation in a new window
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AutoResolveBehaviorSettingsDialog.title=Auto Resolve Help
AutoResolveBehaviorSettingsDialog.autoResolveHelpPath=docs/help/en/AutoResolve.html
AutoResolveBehaviorSettingsDialog.help=Auto Resolve Help
AutoResolveBehaviorSettingsDialog.helpTooltip=Open the Auto Resolve Help documentation in a new window
AutoResolveBehaviorSettingsDialog.helpTooltip=Open the Auto Resolve Help documentation in a new window
2 changes: 1 addition & 1 deletion MekHQ/resources/mekhq/resources/BloodGroup.properties
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ BO_POSITIVE.label=B+
BO_NEGATIVE.label=B-

OO_POSITIVE.label=O+
OO_NEGATIVE.label=O- (Universal Donor)
OO_NEGATIVE.label=O- (Universal Donor)
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -499,5 +499,3 @@ comingOfAge.message.9.hrReminder.ic={8}, just wanted to touch base and make sure
\ time.</p>\
<p>If you''re able to drop by and say a few words, it would really make a difference. Let me know if you need any\
\ assistance with arrangements.</p>


Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ lblFailureEffects.text=Effects on Failure
btnAdd.text=Add
btnRemove.text=Remove
btnCancel.text=Cancel
btnOK.text=Done
btnOK.text=Done
2 changes: 1 addition & 1 deletion MekHQ/resources/mekhq/resources/DateChooser.properties
Original file line number Diff line number Diff line change
Expand Up @@ -333,4 +333,4 @@ BattleOfTerra.tooltip=The Battle of Terra was a decisive and brutal conflict bet
\ Clan Jade Falcon, fighting for control of Terra and the right to become ilClan, the supreme Clan\
\ leader. After fierce combat across the planet, Clan Wolf emerged victorious, securing Terra and\
\ significantly altering the balance of power in the Inner Sphere. This victory marked the end of\
\ the ilClan Trial and positioned Clan Wolf as the dominant force in the Clans.
\ the ilClan Trial and positioned Clan Wolf as the dominant force in the Clans.
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ labDeploymentWidth.tip=Deployment Zone width, in hexes
labDeploymentAnyNW.text=Deployment Zone NW corner
labDeploymentAnySE.text=Deployment Zone SE corner
btnOK.text=Done
btnCancel.text=Cancel
btnCancel.text=Cancel
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Form.title=Edit Injury
btnOkay.text=Done
btnCancel.text=Cancel
btnCancel.text=Cancel
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ listMapGenerators.none=None
lblBoardType.text=Board Type:
lblMapSize.text=Map Size:
btnOK.text=Done
btnCancel.text=Cancel
btnCancel.text=Cancel
2 changes: 1 addition & 1 deletion MekHQ/resources/mekhq/resources/FameAndInfamy.properties
Original file line number Diff line number Diff line change
Expand Up @@ -460,4 +460,4 @@ greetingCLANLevel3Type2.text=You cannot hope to stand against us. We shall sweep
greetingCLANLevel4Type0.text=Your defiance is futile. We shall crush you and take what belongs to us.
greetingCLANLevel4Type1.text=You are but a shadow before us. We will strike you down and claim what we desire.
greetingCLANLevel4Type2.text=You stand in our path, but your resistance is meaningless. We shall take what is ours.
greetingCLANLevel5Type0.text=Since you have proven yourself unworthy of honor, we will dispense with a formal Batchall.
greetingCLANLevel5Type0.text=Since you have proven yourself unworthy of honor, we will dispense with a formal Batchall.
2 changes: 1 addition & 1 deletion MekHQ/resources/mekhq/resources/FinancesTab.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ graphDate.text=Date
graphCBills.text=Money
activeLoans.text=Active Loans
cbillsBalanceTime.text=Financial Balance Over Time
monthlyRevenueExpenditures.text=Monthly Revenue and Expenditures
monthlyRevenueExpenditures.text=Monthly Revenue and Expenditures
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ lblCommander1.text=<html><nobr><b>Commanding Officer:</b></nobr></html>
lblFormationType1.text=<html><nobr><b>Formation Type:</b></nobr></html>
mixed=Mixed
unit=Unit
tonnageToolTip.text=<html>1........Ultra Light...39<br>40......Light............130<br>131....Medium......200<br>201....Heavy..........280<br>281....Assault........380<br>381+..Super Heavy.......</html>
tonnageToolTip.text=<html>1........Ultra Light...39<br>40......Light............130<br>131....Medium......200<br>201....Heavy..........280<br>281....Assault........380<br>381+..Super Heavy.......</html>
2 changes: 0 additions & 2 deletions MekHQ/resources/mekhq/resources/Glossary.properties
Original file line number Diff line number Diff line change
Expand Up @@ -864,5 +864,3 @@ WINTER_HOLIDAY.definition=Winter Holiday is a canonical Inner Sphere holiday cel
### X
### Y
### Z


Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ Form.title=Hire Multiple Personnel
btnClose.text=Close
lblAgeRange.text=Age range
lblSkillLevel.text=Fixed Skill Level
lblAgeRangeSeparator.text=↔
lblAgeRangeSeparator.text=↔
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ lblTimeStart1.text=<html><nobr><b>Transit Time (Start):</b></nobr></html>
lblTimeEnd1.text=<html><nobr><b>Transit Time (End):</b></nobr></html>
lblRechargeTime1.text=<html><nobr><b>Total Recharge Time:</b></nobr></html>
lblTotalTime1.text=<html><nobr><b>Total Time:</b></nobr></html>
lblCost1.text=<html><nobr><b>Total Cost:</b></nobr></html>
lblCost1.text=<html><nobr><b>Total Cost:</b></nobr></html>
2 changes: 1 addition & 1 deletion MekHQ/resources/mekhq/resources/Loot.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
looted.cash=%s was %s<b>Looted</b>%s during the skirmish.
looted.successful.parts=The following items were %s<b>Secured</b>%s following the skirmish: %s
looted.failed.parts=The following items were %s<b>Lost</b>%s during the skirmish: %s
looted.failed.parts=The following items were %s<b>Lost</b>%s during the skirmish: %s
Empty file.
2 changes: 1 addition & 1 deletion MekHQ/resources/mekhq/resources/MekHQAboutBox.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
versionLabel.text=Product Version\:
versionLabelMegaMek.text=MegaMek Version\:
versionLabelMegaMekLab.text=MegaMekLab Version\:
homepageLabel.text=Homepage\:
homepageLabel.text=Homepage\:
Empty file.
2 changes: 1 addition & 1 deletion MekHQ/resources/mekhq/resources/MekLabTab.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
dialog.saveAs.title=Save As
dialog.saveAs.message.format=%s %s saved to %s
dialog.filter.unitFiles=Unit Files (*.mtf; *.blk; *.hmp)
dialog.filter.unitFiles=Unit Files (*.mtf; *.blk; *.hmp)
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ auction.successful=Good news - our bid was successful. We secured the {0} and th
auction.failure=Bad news - our bid didn''t make the cut. The {0} went for higher than the limit you\
\ authorized. Looked like some deep pockets were involved, or maybe we were just stingy.\
<p>Unfortunate, but it''s probably for the best. Pushing higher would''ve strained our reserves.\
\ I''ll keep an eye out for other opportunities.</p>
\ I''ll keep an eye out for other opportunities.</p>
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ Form.title=Choose Mission Type
btnMission.text=New Mission
btnMission.tooltip=Start a new non-contract mission
btnContract.text=New Contract
btnContract.tooltip=Start a new contract
btnContract.tooltip=Start a new contract
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ lblRequiredLances.text=Required Combat Forces:
lblEnemyMorale.text=Enemy Morale:
lblContractScoreArbitraryModifier.text=Contract Score Modifier:
lblBasePay.text=Base Pay:
lblShares.text=Percent for Shares:
lblShares.text=Percent for Shares:
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,3 @@ NewPlayerQuickstartDialog.outOfCharacter=<html><div style='width: {0}'>This camp
<br>\
<br>New to the Inner Sphere? No problem. You''ll find everything you need in the <b><b style="color: green;">New Player\
\ Guide</b></b> found inside the Docs folder. This campaign was built around it to get you up to speed, fast.</div></html>

2 changes: 1 addition & 1 deletion MekHQ/resources/mekhq/resources/NewsDialog.properties
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ interstellarNewsNetwork.slogan="Always First on the Scene."
chatterweb.name=Chatterweb
chatterweb.slogan="Strength Through Shared Knowledge"

affiliateNewsNetworks.network=Affiliated News Networks
affiliateNewsNetworks.network=Affiliated News Networks
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ ordered.heading=Ordered
part.heading=Part
stored.heading=Stored
storedTonnage.heading=Tonnage
requestedStock.heading=Requested Stock Percent
requestedStock.heading=Requested Stock Percent
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ chkTopUpWeekly.text=Add Part Orders to Fill Requested Stock Levels Weekly
topUpBtn.text=Order Parts to Fill Requested Stock
topUpGMBtn.text=Add Parts to Fill Requested Stock Levels
resetRequestedStockBtn.text=Reset Requested Stock Levels to Default
lblIgnoreSparesUnderQuality.text=Ignore Spare Parts Under Quality
lblIgnoreSparesUnderQuality.text=Ignore Spare Parts Under Quality
Empty file.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Form.title=Pay Collateral
btnPay.text=Pay
btnDontPay.text=Don't Pay
btnCancel.text=Cancel
btnCancel.text=Cancel
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ CAMPAIGN_OPERATIONS.tooltip=Prisoner capture is randomized at the end of a scena
MEKHQ.label=MekHQ
MEKHQ.tooltip=Prisoner capture is randomized at the end of a scenario using a system based on the\
\ Search and Rescue rules in Campaign Operations. Defections, riots, and other systems are all\
\ enabled.
\ enabled.
Original file line number Diff line number Diff line change
Expand Up @@ -2787,7 +2787,7 @@ prisoners.player.defeat.good.24={0}, ransom is set at {1} C-Bills. Logically spe
\ they are no longer viable assets, retrieval may not be worth the price. We should weigh the\
\ risks before committing resources.
prisoners.player.defeat.good.25={0}, the enemy has offered to ransom our people for {1} C-Bills. It''s a\
\ chance to get them back, but we can''t afford to be naïve. We don''t know their condition, and we\
\ chance to get them back, but we can''t afford to be na�ve. We don''t know their condition, and we\
\ don''t know if this is a clean deal or a setup. I want confirmation before we make any promises.
prisoners.player.defeat.good.26={0}, we finally have a shot at bringing our people home. The enemy\
\ is asking for {1} C-Bills, and while I want to believe this is straightforward, we both know better. We\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ PRISONER_DEFECTOR.titleExtension=Prisoner*
BECOMING_BONDSMAN.label=Becoming Bondsman
BECOMING_BONDSMAN.titleExtension=Becoming Bondsman
BONDSMAN.label=Bondsman
BONDSMAN.titleExtension=Bondsman
BONDSMAN.titleExtension=Bondsman
2 changes: 1 addition & 1 deletion MekHQ/resources/mekhq/resources/RandomDeath.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
cannotDie.Dead.text=They are already dead.
cannotDie.Immortal.text=They are immortal and cannot die a random death.
cannotDie.AgeGroupDisabled.text=Their current age group is disabled.
cannotDie.AgeGroupDisabled.text=Their current age group is disabled.
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ definiteArticle.text=The
suffixTh.text=th
suffixSt.text=st
suffixNd.text=nd
suffixRd.text=rd
suffixRd.text=rd
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ Form.title=Name this refit
lblChassis.text=Chassis:
lblModel.text=Model:
btnOK.text=Submit
btnCancel.text=Cancel
btnCancel.text=Cancel
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ message.ooc=Performing this procedure requires a Doctor with at least {0}+ in th
\ skill. If no suitable character is available, you can hire a specialist while planetside. This\
\ increases the cost of surgery tenfold.\
<p>While a character is recovering from surgery, all missing limb penalties will be doubled.\
\ Once the recovery period has concluded, all penalties will be removed.</p>
\ Once the recovery period has concluded, all penalties will be removed.</p>
Empty file.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
report.string=<html>{0}<b>{1}</b>{2} {3} - BV {4} {5}\
<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i>{6}</i></html>
fatigueReport.string=Fatigue {0}
fatigueReport.string=Fatigue {0}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ btnJumpship.text=Jumpship
btnWarship.text=Warship
lblNoSearch.text=No ship types are available for search.
lblInContract.text=You cannot conduct a ship search while in a contract.
lblAvailable.text=Available:
lblAvailable.text=Available:
btnPurchase.text=Purchase
btnStartSearch.text=Start Search
btnStartSearch.toolTipText=Begin searching. You will be charged %s per week for %d weeks, after which the results of the search will be determined.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ btnClose.text=Close
lblPartsChoice.text=Type:
lblFilter.text=Filter:
txtInstructions.title=Changing amounts
txtInstructions.text=You can increase amounts with the right arrow or the plus sign. You can decrease amounts with the left arrow or the minus sign. You can remove items entirely with backspace or delete.
txtInstructions.text=You can increase amounts with the right arrow or the plus sign. You can decrease amounts with the left arrow or the minus sign. You can remove items entirely with backspace or delete.
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
lblPrereq.toolTipText=Prerequisite abilities and skills needed for this special ability. Elements between brackets must all be present. For elements within brackets, only one must be true.
lblIncompatible.toolTipText=The presence of these abilities will prevent personnel from gaining the current one.
lblRemove.toolTipText=These abilities will be removed from personnel if they gain the current one.


Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
btnOK.text=OK
btnCancel.text=Cancel
btnCancel.text=Cancel
Empty file.
Empty file.
2 changes: 1 addition & 1 deletion MekHQ/resources/mekhq/resources/Utilities.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# File Export
RowsWritten.text=rows written to file.
RowsWritten.text=rows written to file.
1 change: 0 additions & 1 deletion MekHQ/resources/mekhq/resources/messages.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,3 @@
# You should have received a copy of the GNU General Public License
# along with MekHQ. If not, see <http://www.gnu.org/licenses/>.
#

Loading
0