Skip to content

Commit

Permalink
merging 1.14 po files into master
Browse files Browse the repository at this point in the history
This ports translations to master, which had been added before the pot-update on master

command used for merging:
msgmerge --previous ${stable_file} ${master_file}
  • Loading branch information
sevu committed Aug 3, 2019
1 parent 6049851 commit 35961d0
Show file tree
Hide file tree
Showing 632 changed files with 10,067 additions and 34,721 deletions.
101 changes: 0 additions & 101 deletions po/wesnoth-ai/en_GB.po
Expand Up @@ -651,26 +651,6 @@ msgstr "Be careful to stay out of the way of that dragon. He's a mean one."

#. [message]: speaker=Rowck
#: data/ai/micro_ais/scenarios/dragon.cfg:91
#, fuzzy
#| msgid ""
#| "Hi there. I am Rowck and here is what I do:\n"
#| "When hungry, I move around part of the map in a random wander until I get "
#| "into range of an enemy. If enemies are within range, I attack and devour "
#| "the weakest of them. After that, I retreat to my rest location, where I "
#| "stay for a certain number of turns or until fully healed.\n"
#| "A few details (features, not bugs, but can be changed if desired):\n"
#| "- If my way home is blocked on the return, the normal RCA AI takes over "
#| "my behavior.\n"
#| "- I will, however, attack any enemy occupying my rest hex, if I can get "
#| "there.\n"
#| "- A kill only makes me go home when I am the attacker, not as defender.\n"
#| "- Occasionally I will not move at all while wandering (a dragon has to "
#| "rest sometimes!)\n"
#| "\n"
#| "Note: The Hunter AI is coded as a Micro AI. A Micro AI can be added and "
#| "adapted to the need of a scenario easily using only WML and the "
#| "[micro_ai] tag. Check out the <span color='#00A000'>Micro AI wiki page</"
#| "span> at https://wiki.wesnoth.org/Micro_AIs for more information."
msgid ""
"Hi there. I am Rowck and here is what I do:\n"
"When hungry, I move around part of the map in a random wander until I get "
Expand Down Expand Up @@ -834,22 +814,6 @@ msgstr "Turn off human control of Side 1"

#. [message]: speaker=narrator
#: data/ai/micro_ais/scenarios/goto.cfg:419
#, fuzzy
#| msgid ""
#| "This scenario demonstrates a variety of different uses of the Goto Micro "
#| "AI. All AI sides are controlled by this MAI in one way or another (except "
#| "for the saurians, which are run by the Lurkers Micro AI). Messages will "
#| "be displayed throughout the scenario to point out what the units are "
#| "doing.\n"
#| "\n"
#| "The player controls Side 1. There are right-click context menu options "
#| "for adding Side 1 units to the map and for taking them off again. This is "
#| "useful mostly for testing how the Side 3 guardians react.\n"
#| "\n"
#| "Note: The Goto AI is coded as a Micro AI. A Micro AI can be added and "
#| "adapted to the need of a scenario easily using only WML and the "
#| "[micro_ai] tag. Check out the <span color='#00A000'>Micro AI wiki page</"
#| "span> at https://wiki.wesnoth.org/Micro_AIs for more information."
msgid ""
"This scenario demonstrates a variety of different uses of the Goto Micro AI. "
"All AI sides are controlled by this MAI in one way or another (except for "
Expand Down Expand Up @@ -1747,17 +1711,6 @@ msgstr "Notes"

#. [message]: speaker=narrator
#: data/ai/micro_ais/scenarios/lurkers.cfg:475
#, fuzzy
#| msgid ""
#| "You can use the right-click context menu to add additional lurkers.\n"
#| "\n"
#| "Any unit not adjacent to swamp (and water, for the nagas) is safe from "
#| "the lurkers, thus it is easy to keep Pekzs from being attacked.\n"
#| "\n"
#| "The Lua Lurker AI is coded as a Micro AI. A Micro AI can be added and "
#| "adapted to the need of a scenario easily using only WML and the "
#| "[micro_ai] tag. Check out the <span color='#00A000'>Micro AI wiki page</"
#| "span> at https://wiki.wesnoth.org/Micro_AIs for more information."
msgid ""
"You can use the right-click context menu to add additional lurkers.\n"
"\n"
Expand Down Expand Up @@ -1863,24 +1816,6 @@ msgstr ""

