widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #01451
[Merge] lp:~hjd/widelands/more-stringfixes into lp:widelands
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/more-stringfixes into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #933747 in widelands: "Text refers to bug #1951113"
https://bugs.launchpad.net/widelands/+bug/933747
For more details, see:
https://code.launchpad.net/~hjd/widelands/more-stringfixes/+merge/177453
Various stringfixes/improvements for things I spotted while doing translations.
Also fixes bug 933747 (I'm sorry for including it with a bunch of unrelated changes, but I rediscovered the string in question and wanted to fix it.)
I'm gradually moving through the translatable strings now, so there might be more merge proposals like this in the not too distant future. :)
--
https://code.launchpad.net/~hjd/widelands/more-stringfixes/+merge/177453
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/more-stringfixes into lp:widelands.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2013-07-23 18:09:24 +0000
+++ CMakeLists.txt 2013-07-29 19:21:25 +0000
@@ -247,7 +247,7 @@
IF (Compiler_gcc_warnings_supported)
set (WL_COMPILERFLAG_GCCWARNINGS " ${PARAMETER_COMPILERFLAG_GCCWARNINGS}") #the space is on purpose!
ELSE (Compiler_gcc_warnings_supported)
- message("Warning: could not add additional GCC-specific warning options: ${PARAMETER_COMPILERFLAG_GCCWARNINGS}. Most likely you are using a different compiler, like Clang/LLVM.")
+ message("Warning: could not add additional GCC-specific warning options: ${PARAMETER_COMPILERFLAG_GCCWARNINGS}. Most likely you are using a different compiler, like Clang/LLVM or Visual Studio.")
ENDIF (Compiler_gcc_warnings_supported)
CHECK_CXX_COMPILER_FLAG(${PARAMETER_COMPILERFLAG_GCCWARNINGS} Compiler_gcc_warnings_supported)
=== modified file 'src/logic/battle.cc'
--- src/logic/battle.cc 2013-07-26 20:19:36 +0000
+++ src/logic/battle.cc 2013-07-29 19:21:25 +0000
@@ -175,7 +175,7 @@
}
if (soldier.get_current_hitpoints() < 1) {
- molog(_("[battle] soldier %u loose battle\n"), soldier.serial());
+ molog(_("[battle] soldier %u lose battle\n"), soldier.serial());
soldier . owner().count_casualty();
opponent(soldier)->owner().count_kill ();
soldier.start_task_die(game);
=== modified file 'src/logic/soldier.cc'
--- src/logic/soldier.cc 2013-07-26 20:19:36 +0000
+++ src/logic/soldier.cc 2013-07-29 19:21:25 +0000
@@ -1455,15 +1455,14 @@
char buffer[2048];
snprintf
(buffer, sizeof(buffer),
- _
- ("The game engine has encountered a logic error. The %s "
- "#%u of player %u could not find a way from (%i, %i) "
- "(with %s immovable) to the opponent (%s #%u of player "
- "%u) at (%i, %i) (with %s immovable). The %s will now "
- "desert (but will not be executed). Strange things may "
- "happen. No solution for this problem has been "
- "implemented yet. (bug #1951113) (The game has been "
- "paused.)"),
+ "The game engine has encountered a logic error. The %s "
+ "#%u of player %u could not find a way from (%i, %i) "
+ "(with %s immovable) to the opponent (%s #%u of player "
+ "%u) at (%i, %i) (with %s immovable). The %s will now "
+ "desert (but will not be executed). Strange things may "
+ "happen. No solution for this problem has been "
+ "implemented yet. (bug #536066) (The game has been "
+ "paused.)",
descname().c_str(), serial(), owner().player_number(),
get_position().x, get_position().y,
immovable_position ?
=== modified file 'src/network/internet_gaming.cc'
--- src/network/internet_gaming.cc 2013-07-26 20:19:36 +0000
+++ src/network/internet_gaming.cc 2013-07-29 19:21:25 +0000
@@ -113,7 +113,7 @@
GCC_DIAG_ON("-Wold-style-cast")
} else
throw warning
- (_("Connection problem"), "%s", _("Widelands has not been able to connect to the metaserver."));
+ (_("Connection problem"), "%s", _("Widelands could not connect to the metaserver."));
SDLNet_ResolveHost (&peer, m_meta.c_str(), m_port);
m_sock = SDLNet_TCP_Open(&peer);
=== modified file 'src/network/internet_gaming_messages.cc'
--- src/network/internet_gaming_messages.cc 2013-07-26 20:19:36 +0000
+++ src/network/internet_gaming_messages.cc 2013-07-29 19:21:25 +0000
@@ -45,7 +45,7 @@
igmessages["ALREADY_LOGGED_IN"] = _("You are already logged in!");
igmessages["DEFICIENT_PERMISSION"] =
_
- ("You got disconnected, as you send a superuser command without superuser permission."
+ ("You got disconnected, as you sent a superuser command without superuser permission. "
"This incident will be logged and reported to the administrator.");
igmessages["RESTARTING"] = _("You got disconnected, as the metaserver is currently restarting.");
// messages from client to metaserver
=== modified file 'txts/README'
--- txts/README 2013-01-21 09:52:31 +0000
+++ txts/README 2013-07-29 19:21:25 +0000
@@ -48,7 +48,7 @@
"</p>"
"<p line-spacing=3 font-size=12>"
"<br><br>"
-_"SPACE Toggle build-help"
+_"SPACE Toggle build help"
"<br>"
_"M Toggle minimap"
"<br>"
@@ -62,7 +62,7 @@
"<br>"
_"O Toggle objectives display"
"<br>"
-_"F Toggle Fullscreen"
+_"F Toggle fullscreen"
"<br>"
_"Home Center main mapview on starting location"
"<br>"
=== modified file 'txts/editor_readme'
--- txts/editor_readme 2012-12-16 19:08:53 +0000
+++ txts/editor_readme 2013-07-29 19:21:25 +0000
@@ -18,21 +18,21 @@
_"Keyboard shortcuts"
"</p>"
"<p line-spacing=3 font-size=12><br>"
-_"SPACE Toggles build help"
-"<br>"
-_"C Toggles census on/off"
-"<br>"
-_"E Toggles event menu"
-"<br>"
-_"F Toggles fullscreen"
-"<br>"
-_"H Toggles main menu"
-"<br>"
-_"M Toggles minimap"
-"<br>"
-_"P Toggles player menu"
-"<br>"
-_"T Toggles tools menu"
+_"SPACE Toggle build help"
+"<br>"
+_"C Toggle census on/off"
+"<br>"
+_"E Toggle event menu"
+"<br>"
+_"F Toggle fullscreen"
+"<br>"
+_"H Toggle main menu"
+"<br>"
+_"M Toggle minimap"
+"<br>"
+_"P Toggle player menu"
+"<br>"
+_"T Toggle tools menu"
"<br>"
_"I Activates information tool"
"<br>"
