summaryrefslogtreecommitdiff
path: root/src/gui/setup_video.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/setup_video.cpp')
-rw-r--r--src/gui/setup_video.cpp22
1 files changed, 15 insertions, 7 deletions
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index a9c892b2..ce815001 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -192,7 +192,7 @@ Setup_Video::Setup_Video():
mVisibleNamesEnabled)),
mParticleEffectsCheckBox(new CheckBox(_("Particle effects"),
mParticleEffectsEnabled)),
- mNameCheckBox(new CheckBox(_("Show name"), mNameEnabled)),
+ mNameCheckBox(new CheckBox(_("Show own name"), mNameEnabled)),
mPickupNotifyLabel(new Label(_("Show pickup notification"))),
mPickupChatCheckBox(new CheckBox(_("in chat"), mPickupChatEnabled)),
mPickupParticleCheckBox(new CheckBox(_("as particle"),
@@ -352,12 +352,20 @@ void Setup_Video::apply()
fullscreen = !fullscreen;
if (!graphics->setFullscreen(fullscreen))
{
- std::stringstream error;
- error << _("Failed to switch to ") <<
- (fullscreen ? _("windowed") : _("fullscreen")) <<
- _("mode and restoration of old mode also failed!") <<
- std::endl;
- logger->error(error.str());
+ std::stringstream errorMessage;
+ if (fullscreen)
+ {
+ errorMessage << _("Failed to switch to windowed mode "
+ "and restoration of old mode also "
+ "failed!") << std::endl;
+ }
+ else
+ {
+ errorMessage << _("Failed to switch to fullscreen mode "
+ "and restoration of old mode also "
+ "failed!") << std::endl;
+ }
+ logger->error(errorMessage.str());
}
}
#if defined(WIN32) || defined(__APPLE__)