#. [message]: speaker=narrator
#: data/ai/micro_ais/scenarios/messenger_escort.cfg:152
#, fuzzy
#| msgid ""
#| "The Messenger Escort AI will try to move the dragoon messenger to the "
#| "signpost in the north, while protecting him as well as possible with the "
#| "other units. Vanak's orcs need to stop him.\n"
#| "\n"
#| "Note that the messenger route is set up through a series of waypoints "
#| "here simply to demonstrate how to use waypoints. On this map, using only "
#| "a single waypoint at the end of the route would work just as well (or "
#| "probably even better).\n"
#| "\n"
#| "Also note that the messenger does not have to get exactly to each "
#| "signpost (except for the last one), getting close is good enough.\n"
#| "\n"
#| "The Messenger Escort AI is coded as a Micro AI. A Micro AI can be added "
#| "and adapted to the need of a scenario easily using only WML and the "
#| "[micro_ai] tag. Check out the <span color='#00A000'>Micro AI wiki page</"
#| "span> at https://wiki.wesnoth.org/Micro_AIs for more information."
msgid ""
"The Messenger Escort AI will try to move the dragoon messenger to the "
"signpost in the north, while protecting him as well as possible with the "
Expand Down Expand Up @@ -2832,21 +2767,6 @@ msgstr ""

#. [message]: speaker=Uralt
#: data/ai/micro_ais/scenarios/simple_attack.cfg:176
#, fuzzy
#| msgid ""
#| "Hahahahaha!! I have given special instruction to my Soulless to attack "
#| "all your almost-advanced units first. Also watch how those same Soulless "
#| "will throw themselves mercilessly at your pitiful soldiers after that, "
#| "saving my more valuable skeleton minions for later. I have taken the term "
#| "'disposable units' to a whole new level. Watch in awe!!\n"
#| "\n"
#| "<i>Translation: The undead side includes two instances of the Simple "
#| "Attack Micro AI. The first makes the Soulless attack all units 1 XP from "
#| "leveling up, such that they can be eliminated afterward. The second "
#| "executes all remaining attacks possible by Soulless (and Walking "
#| "Corpses), without regard for their own safety. Only after that does the "
#| "default Wesnoth attack mechanism kick in to attack with the remaining "
#| "units (skeletons).</i>"
msgid ""
"Hahahahaha!! I have given special instruction to my Soulless to attack all "
"your almost-advanced units first. Also watch how those same Soulless will "
Expand Down Expand Up @@ -2901,27 +2821,6 @@ msgstr "Place Side 2 Bat"

#. [message]: speaker=narrator
#: data/ai/micro_ais/scenarios/swarm.cfg:144
#, fuzzy
#| msgid ""
#| "This scenario features bats moving around in a swarm. Without adjacent "
#| "enemies, they simply try to stay together and at a certain distance from "
#| "enemies. However, if an enemy unit is close to any bat, the swarm "
#| "scatters. This is particular fun to watch when one places an enemy unit "
#| "in the middle of the swarm. After being scattered, the swarm members "
#| "slowly rejoin, but not in a very organized way. Sub-swarms or individual "
#| "bats might roam around for quite some time before they find their way "
#| "back. It is also possible that individual bats (or small groups) split "
#| "off from the larger swarm at times.\n"
#| "\n"
#| "The player controls a side of gryphons, each of which is given 99 moves "
#| "so that the reaction of the swarm to enemies can be tested easily. There "
#| "are also several right-click options, for example for adding bats or "
#| "gryphons or for taking units off the map.\n"
#| "\n"
#| "Note: The Swarm AI is coded as a Micro AI. A Micro AI can be added and "
#| "adapted to the need of a scenario easily using only WML and the "
#| "[micro_ai] tag. Check out the <span color='#00A000'>Micro AI wiki page</"
#| "span> at https://wiki.wesnoth.org/Micro_AIs for more information."
msgid ""
"This scenario features bats moving around in a swarm. Without adjacent "
"enemies, they simply try to stay together and at a certain distance from "
Expand Down
101 changes: 0 additions & 101 deletions po/wesnoth-ai/es.po
Expand Up @@ -672,26 +672,6 @@ msgstr "Mantente alejado del camino de ese dragón. Es realmente malo."

