1 files changed, 31 insertions, 15 deletions

diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index a9c892b2..f21f20e0 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -192,15 +192,17 @@ 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"))),
+    // TRANSLATORS: Refers to "Show own name"
     mPickupChatCheckBox(new CheckBox(_("in chat"), mPickupChatEnabled)),
+    // TRANSLATORS: Refers to "Show own name"
     mPickupParticleCheckBox(new CheckBox(_("as particle"),
                                          mPickupParticleEnabled)),
     mSpeechSlider(new Slider(0, 3)),
     mSpeechLabel(new Label("")),
     mAlphaSlider(new Slider(0.2, 1.0)),
-    mFpsCheckBox(new CheckBox(_("FPS Limit:"))),
+    mFpsCheckBox(new CheckBox(_("FPS limit:"))),
     mFpsSlider(new Slider(10, 120)),
     mFpsField(new TextField),
     mOverlayDetail((int) config.getValue("OverlayDetail", 2)),
@@ -219,7 +221,7 @@ Setup_Video::Setup_Video():
     speechLabel = new Label(_("Overhead text"));
     alphaLabel = new Label(_("Gui opacity"));
     overlayDetailLabel = new Label(_("Ambient FX"));
-    particleDetailLabel = new Label(_("Particle Detail"));
+    particleDetailLabel = new Label(_("Particle detail"));
     fontSizeLabel = new Label(_("Font size"));
 
     mFontSizeDropDown = new DropDown(new FontSizeChoiceListModel);
@@ -352,19 +354,27 @@ 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__)
         }
         else
         {
-            new OkDialog(_("Switching to full screen"),
+            new OkDialog(_("Switching to Full Screen"),
                          _("Restart needed for changes to take effect."));
         }
 #endif
@@ -377,7 +387,7 @@ void Setup_Video::apply()
         config.setValue("opengl", mOpenGLCheckBox->isSelected());
 
         // OpenGL can currently only be changed by restarting, notify user.
-        new OkDialog(_("Changing OpenGL"),
+        new OkDialog(_("Changing to OpenGL"),
                      _("Applying change to OpenGL requires restart."));
     }
 
@@ -436,11 +446,17 @@ void Setup_Video::action(const gcn::ActionEvent &event)
         const int width = atoi(mode.substr(0, mode.find("x")).c_str());
         const int height = atoi(mode.substr(mode.find("x") + 1).c_str());
 
+          // TODO: Find out why the drawing area doesn't resize without a restart.
         if (width != graphics->getWidth() || height != graphics->getHeight())
         {
-            // TODO: Find out why the drawing area doesn't resize without a restart.
-            new OkDialog(_("Screen resolution changed"),
-                         _("Restart your client for the change to take effect."));
+            if (width < graphics->getWidth() || height < graphics->getHeight())
+                new OkDialog(_("Screen Resolution Changed"),
+                       _("Restart your client for the change to take effect.")
+                       + std::string("\n") +
+                _("Some windows may be moved to fit the lowered resolution."));
+            else
+                new OkDialog(_("Screen Resolution Changed"),
+                     _("Restart your client for the change to take effect."));
         }
 
         config.setValue("screenwidth", width);
@@ -464,7 +480,7 @@ void Setup_Video::action(const gcn::ActionEvent &event)
                         mParticleEffectsCheckBox->isSelected());
         if (engine)
         {
-            new OkDialog(_("Particle effect settings changed."),
+            new OkDialog(_("Particle Effect Settings Changed."),
                          _("Changes will take effect on map change."));
         }
     }