0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update text to match changes in dialogues (fixes #2882).

Browse source 
[ci skip]
This commit is contained in:
Wedge009 2018-05-03 15:29:47 +10:00 • committed by sevu
parent d0ebbbb7c3
commit f1bcdc7f1b
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/core/help.cfg
View file

@ -196,7 +196,7 @@ When you win a scenario, the map grays over and the <b>End Turn</b> button chang
[topic]
id=recruit_and_recall
title= _ "Recruiting and Recalling"
text="<img>src=help/recruit.png align=left float=yes</img>" + _ "Each side begins with one leader in their keep. At the start of any battle, and at times during it, you will need to recruit <ref>dst='..units' text='units'</ref> into your army. To recruit, you must have your leader (for instance, Konrad in the <i>Heir to the Throne</i> campaign) on the keep hex of a <ref>dst='terrain_castle' text='castle'</ref>. Then you may recruit by either choosing <b>Recruit</b> from the menu or right-clicking on a hex and selecting <b>Recruit</b>. This brings up the recruit menu, which lists units available for recruitment, along with their gold cost. Click on a unit to see its statistics, then press the OK button to recruit it." + _ "
text="<img>src=help/recruit.png align=left float=yes</img>" + _ "Each side begins with one leader in their keep. At the start of any battle, and at times during it, you will need to recruit <ref>dst='..units' text='units'</ref> into your army. To recruit, you must have your leader (for instance, Konrad in the <i>Heir to the Throne</i> campaign) on the keep hex of a <ref>dst='terrain_castle' text='castle'</ref>. Then you may recruit by either choosing <b>Recruit</b> from the menu or right-clicking on a hex and selecting <b>Recruit</b>. This brings up the recruit menu, which lists units available for recruitment, along with their gold cost. Click on a unit to see its statistics, then press the <bold>Recruit</bold> button to recruit it." + _ "
If you right-clicked on a castle hex and selected recruit, the new unit will appear in that hex. Otherwise, it will appear in a free hex near the keep. You may only recruit as many units as you have free hexes in your castle, and you cannot spend more gold than you actually have on recruiting." + _ "
@ -506,7 +506,7 @@ The installation status for each add-on is shown below each entry. For add-ons t
To search for add-ons by keywords, type any relevant terms in any order in the <b>Filter</b> box, separated by spaces. You can also sort the add-on list by clicking the column headers. It is also possible to choose to only display add-ons of specific categories by clicking on the <b>Options</b> button in the top-right corner.
To install an add-on, select it from the list and click <b>OK</b>, or simply double-click on the add-on’s title. The <b>Description</b> button provides you with additional details about the add-on, such as its full description, installation status, and available languages."
To install an add-on, select it from the list and click the <b>+</b> icon, or simply double-click on the add-on’s title. The <b>Description</b> button provides you with additional details about the add-on, such as its full description, installation status, and available languages."
[/topic]
# wmllint: markcheck on

2
data/tools/addon_manager/html.py
View file

@ -90,7 +90,7 @@ WESMERE_HEADER = '''\
<div id="content">
<h1>Wesnoth %(server_name)s Add-ons List</h1>
<p>To install add-ons using the in-game client, choose “Add-ons” from the main menu, and click “Connect” to connect to the add-ons server. Pick the add-on you want to install from the list and click “OK” — the download will commence immediately and the add-on will be automatically installed once finished. Bear in mind that not all add-ons are singleplayer campaigns!</p>
<p>To install add-ons using the in-game client, choose “Add-ons” from the main menu, and click “Connect” to connect to the add-ons server. Pick the add-on you want to install from the list and click the “+” icon — the download will commence immediately and the add-on will be automatically installed once finished. Bear in mind that not all add-ons are singleplayer campaigns!</p>
'''
WESMERE_DOWNLOAD_HELP = '''\

2
doc/man/wesnoth.6
View file

@ -367,7 +367,7 @@ era. The era is chosen by an id. Eras are described in the
file.
.TP
.B --exit-at-end
exits once the scenario is over, without displaying victory/defeat dialog which requires the user to click OK.
exits once the scenario is over, without displaying victory/defeat dialog which normally requires the user to click End Scenario.
This is also used for scriptable benchmarking.
.TP
.B --ignore-map-settings

2
utils/umc_dev/manual/dev_manual.tex
View file

@ -93,7 +93,7 @@ After you got all the prerequisites, you need to setup the eclipse installation.
\item Browse to the previous location where you have extracted the ``eclipse\_3.7.zip" archive.
\item Press Finish and OK until you exist all windows.
\item Press Finish and OK until you exit all windows.
\end{enumerate}
\subsection{Installing Xtext}