widelands-dev team mailing list archive

[Hans Joachim Desserud <launchpad@xxxxxxxxxxxx>]

Hans Joachim Desserud has proposed merging lp:~widelands-dev/widelands/yet-some-more-tiny-fixes into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/yet-some-more-tiny-fixes/+merge/213382

Some more tiny fixes. See commit messages for details.
-- 
https://code.launchpad.net/~widelands-dev/widelands/yet-some-more-tiny-fixes/+merge/213382
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/yet-some-more-tiny-fixes into lp:widelands.

=== modified file 'maps/Ice wars.wmf/elemental'
--- maps/Ice wars.wmf/elemental	2014-02-25 10:47:47 +0000
+++ maps/Ice wars.wmf/elemental	2014-03-30 14:06:44 +0000
@@ -8,6 +8,6 @@
 world="winterland"
 name=_"Ice wars"
 author="Einstein13"
-descr=_"Autumn follows winter. Some things are frozen, but not the war."
+descr=_"Autumn became winter. Some things are frozen, but not the war."
 hint=_"Start positions are clockwise"
 tags="seafaring,official,4teams,3teams,2teams"

=== modified file 'src/io/filesystem/disk_filesystem.cc'
--- src/io/filesystem/disk_filesystem.cc	2014-03-30 09:08:55 +0000
+++ src/io/filesystem/disk_filesystem.cc	2014-03-30 14:06:44 +0000
@@ -367,7 +367,7 @@
 			if (ftell_pos < 0)
 				throw wexception
 					("RealFSImpl::Load: error when loading \"%s\" (\"%s\"): file "
-					 "size calculation yieded negative value %i",
+					 "size calculation yielded negative value %i",
 					 fname.c_str(), fullname.c_str(), ftell_pos);
 			size = ftell_pos;
 		}

=== modified file 'txts/editor_readme'
--- txts/editor_readme	2014-03-10 19:54:40 +0000
+++ txts/editor_readme	2014-03-30 14:06:44 +0000
@@ -22,8 +22,6 @@
 "<br>"
 _"C: toggles census"
 "<br>"
-_"E: toggles event menu"
-"<br>"
 _"F: toggles fullscreen"
 "<br>"
 _"H: toggles main menu"
@@ -36,9 +34,9 @@
 "<br>"
 _"I: activates information tool"
 "<br>"
-_"CTRL+L: load Map"
+_"CTRL+L: load map"
 "<br>"
-_"CTRL+S: save Map"
+_"CTRL+S: save map"
 "<br><br>"
 _"1-0: changes tool size"
 "<br>"