From c5fce583803003756ae1b1cee2e8c1c1a198e10c Mon Sep 17 00:00:00 2001 From: Wanne Date: Wed, 31 Jan 2007 21:45:05 +0000 Subject: [PATCH] - bugfix: CTD in German Version if you press 'q' in tactical (-> Missing strings in _GermanText.cpp) git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@694 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- JA2.suo | Bin 197632 -> 197632 bytes Utils/_DutchText.cpp | 6 ++++++ Utils/_EnglishText.cpp | 22 +++++++++++----------- Utils/_FrenchText.cpp | 6 ++++++ Utils/_GermanText.cpp | 24 ++++++++++++++---------- Utils/_ItalianText.cpp | 6 ++++++ Utils/_PolishText.cpp | 6 ++++++ Utils/_RussianText.cpp | 8 ++++---- 8 files changed, 53 insertions(+), 25 deletions(-) diff --git a/JA2.suo b/JA2.suo index 5b36576534cd3ec39fbd1ff7775da196266d0dba..798a2021d7a929e535a5735b6690f1b6dcad2fd9 100644 GIT binary patch delta 634 zcmY*WO=uHQ5T1G6m~^|@B-X4FB&O0zOvKt6#A?A+n}emrswmzx(2KNaYy)i+!nOy^ zv1TmeF(=QZdx&}p)G9`WA_Ol*q6cqYY>{3xz88b&9Ok|G=I5Iqr)W4uV`W-1W9iU) zC;b{b0HC_)-qYTA{b)*~*%rFw>veO+WAub1YLVaE+u139Dkef9vzu)5nKo+y&;o@i z6iD>B$~OiX$U+Y8NDbf`QeBniEtrN`1<=L7K6KrDpyr|Ty9X#2o-h={f4tk_l)zsu z9{Px@k@;hI(9Mrt%kOCsq+wE4Qv@@udJEsfw6pe=ZmyU4gf7l;_A(CougHiD+?KH! zn4!BHLsa-_QX>|1Cto!>3{9p6+N^&jtxce@Un0SO(e1ZJYIzY~ki8z0o0{hVU0mR7 z4+i;L9izOWi(SgcBN~n=+@z%`jUyVyp9&OwL>JXcRl`ruc`1c)&MxBvzphIPDe67N z*o{-Xv5CW_q>VtBI746hueZ7l)_bXz{NYxUj$m6uheXPDouiJjcsu!)j65yVfcwjYQBbQ=W;S}T(}k4g_1v5XiS2j3oBB>n|{8tB0Xy@m<_WC!d0a4dum!-FvIbaZdk+}bg;wN;)v4DIVwF<++a}4=eHqqI|oyl_z zW?o}>E@cad4{|HdHI`bM6uld~;D-S8iYGu5?=lwTHOZoF72rAOfqn&!1&xzhK9N_> z16GeL2}to&D($;wtzg=02Jk0_yJzr8;eZS4V!_6?plVVNJ~2x%=}Vgo{;| zUrW^Tc(R7Z7tuBB!kZ$o0V>zC2J-Jf6RpglgZq;@a_L#^2t!88vuNYD&P%j_SVDXC zEHoCE@Y4(O&*LdN`yO+I3}?}SPsz22OR-mb#x;~mpp!xp)>29mUDpqED6s&Ie#D|! zxGap8ss(ejdclkW%~TQ~$hycsBY>M%p$wvCB%d$_&qF{bm{#X!kXsiCS7Q?z=-q`a%A!k_@Jz<$^VhbTUUVFZq)2k)06 bMVuI+XblRlDB5VT5N$Vft2m}xW$UJYJO&%< diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp index cfb0809a5..61cb542a5 100644 --- a/Utils/_DutchText.cpp +++ b/Utils/_DutchText.cpp @@ -3764,6 +3764,12 @@ STR16 pMessageStrings[] = L"Een pakket is in Drassen gearriveerd.", L"%s zou moeten arriveren op het aangewezen punt (sector %s) op dag %d, om ongeveer %s.", L"Geschiedenisverslag bijgewerkt.", + L"Grenade Bursts use Targeting Cursor (Spread fire enabled)", + L"Grenade Bursts use Trajectory Cursor (Spread fire disabled)", + L"Drop All Enabled", + L"Drop All Disabled", + L"Granade Launchers fire at standard angles", + L"Grenade Launchers fire at higher angles", #ifdef JA2BETAVERSION L"Spel succesvol bewaard in de Einde Beurt Auto Bewaar Slot.", #endif diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index 1530a167d..f2b61e81c 100644 --- a/Utils/_EnglishText.cpp +++ b/Utils/_EnglishText.cpp @@ -3676,7 +3676,7 @@ STR16 pMessageStrings[] = L"No description", //Save slots that don't have a description. L"Game Saved.", L"Game Saved.", - L"QuickSave", //The name of the quicksave file (filename, text reference) + L"QuickSave", //10 The name of the quicksave file (filename, text reference) L"SaveGame", //The name of the normal savegame file, such as SaveGame01, SaveGame02, etc. L"sav", //The 3 character dos extension (represents sav) L"..\\SavedGames", //The name of the directory where games are saved. @@ -3686,7 +3686,7 @@ STR16 pMessageStrings[] = L"Demo", //Demo of JA2 L"Debug", //State of development of a project (JA2) that is a debug build L"Release", //Release build for JA2 - L"rpm", //Abbreviation for Rounds per minute -- the potential # of bullets fired in a minute. + L"rpm", //20 Abbreviation for Rounds per minute -- the potential # of bullets fired in a minute. L"min", //Abbreviation for minute. L"m", //One character abbreviation for meter (metric distance measurement unit). L"rnds", //Abbreviation for rounds (# of bullets) @@ -3696,7 +3696,7 @@ STR16 pMessageStrings[] = L"USD", //Abbreviation to US dollars L"n/a", //Lowercase acronym for not applicable. L"Meanwhile", //Meanwhile - L"%s has arrived in sector %s%s", //Name/Squad has arrived in sector A9. Order must not change without notifying + L"%s has arrived in sector %s%s", //30 Name/Squad has arrived in sector A9. Order must not change without notifying //SirTech L"Version", L"Empty Quick Save Slot", @@ -3707,7 +3707,7 @@ STR16 pMessageStrings[] = L"Hired %s from AIM", L"%s has caught %s.", //'Merc name' has caught 'item' -- let SirTech know if name comes after item. L"%s has taken the drug.", //'Merc name' has taken the drug - L"%s has no medical skill",//'Merc name' has no medical skill. + L"%s has no medical skill",//40 'Merc name' has no medical skill. //CDRom errors (such as ejecting CD while attempting to read the CD) L"The integrity of the game has been compromised.", @@ -3729,7 +3729,7 @@ STR16 pMessageStrings[] = L"No room to pass %s to %s.", //pass "item" to "merc". Same instructions as above. //A list of attachments appear after the items. Ex: Kevlar vest ( Ceramic Plate 'Attached )' - L" attached]", + L" attached]", // 50 //Cheat modes L"Cheat level ONE reached", @@ -3749,7 +3749,7 @@ STR16 pMessageStrings[] = //These are used in the cheat modes for changing levels in the game. Going from a basement level to //an upper level, etc. L"Can't go up from this level...", - L"There are no lower levels...", + L"There are no lower levels...", // 60 L"Entering basement level %d...", L"Leaving basement...", @@ -3760,19 +3760,19 @@ STR16 pMessageStrings[] = L"3D Cursor ON.", L"Squad %d active.", L"You cannot afford to pay for %s's daily salary of %s", //first %s is the mercs name, the seconds is a string containing the salary - L"Skip", + L"Skip", // 70 L"%s cannot leave alone.", L"A save has been created called, SaveGame99.sav. If needed, rename it to SaveGame01 - SaveGame10 and then you will have access to it in the Load screen.", L"%s drank some %s", L"A package has arrived in Drassen.", L"%s should arrive at the designated drop-off point (sector %s) on day %d, at approximately %s.", //first %s is mercs name, next is the sector location and name where they will be arriving in, lastely is the day an the time of arrival L"History log updated.", - L"Grenade Bursts - Using Targeting Cursor (Spread fire enabled)", - L"Grenade Bursts - Using Trajectory Cursor (Spread fire disabled)", + L"Grenade Bursts use Targeting Cursor (Spread fire enabled)", + L"Grenade Bursts use Trajectory Cursor (Spread fire disabled)", L"Drop All Enabled", L"Drop All Disabled", - L"Grenade Launchers - Fire at standard angles", - L"Grenade Launchers - Fire at high angles", + L"Granade Launchers fire at standard angles", + L"Grenade Launchers fire at higher angles", #ifdef JA2BETAVERSION L"Successfully Saved the Game into the End Turn Auto Save slot.", #endif diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp index 7bdba3200..4d5b5f051 100644 --- a/Utils/_FrenchText.cpp +++ b/Utils/_FrenchText.cpp @@ -3754,6 +3754,12 @@ STR16 pMessageStrings[] = L"Un colis vient d'arriver à Drassen.", L"%s devrait arriver au point d'entrée (secteur %s) en jour %d vers %s.", //first %s is mercs name, next is the sector location and name where they will be arriving in, lastely is the day an the time of arrival L"Historique mis à jour.", + L"Grenade Bursts use Targeting Cursor (Spread fire enabled)", + L"Grenade Bursts use Trajectory Cursor (Spread fire disabled)", + L"Drop All Enabled", + L"Drop All Disabled", + L"Granade Launchers fire at standard angles", + L"Grenade Launchers fire at higher angles", #ifdef JA2BETAVERSION L"Partie enregistrée dans l'emplacement de sauvegarde automatique.", #endif diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index c1093f9ae..2443cdf32 100644 --- a/Utils/_GermanText.cpp +++ b/Utils/_GermanText.cpp @@ -3479,7 +3479,7 @@ STR16 pMessageStrings[] = L"Keine Beschreibung", //Save slots that don't have a description. L"Spiel gespeichert", L"Spiel gespeichert", - L"QuickSave", //The name of the quicksave file (filename, text reference) + L"QuickSave", //10 The name of the quicksave file (filename, text reference) L"Spielstand", //The name of the normal savegame file, such as SaveGame01, SaveGame02, etc. L"sav", //The 3 character dos extension (represents sav) L"..\\Spielstände", //The name of the directory where games are saved. @@ -3489,7 +3489,7 @@ STR16 pMessageStrings[] = L"Demo", //Demo of JA2 L"Debug", //State of development of a project (JA2) that is a debug build L"Veröffentlichung", //Release build for JA2 - L"KpM", //Abbreviation for Rounds per minute -- the potential # of bullets fired in a minute. + L"KpM", //20 Abbreviation for Rounds per minute -- the potential # of bullets fired in a minute. L"min", //Abbreviation for minute. L"m", //One character abbreviation for meter (metric distance measurement unit). L"Kgln", //Abbreviation for rounds (# of bullets) @@ -3499,7 +3499,7 @@ STR16 pMessageStrings[] = L"US$", //Abbreviation for US Dollars L"n.a", //Lowercase acronym for not applicable. L"Inzwischen", //Meanwhile - L"%s ist angekommen im Sektor %s%s", //Name/Squad has arrived in sector A9. Order must not change without notifying SirTech + L"%s ist angekommen im Sektor %s%s", //30 Name/Squad has arrived in sector A9. Order must not change without notifying SirTech L"Version", L"Leerer Quick-Save-Slot", L"Dieser Slot ist nur für Quick-Saves aus den Map Screens und dem Taktik-Bildschirm. Speichern mit ALT+S", @@ -3510,7 +3510,7 @@ STR16 pMessageStrings[] = L"%s hat %s gefangen.", //'Merc name' has caught 'item' -- let SirTech know if name comes after item. L"%s hat die Droge genommen.", //'Merc name' has taken the drug - L"%s hat keine medizinischen Fähigkeiten",//'Merc name' has no medical skill. + L"%s hat keine medizinischen Fähigkeiten",//40 'Merc name' has no medical skill. //CDRom errors (such as ejecting CD while attempting to read the CD) L"Die Integrität des Spieles wurde beschädigt.", //The integrity of the game has been compromised @@ -3532,7 +3532,7 @@ STR16 pMessageStrings[] = L"Kein Platz, um %s an %s weiterzugeben.", //pass "item" to "merc". Same instructions as above. //A list of attachments appear after the items. Ex: Kevlar vest ( Ceramic Plate 'Attached )' - L" angebracht )", + L" angebracht )", // 50 //Cheat modes L"Cheat-Level EINS erreicht", @@ -3552,7 +3552,7 @@ STR16 pMessageStrings[] = //These are used in the cheat modes for changing levels in the game. Going from a basement level to //an upper level, etc. L"Von dieser Ebene geht es nicht nach oben...", - L"Noch tiefere Ebenen gibt es nicht...", + L"Noch tiefere Ebenen gibt es nicht...", // 60 L"Gewölbeebene %d betreten...", L"Gewölbe verlassen...", @@ -3563,17 +3563,21 @@ STR16 pMessageStrings[] = L"3D-Cursor AN.", L"Trupp %d aktiv.", L"Sie können %ss Tagessold von %s nicht zahlen", //first %s is the mercs name, the second is a string containing the salary - L"Abbruch", + L"Abbruch", // 70 L"%s kann alleine nicht gehen.", L"Spielstand namens Spielstand99.sav kreiert. Wenn nötig, in Spielstand01 - Spielstand10 umbennen und über die Option 'Laden' aufrufen.", L"%s hat %s getrunken.", L"Paket in Drassen angekommen.", L"%s kommt am %d. um ca. %s am Zielort an (Sektor %s).", //first %s is mercs name(OK), next is the sector location and name where they will be arriving in, lastely is the day an the time of arrival !!!7 It should be like this: first one is merc (OK), next is day of arrival (OK) , next is time of the day for ex. 07:00 (not OK, now it is still sector), next should be sector (not OK, now it is still time of the day) L"Logbuch aktualisiert.", - L"Grenade Launchers - Fire at standard angles", - L"Grenade Launchers - Fire at high angles", + L"Granaten Feuerstöße verwenden Ziel Cursor (Sperrfeuer aktiviert).", + L"Granaten Feuerstöße verwenden Flugbahn Cursor (Sperrfeuer deaktiviert).", + L"Alles fallen lassen einschalten.", + L"Alles fallen lassen ausschalten.", // 80 + L"Granatwerfer schießen im normalen Winkel.", + L"Granatwerfer schießen im erhöhten Winkel.", #ifdef JA2BETAVERSION - L"Spiel erfolgreich in Slot End Turn Auto Save gespeichert.", + L"Spiel erfolgreich in Slot End Turn Auto Save gespeichert.", // 83 #endif }; diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp index 0a4cf7f33..307bdc678 100644 --- a/Utils/_ItalianText.cpp +++ b/Utils/_ItalianText.cpp @@ -3744,6 +3744,12 @@ STR16 pMessageStrings[] = L"Un pacco è arivato a Drassen.", L"%s dovrebbe arrivare al punto designato di partenza (settore %s) nel giorno %d, approssimativamente alle ore %s.", //first %s is mercs name, next is the sector location and name where they will be arriving in, lastely is the day an the time of arrival L"Registro aggiornato.", + L"Grenade Bursts use Targeting Cursor (Spread fire enabled)", + L"Grenade Bursts use Trajectory Cursor (Spread fire disabled)", + L"Drop All Enabled", + L"Drop All Disabled", + L"Granade Launchers fire at standard angles", + L"Grenade Launchers fire at higher angles", #ifdef JA2BETAVERSION L"Salvataggio riuscito della partita nello slot End Turn Auto Save.", #endif diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp index af7b70719..56b6bd6c6 100644 --- a/Utils/_PolishText.cpp +++ b/Utils/_PolishText.cpp @@ -3746,6 +3746,12 @@ STR16 pMessageStrings[] = L"Przesy³ka dotar³a do Drassen.", L"%s przybêdzie do wyznaczonego punktu zrzutu (sektor %s) w dniu %d, oko³o godziny %s.", //first %s is mercs name, next is the sector location and name where they will be arriving in, lastely is the day an the time of arrival L"Lista historii zaktualizowana.", + L"Grenade Bursts use Targeting Cursor (Spread fire enabled)", + L"Grenade Bursts use Trajectory Cursor (Spread fire disabled)", + L"Drop All Enabled", + L"Drop All Disabled", + L"Granade Launchers fire at standard angles", + L"Grenade Launchers fire at higher angles", #ifdef JA2BETAVERSION L"Automatyczny zapis zosta³ pomyœlnie wykonany.", #endif diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index cf05d1e1d..9605cbc1b 100644 --- a/Utils/_RussianText.cpp +++ b/Utils/_RussianText.cpp @@ -3757,12 +3757,12 @@ STR16 pMessageStrings[] = L"Áàãàæ ïðèáûë â Äðàññåí.", L"%s äîëæåí ïðèáûòü â óêàçàííîå ìåñòî âûñàäêè (ñåêòîð %s) â äåíü %d,ïðèìåðíî â %s.", //first %s is mercs name, next is the sector location and name where they will be arriving in, lastely is the day an the time of arrival L"Èñòîðèÿ îáíîâëåíà.", - L"Grenade Bursts - Using Targeting Cursor (Spread fire enabled)", - L"Grenade Bursts - Using Trajectory Cursor (Spread fire disabled)", + L"Grenade Bursts use Targeting Cursor (Spread fire enabled)", + L"Grenade Bursts use Trajectory Cursor (Spread fire disabled)", L"Drop All Enabled", L"Drop All Disabled", - L"Grenade Launchers - Fire at standard angles", - L"Grenade Launchers - Fire at high angles", + L"Granade Launchers fire at standard angles", + L"Grenade Launchers fire at higher angles", #ifdef JA2BETAVERSION L"Èãðà ñîõðàíåíà â ÿ÷åéêó àâòî-ñîõðàíåíèÿ.", #endif