#. [message]: speaker=Rowck
#: data/ai/micro_ais/scenarios/dragon.cfg:91
#, fuzzy
#| msgid ""
#| "Hi there. I am Rowck and here is what I do:\n"
#| "When hungry, I move around part of the map in a random wander until I get "
#| "into range of an enemy. If enemies are within range, I attack and devour "
#| "the weakest of them. After that, I retreat to my rest location, where I "
#| "stay for a certain number of turns or until fully healed.\n"
#| "A few details (features, not bugs, but can be changed if desired):\n"
#| "- If my way home is blocked on the return, the normal RCA AI takes over "
#| "my behavior.\n"
#| "- I will, however, attack any enemy occupying my rest hex, if I can get "
#| "there.\n"
#| "- A kill only makes me go home when I am the attacker, not as defender.\n"
#| "- Occasionally I will not move at all while wandering (a dragon has to "
#| "rest sometimes!)\n"
#| "\n"
#| "Note: The Hunter AI is coded as a Micro AI. A Micro AI can be added and "
#| "adapted to the need of a scenario easily using only WML and the "
#| "[micro_ai] tag. Check out the <span color='#00A000'>Micro AI wiki page</"
#| "span> at https://wiki.wesnoth.org/Micro_AIs for more information."
msgid ""
"Hi there. I am Rowck and here is what I do:\n"
"When hungry, I move around part of the map in a random wander until I get "
Expand Down Expand Up @@ -857,22 +837,6 @@ msgstr "Desactivar el control humano para el lado 1"

#. [message]: speaker=narrator
#: data/ai/micro_ais/scenarios/goto.cfg:419
#, fuzzy
#| msgid ""
#| "This scenario demonstrates a variety of different uses of the Goto Micro "
#| "AI. All AI sides are controlled by this MAI in one way or another (except "
#| "for the saurians, which are run by the Lurkers Micro AI). Messages will "
#| "be displayed throughout the scenario to point out what the units are "
#| "doing.\n"
#| "\n"
#| "The player controls Side 1. There are right-click context menu options "
#| "for adding Side 1 units to the map and for taking them off again. This is "
#| "useful mostly for testing how the Side 3 guardians react.\n"
#| "\n"
#| "Note: The Goto AI is coded as a Micro AI. A Micro AI can be added and "
#| "adapted to the need of a scenario easily using only WML and the "
#| "[micro_ai] tag. Check out the <span color='#00A000'>Micro AI wiki page</"
#| "span> at https://wiki.wesnoth.org/Micro_AIs for more information."
msgid ""
"This scenario demonstrates a variety of different uses of the Goto Micro AI. "
"All AI sides are controlled by this MAI in one way or another (except for "
Expand Down Expand Up @@ -1793,17 +1757,6 @@ msgstr "Notas"

#. [message]: speaker=narrator
#: data/ai/micro_ais/scenarios/lurkers.cfg:475
#, fuzzy
#| msgid ""
#| "You can use the right-click context menu to add additional lurkers.\n"
#| "\n"
#| "Any unit not adjacent to swamp (and water, for the nagas) is safe from "
#| "the lurkers, thus it is easy to keep Pekzs from being attacked.\n"
#| "\n"
#| "The Lua Lurker AI is coded as a Micro AI. A Micro AI can be added and "
#| "adapted to the need of a scenario easily using only WML and the "
#| "[micro_ai] tag. Check out the <span color='#00A000'>Micro AI wiki page</"
#| "span> at https://wiki.wesnoth.org/Micro_AIs for more information."
msgid ""
"You can use the right-click context menu to add additional lurkers.\n"
"\n"
Expand Down Expand Up @@ -1914,24 +1867,6 @@ msgstr ""

