[Wesnoth-cvs-commits] wesnoth src/game.cpp po/wesnoth-lib/de.po

[Isaac Clerencia]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Isaac Clerencia <address@hidden>        04/11/01 18:01:20

Modified files:
        src            : game.cpp 

Log message:
        Fixed savegames of (begining of) tutorial not loading.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game.cpp.diff?tr1=1.144&tr2=1.145&r1=text&r2=text

Modified files:
        po/wesnoth-lib : de.po 

Log message:
        Updated German translation

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-lib/de.po.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: wesnoth/src/game.cpp
diff -u wesnoth/src/game.cpp:1.155 wesnoth/src/game.cpp:1.156
--- wesnoth/src/game.cpp:1.155  Sun Oct 31 20:42:16 2004
+++ wesnoth/src/game.cpp        Mon Nov  1 00:29:51 2004
@@ -1,4 +1,4 @@
-/* $Id: game.cpp,v 1.155 2004/10/31 20:42:16 gruikya Exp $ */
+/* $Id: game.cpp,v 1.156 2004/11/01 00:29:51 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -430,6 +430,7 @@
                        throw config::error("unknown option");
                } else {
 
+                 std::cerr << "Setting path using " << val;
                        if(val[0] == '/') {
                                game_config::path = val;
                        } else {
@@ -1422,6 +1423,19 @@
 
        game_controller game(argc,argv,use_sound);
 
+       // I would prefer to setup locale first so that early error
+       // messages can get localized, but we need the game_controller
+       // initialized to have get_intl_dir() to work.  Note: this
+       // setlocale() but this does not take GUI language setting
+       // into account.
+       setlocale (LC_ALL, "");
+       const std::string& intl_dir = get_intl_dir();
+       bindtextdomain (PACKAGE, intl_dir.c_str());
+       bind_textdomain_codeset (PACKAGE, "UTF-8");
+       bindtextdomain (PACKAGE "-lib", intl_dir.c_str());
+       bind_textdomain_codeset (PACKAGE "-lib", "UTF-8");
+       textdomain (PACKAGE);
+
        bool res;
 #ifdef WIN32
        res = game.init_config();
@@ -1528,27 +1542,15 @@
 
 int main(int argc, char** argv)
 {
-       // setup locale first so that early error messages can get localized
-       // but this does not take GUI language setting into account
-       setlocale (LC_ALL, "");
-
-       const std::string& intl_dir = get_intl_dir();
-       bindtextdomain (PACKAGE, intl_dir.c_str());
-       bind_textdomain_codeset (PACKAGE, "UTF-8");
-       bindtextdomain (PACKAGE "-lib", intl_dir.c_str());
-       bind_textdomain_codeset (PACKAGE "-lib", "UTF-8");
-
-       textdomain (PACKAGE);
-
        try {
                std::cerr << "started game: " << SDL_GetTicks() << "\n";
                const int res = play_game(argc,argv);
                std::cerr << "exiting with code " << res << "\n";
                return res;
        } catch(CVideo::error&) {
-               std::cerr << _("Could not initialize video. Exiting.\n");
+               std::cerr << "Could not initialize video. Exiting.\n";
        } catch(font::manager::error&) {
-               std::cerr << _("Could not initialize fonts. Exiting.\n");
+               std::cerr << "Could not initialize fonts. Exiting.\n";
        } catch(config::error& e) {
                std::cerr << e.message << "\n";
        } catch(gui::button::error&) {
Index: wesnoth/po/wesnoth-lib/de.po
diff -u wesnoth/po/wesnoth-lib/de.po:1.6 wesnoth/po/wesnoth-lib/de.po:1.7
--- wesnoth/po/wesnoth-lib/de.po:1.6    Sun Oct 31 00:36:51 2004
+++ wesnoth/po/wesnoth-lib/de.po        Mon Nov  1 18:01:20 2004
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the Battle for Wesnoth 
package.
 # Automatically generated, 2004.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: Battle for Wesnoth 0.8.2-CVS\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
 "POT-Creation-Date: 2004-10-31 02:17+0200\n"
-"PO-Revision-Date: 2004-09-29 18:04+0100\n"
-"Last-Translator: Christoph Berg <address@hidden>\n"
+"PO-Revision-Date: 2004-11-01 18:17+0100\n"
+"Last-Translator: Nils Kneuper <address@hidden>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +21,7 @@
 
 #: src/hotkeys.cpp:121
 msgid "End Unit Turn"
-msgstr ""
+msgstr "Zug beenden"
 
 #: src/hotkeys.cpp:122
 msgid "Leader"
@@ -46,7 +45,7 @@
 
 #: src/hotkeys.cpp:127
 msgid "Default Zoom"
-msgstr ""
+msgstr "Standard Zoom"
 
 #: src/hotkeys.cpp:128
 msgid "Fullscreen"
@@ -54,7 +53,7 @@
 
 #: src/hotkeys.cpp:129
 msgid "Accelerated"
-msgstr ""
+msgstr "Beschleunigt"
 
 #: src/hotkeys.cpp:130
 msgid "Unit Description"
@@ -162,19 +161,19 @@
 
 #: src/hotkeys.cpp:156
 msgid "Save As"
-msgstr ""
+msgstr "Speichern Unter"
 
 #: src/hotkeys.cpp:157
 msgid "Set Player Start Position"
-msgstr ""
+msgstr "Start Position des Spielers setzen"
 
 #: src/hotkeys.cpp:158
 msgid "Flood Fill"
-msgstr ""
+msgstr "Alles füllen"
 
 #: src/hotkeys.cpp:159
 msgid "Fill Selection"
-msgstr ""
+msgstr "ausgewählten Bereich füllen"
 
 #: src/hotkeys.cpp:160
 msgid "Cut"
@@ -190,27 +189,27 @@
 
 #: src/hotkeys.cpp:163
 msgid "Revert from Disk"
-msgstr ""
+msgstr "Rückgängig"
 
 #: src/hotkeys.cpp:164
 msgid "Resize Map"
-msgstr ""
+msgstr "Kartengröße anpassen"
 
 #: src/hotkeys.cpp:165
 msgid "Flip Map"
-msgstr ""
+msgstr "Karte drehen"
 
 #: src/hotkeys.cpp:166
 msgid "Select All"
-msgstr ""
+msgstr "Alles auswählen"
 
 #: src/hotkeys.cpp:167
 msgid "Draw Terrain"
-msgstr ""
+msgstr "Terrain malen"
 
 #: src/hotkeys.cpp:168
 msgid "Delay Shroud Updates"
-msgstr ""
+msgstr "Schleier verspätet aktualisieren"
 
 #: src/hotkeys.cpp:169
 msgid "Update Shroud Now"