Fixed a small problem with the shader effects option being displayed incorrectly. Some more strings externalized.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1316 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Nikos Barkas 2008-01-19 10:57:41 +00:00
parent e7f0b0e316
commit c47f8db6aa
3 changed files with 13 additions and 9 deletions

View File

@ -1068,6 +1068,14 @@
<string> Shader Effects: Not available </string>
<key>gameoptions-shaderfx-@</key>
<string> Shader Effects: %@ </string>
<key>shaderfx-not-available</key>
<string>Not available</string>
<key>shaderfx-off</key>
<string>Off</string>
<key>shaderfx-simple</key>
<string>Simple</string>
<key>shaderfx-full</key>
<string>Full</string>
<key>gameoptions-back</key>
<string> Back </string>
@ -1123,10 +1131,6 @@
<string>%@ Will pay %llu Cr: %d Cr in advance, and %llu Cr on arrival.</string>
<key>contracts-deliver-a-cargo-of-@-to-@</key>
<string>Deliver a cargo of %@ to %@.</string>
<key>contracts-@-the-route-is-f-light-years-long-a-minimum-of-d-jumps</key>
<string>%@ The route is %.1f light years long, a minimum of %d jumps.</string>
<key>contracts-@-you-will-need-to-depart-within-@-in-order-to-arrive-within-@-time</key>
<string>%@ You will need to depart within %@, in order to arrive within %@ time.</string>
<key>contracts-@-the-contract-will-cost-you-f-credits-and-pay-a-total-of-f-credits</key>
<string>%@ The contract will cost you %.1f Cr, and pay a total of %.1f Cr.</string>
<key>contracts-no-time</key>

View File

@ -4549,7 +4549,7 @@ double scoopSoundPlayTime = 0.0;
}
else
{
shaderEffectsOptionsString = [NSString stringWithFormat:DESC(@"gameoptions-shader-fx-@"), ShaderSettingToDisplayString(shaderEffects)];
shaderEffectsOptionsString = [NSString stringWithFormat:DESC(@"gameoptions-shaderfx-@"), ShaderSettingToDisplayString(shaderEffects)];
[gui setText:shaderEffectsOptionsString forRow:GUI_ROW_GAMEOPTIONS_SHADEREFFECTS align:GUI_ALIGN_CENTER];
[gui setKey:GUI_KEY_OK forRow:GUI_ROW_GAMEOPTIONS_SHADEREFFECTS];
}

View File

@ -500,10 +500,10 @@ NSString *ShaderSettingToDisplayString(OOShaderSetting setting)
{
switch (setting)
{
case SHADERS_NOT_SUPPORTED: return @"Not available";
case SHADERS_OFF: return @"Off";
case SHADERS_SIMPLE: return @"Simple";
case SHADERS_FULL: return @"Full";
case SHADERS_NOT_SUPPORTED: return DESC(@"shaderfx-not-available");
case SHADERS_OFF: return DESC(@"shaderfx-off");
case SHADERS_SIMPLE: return DESC(@"shaderfx-simple");
case SHADERS_FULL: return DESC(@"shaderfx-full");
}
return @"??";