updated British English translation

(cherry-picked from commit 57c1a67134)
This commit is contained in:
Nils Kneuper 2018-03-29 22:56:58 +02:00
parent b02b6d0853
commit 79e6e578d2
9 changed files with 322 additions and 969 deletions

View file

@ -16,8 +16,8 @@
(bug #2732) (bug #2732)
* Fixed "Search" placeholder text in dialog item filters not being * Fixed "Search" placeholder text in dialog item filters not being
translatable (bug #2709, bug #2732). translatable (bug #2709, bug #2732).
* Updated translations: Chinese (Simplified), Scottish Gaelic, Spanish, * Updated translations: British English, Chinese (Simplified),
Ukrainian Scottish Gaelic, Spanish, Ukrainian
### WML engine ### WML engine
* Support formula= key in [variable] ConditionalWML * Support formula= key in [variable] ConditionalWML
* Support to_location in [move_unit], taking a location ID * Support to_location in [move_unit], taking a location ID

View file

@ -4,8 +4,8 @@ changelog: https://github.com/wesnoth/wesnoth/blob/master/changelog.md
## Version 1.15.0-dev ## Version 1.15.0-dev
### Language and i18n ### Language and i18n
* Updated translations: Chinese (Simplified), Scottish Gaelic, Spanish, * Updated translations: British English, Chinese (Simplified),
Ukrainian. Scottish Gaelic, Spanish, Ukrainian.
### Miscellaneous and bug fixes ### Miscellaneous and bug fixes
* Fixed minimap buttons not doing anything (bug #2681) * Fixed minimap buttons not doing anything (bug #2681)

File diff suppressed because it is too large Load diff

View file

@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: en_GB\n" "Project-Id-Version: en_GB\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n" "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n"
"POT-Creation-Date: 2018-03-17 18:30 UTC\n" "POT-Creation-Date: 2018-03-17 18:30 UTC\n"
"PO-Revision-Date: 2018-02-10 02:25+1100\n" "PO-Revision-Date: 2018-03-29 12:09+1100\n"
"Last-Translator: Wedge009 <wedge009@wedge009.net>\n" "Last-Translator: Wedge009 <wedge009@wedge009.net>\n"
"Language-Team: English (British) <http://wiki.wesnoth.org/" "Language-Team: English (British) <http://wiki.wesnoth.org/"
"EnglishGBTranslation>\n" "EnglishGBTranslation>\n"
@ -8582,12 +8582,6 @@ msgstr "Battle Princess"
#. [unit_type]: id=Battle Princess, race=human #. [unit_type]: id=Battle Princess, race=human
#: data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg:28 #: data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg:28
#, fuzzy
#| msgid ""
#| "A noble by birth, the Princess has learnt swordplay with the greatest "
#| "generals, and battle tactics with the greatest sages, making her both a "
#| "great combatant and a leader. Now battle-hardened and strong of will, she "
#| "can now aid those around her in the art of combat."
msgid "" msgid ""
"A noble by birth, the Princess has learnt swordplay with the greatest " "A noble by birth, the Princess has learnt swordplay with the greatest "
"generals and battle tactics with the greatest sages, making her both a great " "generals and battle tactics with the greatest sages, making her both a great "
@ -8595,9 +8589,9 @@ msgid ""
"aid those around her in the art of combat." "aid those around her in the art of combat."
msgstr "" msgstr ""
"A noble by birth, the Princess has learnt swordplay with the greatest " "A noble by birth, the Princess has learnt swordplay with the greatest "
"generals, and battle tactics with the greatest sages, making her both a " "generals and battle tactics with the greatest sages, making her both a great "
"great combatant and a leader. Now battle-hardened and strong of will, she " "combatant and a leader. Now battle-hardened and strong of will, she can now "
"can now aid those around her in the art of combat." "aid those around her in the art of combat."
#. [variation]: id=Battle Princess, race=human #. [variation]: id=Battle Princess, race=human
#: data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg:125 #: data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg:125
@ -8772,15 +8766,11 @@ msgstr ""
"defending." "defending."
#: data/campaigns/Heir_To_The_Throne/utils/abilities.cfg:15 #: data/campaigns/Heir_To_The_Throne/utils/abilities.cfg:15
#, fuzzy
#| msgid ""
#| "This unit's grasp of melee tactics allows adjacent allies to strike the "
#| "first blow even when defending."
msgid "" msgid ""
" This unit's grasp of melee tactics allows adjacent allies to strike the " " This unit's grasp of melee tactics allows adjacent allies to strike the "
"first blow even when defending." "first blow even when defending."
msgstr "" msgstr ""
"This unit's grasp of melee tactics allows adjacent allies to strike the " " This unit's grasp of melee tactics allows adjacent allies to strike the "
"first blow even when defending." "first blow even when defending."
#. [message]: speaker=unit #. [message]: speaker=unit

View file

@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: en_GB\n" "Project-Id-Version: en_GB\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n" "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n"
"POT-Creation-Date: 2018-03-27 04:26+0300\n" "POT-Creation-Date: 2018-03-27 04:26+0300\n"
"PO-Revision-Date: 2018-02-15 13:35+1100\n" "PO-Revision-Date: 2018-03-29 12:10+1100\n"
"Last-Translator: Wedge009 <wedge009@wedge009.net>\n" "Last-Translator: Wedge009 <wedge009@wedge009.net>\n"
"Language-Team: English (British) <http://wiki.wesnoth.org/" "Language-Team: English (British) <http://wiki.wesnoth.org/"
"EnglishGBTranslation>\n" "EnglishGBTranslation>\n"
@ -1965,16 +1965,16 @@ msgstr " (Press '$hotkey' for more information)"
#: data/gui/macros/_initial.cfg:348 #: data/gui/macros/_initial.cfg:348
msgid "Search" msgid "Search"
msgstr "" msgstr "Search"
#. [label]: id=no_options_notice #. [label]: id=no_options_notice
#: data/gui/macros/custom_options_tree.cfg:26 #: data/gui/macros/custom_options_tree.cfg:26
#, fuzzy
#| msgid "Configure settings for the selected custom modifications."
msgid "" msgid ""
"There are no custom options available for the selected era, game, or " "There are no custom options available for the selected era, game, or "
"modification." "modification."
msgstr "Configure settings for the selected custom modifications." msgstr ""
"There are no custom options available for the selected era, game, or "
"modification."
#. [button]: id=reset_option_values #. [button]: id=reset_option_values
#. [button]: id=btn_reset_hotkeys #. [button]: id=btn_reset_hotkeys
@ -5305,10 +5305,8 @@ msgid "feature^Experimental OpenMP support"
msgstr "Experimental OpenMP support" msgstr "Experimental OpenMP support"
#: src/build_info.cpp:249 #: src/build_info.cpp:249
#, fuzzy
#| msgid "feature^PNG screenshots"
msgid "feature^JPG screenshots" msgid "feature^JPG screenshots"
msgstr "PNG screenshots" msgstr "JPG screenshots"
#: src/build_info.cpp:256 #: src/build_info.cpp:256
msgid "feature^Lua console completion" msgid "feature^Lua console completion"

View file

@ -56,12 +56,6 @@ msgstr "Difficult"
#. [campaign]: id=Secrets of the Ancients #. [campaign]: id=Secrets of the Ancients
#: data/campaigns/Secrets_of_the_Ancients/_main.cfg:21 #: data/campaigns/Secrets_of_the_Ancients/_main.cfg:21
#, fuzzy
#| msgid ""
#| "Rediscover the secrets known by the lich lords of the Green Isle. They "
#| "knew how to live forever, so why can't you?\n"
#| "\t\n"
#| "(Intermediate level, 21 scenarios.)\n"
msgid "" msgid ""
"Rediscover the secrets known by the lich lords of the Green Isle. They knew " "Rediscover the secrets known by the lich lords of the Green Isle. They knew "
"how to live forever, so why can't you?\n" "how to live forever, so why can't you?\n"
@ -70,7 +64,7 @@ msgid ""
msgstr "" msgstr ""
"Rediscover the secrets known by the lich lords of the Green Isle. They knew " "Rediscover the secrets known by the lich lords of the Green Isle. They knew "
"how to live for ever, so why can't you?\n" "how to live for ever, so why can't you?\n"
"\t\n" "\n"
"(Intermediate level, 21 scenarios.)\n" "(Intermediate level, 21 scenarios.)\n"
#. [about] #. [about]
@ -1011,14 +1005,6 @@ msgstr "Blackwater"
#. [part] #. [part]
#: data/campaigns/Secrets_of_the_Ancients/scenarios/05_Blackwater.cfg:26 #: data/campaigns/Secrets_of_the_Ancients/scenarios/05_Blackwater.cfg:26
#, fuzzy
#| msgid ""
#| "29 III, 23 YW\n"
#| "\t\t\t\n"
#| "When the captain retained his memories, I reasoned that it may have been "
#| "because he was raised so soon after his death. Further experiments with "
#| "the other passengers bore out that conclusion. Just think: They may be "
#| "the first people on this continent to live forever!"
msgid "" msgid ""
"29 III, 23 YW\n" "29 III, 23 YW\n"
"\n" "\n"
@ -1028,7 +1014,7 @@ msgid ""
"people on this continent to live forever!" "people on this continent to live forever!"
msgstr "" msgstr ""
"29 III, 23 YW\n" "29 III, 23 YW\n"
"\t\t\t\n" "\n"
"When the captain retained his memories, I reasoned that it may have been " "When the captain retained his memories, I reasoned that it may have been "
"because he was raised so soon after his death. Further experiments with the " "because he was raised so soon after his death. Further experiments with the "
"other passengers bore out that conclusion. Just think: They may be the first " "other passengers bore out that conclusion. Just think: They may be the first "
@ -1184,17 +1170,6 @@ msgstr "Following the Shadow"
#. [then] #. [then]
#: data/campaigns/Secrets_of_the_Ancients/scenarios/06_Following_the_Shadow.cfg:30 #: data/campaigns/Secrets_of_the_Ancients/scenarios/06_Following_the_Shadow.cfg:30
#, fuzzy
#| msgid ""
#| "3 IV, 23 YW\n"
#| "\t\t\t\t\n"
#| "I was so sure I had the answer! I was wrong. I wanted to believe that I "
#| "was imagining it, but its now clear that the captains memories are "
#| "fading. He still retains speech, and the others fight better when he is "
#| "watching (many used to be his crew after all — it would be habit for "
#| "them), but he remembers precious little else now. The same is true of my "
#| "other recently-raised friends. I am disappointed, but the existence of my "
#| "strange new companion keeps me from being depressed."
msgid "" msgid ""
"3 IV, 23 YW\n" "3 IV, 23 YW\n"
"\n" "\n"
@ -1207,7 +1182,7 @@ msgid ""
"companion keeps me from being depressed." "companion keeps me from being depressed."
msgstr "" msgstr ""
"3 IV, 23 YW\n" "3 IV, 23 YW\n"
"\t\t\t\t\n" "\n"
"I was so sure I had the answer! I was wrong. I wanted to believe that I was " "I was so sure I had the answer! I was wrong. I wanted to believe that I was "
"imagining it, but its now clear that the captains memories are fading. He " "imagining it, but its now clear that the captains memories are fading. He "
"still retains speech, and the others fight better when he is watching (many " "still retains speech, and the others fight better when he is watching (many "
@ -1218,15 +1193,6 @@ msgstr ""
#. [else] #. [else]
#: data/campaigns/Secrets_of_the_Ancients/scenarios/06_Following_the_Shadow.cfg:35 #: data/campaigns/Secrets_of_the_Ancients/scenarios/06_Following_the_Shadow.cfg:35
#, fuzzy
#| msgid ""
#| "3 IV, 23 YW\n"
#| "\t\t\t\t\n"
#| "I was so sure I had the answer! I was wrong. I wanted to believe that I "
#| "was imagining it, but my recently-raised friends are losing their "
#| "memories. They retain the power of speech, but precious little else. I am "
#| "disappointed, but the existence of my strange new companion keeps me from "
#| "being depressed."
msgid "" msgid ""
"3 IV, 23 YW\n" "3 IV, 23 YW\n"
"\n" "\n"
@ -1236,7 +1202,7 @@ msgid ""
"the existence of my strange new companion keeps me from being depressed." "the existence of my strange new companion keeps me from being depressed."
msgstr "" msgstr ""
"3 IV, 23 YW\n" "3 IV, 23 YW\n"
"\t\t\t\t\n" "\n"
"I was so sure I had the answer! I was wrong. I wanted to believe that I was " "I was so sure I had the answer! I was wrong. I wanted to believe that I was "
"imagining it, but my recently-raised friends are losing their memories. They " "imagining it, but my recently-raised friends are losing their memories. They "
"retain the power of speech, but precious little else. I am disappointed, but " "retain the power of speech, but precious little else. I am disappointed, but "
@ -1397,13 +1363,6 @@ msgstr "Meeting of the Minds"
#. [part] #. [part]
#: data/campaigns/Secrets_of_the_Ancients/scenarios/07_Meeting_of_the_Minds.cfg:10 #: data/campaigns/Secrets_of_the_Ancients/scenarios/07_Meeting_of_the_Minds.cfg:10
#, fuzzy
#| msgid ""
#| "9 IV, 23 YW\n"
#| "\t\t\t\n"
#| "The tunnel at the back of the cave narrowed and ran on for quite some "
#| "time. Patches of fungus on the wall gave off a feeble glow that kept me "
#| "from stumbling too badly. Finally I saw a brighter light up ahead."
msgid "" msgid ""
"9 IV, 23 YW\n" "9 IV, 23 YW\n"
"\n" "\n"
@ -1412,7 +1371,7 @@ msgid ""
"stumbling too badly. Finally I saw a brighter light up ahead." "stumbling too badly. Finally I saw a brighter light up ahead."
msgstr "" msgstr ""
"9 IV, 23 YW\n" "9 IV, 23 YW\n"
"\t\t\t\n" "\n"
"The tunnel at the back of the cave narrowed and ran on for quite some time. " "The tunnel at the back of the cave narrowed and ran on for quite some time. "
"Patches of fungus on the wall gave off a feeble glow that kept me from " "Patches of fungus on the wall gave off a feeble glow that kept me from "
"stumbling too badly. Finally I saw a brighter light up ahead." "stumbling too badly. Finally I saw a brighter light up ahead."

View file

@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: en_GB\n" "Project-Id-Version: en_GB\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n" "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n"
"POT-Creation-Date: 2018-03-17 18:31 UTC\n" "POT-Creation-Date: 2018-03-17 18:31 UTC\n"
"PO-Revision-Date: 2018-02-10 02:31+1100\n" "PO-Revision-Date: 2018-03-29 12:13+1100\n"
"Last-Translator: Wedge009 <wedge009@wedge009.net>\n" "Last-Translator: Wedge009 <wedge009@wedge009.net>\n"
"Language-Team: English (British) <http://wiki.wesnoth.org/" "Language-Team: English (British) <http://wiki.wesnoth.org/"
"EnglishGBTranslation>\n" "EnglishGBTranslation>\n"
@ -1006,10 +1006,6 @@ msgstr ""
#. [objectives] #. [objectives]
#: data/campaigns/Two_Brothers/scenarios/03_Guarded_Castle.cfg:337 #: data/campaigns/Two_Brothers/scenarios/03_Guarded_Castle.cfg:337
#, fuzzy
#| msgid ""
#| "The dark sorcerer is a strong unit; attack him with multiple units at "
#| "once and try to force him off of his keep."
msgid "" msgid ""
"The dark sorcerer is a strong unit; attack him with multiple units at once " "The dark sorcerer is a strong unit; attack him with multiple units at once "
"and try to force him off his keep." "and try to force him off his keep."

View file

@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: en_GB\n" "Project-Id-Version: en_GB\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n" "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n"
"POT-Creation-Date: 2018-03-27 01:27 UTC\n" "POT-Creation-Date: 2018-03-27 01:27 UTC\n"
"PO-Revision-Date: 2018-02-15 14:23+1100\n" "PO-Revision-Date: 2018-03-29 12:16+1100\n"
"Last-Translator: Wedge009 <wedge009@wedge009.net>\n" "Last-Translator: Wedge009 <wedge009@wedge009.net>\n"
"Language-Team: English (British) <http://wiki.wesnoth.org/" "Language-Team: English (British) <http://wiki.wesnoth.org/"
"EnglishGBTranslation>\n" "EnglishGBTranslation>\n"
@ -1409,13 +1409,6 @@ msgstr "Dune Apothecary"
#. [unit_type]: id=Dune Apothecary, race=dunefolk #. [unit_type]: id=Dune Apothecary, race=dunefolk
#: data/core/units/dunefolk/Apothecary.cfg:22 #: data/core/units/dunefolk/Apothecary.cfg:22
#, fuzzy
#| msgid ""
#| "Some men excel at medicine the way others do at strength of arms, and the "
#| "Apothecaries are those whose knowledge is without peer outside of the "
#| "Dunefolk. Their remedies cannot only heal wounds but remove infection and "
#| "poison as well, often to the disbelief of the injured. Hardened by years "
#| "of travels, many are able to treat themselves."
msgid "" msgid ""
"Some men excel at medicine the way others do at strength of arms, and the " "Some men excel at medicine the way others do at strength of arms, and the "
"Apothecaries are those whose knowledge is without peer outside of the " "Apothecaries are those whose knowledge is without peer outside of the "
@ -2150,14 +2143,6 @@ msgstr "Dwarvish Sentinel"
#. [unit_type]: id=Dwarvish Sentinel, race=dwarf #. [unit_type]: id=Dwarvish Sentinel, race=dwarf
#: data/core/units/dwarves/Sentinel.cfg:19 #: data/core/units/dwarves/Sentinel.cfg:19
#, fuzzy
#| msgid ""
#| "Champions among their fellow troops, the dwarven sentinels form the "
#| "bulwark of their battle lines. Leading a direct assault against a line "
#| "that they fortify, is often out of the question; it tends toward being "
#| "suicidal, rather than merely ineffectual. These dwarves are masters of "
#| "the melee, and can hold a patch of earth with the singleminded tenacity "
#| "of an oak."
msgid "" msgid ""
"Champions among their fellow troops, the dwarven sentinels form the bulwark " "Champions among their fellow troops, the dwarven sentinels form the bulwark "
"of their battle lines. Leading a direct assault against a line that they " "of their battle lines. Leading a direct assault against a line that they "
@ -3017,24 +3002,6 @@ msgstr "Paladin"
#. [unit_type]: id=Paladin, race=human #. [unit_type]: id=Paladin, race=human
#: data/core/units/humans/Horse_Paladin.cfg:20 #: data/core/units/humans/Horse_Paladin.cfg:20
#, fuzzy
#| msgid ""
#| "Knights of the highest virtue, Paladins have sworn their strength not to "
#| "king and crown, but to ideals themselves; of chivalry, and the "
#| "stewardship of everything that is good. They may serve in the armies of "
#| "the world, but their first loyalties often lie with groups of their own "
#| "making; secret, monastic orders that cross political and cultural "
#| "boundaries. Rulers are sometimes wary of them, for the paladins loyalty "
#| "is only as strong as the lieges apparent virtue. This has led the more "
#| "darkly ambitious to either attempt to defame and disperse these groups, "
#| "or more rarely, to conjure elaborate deceptions to keep these otherwise "
#| "staunchly loyal troops in service.\n"
#| " \n"
#| "Full paladins are generally not quite as fearsome as the Grand Knights "
#| "that champion most armies, but they are first-class fighters nonetheless. "
#| "Additionally, their wisdom and piety grants these warrior monks certain "
#| "curious abilities; a paladin is very powerful in fighting magical or "
#| "unnatural things, and most have some skill at medicine and healing."
msgid "" msgid ""
"Knights of the highest virtue, Paladins have sworn their strength not to " "Knights of the highest virtue, Paladins have sworn their strength not to "
"king and crown, but to ideals themselves; of chivalry, and the stewardship " "king and crown, but to ideals themselves; of chivalry, and the stewardship "
@ -3063,7 +3030,7 @@ msgstr ""
"attempt to defame and disperse these groups, or more rarely, to conjure " "attempt to defame and disperse these groups, or more rarely, to conjure "
"elaborate deceptions to keep these otherwise staunchly loyal troops in " "elaborate deceptions to keep these otherwise staunchly loyal troops in "
"service.\n" "service.\n"
" \n" "\n"
"Full paladins are generally not quite as fearsome as the Grand Knights " "Full paladins are generally not quite as fearsome as the Grand Knights "
"that champion most armies, but they are first-class fighters nonetheless. " "that champion most armies, but they are first-class fighters nonetheless. "
"Additionally, their wisdom and piety grants these warrior monks certain " "Additionally, their wisdom and piety grants these warrior monks certain "

View file

@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: en_GB\n" "Project-Id-Version: en_GB\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n" "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n"
"POT-Creation-Date: 2018-03-27 04:27+0300\n" "POT-Creation-Date: 2018-03-27 04:27+0300\n"
"PO-Revision-Date: 2018-02-15 13:13+1100\n" "PO-Revision-Date: 2018-03-29 11:38+1100\n"
"Last-Translator: Wedge009 <wedge009@wedge009.net>\n" "Last-Translator: Wedge009 <wedge009@wedge009.net>\n"
"Language-Team: English (British) <http://wiki.wesnoth.org/" "Language-Team: English (British) <http://wiki.wesnoth.org/"
"EnglishGBTranslation>\n" "EnglishGBTranslation>\n"
@ -225,7 +225,7 @@ msgstr "Show special unit graphical effects"
#. [advanced_preference]: type=boolean #. [advanced_preference]: type=boolean
#: data/advanced_preferences.cfg:189 #: data/advanced_preferences.cfg:189
msgid "Show deprecation messages in-game" msgid "Show deprecation messages in-game"
msgstr "" msgstr "Show deprecation messages in-game"
#. [advanced_preference]: type=boolean #. [advanced_preference]: type=boolean
#: data/advanced_preferences.cfg:190 #: data/advanced_preferences.cfg:190
@ -234,6 +234,9 @@ msgid ""
"will still be shown in the log, even if this is disabled. In addition, the " "will still be shown in the log, even if this is disabled. In addition, the "
"deprecation log-domain controls how many messages are printed." "deprecation log-domain controls how many messages are printed."
msgstr "" msgstr ""
"Show warnings about deprecated API in the in-game chat area. These messages "
"will still be shown in the log, even if this is disabled. In addition, the "
"deprecation log-domain controls how many messages are printed."
#. [advanced_preference]: type=boolean #. [advanced_preference]: type=boolean
#: data/advanced_preferences.cfg:198 #: data/advanced_preferences.cfg:198
@ -1502,10 +1505,8 @@ msgstr ""
#. [else] #. [else]
#: data/core/macros/deprecated-utils.cfg:43 #: data/core/macros/deprecated-utils.cfg:43
#, fuzzy
#| msgid "This unit has been renamed to: {NEW_NAME}"
msgid "This unit has been renamed to: " msgid "This unit has been renamed to: "
msgstr "This unit has been renamed to: {NEW_NAME}" msgstr "This unit has been renamed to: "
#: data/core/macros/deprecated-utils.cfg:95 #: data/core/macros/deprecated-utils.cfg:95
msgid "<small>(early finish bonus)</small>" msgid "<small>(early finish bonus)</small>"
@ -2702,22 +2703,6 @@ msgstr ""
#. Generator for male dunefolk human names #. Generator for male dunefolk human names
#: data/core/macros/names.cfg:145 #: data/core/macros/names.cfg:145
#, fuzzy
#| msgid ""
#| "\n"
#| "main={name_long}|{prefix}{suffix}|{name_mid}{connector}{name_mid}\n"
#| "name_mid={prefix}{suffix}|{name_short}\n"
#| "name_long={prefix}{suffix}|{prefix}{centre}{suffix}\n"
#| "name_short=Din|Sif|Din|Taj|Sud|Ali|Lut|Nuh|Qays|Nimr|Jad|Bushr|Lut|Maʿd|"
#| "Nur|Fadl\n"
#| "prefix=Ab|Bas|Fat|Gha|Al|Ba|Ja|Ha|Mu|Ra|Raz|Abi|Am|La|ʿAj|Ala|ʿAk|Fa|Du|"
#| "Im|Ju|Mun|Ma|Ni|Ji|Mu|Lab|Luf|Mih|Mi|Qu|Tal|Ta|Tha|Za|Zi|Yas|Wa|Su|Qa|"
#| "ʿIkri|Lu|Su|Osa|Rag|Saf|Da|Fay|Nib|Nash\n"
#| "suffix=af|al|lih|bair|sur|bi|lah|at|sim|ma|ih|yl|iq|raj|mam|man|ya|zid|"
#| "riya|ail|air|ah|en|in|ayd|ud|rah|wah|nan|as|ir|ba|ni|yad|ras|zuq|hid|mal|"
#| "kib\n"
#| "connector= al-| bin | ibn \n"
#| "centre=ʿ|ʾ|hi|sa|kar|da|na|ja|tay|ki|hai|saw\n"
msgid "" msgid ""
"\n" "\n"
"main={name_long}|{prefix}{suffix}|{name_mid}{connector}{name_mid}\n" "main={name_long}|{prefix}{suffix}|{name_mid}{connector}{name_mid}\n"
@ -2744,39 +2729,11 @@ msgstr ""
"Su|Osa|Rag|Saf|Da|Fay|Nib|Nash\n" "Su|Osa|Rag|Saf|Da|Fay|Nib|Nash\n"
"suffix=af|al|lih|bair|sur|bi|lah|at|sim|ma|ih|yl|iq|raj|mam|man|ya|zid|riya|" "suffix=af|al|lih|bair|sur|bi|lah|at|sim|ma|ih|yl|iq|raj|mam|man|ya|zid|riya|"
"ail|air|ah|en|in|ayd|ud|rah|wah|nan|as|ir|ba|ni|yad|ras|zuq|hid|mal|kib\n" "ail|air|ah|en|in|ayd|ud|rah|wah|nan|as|ir|ba|ni|yad|ras|zuq|hid|mal|kib\n"
"connector= al-| bin | ibn \n" "connector= al-| bin | ibn\n"
"centre=ʿ|ʾ|hi|sa|kar|da|na|ja|tay|ki|hai|saw\n" "centre=ʿ|ʾ|hi|sa|kar|da|na|ja|tay|ki|hai|saw\n"
#. Generator for female dunefolk human names #. Generator for female dunefolk human names
#: data/core/macros/names.cfg:156 #: data/core/macros/names.cfg:156
#, fuzzy
#| msgid ""
#| "\n"
#| "main={name_long}|{prefix}{suffix}|{name_mid}{connector}{surname}\n"
#| "name_mid={prefix}{suffix}|{name_short}\n"
#| "surname={name_mid_male}|{name_mid}|{name_mid_male}\n"
#| "name_long={prefix}{suffix}|{prefix}{centre}{suffix}\n"
#| "name_short=Afaf|Aida|Alya|Arij|Arwa|Asma|Asra|Azra|Dua|Fajr|Hala|Hana|"
#| "Hiba|Inas|Isra|Lina|Mona|Muna|Nida|Nima|Nur|Rana|Rim|Ruba|Ruya|Ruwa|Sana|"
#| "Sara|Suha|Tuba|Uzma|Zara\n"
#| "prefix=Ab|Bas|Fat|Gha|Al|Ba|Ja|Ha|Mu|Ra|Raz|Abi|Am|La|ʿAj|Ala|ʿAk|Fa|Du|"
#| "Im|Ju|Mun|Ma|Ni|Ji|Mu|Lab|Luf|Mih|Mi|Qu|Tal|Ta|Tha|Za|Zi|Yas|Wa|Su|Qa|"
#| "ʿIkri|Lu|Su|Osa|Rag|Saf|Da|Fay|Nib|Nash\n"
#| "suffix=a|ab|ad|ah|af|aj|al|am|an|ar|as|at|ay|az|da|een|ia|ij|in|ir|la|ma|"
#| "mas|n|na|nab|ni|r|ra|raa|ran|rat|ul|ur|uz|wa|ya|yah|yam|za|zi\n"
#| "connector= al-| ibna | bint \n"
#| "centre=ʿ|ʾ|hi|sa|kar|da|na|ja|tay|ki|hai|saw\n"
#| "\n"
#| "These nonterminals are literally copied from the male names.\n"
#| "name_mid_male={prefix_male}{suffix_male}|{name_short_male}\n"
#| "name_short_male=Din|Sif|Din|Taj|Sud|Ali|Lut|Nuh|Qays|Nimr|Jad|Bushr|Lut|"
#| "Maʿd|Nur|Fadl\n"
#| "prefix_male=Ab|Bas|Fat|Gha|Al|Ba|Ja|Ha|Mu|Ra|Raz|Abi|Am|La|ʿAj|Ala|ʿAk|Fa|"
#| "Du|Im|Ju|Mun|Ma|Ni|Ji|Mu|Lab|Luf|Mih|Mi|Qu|Tal|Ta|Tha|Za|Zi|Yas|Wa|Su|Qa|"
#| "ʿIkri|Lu|Su|Osa|Rag|Saf|Da|Fay|Nib|Nash\n"
#| "suffix_male=af|al|lih|bair|sur|bi|lah|at|sim|ma|ih|yl|iq|raj|mam|man|ya|"
#| "zid|riya|ail|air|ah|en|in|ayd|ud|rah|wah|nan|as|ir|ba|ni|yad|ras|zuq|hid|"
#| "mal|kib\n"
msgid "" msgid ""
"\n" "\n"
"main={name_long}|{prefix}{suffix}|{name_mid}{connector}{surname}\n" "main={name_long}|{prefix}{suffix}|{name_mid}{connector}{surname}\n"
@ -2818,10 +2775,10 @@ msgstr ""
"Su|Osa|Rag|Saf|Da|Fay|Nib|Nash\n" "Su|Osa|Rag|Saf|Da|Fay|Nib|Nash\n"
"suffix=a|ab|ad|ah|af|aj|al|am|an|ar|as|at|ay|az|da|een|ia|ij|in|ir|la|ma|mas|" "suffix=a|ab|ad|ah|af|aj|al|am|an|ar|as|at|ay|az|da|een|ia|ij|in|ir|la|ma|mas|"
"n|na|nab|ni|r|ra|raa|ran|rat|ul|ur|uz|wa|ya|yah|yam|za|zi\n" "n|na|nab|ni|r|ra|raa|ran|rat|ul|ur|uz|wa|ya|yah|yam|za|zi\n"
"connector= al-| ibna | bint \n" "connector= al-| ibna | bint\n"
"centre=ʿ|ʾ|hi|sa|kar|da|na|ja|tay|ki|hai|saw\n" "centre=ʿ|ʾ|hi|sa|kar|da|na|ja|tay|ki|hai|saw\n"
"\n" "\n"
"These nonterminals are literally copied from the male names.\n" "These non-terminals are literally copied from the male names.\n"
"name_mid_male={prefix_male}{suffix_male}|{name_short_male}\n" "name_mid_male={prefix_male}{suffix_male}|{name_short_male}\n"
"name_short_male=Din|Sif|Din|Taj|Sud|Ali|Lut|Nuh|Qays|Nimr|Jad|Bushr|Lut|Maʿd|" "name_short_male=Din|Sif|Din|Taj|Sud|Ali|Lut|Nuh|Qays|Nimr|Jad|Bushr|Lut|Maʿd|"
"Nur|Fadl\n" "Nur|Fadl\n"
@ -3910,14 +3867,6 @@ msgstr ""
#. [village_naming] #. [village_naming]
#: data/english.cfg:76 #: data/english.cfg:76
#, fuzzy
#| msgid ""
#| "\n"
#| "\t\tprefix=$base{!}|$river{!}\n"
#| "\t\triver=$river{!}|River\n"
#| "\t\tsuffix=ham|ford|cross| on {river} \n"
#| "\t\tmain={prefix}{suffix}\n"
#| "\t"
msgid "" msgid ""
"\n" "\n"
"\t\tprefix=$base{!}|$river{!}\n" "\t\tprefix=$base{!}|$river{!}\n"
@ -3929,7 +3878,7 @@ msgstr ""
"\n" "\n"
"\t\tprefix=$base{!}|$river{!}\n" "\t\tprefix=$base{!}|$river{!}\n"
"\t\triver=$river{!}|River\n" "\t\triver=$river{!}|River\n"
"\t\tsuffix=ham|ford|cross| on {river} \n" "\t\tsuffix=ham|ford|cross| on {river}\n"
"\t\tmain={prefix}{suffix}\n" "\t\tmain={prefix}{suffix}\n"
"\t" "\t"
@ -4092,12 +4041,12 @@ msgstr "DejaVu Sans Mono"
#. [fonts] #. [fonts]
#: data/hardwired/fonts.cfg:30 #: data/hardwired/fonts.cfg:30
msgid "Lato Light" msgid "Lato Light"
msgstr "" msgstr "Lato Light"
#. [fonts] #. [fonts]
#: data/hardwired/fonts.cfg:31 #: data/hardwired/fonts.cfg:31
msgid "Oldania ADF Std" msgid "Oldania ADF Std"
msgstr "" msgstr "Oldania ADF Std"
#. [lua]: wesnoth.deprecate_api #. [lua]: wesnoth.deprecate_api
#: data/lua/core.lua:187 #: data/lua/core.lua:187
@ -5876,10 +5825,8 @@ msgid "$elem has been deprecated and may be removed at any time."
msgstr "$elem has been deprecated and may be removed at any time." msgstr "$elem has been deprecated and may be removed at any time."
#: src/deprecation.cpp:56 #: src/deprecation.cpp:56
#, fuzzy
#| msgid "$elem has been deprecated and may be removed in version $version."
msgid "$elem has been deprecated and will be removed in version $version." msgid "$elem has been deprecated and will be removed in version $version."
msgstr "$elem has been deprecated and may be removed in version $version." msgstr "$elem has been deprecated and will be removed in version $version."
#: src/deprecation.cpp:61 #: src/deprecation.cpp:61
msgid "$elem has been deprecated and removed." msgid "$elem has been deprecated and removed."
@ -6645,10 +6592,8 @@ msgid "Defense properties: "
msgstr "Defence properties: " msgstr "Defence properties: "
#: src/help/help_topic_generators.cpp:246 #: src/help/help_topic_generators.cpp:246
#, fuzzy
#| msgid "Level: "
msgid "Level" msgid "Level"
msgstr "Level: " msgstr "Level"
#: src/help/help_topic_generators.cpp:307 #: src/help/help_topic_generators.cpp:307
msgid "Advances from: " msgid "Advances from: "
@ -8056,13 +8001,15 @@ msgstr "i"
#: src/synced_commands.cpp:404 #: src/synced_commands.cpp:404
msgid "The :$command debug command was used during $players turn" msgid "The :$command debug command was used during $players turn"
msgstr "" msgstr "The :$command debug command was used during $players turn"
#: src/synced_commands.cpp:412 #: src/synced_commands.cpp:412
msgid "" msgid ""
"A player used a debug command during the game. If this is unexpected, it is " "A player used a debug command during the game. If this is unexpected, it is "
"possible the player in question is cheating." "possible the player in question is cheating."
msgstr "" msgstr ""
"A player used a debug command during the game. If this is unexpected, it is "
"possible the player in question is cheating."
#: src/synced_commands.cpp:414 #: src/synced_commands.cpp:414
msgid "Details:" msgid "Details:"
@ -8070,17 +8017,15 @@ msgstr "Details:"
#: src/synced_commands.cpp:417 #: src/synced_commands.cpp:417
msgid "Do you wish to save the game before continuing?" msgid "Do you wish to save the game before continuing?"
msgstr "" msgstr "Do you wish to save the game before continuing?"
#: src/synced_commands.cpp:419 #: src/synced_commands.cpp:419
#, fuzzy
#| msgid "(debug command)"
msgid "Debug Command Used" msgid "Debug Command Used"
msgstr "(debug command)" msgstr "Debug Command Used"
#: src/synced_commands.cpp:503 #: src/synced_commands.cpp:503
msgid "A unit was created using debug mode during $players turn" msgid "A unit was created using debug mode during $players turn"
msgstr "" msgstr "A unit was created using debug mode during $players turn"
#: src/synced_user_choice.cpp:326 #: src/synced_user_choice.cpp:326
msgid "waiting for $desc from side(s) $sides" msgid "waiting for $desc from side(s) $sides"
@ -8212,11 +8157,8 @@ msgid "$attack_list|: $effect_description"
msgstr "$attack_list|: $effect_description" msgstr "$attack_list|: $effect_description"
#: src/units/unit.cpp:1791 #: src/units/unit.cpp:1791
#, fuzzy
#| msgid "<span color=\"$color\">$number_or_percent</span> move"
#| msgid_plural "<span color=\"$color\">$number_or_percent</span> moves"
msgid "<span color=\"$color\">$number_or_percent</span> HP" msgid "<span color=\"$color\">$number_or_percent</span> HP"
msgstr "<span color=\"$color\">$number_or_percent</span> move" msgstr "<span color=\"$color\">$number_or_percent</span> HP"
#: src/units/unit.cpp:1801 #: src/units/unit.cpp:1801
msgid "<span color=\"$color\">$number_or_percent</span> move" msgid "<span color=\"$color\">$number_or_percent</span> move"