[Wesnoth-cvs-commits] wesnoth/src game.cpp multiplayer.cpp unit.cpp

[Philippe Plantier]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Philippe Plantier <address@hidden>      05/04/11 18:57:26

Modified files:
        src            : game.cpp multiplayer.cpp unit.cpp 

Log message:
        Now that the string freeze is over, adding some more work for 
translators.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game.cpp.diff?tr1=1.227&tr2=1.228&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer.cpp.diff?tr1=1.154&tr2=1.155&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit.cpp.diff?tr1=1.138&tr2=1.139&r1=text&r2=text

Patches:
Index: wesnoth/src/game.cpp
diff -u wesnoth/src/game.cpp:1.227 wesnoth/src/game.cpp:1.228
--- wesnoth/src/game.cpp:1.227  Mon Apr 11 18:39:25 2005
+++ wesnoth/src/game.cpp        Mon Apr 11 18:57:26 2005
@@ -1,4 +1,4 @@
-/* $Id: game.cpp,v 1.227 2005/04/11 18:39:25 silene Exp $ */
+/* $Id: game.cpp,v 1.228 2005/04/11 18:57:26 gruikya Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -748,10 +748,8 @@
                std::string error_log;
                read_save_file(game,cfg,&error_log);
                if(!error_log.empty()) {
-                       // FIXME: fix this string after the string-freeze is
-                       // over, to clearly state this is a warning.
                        gui::show_error_message(disp(), 
-                                       _("The file you have tried to load is 
corrupt: '") +
+                                       _("Warning: The file you have tried to 
load is corrupt. Loading anyway.\n") +
                                        error_log);
                }
 
@@ -1392,10 +1390,8 @@
                                std::string error_log;
                                read(cfg, *stream, &error_log);
                                if(!error_log.empty()) {
-                                       // FIXME: fix this string after the 
string-freeze is
-                                       // over, to clearly state this is a 
warning.
                                        gui::show_error_message(disp(), 
-                                                       _("Error loading game 
configuration files: '") +
+                                                       _("Warning: Errors 
occured while loading game configuration files: '") +
                                                        error_log);
 
                                }
Index: wesnoth/src/multiplayer.cpp
diff -u wesnoth/src/multiplayer.cpp:1.154 wesnoth/src/multiplayer.cpp:1.155
--- wesnoth/src/multiplayer.cpp:1.154   Wed Apr  6 20:46:45 2005
+++ wesnoth/src/multiplayer.cpp Mon Apr 11 18:57:26 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer.cpp,v 1.154 2005/04/06 20:46:45 gruikya Exp $ */
+/* $Id: multiplayer.cpp,v 1.155 2005/04/11 18:57:26 gruikya Exp $ */
 /*
    Copyright (C)
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -134,10 +134,11 @@
                // Backwards-compatibility "version" attribute
                const std::string& version = data["version"];
                if(version.empty() == false && version != game_config::version) 
{
-                       // FIXME: make this string translatable
-                       throw network::error("The server requires version '" + 
version
-                                       + "' while you are using version '" + 
-                                       game_config::version + "'");
+                       utils::string_map i18n_symbols;
+                       i18n_symbols["version1"] = version;
+                       i18n_symbols["version2"] = game_config::version;
+                       const std::string errorstring = vgettext("The server 
requires version '$version1' while you are using version '$version2'", 
i18n_symbols);
+                       throw network::error(errorstring);
                }
                
                // Check for "redirect" messages
@@ -148,8 +149,7 @@
                        port = lexical_cast_default<unsigned 
int>((*redirect)["port"], 15000);
 
                        if(shown_hosts.find(hostpair(host,port)) != 
shown_hosts.end()) {
-                               // FIXME: make this string translatable
-                               throw network::error("Server-side redirect 
loop");
+                               throw network::error(_("Server-side redirect 
loop"));
                        }
                        shown_hosts.insert(hostpair(host, port));
 
Index: wesnoth/src/unit.cpp
diff -u wesnoth/src/unit.cpp:1.138 wesnoth/src/unit.cpp:1.139
--- wesnoth/src/unit.cpp:1.138  Thu Apr  7 21:16:50 2005
+++ wesnoth/src/unit.cpp        Mon Apr 11 18:57:26 2005
@@ -1,4 +1,4 @@
-/* $Id: unit.cpp,v 1.138 2005/04/07 21:16:50 gruikya Exp $ */
+/* $Id: unit.cpp,v 1.139 2005/04/11 18:57:26 gruikya Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -1139,22 +1139,23 @@
 
        t_string& description = modificationDescriptions_[type];
 
-       // FIXME: the colon must be translatable.
-       description += mod["name"] + ": ";
+       // Punctuation should be translatable: not all languages use latin 
punctuation.
+       // (however, there maybe is a better way to do it)
+       description += mod["name"] + t_string(N_(": "), "wesnoth");
        if(!mod["description"].empty()) {
                description += mod["description"];
                description += " ";
        }
 
        if(effects_description.empty() == false) {
-               description += "(";
+               description += t_string(N_("("), "wesnoth");
                for(std::vector<t_string>::const_iterator i = 
effects_description.begin(); 
                                i != effects_description.end(); ++i) {
                        description += *i;
                        if(i+1 != effects_description.end())
-                               description += "; ";
+                               description += t_string(N_("; "), "wesnoth");
                }
-               description += ")";
+               description += t_string(N_(")"), "wesnoth");
        }
 
        description += "\n";