[wesnoth-commits] [wesnoth/wesnoth] 8a2d08: Revise capitalisation (#6067)

Wedge009 noreply at github.com
Wed Nov 10 00:56:26 UTC 2021 

  Branch: refs/heads/1.16
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 8a2d08589c4d0455eb1ca4ca00a6bc6f4c3a2774
      https://github.com/wesnoth/wesnoth/commit/8a2d08589c4d0455eb1ca4ca00a6bc6f4c3a2774
  Author: Wedge009 <wedge009 at wedge009.net>
  Date:   2021-11-10 (Wed, 10 Nov 2021)

  Changed paths:
    M data/campaigns/Dead_Water/scenarios/02_Flight.cfg
    M data/campaigns/Dead_Water/scenarios/08_Talking_to_Tyegea.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/05_Council_in_Weldyn.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/09_Houses_of_the_Undead.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/12_Terror_at_the_Ford_of_Parthyn.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/13_The_Return_of_Trouble.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/15_Save_the_King.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/16_Dark_Sky_Over_Weldyn.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/17_A_New_Ally.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/18_The_Portal_of_Doom.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/19_Showdown_in_the_Northern_Swamp.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/20_Prince_of_Wesnoth.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/21_Clash_at_the_Manor.cfg
    M data/campaigns/Delfadors_Memoirs/scenarios/22_Face_of_the_Enemy.cfg
    M data/campaigns/Descent_Into_Darkness/scenarios/05_Schism.cfg
    M data/campaigns/Eastern_Invasion/scenarios/12_Evacuation.cfg
    M data/campaigns/Eastern_Invasion/scenarios/14_Approaching_Weldyn.cfg
    M data/campaigns/Eastern_Invasion/scenarios/15_The_Council.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/03_The_Isle_of_Alduin.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/14_Plunging_Into_the_Darkness.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/15_The_Lost_General.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/18_A_Choice_Must_Be_Made.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/20b_Underground_Channels.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/21_Elven_Council.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/23_Test_of_the_Clans.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg
    M data/campaigns/Heir_To_The_Throne/scenarios/25_HttT_Epilogue.cfg
    M data/campaigns/Heir_To_The_Throne/units/Sleeping_Gryphon.cfg
    M data/campaigns/Heir_To_The_Throne/utils/intro.cfg
    M data/campaigns/Legend_of_Wesmere/_main.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter1/01_The_Uprooting.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/04_The_Elvish_Treasury.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/05_The_Saurian_Treasury.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter2/08_Council_of_Hard_Choices.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/09_Bounty_Hunters.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter3/12_Revelations.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/14_Human_Alliance.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter4/15_The_Treaty.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter5/19_Costly_Revenge.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter5/20_Council_Ruling.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter5/21_Elvish_Assassins.cfg
    M data/campaigns/Legend_of_Wesmere/scenarios/chapter5/24_Epilogue.cfg
    M data/campaigns/Liberty/scenarios/02_Civil_Disobedience.cfg
    M data/campaigns/Liberty/scenarios/06_The_Hunters.cfg
    M data/campaigns/Northern_Rebirth/scenarios/02_01_Infested_Caves.cfg
    M data/campaigns/Northern_Rebirth/scenarios/05a_01_The_Pursuit.cfg
    M data/campaigns/Northern_Rebirth/scenarios/06a_Old_Friend.cfg
    M data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg
    M data/campaigns/Northern_Rebirth/scenarios/08a_Elvish_Princess.cfg
    M data/campaigns/Northern_Rebirth/scenarios/09a_Introductions.cfg
    M data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
    M data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg
    M data/campaigns/Northern_Rebirth/scenarios/14a_Epilogue.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/2t_In_the_Dwarven_City.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg
    M data/campaigns/Sceptre_of_Fire/scenarios/Epilogue.cfg
    M data/campaigns/Sceptre_of_Fire/units/Dwarvish_Miner.cfg
    M data/campaigns/Secrets_of_the_Ancients/scenarios/06_Following_the_Shadow.cfg
    M data/campaigns/Secrets_of_the_Ancients/scenarios/07_Meeting_of_the_Minds.cfg
    M data/campaigns/Secrets_of_the_Ancients/scenarios/18_Abandoned_Outpost.cfg
    M data/campaigns/Secrets_of_the_Ancients/scenarios/20_North_Knalga.cfg
    M data/campaigns/Secrets_of_the_Ancients/scenarios/21_Against_the_World.cfg
    M data/campaigns/Secrets_of_the_Ancients/units/Dwarvish_Miner.cfg
    M data/campaigns/Secrets_of_the_Ancients/units/Orcish_Shaman.cfg
    M data/campaigns/Son_Of_The_Black_Eye/_main.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/04_The_Siege_of_Barag_Gor.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/05_To_the_Harbor_of_Tirigaz.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/08_Silent_Forest.cfg
    M data/campaigns/Son_Of_The_Black_Eye/scenarios/09_Shan_Taum_the_Smug.cfg
    M data/campaigns/Son_Of_The_Black_Eye/units/Novice_Orcish_Shaman.cfg
    M data/campaigns/Son_Of_The_Black_Eye/units/Old_Orcish_Shaman.cfg
    M data/campaigns/Son_Of_The_Black_Eye/units/Orcish_Shaman.cfg
    M data/campaigns/The_Hammer_of_Thursagan/scenarios/02_Reclaiming_the_Past.cfg
    M data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Dragonguard.cfg
    M data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Lord.cfg
    M data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Steelclad.cfg
    M data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Thunderguard.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/10_Sewer_of_Southbay.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/12_A_Final_Spring.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/13_Peoples_in_Decline.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/14_Rough_Landing.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/15_A_New_Land.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/16_The_Kalian.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/18_A_Spy_in_the_Woods.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/20_Return_of_the_Fleet.cfg
    M data/campaigns/The_Rise_Of_Wesnoth/scenarios/23_Epilogue.cfg
    M data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg
    M data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg
    M data/campaigns/The_South_Guard/utils/sg_story.cfg
    M data/campaigns/Two_Brothers/scenarios/01_Rooting_Out_a_Mage.cfg
    M data/campaigns/Two_Brothers/scenarios/02_The_Chase.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/04_Descending_into_Darkness.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/07b_Talking_with_Trolls.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
    M data/campaigns/Under_the_Burning_Suns/scenarios/10_Speaking_with_the_Fishes.cfg
    M data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Hunter.cfg
    M data/campaigns/Under_the_Burning_Suns/units/quenoth/Fighter.cfg
    M data/campaigns/Under_the_Burning_Suns/units/quenoth/Shaman.cfg
    M data/campaigns/Under_the_Burning_Suns/units/quenoth/Youth.cfg
    M data/campaigns/Under_the_Burning_Suns/utils/storytxt.cfg
    M data/campaigns/World_Conquest/resources/strings/artifacts.cfg
    M data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg

  Log Message:
  -----------
  Revise capitalisation (#6067)

* Revise capitalisation as per https://wiki.wesnoth.org/ProseStyle

Capitalisation of race names was inconsistent in parts, even within the same scenario in some cases.
As per https://wiki.wesnoth.org/ProseStyle, race names are generally lower-case unless part of unit or place names, or a specific group (such as 'Quenoth Elves'):
* Elf/Elves/Elvish/Elven
* Drakes
* Dwarf/Dwarves/Dwarvish/Dwarven
* Goblins
* Gryphons
* Humans
* Mer/Merfolk
* Nagas
* Ogres
* Orcs
* Saurians
* Trolls
* Woses

I substitute 'human' for 'men' on occasion, not for PC-ness, but to make it clear it's a reference to the race, not males (non-humans sometimes say 'men' when speaking to fellow male soldiers, for example).

Capitalisation of titles is a little less straightforward. Clearly cases such as King Haldric, Queen Asheviere, Prince of Wesnoth, Great Chief, etc, are capitalised.
However, use of a title alone can be valid with or without capital, eg 'the king/King'. I try to be consistent and consider the context:
* Title is used in place of the name, eg compare 'by the King's order' with 'by Garard's order'
* Would the speaker show respect to the person concerned as their leader, or a foreign dignitary? Contrast, 'Asheviere, that vile queen'.
* Compare 'my king' with 'my father' (latter is not usually capitalised in everyday English)
* Occasionally, when the speaker may not otherwise know a character's name or the correct protocol to address, may say something like 'Sir Elf'.

I apologise if I run counter to previous revisions - removal of 'princess' as a direct address in Northern Rebirth, for example, also dealt with the capitalisation issue, if I recall correctly.

Miscellaneous changes:
* Magi, as plural of mage, is not usually capitalised.
* Council may be capitalised when referring to a specific instance, such as the Elvish High Council in the Ka'lian, but not in instances such as 'making council'.

The review focused solely on campaign prose - there may be cases in other data files where capitalisation needs revising too.

* Capitalise proper noun use of 'kingdom'.

Just as England may be referred to as such on its own, it was also known as the Kingdom of England.
In the same way, Wesnoth is usually referred to simply as Wesnoth, but it would be formally called the Kingdom of Wesnoth.

* Capitalise 'majesty' when used as an address.

For consistency with existing instances of 'Your Majesty'.

* Capitalise 'Land of the Dead'.

While we might not normally refer to such as a place as a proper noun, Delfador's Memoirs seems to establish this as a specific location in Wesnoth lore.
For consistency, also capitalise a few references to this place in Northern Rebirth and Son of the Black-Eye.

(Granted, this does make Iliah-Malal's line in DM S18 seem a bit awkward, contrasting with 'land of the living', but the precedent has been set throughout the rest of the campaign.)

* Capitalise instances of the Book of Crelanu.

I leave book as lower-case when it's not yet famously known as the Book of Crelanu, such as in Legend of Wesmere, as well as in DM S15, where it is simply described as a book belonging to the old mage Crelanu.

* Harbour of Tirigaz does not appear to be a formal (capitalised) name.

In S12, Tirigaz is only described as a 'harbour'. Other instances of Tirigaz describes it as (lower-case) a port city.

[ci skip]

(cherry picked from commit 9cd5503338c0590ea0265f8ab3e6b79d02784750)

More information about the Commits mailing list