From f927aa73888b62170d0c61e153de5ee90f31b13b Mon Sep 17 00:00:00 2001 From: Wanne Date: Sun, 12 Apr 2009 23:01:40 +0000 Subject: [PATCH] - Translated MP Text in _GermanText.cpp - A few minor adjustments git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2728 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Multiplayer/client.cpp | 20 ++----- Utils/_ChineseText.cpp | 3 +- Utils/_DutchText.cpp | 3 +- Utils/_EnglishText.cpp | 4 +- Utils/_FrenchText.cpp | 3 +- Utils/_GermanText.cpp | 113 +++++++++++++++++++-------------------- Utils/_ItalianText.cpp | 3 +- Utils/_PolishText.cpp | 3 +- Utils/_RussianText.cpp | 3 +- Utils/_TaiwaneseText.cpp | 3 +- 10 files changed, 77 insertions(+), 81 deletions(-) diff --git a/Multiplayer/client.cpp b/Multiplayer/client.cpp index 28ecf3e29..3939bdeb8 100644 --- a/Multiplayer/client.cpp +++ b/Multiplayer/client.cpp @@ -2173,16 +2173,10 @@ void recieveSETTINGS (RPCParameters *rpcParameters) //recive settings from serve // WANNE - MP: We also have to reinitialize the merc profiles because // they depend on the inventory! LoadMercProfiles(); + + ScreenMsg( FONT_LTGREEN, MSG_CHAT, MPClientMessage[26],cl_lan->client_num,szDefault ); - if (!RANDOM_SPAWN) - ScreenMsg( FONT_LTGREEN, MSG_CHAT, MPClientMessage[26],cl_lan->client_num,szDefault,cl_lan->cl_edge,cl_lan->team ); - else - ScreenMsg( FONT_LTGREEN, MSG_CHAT, MPClientMessage[26],cl_lan->client_num,szDefault,L"?",cl_lan->team ); - fDrawCharacterList = true; // set the character list to be redrawn - -// if(PLAYER_BSIDE==0)ScreenMsg(FONT_LTGREEN,MSG_CHAT,MPClientMessage[27],cl_lan->cl_ops[0],cl_lan->cl_ops[1],cl_lan->cl_ops[2],cl_lan->cl_ops[3]); - //ScreenMsg(FONT_LTGREEN,MSG_CHAT,MPClientMessage[27],cl_lan->team); strcpy(client_names[cl_lan->client_num-1],szDefault); @@ -2190,14 +2184,10 @@ void recieveSETTINGS (RPCParameters *rpcParameters) //recive settings from serve else { fDrawCharacterList = true; // set the character list to be redrawn - - if (!RANDOM_SPAWN) - ScreenMsg( FONT_LTGREEN, MSG_CHAT, MPClientMessage[26],cl_lan->client_num,szDefault,cl_lan->cl_edge,cl_lan->team ); - else - ScreenMsg( FONT_LTGREEN, MSG_CHAT, MPClientMessage[26],cl_lan->client_num,szDefault,L"?",cl_lan->team ); - // ScreenMsg(FONT_LTGREEN,MSG_CHAT,MPClientMessage[27],cl_lan->team); - strcpy(client_names[cl_lan->client_num-1],szDefault); + ScreenMsg( FONT_LTGREEN, MSG_CHAT, MPClientMessage[26],cl_lan->client_num,szDefault ); + + strcpy(client_names[cl_lan->client_num-1],szDefault); } diff --git a/Utils/_ChineseText.cpp b/Utils/_ChineseText.cpp index 7345bb0aa..6b678b31e 100644 --- a/Utils/_ChineseText.cpp +++ b/Utils/_ChineseText.cpp @@ -4741,6 +4741,7 @@ STR16 gzMPJScreenText[] = L"MP Sync. Directory", L"You must enter a file transfer directory.", L"(Use '/' instead of '\\' for directory delimiters.)", + L"The specified synchronisation directory does not exist.", }; STR16 gzMPHScreenText[] = @@ -5670,7 +5671,7 @@ STR16 MPClientMessage[] = // 25 L"测试与欺骗功能键'9'已被激活。", - L"新建连接: 客户端 #%d - '%S', Edge: %d, 队: %d.", + L"新建连接: 客户端 #%d - '%S'.", L"队: %d.",//not used any more L"'%s' (客户端 %d - '%S') 已被 '%s' (客户端 %d - '%S' 杀死)", L"踢出客户端 #%d - '%S'", diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp index 4a23e7afb..dfa8989a7 100644 --- a/Utils/_DutchText.cpp +++ b/Utils/_DutchText.cpp @@ -3966,6 +3966,7 @@ STR16 gzMPJScreenText[] = L"MP Sync. Directory", L"You must enter a file transfer directory.", L"(Use '/' instead of '\\' for directory delimiters.)", + L"The specified synchronisation directory does not exist.", }; STR16 gzMPHScreenText[] = @@ -4723,7 +4724,7 @@ STR16 MPClientMessage[] = L"Sector=%s, Max Clients=%d, Max Mercs=%d, Game_Mode=%d, Same Merc=%d, Damage Multiplier=%f, Timed Turns=%d, Secs/Tic=%d, Dis BobbyRay=%d, Dis Aim/Merc Equip=%d, Dis Morale=%d, Testing=%d", // 25 L"Testing and cheat function '9' is enabled.", - L"New connection: Client #%d - '%S', Edge: %d, Team: %d.", + L"New connection: Client #%d - '%S'.", L"Team: %d.",//not used any more L"'%s' (client %d - '%S') was killed by '%s' (client %d - '%S')", L"Kicked client #%d - '%S'", diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index 80a77788e..46b9412ed 100644 --- a/Utils/_EnglishText.cpp +++ b/Utils/_EnglishText.cpp @@ -3979,6 +3979,8 @@ STR16 gzMPJScreenText[] = L"MP Sync. Directory", L"You must enter a file transfer directory.", L"(Use '/' instead of '\\' for directory delimiters.)", + L"The specified synchronisation directory does not exist.", + L"The specified synchronisation directory does not exist.", }; STR16 gzMPHScreenText[] = @@ -4737,7 +4739,7 @@ STR16 MPClientMessage[] = // 25 L"Testing and cheat function '9' is enabled.", - L"New connection: Client #%d - '%S', Edge: %d, Team: %d.", + L"New connection: Client #%d - '%S'.", L"Team: %d.",//not used any more L"'%s' (client %d - '%S') was killed by '%s' (client %d - '%S').", L"Kicked client #%d - '%S'.", diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp index 3b708eb07..7b110d14a 100644 --- a/Utils/_FrenchText.cpp +++ b/Utils/_FrenchText.cpp @@ -3980,6 +3980,7 @@ STR16 gzMPJScreenText[] = L"MP Sync. Directory", L"You must enter a file transfer directory.", L"(Use '/' instead of '\\' for directory delimiters.)", + L"The specified synchronisation directory does not exist.", }; STR16 gzMPHScreenText[] = @@ -4737,7 +4738,7 @@ STR16 MPClientMessage[] = // 25 L"Testing and cheat function '9' is enabled.", - L"New connection: Client #%d - '%S', Edge: %d, Team: %d.", + L"New connection: Client #%d - '%S'.", L"Team: %d.",//not used any more L"'%s' (client %d - '%S') was killed by '%s' (client %d - '%S')", L"Kicked client #%d - '%S'", diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index fc8c7f966..7d28d778f 100644 --- a/Utils/_GermanText.cpp +++ b/Utils/_GermanText.cpp @@ -3310,7 +3310,7 @@ STR16 zOptionsText[] = //button Text L"Spiel sichern", L"Spiel laden", - L"Spiel beenden", + L"Spielende", L"Nchste", L"Vorherige", L"Fertig", @@ -3496,11 +3496,11 @@ STR16 zOptionsToggleText[] = L"Automatisch speichern", L"Stummer Skyrider", L"Niedrige CPU Belastung", - L"Erweiterte Gegenstandsinfo (EDB)", + L"Erw. Gegenstandsinfo (EDB)", L"Erzwungender Runden-Modus", // arynn : reset all toggle options, in cases for corrupted JA2.set files (and general debugging of options) - L"Reset ALL game options", - L"Do you really want to reset?", + L"ALLE Einstellungen rcksetzen", + L"Wollen Sie wirklich rcksetzen?", // arynn : a sample options screen options header, just text, not a real option L"--DEBUG OPTIONS--", // arynn : allow debug options that were set in debug.exe to continue in a rel.exe that shares same JA2.set file @@ -3691,61 +3691,62 @@ STR16 gzGIOScreenText[] = STR16 gzMPJScreenText[] = { - L"MULTIPLAYER", - L"Join", - L"Host", - L"Cancel", - L"Refresh", - L"Player Name", + L"MEHRSPIELER", + L"Teilnehmen", + L"Erffnen", + L"Abbrechen", + L"Aktualisieren", + L"Spieler Name", L"Server IP", L"Port", L"Server Name", - L"# Plrs", + L"# Spieler", L"Version", - L"Game Type", + L"Spieltyp", L"Ping", - L"You must enter a player name.", - L"You must enter a valid server IP address.\n (eg 84.114.195.239).", - L"You must enter a valid Server Port between 1 and 65535"., - L"MP Sync. Directory", - L"You must enter a file transfer directory.", - L"(Use '/' instead of '\\' for directory delimiters.)", + L"Sie mssen einen Spieler Name eingeben.", + L"Sie mssen eine gltie Server IP Adresse eingeben.\n (Bsp: 84.114.195.239).", + L"Sie mssen eine gltige Server Portnummer zwischen 1 und 65535 eingeben.", + L"MP Synk. Verzeichnis", + L"Sie mssen ein gltiges MP Synchronsiationsverzeichnis eingeben.", + L"(Benutzen Sie '/' anstelle von '\\' als Verzeichnistrennzeichen.)", + L"Das angegebene MP Synk. Verzeichnis existiert nicht.", }; STR16 gzMPHScreenText[] = { - L"HOST GAME", - L"Start", - L"Cancel", + L"ERFFNE SPIEL", + L"Starten", + L"Abbrechen", L"Server Name", - L"Game Type", + L"Spieltyp", L"Deathmatch", L"Team Deathmatch", - L"Co-operative", - L"Max Players", - L"Squad Size", - L"Merc Selection", - L"Random Mercs", - L"Hired by Player", - L"Starting Balance", - L"Can Hire Same Merc", - L"Report Hired Mercs", - L"Allow Bobby Rays", - L"Randomise Starting Edge", - L"You must enter a server name", - L"Max Players must be between 2 and 4", - L"Squad size must be between 1 and 6", - L"Time of Day", - L"Time of Day must be a 24 hr time (HH:MM)\n\n eg. 13:30 = 1.30pm", - L"Starting Cash must be a valid dollar amount ( no cents )\n\n eg. 150000" , - L"Damage Multiplier", - L"Damage Multiplier must be a number between 0 and 5", - L"Turn Timer Multiplier", - L"Turn Timer multiplier must be a number between 1 and 200", - L"Enable Civilians in CO-OP", - L"Use New Inventory (NIV)", - L"Enforce Maximum AI Enemies", - L"Sync. MP Clients Directory", + L"CO-OP", + L"Max. Spieler", + L"Teamgre", + L"Sldnerauswahl", + L"Zufllige Sldner anheuern", + L"Sldner selbst whlen", + L"Startkapital", + L"Kann gleiche Sldner anheuern", + L"Zeige angeheuerten Sldner", + L"Bobby Ray erlauben", + L"Zufllige Startzone", + L"Sie mssen einen Server Namen eingeben.", + L"Max. Spieleranzahl muss zwischen 2 und 4 sein.", + L"Teamgre muss zwischen 1 und 6 sein.", + L"Tageszeit", + L"Tageszeit muss eine 24h Zeit (SS:MM) sein.\n\nBsp: 13:30", + L"Startkapital muss ein gltiger Dollerwert (keine Cents) sein.\n\nBsp: 150000" , + L"Schaden Multiplikator", + L"Schaden Multiplikator muss zwischen 0 and 5 sein.", + L"Zeit Multiplikator", + L"Zeit Multiplikator muss zwischen 1 and 200 sein.", + L"Erlaube Zivilisten in CO-OP", + L"Verwende neues Inventar (NIV)", + L"Erzwinge maximale AI Gegner", + L"Synk. MP Client Verzeichnisse", }; STR16 pDeliveryLocationStrings[] = @@ -4419,7 +4420,7 @@ STR16 MPServerMessage[] = L"Clients sind noch am laden, bitte warten...", L"Sie knnen die Absprungzone nicht ndern, wenn der Server bereits gestartet wurde.", // 10 - L"Sent file '%S' - 100/100", + L"Datei '%S' gesendet - 100/100", }; STR16 MPClientMessage[] = @@ -4453,15 +4454,11 @@ STR16 MPClientMessage[] = L"Raster Nummer: %d", L"Aktion kann nur der Server durchfhren.", L"Whle exklusive Server Aktion: ('1' - Laptop freischalten/anheuern) ('2' - Gefecht starten/Sektor laden) ('3' - Interface freischalten ) ('4' - Sldner Platzierung abschlieen) ", - L"Sektor=%s, Max. Clients=%d, Max. Sldner=%d, Spieltyp=%d, Gleiche Sldner=%d, Schaden Mult.=%f, Zeitl. Runden=%d, Seks/Tik=%d, Kein Bobby Ray=%d, Keine Aim/Merc Ausrstung=%d, Keine Moral=%d, Testen=%d", - + L"Sektor=%s, Max. Clients=%d, Teamgre=%d, Spieltyp=%d, Gleiche Sldner=%d, Schaden Mult.=%f, Zeitl. Runden=%d, Seks/Tik=%d, Kein Bobby Ray=%d, Keine Aim/Merc Ausrstung=%d, Keine Moral=%d, Testen=%d", // 25 L"Testmodus und Cheat-Funktion mit '9' ist freigeschalten.", - //L"Neue Verbindung: Client #%d - '%S', Startzone: %d.", - //L"Feindlich mit Client: #1=%d, #2=%d, #3=%d, #4=%d.", - L"New connection: Client #%d - '%S', Edge: %d, Team: %d.", - L"Team: %d.",//not used any more - + L"Neue Verbindung: Client #%d - '%S'.", + L"Team: %d.", L"'%s' (Client #%d - '%S') wurde gettet von '%s' (Client #%d - '%S')", L"Werfe Client #%d - '%S' aus dem Spiel.", // 30 @@ -4501,7 +4498,7 @@ STR16 MPClientMessage[] = L"%S - 100/100", L"%S - %i/100", // 60 - L"Received all files from server!", + L"Alle Dateien vom Server erhalten!", }; STR16 MPHelp[] = @@ -4549,10 +4546,10 @@ STR16 gszMPMapscreenText[] = { L"Spieltyp: ", L"Spieler: ", - L"Sldner/Spieler: ", + L"Teamgre: ", L"Sie knnen die Startpositionen nicht mehr ndern, sobald der Laptop freigeschaltet ist.", L"Sie knnen die Teams nicht mehr ndern, sobald der Laptop freigeschaltet ist.", - L"Zufllige Sldner: ", + L"Zuf. Sldner: ", L"J", L"Schwierigkeit:" }; diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp index f868a4f5a..b641d1a2e 100644 --- a/Utils/_ItalianText.cpp +++ b/Utils/_ItalianText.cpp @@ -3959,6 +3959,7 @@ STR16 gzMPJScreenText[] = L"MP Sync. Directory", L"You must enter a file transfer directory.", L"(Use '/' instead of '\\' for directory delimiters.)", + L"The specified synchronisation directory does not exist.", }; STR16 gzMPHScreenText[] = @@ -4721,7 +4722,7 @@ STR16 MPClientMessage[] = L"Sector=%s, Max Clients=%d, Max Mercs=%d, Game_Mode=%d, Same Merc=%d, Damage Multiplier=%f, Timed Turns=%d, Secs/Tic=%d, Dis BobbyRay=%d, Dis Aim/Merc Equip=%d, Dis Morale=%d, Testing=%d", // 25 L"Testing and cheat function '9' is enabled.", - L"New connection: Client #%d - '%S', Edge: %d, Team: %d.", + L"New connection: Client #%d - '%S'.", L"Team: %d.",//not used any more L"'%s' (client %d - '%S') was killed by '%s' (client %d - '%S')", L"Kicked client #%d - '%S'", diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp index 9822c3ab9..ea5562c01 100644 --- a/Utils/_PolishText.cpp +++ b/Utils/_PolishText.cpp @@ -3972,6 +3972,7 @@ STR16 gzMPJScreenText[] = L"MP Sync. Directory", L"You must enter a file transfer directory.", L"(Use '/' instead of '\\' for directory delimiters.)", + L"The specified synchronisation directory does not exist.", }; STR16 gzMPHScreenText[] = @@ -4727,7 +4728,7 @@ STR16 MPClientMessage[] = L"Sektor=%s, MaxKlientw=%d, Max Najem=%d, Tryb_Gry=%d, TenSamNaj=%d, Mnonik obra.=%f, TuryCzas=%d, Sek/ruch=%d, Dis BobbyRay=%d, Wy Aim/Merc Ekwip=%d, Wy morale=%d, Test=%d", // 25 L"Test, funkcja cheatw '9' jest wczona.", - L"Nowe poczenie Client #%d - '%S', Edge: %d, Team: %d.", + L"Nowe poczenie Client #%d - '%S'.", L"Team: %d.",//not used any more L"'%s' (klient %d - '%S') zabity przez '%s' (client %d - '%S')", L"Wyrzucono #%d - '%S'", diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index c6c0a4ab9..d05bd6919 100644 --- a/Utils/_RussianText.cpp +++ b/Utils/_RussianText.cpp @@ -3974,6 +3974,7 @@ STR16 gzMPJScreenText[] = L"MP Sync. Directory", L"You must enter a file transfer directory.", L"(Use '/' instead of '\\' for directory delimiters.)", + L"The specified synchronisation directory does not exist.", }; STR16 gzMPHScreenText[] = @@ -4732,7 +4733,7 @@ STR16 MPClientMessage[] = // 25 L" - '9' .", - L" : %d - '%S', : %d, : %d.", + L" : %d - '%S'.", L": %d.",//not used any more L"%s ( %d - '%S') %s ( %d - '%S')", L" %d - '%S' .", diff --git a/Utils/_TaiwaneseText.cpp b/Utils/_TaiwaneseText.cpp index 60d2175b5..940a52e0c 100644 --- a/Utils/_TaiwaneseText.cpp +++ b/Utils/_TaiwaneseText.cpp @@ -3979,6 +3979,7 @@ STR16 gzMPJScreenText[] = L"MP Sync. Directory", L"You must enter a file transfer directory.", L"(Use '/' instead of '\\' for directory delimiters.)", + L"The specified synchronisation directory does not exist.", }; STR16 gzMPHScreenText[] = @@ -4734,7 +4735,7 @@ STR16 MPClientMessage[] = L"Sector=%s, Max Clients=%d, Max Mercs=%d, Game_Mode=%d, Same Merc=%d, Damage Multiplier=%f, Timed Turns=%d, Secs/Tic=%d, Dis BobbyRay=%d, Dis Aim/Merc Equip=%d, Dis Morale=%d, Testing=%d", // 25 L"Testing and cheat function '9' is enabled.", - L"New connection: Client #%d - '%S', Edge: %d, Team: %d.", + L"New connection: Client #%d - '%S'.", L"Team: %d.",//not used any more L"'%s' (client %d - '%S') was killed by '%s' (client %d - '%S')", L"Kicked client #%d - '%S'",