diff --git a/lib/sound/audio.c b/lib/sound/audio.c index 4fea4e75d..ce84fd4f3 100644 --- a/lib/sound/audio.c +++ b/lib/sound/audio.c @@ -645,39 +645,6 @@ BOOL audio_SetTrackVals return sound_SetTrackVals( psTrack, bLoop, *iTrack, iVol, iAudibleRadius ); //now psTrack should be fully set. -Q } -//* -// ======================================================================================================================= -// ======================================================================================================================= -// -BOOL audio_SetTrackValsHashName - ( - UDWORD hash, - BOOL bLoop, - int iTrack, - int iVol, - int iAudibleRadius - ) -{ - //~~~~~~~~~~~~~ - TRACK *psTrack; - //~~~~~~~~~~~~~ - - // if audio not enabled return TRUE to carry on game without audio - if ( g_bAudioEnabled == FALSE ) - { - return TRUE; - } - - // get track pointer from resource - psTrack = (TRACK*)resGetDataFromHash( "WAV", hash ); - if ( psTrack == NULL ) - { - return FALSE; - } - - return sound_SetTrackVals( psTrack, bLoop, iTrack, iVol, iAudibleRadius ); -} - //* // ======================================================================================================================= // ======================================================================================================================= @@ -941,7 +908,7 @@ void audio_StopObjTrack( void *psObj, int iTrack ) return; } - // get next sample from hash table + // get next sample from linked list psSample = psSample->psNext; } } @@ -1107,31 +1074,6 @@ SDWORD audio_GetTrackID( char szFileName[] ) return sound_GetTrackID( psTrack ); } -//* -// ======================================================================================================================= -// ======================================================================================================================= -// -SDWORD audio_GetTrackIDFromHash( UDWORD hash ) -{ - //~~~~~~~~~~~~~ - TRACK *psTrack; - //~~~~~~~~~~~~~ - - // return if audio not enabled - if ( g_bAudioEnabled == FALSE ) - { - return SAMPLE_NOT_FOUND; - } - - psTrack = (TRACK*)resGetDataFromHash( "WAV", hash ); - if ( psTrack == NULL ) - { - return SAMPLE_NOT_FOUND; - } - - return sound_GetTrackID( psTrack ); -} - //* // ======================================================================================================================= // ======================================================================================================================= diff --git a/lib/sound/audio.h b/lib/sound/audio.h index d4df197a2..bbaf51c7b 100644 --- a/lib/sound/audio.h +++ b/lib/sound/audio.h @@ -38,8 +38,6 @@ extern BOOL audio_Disabled( void ); extern BOOL audio_LoadTrackFromFile( char szFileName[] ); extern BOOL audio_SetTrackVals( const char* fileName, BOOL bLoop, int *iTrack, int iVol, int iAudibleRadius ); -extern BOOL audio_SetTrackValsHashName( UDWORD hash, BOOL bLoop, int iTrack, int iVol, - int iAudibleRadius ); extern void audio_ReleaseTrack( TRACK *psTrack ); extern BOOL audio_PlayStaticTrack( SDWORD iX, SDWORD iY, int iTrack ); @@ -74,7 +72,6 @@ extern void audio_StopAll( void ); extern void audio_CheckAllUnloaded( void ); extern SDWORD audio_GetTrackID( char szFileName[] ); -extern SDWORD audio_GetTrackIDFromHash( UDWORD hash ); extern SDWORD audio_GetAvailableID( void ); extern SDWORD audio_GetMixVol( SDWORD iVol ); extern SDWORD audio_GetSampleMixVol( AUDIO_SAMPLE * psSample, SDWORD iVol, diff --git a/po/da.po b/po/da.po index 6a82c0e11..393015bfe 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: da\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2007-04-13 14:16+0200\n" +"POT-Creation-Date: 2007-04-16 00:40+0200\n" "PO-Revision-Date: 2007-04-03 22:35+0200\n" "Last-Translator: Christian Vest Hansen \n" "Language-Team: Dansk \n" @@ -141,7 +141,7 @@ msgstr "Forskning" msgid "Build" msgstr "Konstruktion" -#: src/hci.c:4017 src/multiint.c:1022 +#: src/hci.c:4017 src/multiint.c:1020 msgid "Power" msgstr "Energi" @@ -269,200 +269,200 @@ msgstr "Oberst" msgid "Hero" msgstr "General" -#: src/multiint.c:466 src/multiint.c:1635 src/multilimit.c:181 +#: src/multiint.c:464 src/multiint.c:1633 src/multilimit.c:181 msgid "Accept Settings" msgstr "" -#: src/multiint.c:477 +#: src/multiint.c:475 msgid "IP Address or Machine Name" msgstr "IP adressse eller computernavn" -#: src/multiint.c:517 +#: src/multiint.c:515 msgid "CONNECTION" msgstr "FORBINDELSE" -#: src/multiint.c:520 src/multiint.c:568 src/multiint.c:784 -#: src/multiint.c:1113 src/multiint.c:3343 src/keyedit.c:381 +#: src/multiint.c:518 src/multiint.c:566 src/multiint.c:782 +#: src/multiint.c:1111 src/multiint.c:3359 src/keyedit.c:381 #: src/multilimit.c:173 msgid "Return To Previous Screen" msgstr "" -#: src/multiint.c:531 +#: src/multiint.c:529 msgid "Internet" msgstr "Internet" -#: src/multiint.c:770 +#: src/multiint.c:768 msgid "Searching" msgstr "Søger" -#: src/multiint.c:781 +#: src/multiint.c:779 msgid "GAMES" msgstr "SPIL" -#: src/multiint.c:791 +#: src/multiint.c:789 msgid "Refresh Games List" msgstr "" -#: src/multiint.c:866 +#: src/multiint.c:864 msgid "OPTIONS" msgstr "INDSTILLINGER" -#: src/multiint.c:868 +#: src/multiint.c:866 #, fuzzy msgid "Select Game Name" msgstr "Nulstil spillehastighed" -#: src/multiint.c:869 +#: src/multiint.c:867 msgid "Select Map" msgstr "" -#: src/multiint.c:875 +#: src/multiint.c:873 msgid "Game" msgstr "Spil" -#: src/multiint.c:879 +#: src/multiint.c:877 #, fuzzy msgid "Campaign Mode" msgstr "Ny kampange" -#: src/multiint.c:882 +#: src/multiint.c:880 #, fuzzy msgid "Team Play" msgstr "Hurtgigt spil" -#: src/multiint.c:885 +#: src/multiint.c:883 msgid "Skirmish" msgstr "" -#: src/multiint.c:916 +#: src/multiint.c:914 #, fuzzy msgid "Select Player Name" msgstr "Flerbruger spil" -#: src/multiint.c:917 +#: src/multiint.c:915 #, fuzzy msgid "Select Force" msgstr "Gem styrke" -#: src/multiint.c:921 src/frontend.c:763 +#: src/multiint.c:919 src/frontend.c:763 msgid "Fog" msgstr "Tåge" -#: src/multiint.c:923 src/frontend.c:770 src/frontend.c:867 +#: src/multiint.c:921 src/frontend.c:770 src/frontend.c:867 msgid "Fog Of War" msgstr "Krigståge" -#: src/multiint.c:924 +#: src/multiint.c:922 msgid "Distance Fog" msgstr "" -#: src/multiint.c:944 src/multimenu.c:771 +#: src/multiint.c:942 src/multimenu.c:771 msgid "Alliances" msgstr "Aliancer" -#: src/multiint.c:948 +#: src/multiint.c:946 msgid "No Alliances" msgstr "" -#: src/multiint.c:950 +#: src/multiint.c:948 msgid "Allow Alliances" msgstr "" -#: src/multiint.c:954 src/multiint.c:2406 +#: src/multiint.c:952 src/multiint.c:2422 msgid "Locked Teams" msgstr "Låste hold" -#: src/multiint.c:1024 +#: src/multiint.c:1022 msgid "Low Power Levels" msgstr "" -#: src/multiint.c:1026 +#: src/multiint.c:1024 msgid "Medium Power Levels" msgstr "" -#: src/multiint.c:1028 +#: src/multiint.c:1026 msgid "High Power Levels" msgstr "" -#: src/multiint.c:1046 +#: src/multiint.c:1044 msgid "Base" msgstr "Base" -#: src/multiint.c:1048 +#: src/multiint.c:1046 msgid "Start with No Bases" msgstr "" -#: src/multiint.c:1050 +#: src/multiint.c:1048 msgid "Start with Bases" msgstr "" -#: src/multiint.c:1052 +#: src/multiint.c:1050 msgid "Start with Advanced Bases" msgstr "" -#: src/multiint.c:1076 src/multiint.c:1080 +#: src/multiint.c:1074 src/multiint.c:1078 msgid "Computer" msgstr "Computer" -#: src/multiint.c:1084 +#: src/multiint.c:1082 msgid "Computer Opponents" msgstr "" -#: src/multiint.c:1086 +#: src/multiint.c:1084 msgid "No Computer Opponents" msgstr "" -#: src/multiint.c:1120 +#: src/multiint.c:1118 #, fuzzy msgid "Start Hosting Game" msgstr "Værten starter spillet" -#: src/multiint.c:1128 +#: src/multiint.c:1126 #, fuzzy msgid "Set Structure Limits" msgstr "Tabte bygninger" -#: src/multiint.c:1517 +#: src/multiint.c:1515 msgid "PLAYERS" msgstr "SPILLERE" -#: src/multiint.c:1666 +#: src/multiint.c:1664 msgid "CHAT" msgstr "BESKEDER" -#: src/multiint.c:2347 +#: src/multiint.c:2363 msgid "Host is Starting Game" msgstr "Værten starter spillet" -#: src/multiint.c:2955 +#: src/multiint.c:2971 msgid "FORCE" msgstr "STYRKE" -#: src/multiint.c:3078 +#: src/multiint.c:3094 msgid "TEMPLATES" msgstr "SKABELONER" -#: src/multiint.c:3242 src/multiint.c:3352 +#: src/multiint.c:3258 src/multiint.c:3368 msgid "Load Force" msgstr "Indlæs styrke" -#: src/multiint.c:3246 src/multiint.c:3355 +#: src/multiint.c:3262 src/multiint.c:3371 msgid "Save Force" msgstr "Gem styrke" -#: src/multiint.c:3311 +#: src/multiint.c:3327 msgid "CONTROL" msgstr "KONTROL" -#: src/multiint.c:3346 +#: src/multiint.c:3362 msgid "Clear Current Force" msgstr "" -#: src/multiint.c:3349 src/keyedit.c:386 +#: src/multiint.c:3365 src/keyedit.c:386 msgid "Select Default" msgstr "" -#: src/multiint.c:3647 +#: src/multiint.c:3663 msgid "Players" msgstr "Spillere" @@ -591,11 +591,16 @@ msgstr "Kan ikke finde nogle rekonniseringsenheder!" msgid "Unable to locate any Commanders!" msgstr "Kan ikke finde nogle kommandører!" -#: src/research.c:2014 src/research.c:2033 +#: src/research.c:2040 +#, fuzzy, c-format +msgid "Research completed: %s" +msgstr "Forskning fuldendt: %s" + +#: src/research.c:2045 msgid "Research Completed" msgstr "Forskning fuldendt" -#: src/research.c:2880 +#: src/research.c:2892 msgid "Research Award" msgstr "Forskningsgevinst" diff --git a/po/de.po b/po/de.po index 022847962..cd522a978 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2007-04-13 14:16+0200\n" +"POT-Creation-Date: 2007-04-16 00:40+0200\n" "PO-Revision-Date: 2007-04-13 02:10+0200\n" "Last-Translator: Dennis Schridde \n" "Language-Team: Deutsch\n" @@ -142,7 +142,7 @@ msgstr "Forschen" msgid "Build" msgstr "Bauen" -#: src/hci.c:4017 src/multiint.c:1022 +#: src/hci.c:4017 src/multiint.c:1020 msgid "Power" msgstr "Energie" @@ -269,193 +269,193 @@ msgstr "" msgid "Hero" msgstr "Help" -#: src/multiint.c:466 src/multiint.c:1635 src/multilimit.c:181 +#: src/multiint.c:464 src/multiint.c:1633 src/multilimit.c:181 msgid "Accept Settings" msgstr "" -#: src/multiint.c:477 +#: src/multiint.c:475 msgid "IP Address or Machine Name" msgstr "IP Addresse oder Hostname" -#: src/multiint.c:517 +#: src/multiint.c:515 msgid "CONNECTION" msgstr "" -#: src/multiint.c:520 src/multiint.c:568 src/multiint.c:784 -#: src/multiint.c:1113 src/multiint.c:3343 src/keyedit.c:381 +#: src/multiint.c:518 src/multiint.c:566 src/multiint.c:782 +#: src/multiint.c:1111 src/multiint.c:3359 src/keyedit.c:381 #: src/multilimit.c:173 msgid "Return To Previous Screen" msgstr "" -#: src/multiint.c:531 +#: src/multiint.c:529 msgid "Internet" msgstr "Internet" -#: src/multiint.c:770 +#: src/multiint.c:768 msgid "Searching" msgstr "" -#: src/multiint.c:781 +#: src/multiint.c:779 msgid "GAMES" msgstr "" -#: src/multiint.c:791 +#: src/multiint.c:789 msgid "Refresh Games List" msgstr "" -#: src/multiint.c:866 +#: src/multiint.c:864 msgid "OPTIONS" msgstr "" -#: src/multiint.c:868 +#: src/multiint.c:866 msgid "Select Game Name" msgstr "" -#: src/multiint.c:869 +#: src/multiint.c:867 msgid "Select Map" msgstr "" -#: src/multiint.c:875 +#: src/multiint.c:873 msgid "Game" msgstr "Spiel" -#: src/multiint.c:879 +#: src/multiint.c:877 msgid "Campaign Mode" msgstr "" -#: src/multiint.c:882 +#: src/multiint.c:880 msgid "Team Play" msgstr "" -#: src/multiint.c:885 +#: src/multiint.c:883 msgid "Skirmish" msgstr "" -#: src/multiint.c:916 +#: src/multiint.c:914 msgid "Select Player Name" msgstr "" -#: src/multiint.c:917 +#: src/multiint.c:915 msgid "Select Force" msgstr "" -#: src/multiint.c:921 src/frontend.c:763 +#: src/multiint.c:919 src/frontend.c:763 msgid "Fog" msgstr "Nebel" -#: src/multiint.c:923 src/frontend.c:770 src/frontend.c:867 +#: src/multiint.c:921 src/frontend.c:770 src/frontend.c:867 msgid "Fog Of War" msgstr "Nebel des Krieges" -#: src/multiint.c:924 +#: src/multiint.c:922 msgid "Distance Fog" msgstr "" -#: src/multiint.c:944 src/multimenu.c:771 +#: src/multiint.c:942 src/multimenu.c:771 msgid "Alliances" msgstr "Allianzen" -#: src/multiint.c:948 +#: src/multiint.c:946 msgid "No Alliances" msgstr "" -#: src/multiint.c:950 +#: src/multiint.c:948 msgid "Allow Alliances" msgstr "" -#: src/multiint.c:954 src/multiint.c:2406 +#: src/multiint.c:952 src/multiint.c:2422 msgid "Locked Teams" msgstr "Feste Mannschaften" -#: src/multiint.c:1024 +#: src/multiint.c:1022 msgid "Low Power Levels" msgstr "" -#: src/multiint.c:1026 +#: src/multiint.c:1024 msgid "Medium Power Levels" msgstr "" -#: src/multiint.c:1028 +#: src/multiint.c:1026 msgid "High Power Levels" msgstr "" -#: src/multiint.c:1046 +#: src/multiint.c:1044 msgid "Base" msgstr "Basis" -#: src/multiint.c:1048 +#: src/multiint.c:1046 msgid "Start with No Bases" msgstr "" -#: src/multiint.c:1050 +#: src/multiint.c:1048 msgid "Start with Bases" msgstr "" -#: src/multiint.c:1052 +#: src/multiint.c:1050 msgid "Start with Advanced Bases" msgstr "" -#: src/multiint.c:1076 src/multiint.c:1080 +#: src/multiint.c:1074 src/multiint.c:1078 msgid "Computer" msgstr "Computer" -#: src/multiint.c:1084 +#: src/multiint.c:1082 msgid "Computer Opponents" msgstr "" -#: src/multiint.c:1086 +#: src/multiint.c:1084 msgid "No Computer Opponents" msgstr "" -#: src/multiint.c:1120 +#: src/multiint.c:1118 msgid "Start Hosting Game" msgstr "" -#: src/multiint.c:1128 +#: src/multiint.c:1126 msgid "Set Structure Limits" msgstr "" -#: src/multiint.c:1517 +#: src/multiint.c:1515 msgid "PLAYERS" msgstr "" -#: src/multiint.c:1666 +#: src/multiint.c:1664 msgid "CHAT" msgstr "" -#: src/multiint.c:2347 +#: src/multiint.c:2363 msgid "Host is Starting Game" msgstr "Host startet das Spiel" -#: src/multiint.c:2955 +#: src/multiint.c:2971 msgid "FORCE" msgstr "" -#: src/multiint.c:3078 +#: src/multiint.c:3094 msgid "TEMPLATES" msgstr "" -#: src/multiint.c:3242 src/multiint.c:3352 +#: src/multiint.c:3258 src/multiint.c:3368 msgid "Load Force" msgstr "" -#: src/multiint.c:3246 src/multiint.c:3355 +#: src/multiint.c:3262 src/multiint.c:3371 msgid "Save Force" msgstr "" -#: src/multiint.c:3311 +#: src/multiint.c:3327 msgid "CONTROL" msgstr "" -#: src/multiint.c:3346 +#: src/multiint.c:3362 msgid "Clear Current Force" msgstr "" -#: src/multiint.c:3349 src/keyedit.c:386 +#: src/multiint.c:3365 src/keyedit.c:386 msgid "Select Default" msgstr "" -#: src/multiint.c:3647 +#: src/multiint.c:3663 msgid "Players" msgstr "Spieler" @@ -584,11 +584,16 @@ msgstr "" msgid "Unable to locate any Commanders!" msgstr "" -#: src/research.c:2014 src/research.c:2033 +#: src/research.c:2040 +#, c-format +msgid "Research completed: %s" +msgstr "" + +#: src/research.c:2045 msgid "Research Completed" msgstr "" -#: src/research.c:2880 +#: src/research.c:2892 msgid "Research Award" msgstr "" diff --git a/po/la.po b/po/la.po index ee3db7ab1..dbda02d8e 100644 --- a/po/la.po +++ b/po/la.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Warzone 2100 TRUNK\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2007-04-13 14:16+0200\n" +"POT-Creation-Date: 2007-04-16 00:40+0200\n" "PO-Revision-Date: 2007-04-13 14:34+0200\n" "Last-Translator: Giel van Schijndel \n" "Language-Team: Latin\n" @@ -144,7 +144,7 @@ msgstr "Invenio" msgid "Build" msgstr "Construo" -#: src/hci.c:4017 src/multiint.c:1022 +#: src/hci.c:4017 src/multiint.c:1020 #, fuzzy msgid "Power" msgstr "Vigor" @@ -275,193 +275,193 @@ msgstr "" msgid "Hero" msgstr "Heros" -#: src/multiint.c:466 src/multiint.c:1635 src/multilimit.c:181 +#: src/multiint.c:464 src/multiint.c:1633 src/multilimit.c:181 msgid "Accept Settings" msgstr "" -#: src/multiint.c:477 +#: src/multiint.c:475 msgid "IP Address or Machine Name" msgstr "" -#: src/multiint.c:517 +#: src/multiint.c:515 msgid "CONNECTION" msgstr "" -#: src/multiint.c:520 src/multiint.c:568 src/multiint.c:784 -#: src/multiint.c:1113 src/multiint.c:3343 src/keyedit.c:381 +#: src/multiint.c:518 src/multiint.c:566 src/multiint.c:782 +#: src/multiint.c:1111 src/multiint.c:3359 src/keyedit.c:381 #: src/multilimit.c:173 msgid "Return To Previous Screen" msgstr "" -#: src/multiint.c:531 +#: src/multiint.c:529 msgid "Internet" msgstr "" -#: src/multiint.c:770 +#: src/multiint.c:768 msgid "Searching" msgstr "" -#: src/multiint.c:781 +#: src/multiint.c:779 msgid "GAMES" msgstr "" -#: src/multiint.c:791 +#: src/multiint.c:789 msgid "Refresh Games List" msgstr "" -#: src/multiint.c:866 +#: src/multiint.c:864 msgid "OPTIONS" msgstr "" -#: src/multiint.c:868 +#: src/multiint.c:866 msgid "Select Game Name" msgstr "" -#: src/multiint.c:869 +#: src/multiint.c:867 msgid "Select Map" msgstr "" -#: src/multiint.c:875 +#: src/multiint.c:873 msgid "Game" msgstr "" -#: src/multiint.c:879 +#: src/multiint.c:877 msgid "Campaign Mode" msgstr "" -#: src/multiint.c:882 +#: src/multiint.c:880 msgid "Team Play" msgstr "" -#: src/multiint.c:885 +#: src/multiint.c:883 msgid "Skirmish" msgstr "" -#: src/multiint.c:916 +#: src/multiint.c:914 msgid "Select Player Name" msgstr "" -#: src/multiint.c:917 +#: src/multiint.c:915 msgid "Select Force" msgstr "" -#: src/multiint.c:921 src/frontend.c:763 +#: src/multiint.c:919 src/frontend.c:763 msgid "Fog" msgstr "" -#: src/multiint.c:923 src/frontend.c:770 src/frontend.c:867 +#: src/multiint.c:921 src/frontend.c:770 src/frontend.c:867 msgid "Fog Of War" msgstr "" -#: src/multiint.c:924 +#: src/multiint.c:922 msgid "Distance Fog" msgstr "" -#: src/multiint.c:944 src/multimenu.c:771 +#: src/multiint.c:942 src/multimenu.c:771 msgid "Alliances" msgstr "" -#: src/multiint.c:948 +#: src/multiint.c:946 msgid "No Alliances" msgstr "" -#: src/multiint.c:950 +#: src/multiint.c:948 msgid "Allow Alliances" msgstr "" -#: src/multiint.c:954 src/multiint.c:2406 +#: src/multiint.c:952 src/multiint.c:2422 msgid "Locked Teams" msgstr "" -#: src/multiint.c:1024 +#: src/multiint.c:1022 msgid "Low Power Levels" msgstr "" -#: src/multiint.c:1026 +#: src/multiint.c:1024 msgid "Medium Power Levels" msgstr "" -#: src/multiint.c:1028 +#: src/multiint.c:1026 msgid "High Power Levels" msgstr "" -#: src/multiint.c:1046 +#: src/multiint.c:1044 msgid "Base" msgstr "" -#: src/multiint.c:1048 +#: src/multiint.c:1046 msgid "Start with No Bases" msgstr "" -#: src/multiint.c:1050 +#: src/multiint.c:1048 msgid "Start with Bases" msgstr "" -#: src/multiint.c:1052 +#: src/multiint.c:1050 msgid "Start with Advanced Bases" msgstr "" -#: src/multiint.c:1076 src/multiint.c:1080 +#: src/multiint.c:1074 src/multiint.c:1078 msgid "Computer" msgstr "" -#: src/multiint.c:1084 +#: src/multiint.c:1082 msgid "Computer Opponents" msgstr "" -#: src/multiint.c:1086 +#: src/multiint.c:1084 msgid "No Computer Opponents" msgstr "" -#: src/multiint.c:1120 +#: src/multiint.c:1118 msgid "Start Hosting Game" msgstr "" -#: src/multiint.c:1128 +#: src/multiint.c:1126 msgid "Set Structure Limits" msgstr "" -#: src/multiint.c:1517 +#: src/multiint.c:1515 msgid "PLAYERS" msgstr "" -#: src/multiint.c:1666 +#: src/multiint.c:1664 msgid "CHAT" msgstr "" -#: src/multiint.c:2347 +#: src/multiint.c:2363 msgid "Host is Starting Game" msgstr "" -#: src/multiint.c:2955 +#: src/multiint.c:2971 msgid "FORCE" msgstr "" -#: src/multiint.c:3078 +#: src/multiint.c:3094 msgid "TEMPLATES" msgstr "" -#: src/multiint.c:3242 src/multiint.c:3352 +#: src/multiint.c:3258 src/multiint.c:3368 msgid "Load Force" msgstr "" -#: src/multiint.c:3246 src/multiint.c:3355 +#: src/multiint.c:3262 src/multiint.c:3371 msgid "Save Force" msgstr "" -#: src/multiint.c:3311 +#: src/multiint.c:3327 msgid "CONTROL" msgstr "" -#: src/multiint.c:3346 +#: src/multiint.c:3362 msgid "Clear Current Force" msgstr "" -#: src/multiint.c:3349 src/keyedit.c:386 +#: src/multiint.c:3365 src/keyedit.c:386 msgid "Select Default" msgstr "" -#: src/multiint.c:3647 +#: src/multiint.c:3663 msgid "Players" msgstr "" @@ -591,11 +591,16 @@ msgstr "" msgid "Unable to locate any Commanders!" msgstr "" -#: src/research.c:2014 src/research.c:2033 +#: src/research.c:2040 +#, c-format +msgid "Research completed: %s" +msgstr "" + +#: src/research.c:2045 msgid "Research Completed" msgstr "" -#: src/research.c:2880 +#: src/research.c:2892 msgid "Research Award" msgstr "" diff --git a/po/nb.po b/po/nb.po index b11054b4f..0cb704aab 100644 --- a/po/nb.po +++ b/po/nb.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Warzone 2100 TRUNK\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2007-04-13 14:16+0200\n" +"POT-Creation-Date: 2007-04-16 00:40+0200\n" "PO-Revision-Date: 2007-03-24 17:49+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -141,7 +141,7 @@ msgstr "Forskning" msgid "Build" msgstr "Bygg" -#: src/hci.c:4017 src/multiint.c:1022 +#: src/hci.c:4017 src/multiint.c:1020 msgid "Power" msgstr "" @@ -268,194 +268,194 @@ msgstr "" msgid "Hero" msgstr "" -#: src/multiint.c:466 src/multiint.c:1635 src/multilimit.c:181 +#: src/multiint.c:464 src/multiint.c:1633 src/multilimit.c:181 msgid "Accept Settings" msgstr "" -#: src/multiint.c:477 +#: src/multiint.c:475 msgid "IP Address or Machine Name" msgstr "" -#: src/multiint.c:517 +#: src/multiint.c:515 msgid "CONNECTION" msgstr "" -#: src/multiint.c:520 src/multiint.c:568 src/multiint.c:784 -#: src/multiint.c:1113 src/multiint.c:3343 src/keyedit.c:381 +#: src/multiint.c:518 src/multiint.c:566 src/multiint.c:782 +#: src/multiint.c:1111 src/multiint.c:3359 src/keyedit.c:381 #: src/multilimit.c:173 msgid "Return To Previous Screen" msgstr "" -#: src/multiint.c:531 +#: src/multiint.c:529 msgid "Internet" msgstr "" -#: src/multiint.c:770 +#: src/multiint.c:768 msgid "Searching" msgstr "" -#: src/multiint.c:781 +#: src/multiint.c:779 msgid "GAMES" msgstr "" -#: src/multiint.c:791 +#: src/multiint.c:789 msgid "Refresh Games List" msgstr "" -#: src/multiint.c:866 +#: src/multiint.c:864 msgid "OPTIONS" msgstr "ALTERNATIVER" -#: src/multiint.c:868 +#: src/multiint.c:866 #, fuzzy msgid "Select Game Name" msgstr "Nullstill hastighet" -#: src/multiint.c:869 +#: src/multiint.c:867 msgid "Select Map" msgstr "" -#: src/multiint.c:875 +#: src/multiint.c:873 msgid "Game" msgstr "" -#: src/multiint.c:879 +#: src/multiint.c:877 msgid "Campaign Mode" msgstr "" -#: src/multiint.c:882 +#: src/multiint.c:880 msgid "Team Play" msgstr "" -#: src/multiint.c:885 +#: src/multiint.c:883 msgid "Skirmish" msgstr "" -#: src/multiint.c:916 +#: src/multiint.c:914 msgid "Select Player Name" msgstr "" -#: src/multiint.c:917 +#: src/multiint.c:915 msgid "Select Force" msgstr "" -#: src/multiint.c:921 src/frontend.c:763 +#: src/multiint.c:919 src/frontend.c:763 msgid "Fog" msgstr "" -#: src/multiint.c:923 src/frontend.c:770 src/frontend.c:867 +#: src/multiint.c:921 src/frontend.c:770 src/frontend.c:867 msgid "Fog Of War" msgstr "" -#: src/multiint.c:924 +#: src/multiint.c:922 msgid "Distance Fog" msgstr "" -#: src/multiint.c:944 src/multimenu.c:771 +#: src/multiint.c:942 src/multimenu.c:771 msgid "Alliances" msgstr "" -#: src/multiint.c:948 +#: src/multiint.c:946 msgid "No Alliances" msgstr "" -#: src/multiint.c:950 +#: src/multiint.c:948 msgid "Allow Alliances" msgstr "" -#: src/multiint.c:954 src/multiint.c:2406 +#: src/multiint.c:952 src/multiint.c:2422 msgid "Locked Teams" msgstr "" -#: src/multiint.c:1024 +#: src/multiint.c:1022 msgid "Low Power Levels" msgstr "" -#: src/multiint.c:1026 +#: src/multiint.c:1024 msgid "Medium Power Levels" msgstr "" -#: src/multiint.c:1028 +#: src/multiint.c:1026 msgid "High Power Levels" msgstr "" -#: src/multiint.c:1046 +#: src/multiint.c:1044 msgid "Base" msgstr "" -#: src/multiint.c:1048 +#: src/multiint.c:1046 msgid "Start with No Bases" msgstr "" -#: src/multiint.c:1050 +#: src/multiint.c:1048 msgid "Start with Bases" msgstr "" -#: src/multiint.c:1052 +#: src/multiint.c:1050 msgid "Start with Advanced Bases" msgstr "" -#: src/multiint.c:1076 src/multiint.c:1080 +#: src/multiint.c:1074 src/multiint.c:1078 msgid "Computer" msgstr "" -#: src/multiint.c:1084 +#: src/multiint.c:1082 msgid "Computer Opponents" msgstr "" -#: src/multiint.c:1086 +#: src/multiint.c:1084 msgid "No Computer Opponents" msgstr "" -#: src/multiint.c:1120 +#: src/multiint.c:1118 msgid "Start Hosting Game" msgstr "" -#: src/multiint.c:1128 +#: src/multiint.c:1126 msgid "Set Structure Limits" msgstr "" -#: src/multiint.c:1517 +#: src/multiint.c:1515 msgid "PLAYERS" msgstr "" -#: src/multiint.c:1666 +#: src/multiint.c:1664 msgid "CHAT" msgstr "" -#: src/multiint.c:2347 +#: src/multiint.c:2363 msgid "Host is Starting Game" msgstr "" -#: src/multiint.c:2955 +#: src/multiint.c:2971 msgid "FORCE" msgstr "" -#: src/multiint.c:3078 +#: src/multiint.c:3094 msgid "TEMPLATES" msgstr "" -#: src/multiint.c:3242 src/multiint.c:3352 +#: src/multiint.c:3258 src/multiint.c:3368 msgid "Load Force" msgstr "" -#: src/multiint.c:3246 src/multiint.c:3355 +#: src/multiint.c:3262 src/multiint.c:3371 msgid "Save Force" msgstr "" -#: src/multiint.c:3311 +#: src/multiint.c:3327 msgid "CONTROL" msgstr "KONTROLL" -#: src/multiint.c:3346 +#: src/multiint.c:3362 msgid "Clear Current Force" msgstr "" -#: src/multiint.c:3349 src/keyedit.c:386 +#: src/multiint.c:3365 src/keyedit.c:386 msgid "Select Default" msgstr "" -#: src/multiint.c:3647 +#: src/multiint.c:3663 msgid "Players" msgstr "" @@ -584,11 +584,16 @@ msgstr "" msgid "Unable to locate any Commanders!" msgstr "" -#: src/research.c:2014 src/research.c:2033 +#: src/research.c:2040 +#, fuzzy, c-format +msgid "Research completed: %s" +msgstr "Forskning ferdig: %s" + +#: src/research.c:2045 msgid "Research Completed" msgstr "Forskning ferdig" -#: src/research.c:2880 +#: src/research.c:2892 msgid "Research Award" msgstr "" diff --git a/po/nl.po b/po/nl.po index 6856c8c55..537d4ef18 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Warzone 2100 TRUNK\n" "Report-Msgid-Bugs-To: warzone-dev@gna.org\n" -"POT-Creation-Date: 2007-04-13 14:16+0200\n" +"POT-Creation-Date: 2007-04-16 00:40+0200\n" "PO-Revision-Date: 2007-04-13 14:27+0200\n" "Last-Translator: Giel van Schijndel \n" "Language-Team: Dutch \n" @@ -141,7 +141,7 @@ msgstr "Onderzoek" msgid "Build" msgstr "Bouw" -#: src/hci.c:4017 src/multiint.c:1022 +#: src/hci.c:4017 src/multiint.c:1020 msgid "Power" msgstr "Energie" @@ -274,196 +274,196 @@ msgstr "Speciaal" msgid "Hero" msgstr "Held" -#: src/multiint.c:466 src/multiint.c:1635 src/multilimit.c:181 +#: src/multiint.c:464 src/multiint.c:1633 src/multilimit.c:181 msgid "Accept Settings" msgstr "Accepteer Instellingen" -#: src/multiint.c:477 +#: src/multiint.c:475 msgid "IP Address or Machine Name" msgstr "IP Adres of Computer Naam" -#: src/multiint.c:517 +#: src/multiint.c:515 msgid "CONNECTION" msgstr "VERBINDING" -#: src/multiint.c:520 src/multiint.c:568 src/multiint.c:784 -#: src/multiint.c:1113 src/multiint.c:3343 src/keyedit.c:381 +#: src/multiint.c:518 src/multiint.c:566 src/multiint.c:782 +#: src/multiint.c:1111 src/multiint.c:3359 src/keyedit.c:381 #: src/multilimit.c:173 msgid "Return To Previous Screen" msgstr "Terug Naar Vorig Scherm" -#: src/multiint.c:531 +#: src/multiint.c:529 msgid "Internet" msgstr "Internet" -#: src/multiint.c:770 +#: src/multiint.c:768 #, fuzzy msgid "Searching" msgstr "Zoeken" -#: src/multiint.c:781 +#: src/multiint.c:779 msgid "GAMES" msgstr "SPELLEN" -#: src/multiint.c:791 +#: src/multiint.c:789 msgid "Refresh Games List" msgstr "Ververs Lijst Met Spellen" -#: src/multiint.c:866 +#: src/multiint.c:864 msgid "OPTIONS" msgstr "INSTELLINGEN" -#: src/multiint.c:868 +#: src/multiint.c:866 msgid "Select Game Name" msgstr "Kies Spel Naam" -#: src/multiint.c:869 +#: src/multiint.c:867 #, fuzzy msgid "Select Map" msgstr "Kies Map" -#: src/multiint.c:875 +#: src/multiint.c:873 msgid "Game" msgstr "Spel" -#: src/multiint.c:879 +#: src/multiint.c:877 msgid "Campaign Mode" msgstr "" -#: src/multiint.c:882 +#: src/multiint.c:880 msgid "Team Play" msgstr "" -#: src/multiint.c:885 +#: src/multiint.c:883 msgid "Skirmish" msgstr "" -#: src/multiint.c:916 +#: src/multiint.c:914 msgid "Select Player Name" msgstr "Kies Speler Naam" -#: src/multiint.c:917 +#: src/multiint.c:915 msgid "Select Force" msgstr "Kies Strijdkracht" -#: src/multiint.c:921 src/frontend.c:763 +#: src/multiint.c:919 src/frontend.c:763 msgid "Fog" msgstr "Mist" -#: src/multiint.c:923 src/frontend.c:770 src/frontend.c:867 +#: src/multiint.c:921 src/frontend.c:770 src/frontend.c:867 msgid "Fog Of War" msgstr "" -#: src/multiint.c:924 +#: src/multiint.c:922 msgid "Distance Fog" msgstr "" -#: src/multiint.c:944 src/multimenu.c:771 +#: src/multiint.c:942 src/multimenu.c:771 msgid "Alliances" msgstr "Allianties" -#: src/multiint.c:948 +#: src/multiint.c:946 msgid "No Alliances" msgstr "Geen Allianties Toestaan" -#: src/multiint.c:950 +#: src/multiint.c:948 msgid "Allow Alliances" msgstr "Allianties Toestaan" -#: src/multiint.c:954 src/multiint.c:2406 +#: src/multiint.c:952 src/multiint.c:2422 msgid "Locked Teams" msgstr "Vergrendelde Teams" -#: src/multiint.c:1024 +#: src/multiint.c:1022 msgid "Low Power Levels" msgstr "Lage Energie Niveaus" -#: src/multiint.c:1026 +#: src/multiint.c:1024 msgid "Medium Power Levels" msgstr "Normale Energie Niveaus" -#: src/multiint.c:1028 +#: src/multiint.c:1026 msgid "High Power Levels" msgstr "Hoge Energie Niveaus" -#: src/multiint.c:1046 +#: src/multiint.c:1044 msgid "Base" msgstr "Basis" -#: src/multiint.c:1048 +#: src/multiint.c:1046 msgid "Start with No Bases" msgstr "Start Zonder Basis" -#: src/multiint.c:1050 +#: src/multiint.c:1048 msgid "Start with Bases" msgstr "Start Met Basis" -#: src/multiint.c:1052 +#: src/multiint.c:1050 msgid "Start with Advanced Bases" msgstr "Start Met Gevanceerde Basis" -#: src/multiint.c:1076 src/multiint.c:1080 +#: src/multiint.c:1074 src/multiint.c:1078 msgid "Computer" msgstr "Computer" -#: src/multiint.c:1084 +#: src/multiint.c:1082 msgid "Computer Opponents" msgstr "Computer Tegenstanders" -#: src/multiint.c:1086 +#: src/multiint.c:1084 msgid "No Computer Opponents" msgstr "Geen Computer Tegenstanders" -#: src/multiint.c:1120 +#: src/multiint.c:1118 msgid "Start Hosting Game" msgstr "" -#: src/multiint.c:1128 +#: src/multiint.c:1126 msgid "Set Structure Limits" msgstr "" -#: src/multiint.c:1517 +#: src/multiint.c:1515 msgid "PLAYERS" msgstr "SPELERS" -#: src/multiint.c:1666 +#: src/multiint.c:1664 msgid "CHAT" msgstr "CHAT" -#: src/multiint.c:2347 +#: src/multiint.c:2363 msgid "Host is Starting Game" msgstr "" -#: src/multiint.c:2955 +#: src/multiint.c:2971 msgid "FORCE" msgstr "" -#: src/multiint.c:3078 +#: src/multiint.c:3094 msgid "TEMPLATES" msgstr "SJABLONEN" -#: src/multiint.c:3242 src/multiint.c:3352 +#: src/multiint.c:3258 src/multiint.c:3368 msgid "Load Force" msgstr "Laad Strijdkracht" -#: src/multiint.c:3246 src/multiint.c:3355 +#: src/multiint.c:3262 src/multiint.c:3371 msgid "Save Force" msgstr "Strijdkracht opslaan" -#: src/multiint.c:3311 +#: src/multiint.c:3327 msgid "CONTROL" msgstr "" -#: src/multiint.c:3346 +#: src/multiint.c:3362 #, fuzzy msgid "Clear Current Force" msgstr "Maak Huidige Strijdkracht Leeg" -#: src/multiint.c:3349 src/keyedit.c:386 +#: src/multiint.c:3365 src/keyedit.c:386 msgid "Select Default" msgstr "" -#: src/multiint.c:3647 +#: src/multiint.c:3663 msgid "Players" msgstr "Spelers" @@ -592,11 +592,15 @@ msgstr "" msgid "Unable to locate any Commanders!" msgstr "" -#: src/research.c:2014 src/research.c:2033 +#: src/research.c:2040 +msgid "Research completed: %s" +msgstr "Onderzoek Voltooid: %s" + +#: src/research.c:2045 msgid "Research Completed" msgstr "Onderzoek Voltooid" -#: src/research.c:2880 +#: src/research.c:2892 msgid "Research Award" msgstr ""