#. [message]: speaker=narrator
#: data/ai/micro_ais/scenarios/messenger_escort.cfg:152
#, fuzzy
#| msgid ""
#| "The Messenger Escort AI will try to move the dragoon messenger to the "
#| "signpost in the north, while protecting him as well as possible with the "
#| "other units. Vanak's orcs need to stop him.\n"
#| "\n"
#| "Note that the messenger route is set up through a series of waypoints "
#| "here simply to demonstrate how to use waypoints. On this map, using only "
#| "a single waypoint at the end of the route would work just as well (or "
#| "probably even better).\n"
#| "\n"
#| "Also note that the messenger does not have to get exactly to each "
#| "signpost (except for the last one), getting close is good enough.\n"
#| "\n"
#| "The Messenger Escort AI is coded as a Micro AI. A Micro AI can be added "
#| "and adapted to the need of a scenario easily using only WML and the "
#| "[micro_ai] tag. Check out the <span color='#00A000'>Micro AI wiki page</"
#| "span> at https://wiki.wesnoth.org/Micro_AIs for more information."
msgid ""
"The Messenger Escort AI will try to move the dragoon messenger to the "
"signpost in the north, while protecting him as well as possible with the "
Expand Down Expand Up @@ -2919,21 +2854,6 @@ msgstr ""

#. [message]: speaker=Uralt
#: data/ai/micro_ais/scenarios/simple_attack.cfg:176
#, fuzzy
#| msgid ""
#| "Hahahahaha!! I have given special instruction to my Soulless to attack "
#| "all your almost-advanced units first. Also watch how those same Soulless "
#| "will throw themselves mercilessly at your pitiful soldiers after that, "
#| "saving my more valuable skeleton minions for later. I have taken the term "
#| "'disposable units' to a whole new level. Watch in awe!!\n"
#| "\n"
#| "<i>Translation: The undead side includes two instances of the Simple "
#| "Attack Micro AI. The first makes the Soulless attack all units 1 XP from "
#| "leveling up, such that they can be eliminated afterward. The second "
#| "executes all remaining attacks possible by Soulless (and Walking "
#| "Corpses), without regard for their own safety. Only after that does the "
#| "default Wesnoth attack mechanism kick in to attack with the remaining "
#| "units (skeletons).</i>"
msgid ""
"Hahahahaha!! I have given special instruction to my Soulless to attack all "
"your almost-advanced units first. Also watch how those same Soulless will "
Expand Down Expand Up @@ -2990,27 +2910,6 @@ msgstr "Crear un murciélago para el lado 2"

#. [message]: speaker=narrator
#: data/ai/micro_ais/scenarios/swarm.cfg:144
#, fuzzy
#| msgid ""
#| "This scenario features bats moving around in a swarm. Without adjacent "
#| "enemies, they simply try to stay together and at a certain distance from "
#| "enemies. However, if an enemy unit is close to any bat, the swarm "
#| "scatters. This is particular fun to watch when one places an enemy unit "
#| "in the middle of the swarm. After being scattered, the swarm members "
#| "slowly rejoin, but not in a very organized way. Sub-swarms or individual "
#| "bats might roam around for quite some time before they find their way "
#| "back. It is also possible that individual bats (or small groups) split "
#| "off from the larger swarm at times.\n"
#| "\n"
#| "The player controls a side of gryphons, each of which is given 99 moves "
#| "so that the reaction of the swarm to enemies can be tested easily. There "
#| "are also several right-click options, for example for adding bats or "
#| "gryphons or for taking units off the map.\n"
#| "\n"
#| "Note: The Swarm AI is coded as a Micro AI. A Micro AI can be added and "
#| "adapted to the need of a scenario easily using only WML and the "
#| "[micro_ai] tag. Check out the <span color='#00A000'>Micro AI wiki page</"
#| "span> at https://wiki.wesnoth.org/Micro_AIs for more information."
msgid ""
"This scenario features bats moving around in a swarm. Without adjacent "
"enemies, they simply try to stay together and at a certain distance from "
Expand Down

0 comments on commit 35961d0

Please sign in to comment.