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

Merge branch 'fix/text/typographic-apostrophes/1' of https://github.com/8573/wesnoth-old

Browse source 
Conflicts:
	data/lan_server.cfg
This commit is contained in:
Bär Halberkamp 2013-11-18 22:28:37 +01:00
commit 623d752952
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_The_Rise_of_Wesnoth.cfg
View file

@ -328,7 +328,7 @@
[/message]
[message]
speaker=Lich-Lord Jevyan
message= _ "Casting fire is the least of the Ruby's abilities. You are twice a fool, for having failed to plumb more than its most trivial use and for having given it away."
message= _ "Casting fire is the least of the Ruby’s abilities. You are twice a fool, for having failed to plumb more than its most trivial use and for having given it away."
[/message]
[message]
speaker=Burin the Lost

2
data/core/units.cfg
View file

@ -241,7 +241,7 @@ The eastern provinces of Wesnoth, known as the Clan Homelands, have a geography
male_name= _ "race^Ogre"
female_name= _ "race+female^Ogre"
plural_name= _ "race^Ogres"
description= _ "Ogres are a wild and uncivilized race who dwell mainly in the wilderness of the Great Continent. Physically, they resemble humans and orcs but are larger and stronger. Even their adolescents are more than a match for most men. Ogres are distrusted in many populated areas and usually either avoid them or are driven out by force. Instead, they lurk the mountainous areas on the edges of civilization, where hungry ogre bandits provide a constant threat to travelers and caravans. While ogres are not particularly intelligent or quick, their toughness and physical strength make them a valuable asset in the armies of other races. They are especially valued by more ruthless commanders who don't mind the ogres' brutality. Little is known about their biology or society, if they can truly be said to have one, but they are said to attack alongside wolves and other beasts. Whether this is a sign of cooperation, domestication, or simply mutual opportunism is not known."
description= _ "Ogres are a wild and uncivilized race who dwell mainly in the wilderness of the Great Continent. Physically, they resemble humans and orcs but are larger and stronger. Even their adolescents are more than a match for most men. Ogres are distrusted in many populated areas and usually either avoid them or are driven out by force. Instead, they lurk the mountainous areas on the edges of civilization, where hungry ogre bandits provide a constant threat to travelers and caravans. While ogres are not particularly intelligent or quick, their toughness and physical strength make them a valuable asset in the armies of other races. They are especially valued by more ruthless commanders who don’t mind the ogres’ brutality. Little is known about their biology or society, if they can truly be said to have one, but they are said to attack alongside wolves and other beasts. Whether this is a sign of cooperation, domestication, or simply mutual opportunism is not known."
num_traits=2
{OGRE_NAMES}
[/race]

8
data/lan_server.cfg
View file

@ -1,5 +1,11 @@
motd="Welcome to Wesnoth's LAN server!
<<<<<<< HEAD
motd="Welcome to Wesnoth’s LAN server!
This server allows *any* Wesnoth version, so make sure all players have clients with compatible versions! Otherwise, you will run into problems.
This server will automatically shut down after all players have left."
=======
motd="Welcome to Wesnoth’s LAN server!
This server allows *any* wesnoth version, so make sure all players have clients with compatible versions! Otherwise, you will run into problems.
This server will automatically shutdown after all players have left."
>>>>>>> ef73e1d08c1ccc136bb2bf284eb7c038b07b2b04
versions_accepted="*"
lan_server="60"