widelands

Merge lp:~widelands-dev/widelands/yet-some-more-tiny-fixes into lp:widelands

  1. yet-some-more-tiny-fixes
  2. Merge into trunk
Proposed by Hans Joachim Desserud
Status: Merged
Merged at revision: 6908
Proposed branch: lp:~widelands-dev/widelands/yet-some-more-tiny-fixes
Merge into: lp:widelands
Diff against target: 49 lines (+4/-6)
3 files modified
maps/Ice wars.wmf/elemental (+1/-1)
src/io/filesystem/disk_filesystem.cc (+1/-1)
txts/editor_readme (+2/-4)
To merge this branch: bzr merge lp:~widelands-dev/widelands/yet-some-more-tiny-fixes
Reviewer Review Type Date Requested Status
SirVer Approve
Review via email: mp+213382@code.launchpad.net

Description of the change

Some more tiny fixes. See commit messages for details.

To post a comment you must log in.
Revision history for this message
SirVer (sirver) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'maps/Ice wars.wmf/elemental'
2--- maps/Ice wars.wmf/elemental 2014-02-25 10:47:47 +0000
3+++ maps/Ice wars.wmf/elemental 2014-03-30 14:06:44 +0000
4@@ -8,6 +8,6 @@
5 world="winterland"
6 name=_"Ice wars"
7 author="Einstein13"
8-descr=_"Autumn follows winter. Some things are frozen, but not the war."
9+descr=_"Autumn became winter. Some things are frozen, but not the war."
10 hint=_"Start positions are clockwise"
11 tags="seafaring,official,4teams,3teams,2teams"
12
13=== modified file 'src/io/filesystem/disk_filesystem.cc'
14--- src/io/filesystem/disk_filesystem.cc 2014-03-30 09:08:55 +0000
15+++ src/io/filesystem/disk_filesystem.cc 2014-03-30 14:06:44 +0000
16@@ -367,7 +367,7 @@
17 if (ftell_pos < 0)
18 throw wexception
19 ("RealFSImpl::Load: error when loading \"%s\" (\"%s\"): file "
20- "size calculation yieded negative value %i",
21+ "size calculation yielded negative value %i",
22 fname.c_str(), fullname.c_str(), ftell_pos);
23 size = ftell_pos;
24 }
25
26=== modified file 'txts/editor_readme'
27--- txts/editor_readme 2014-03-10 19:54:40 +0000
28+++ txts/editor_readme 2014-03-30 14:06:44 +0000
29@@ -22,8 +22,6 @@
30 "<br>"
31 _"C: toggles census"
32 "<br>"
33-_"E: toggles event menu"
34-"<br>"
35 _"F: toggles fullscreen"
36 "<br>"
37 _"H: toggles main menu"
38@@ -36,9 +34,9 @@
39 "<br>"
40 _"I: activates information tool"
41 "<br>"
42-_"CTRL+L: load Map"
43+_"CTRL+L: load map"
44 "<br>"
45-_"CTRL+S: save Map"
46+_"CTRL+S: save map"
47 "<br><br>"
48 _"1-0: changes tool size"
49 "<br>"

Subscribers

People subscribed via source and target branches

to status/vote changes: